« back to all changes in this revision
Viewing changes to po/he.po
- browse files at revision 6093.4.149
- compare with another revision
- compare with revision 6052
- download diff
- download tarball
- view history from revision 6093.4.149
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-07-11 04:34:44 UTC
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20120711043444-s6bhpt1r22h4fpi1
Launchpad automatic translations update.
added
removed
po/he.po
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-03-15 10:20+0100\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
11
"PO-Revision-Date: 2012-03-05 14:59+0000\n"
12
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
"Language-Team: Hebrew <he@li.org>\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-03-16 04:31+0000\n"
19
"X-Generator: Launchpad (build 14951)\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:32+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
20
21
21
#: bzrlib/add.py:93
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
26
26
msgid "Unstacking"
27
27
msgstr ""
28
28
29
#: bzrlib/branch.py:3121
29
#: bzrlib/branch.py:2955
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr ""
33
33
34
#: bzrlib/branch.py:3123
34
#: bzrlib/branch.py:2957
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] ""
39
39
msgstr[1] ""
40
40
41
#: bzrlib/branch.py:3126
41
#: bzrlib/branch.py:2960
42
42
msgid "No new revisions or tags to push."
43
43
msgstr ""
44
44
45
#: bzrlib/branch.py:3128
45
#: bzrlib/branch.py:2962
46
46
msgid "No new revisions to push."
47
47
msgstr ""
48
48
49
#: bzrlib/branch.py:3148
49
#: bzrlib/branch.py:2982
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3151
53
#: bzrlib/branch.py:2985
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr ""
57
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3026 bzrlib/workingtree.py:323
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr ""
184
184
msgid "bzr status --revision takes exactly one or two revision specifiers"
185
185
msgstr ""
186
186
187
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5197
187
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
188
188
msgid "You can only supply one of revision_id or --revision"
189
189
msgstr ""
190
190
191
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5199
191
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
192
192
msgid "You must supply either --revision or a revision_id"
193
193
msgstr ""
194
194
264
264
msgid "--tree and --revision can not be used together"
265
265
msgstr ""
266
266
267
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5953
267
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
268
268
msgid "Tags can only be placed on a single revision, not on a range"
269
269
msgstr ""
270
270
507
507
"master branch."
508
508
msgstr ""
509
509
510
#: bzrlib/builtins.py:1180
510
#: bzrlib/builtins.py:1189
511
511
msgid "Need working tree for --show-base."
512
512
msgstr ""
513
513
514
#: bzrlib/builtins.py:1196
514
#: bzrlib/builtins.py:1205
515
515
msgid "No pull location known or specified."
516
516
msgstr ""
517
517
518
#: bzrlib/builtins.py:1202
518
#: bzrlib/builtins.py:1211
519
519
#, python-format
520
520
msgid "Using saved parent location: %s\n"
521
521
msgstr ""
522
522
523
#: bzrlib/builtins.py:1209 bzrlib/builtins.py:4406
523
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
524
524
msgid "Cannot use -r with merge directives or bundles"
525
525
msgstr ""
526
526
527
#: bzrlib/builtins.py:1252
527
#: bzrlib/builtins.py:1261
528
528
msgid "Update a mirror of this branch."
529
529
msgstr ""
530
530
531
#: bzrlib/builtins.py:1254
531
#: bzrlib/builtins.py:1263
532
532
msgid ""
533
533
"The target branch will not have its working tree populated because this\n"
534
534
"is both expensive, and is not supported on remote file systems."
535
535
msgstr ""
536
536
537
#: bzrlib/builtins.py:1257
537
#: bzrlib/builtins.py:1266
538
538
msgid ""
539
539
"Some smart servers or protocols *may* put the working tree in place in\n"
540
540
"the future."
541
541
msgstr ""
542
542
543
#: bzrlib/builtins.py:1260
543
#: bzrlib/builtins.py:1269
544
544
msgid ""
545
545
"This command only works on branches that have not diverged. Branches are\n"
546
546
"considered diverged if the destination branch's most recent commit is one\n"
547
547
"that has not been merged (directly or indirectly) by the source branch."
548
548
msgstr ""
549
549
550
#: bzrlib/builtins.py:1264
550
#: bzrlib/builtins.py:1273
551
551
msgid ""
552
552
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
553
553
"the other branch completely, discarding its unmerged changes."
554
554
msgstr ""
555
555
556
#: bzrlib/builtins.py:1267
556
#: bzrlib/builtins.py:1276
557
557
msgid ""
558
558
"If you want to ensure you have the different changes in the other branch,\n"
559
559
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
560
560
"After that you will be able to do a push without '--overwrite'."
561
561
msgstr ""
562
562
563
#: bzrlib/builtins.py:1271
563
#: bzrlib/builtins.py:1280
564
564
msgid ""
565
565
"If there is no default push location set, the first push will set it (use\n"
566
566
"--no-remember to avoid setting it). After that, you can omit the\n"
568
568
"value will only be saved if the remote location can be accessed."
569
569
msgstr ""
570
570
571
#: bzrlib/builtins.py:1276
571
#: bzrlib/builtins.py:1285
572
572
msgid ""
573
573
"The --verbose option will display the revisions pushed using the log_format\n"
574
574
"configuration option. You can use a different format by overriding it with\n"
575
575
"-Olog_format=<other_format>."
576
576
msgstr ""
577
577
578
#: bzrlib/builtins.py:1287 bzrlib/foreign.py:272
578
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
579
579
msgid ""
580
580
"Branch to push from, rather than the one containing the working directory."
581
581
msgstr ""
582
582
583
#: bzrlib/builtins.py:1290
583
#: bzrlib/builtins.py:1299
584
584
msgid ""
585
585
"By default push will fail if the target directory exists, but does not "
586
586
"already have a control directory. This flag will allow push to proceed."
587
587
msgstr ""
588
588
589
#: bzrlib/builtins.py:1295
589
#: bzrlib/builtins.py:1304
590
590
msgid ""
591
591
"Create a stacked branch that references the public location of the parent "
592
592
"branch."
593
593
msgstr ""
594
594
595
#: bzrlib/builtins.py:1298
595
#: bzrlib/builtins.py:1307
596
596
msgid ""
597
597
"Create a stacked branch that refers to another branch for the commit "
598
598
"history. Only the work not present in the referenced branch is included in "
599
599
"the branch created."
600
600
msgstr ""
601
601
602
#: bzrlib/builtins.py:1303 bzrlib/foreign.py:279
602
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
603
603
msgid ""
604
604
"Refuse to push if there are uncommitted changes in the working tree, --no-"
605
605
"strict disables the check."
606
606
msgstr ""
607
607
608
#: bzrlib/builtins.py:1306
608
#: bzrlib/builtins.py:1315
609
609
msgid "Don't populate the working tree, even for protocols that support it."
610
610
msgstr ""
611
611
612
#: bzrlib/builtins.py:1350
612
#: bzrlib/builtins.py:1318
613
msgid "Overwrite tags only."
614
msgstr ""
615
616
#: bzrlib/builtins.py:1369
613
617
msgid "Could not determine branch to refer to."
614
618
msgstr ""
615
619
616
#: bzrlib/builtins.py:1359
620
#: bzrlib/builtins.py:1378
617
621
#, python-format
618
622
msgid ""
619
623
"No push location known or specified. To push to the parent branch (at %s), "
620
624
"use 'bzr push :parent'."
621
625
msgstr ""
622
626
623
#: bzrlib/builtins.py:1365 bzrlib/foreign.py:306
627
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
624
628
msgid "No push location known or specified."
625
629
msgstr ""
626
630
627
#: bzrlib/builtins.py:1369
631
#: bzrlib/builtins.py:1388
628
632
#, python-format
629
633
msgid "Using saved push location: %s"
630
634
msgstr ""
631
635
632
#: bzrlib/builtins.py:1379
636
#: bzrlib/builtins.py:1398
633
637
msgid "Create a new branch that is a copy of an existing branch."
634
638
msgstr ""
635
639
636
#: bzrlib/builtins.py:1381
640
#: bzrlib/builtins.py:1400
637
641
msgid ""
638
642
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
639
643
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
644
648
"create ./foo-bar."
645
649
msgstr ""
646
650
647
#: bzrlib/builtins.py:1388
651
#: bzrlib/builtins.py:1407
648
652
msgid ""
649
653
"To retrieve the branch as of a particular revision, supply the --revision\n"
650
654
"parameter, as in \"branch foo/bar -r 5\"."
651
655
msgstr ""
652
656
653
#: bzrlib/builtins.py:1391
657
#: bzrlib/builtins.py:1410
654
658
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
655
659
msgstr ""
656
660
657
#: bzrlib/builtins.py:1401
661
#: bzrlib/builtins.py:1420
658
662
msgid "Create a branch without a working-tree."
659
663
msgstr ""
660
664
661
#: bzrlib/builtins.py:1403
665
#: bzrlib/builtins.py:1422
662
666
msgid "Switch the checkout in the current directory to the new branch."
663
667
msgstr ""
664
668
665
#: bzrlib/builtins.py:1406
669
#: bzrlib/builtins.py:1425
666
670
msgid ""
667
671
"Create a stacked branch referring to the source branch. The new branch will "
668
672
"depend on the availability of the source branch for all operations."
669
673
msgstr ""
670
674
671
#: bzrlib/builtins.py:1410
675
#: bzrlib/builtins.py:1429
672
676
msgid "Do not use a shared repository, even if available."
673
677
msgstr ""
674
678
675
#: bzrlib/builtins.py:1412
679
#: bzrlib/builtins.py:1431
676
680
msgid ""
677
681
"By default branch will fail if the target directory exists, but does not "
678
682
"already have a control directory. This flag will allow branch to proceed."
679
683
msgstr ""
680
684
681
#: bzrlib/builtins.py:1417
685
#: bzrlib/builtins.py:1436
682
686
msgid "Bind new branch to from location."
683
687
msgstr ""
684
688
685
#: bzrlib/builtins.py:1464
689
#: bzrlib/builtins.py:1483
686
690
#, python-format
687
691
msgid "Target directory \"%s\" already exists."
688
692
msgstr ""
689
693
690
#: bzrlib/builtins.py:1476
694
#: bzrlib/builtins.py:1495
691
695
#, python-format
692
696
msgid "Parent of \"%s\" does not exist."
693
697
msgstr ""
694
698
695
#: bzrlib/builtins.py:1495
699
#: bzrlib/builtins.py:1514
696
700
msgid "The branch {0} has no revision {1}."
697
701
msgstr ""
698
702
699
#: bzrlib/builtins.py:1510 bzrlib/push.py:53
703
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
700
704
#, python-format
701
705
msgid "Created new stacked branch referring to %s."
702
706
msgstr ""
703
707
704
#: bzrlib/builtins.py:1514
708
#: bzrlib/builtins.py:1533
705
709
#, python-format
706
710
msgid "Branched %d revision."
707
711
msgid_plural "Branched %d revisions."
708
712
msgstr[0] ""
709
713
msgstr[1] ""
710
714
711
#: bzrlib/builtins.py:1519
715
#: bzrlib/builtins.py:1538
712
716
#, python-format
713
717
msgid "New branch bound to %s"
714
718
msgstr ""
715
719
716
#: bzrlib/builtins.py:1524 bzrlib/builtins.py:6247
720
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
717
721
#, python-format
718
722
msgid "Switched to branch: %s"
719
723
msgstr ""
720
724
721
#: bzrlib/builtins.py:1529
725
#: bzrlib/builtins.py:1548
722
726
msgid "List the branches available at the current location."
723
727
msgstr ""
724
728
725
#: bzrlib/builtins.py:1531
729
#: bzrlib/builtins.py:1550
726
730
msgid ""
727
731
"This command will print the names of all the branches at the current\n"
728
732
"location."
729
733
msgstr ""
730
734
731
#: bzrlib/builtins.py:1538
735
#: bzrlib/builtins.py:1557
732
736
msgid ""
733
737
"Recursively scan for branches rather than just looking in the specified "
734
738
"location."
735
739
msgstr ""
736
740
737
#: bzrlib/builtins.py:1567
741
#: bzrlib/builtins.py:1586
738
742
msgid "(default)"
739
743
msgstr ""
740
744
741
#: bzrlib/builtins.py:1579
745
#: bzrlib/builtins.py:1598
742
746
msgid "Create a new checkout of an existing branch."
743
747
msgstr ""
744
748
745
#: bzrlib/builtins.py:1581
749
#: bzrlib/builtins.py:1600
746
750
msgid ""
747
751
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
748
752
"for\n"
752
756
"location using SFTP."
753
757
msgstr ""
754
758
755
#: bzrlib/builtins.py:1586
759
#: bzrlib/builtins.py:1605
756
760
msgid ""
757
761
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
758
762
"will\n"
764
768
"create ./foo-bar."
765
769
msgstr ""
766
770
767
#: bzrlib/builtins.py:1593
771
#: bzrlib/builtins.py:1612
768
772
msgid ""
769
773
"To retrieve the branch as of a particular revision, supply the --revision\n"
770
774
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
774
778
"code.)"
775
779
msgstr ""
776
780
777
#: bzrlib/builtins.py:1603
781
#: bzrlib/builtins.py:1622
778
782
msgid ""
779
783
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
780
784
"the branch for every operation. Normal checkouts can perform common "
782
786
"commits."
783
787
msgstr ""
784
788
785
#: bzrlib/builtins.py:1610
789
#: bzrlib/builtins.py:1629
786
790
msgid "Get file contents from this tree."
787
791
msgstr ""
788
792
789
#: bzrlib/builtins.py:1612
793
#: bzrlib/builtins.py:1631
790
794
msgid "Hard-link working tree files where possible."
791
795
msgstr ""
792
796
793
#: bzrlib/builtins.py:1653
797
#: bzrlib/builtins.py:1672
794
798
msgid ""
795
799
"Show list of renamed files.\n"
796
800
" "
797
801
msgstr ""
798
802
799
#: bzrlib/builtins.py:1681
803
#: bzrlib/builtins.py:1700
800
804
msgid "Update a working tree to a new revision."
801
805
msgstr ""
802
806
803
#: bzrlib/builtins.py:1683
807
#: bzrlib/builtins.py:1702
804
808
msgid ""
805
809
"This will perform a merge of the destination revision (the tip of the\n"
806
810
"branch, or the specified revision) into the working tree, and then make\n"
807
811
"that revision the basis revision for the working tree. "
808
812
msgstr ""
809
813
810
#: bzrlib/builtins.py:1687
814
#: bzrlib/builtins.py:1706
811
815
msgid ""
812
816
"You can use this to visit an older revision, or to update a working tree\n"
813
817
"that is out of date from its branch."
814
818
msgstr ""
815
819
816
#: bzrlib/builtins.py:1690
820
#: bzrlib/builtins.py:1709
817
821
msgid ""
818
822
"If there are any uncommitted changes in the tree, they will be carried\n"
819
823
"across and remain as uncommitted changes after the update. To discard\n"
821
825
"with the changes brought in by the change in basis revision."
822
826
msgstr ""
823
827
824
#: bzrlib/builtins.py:1695
828
#: bzrlib/builtins.py:1714
825
829
msgid ""
826
830
"If the tree's branch is bound to a master branch, bzr will also update\n"
827
831
"the branch from the master."
828
832
msgstr ""
829
833
830
#: bzrlib/builtins.py:1698
834
#: bzrlib/builtins.py:1717
831
835
msgid ""
832
836
"You cannot update just a single file or directory, because each Bazaar\n"
833
837
"working tree has just a single basis revision. If you want to restore a\n"
837
841
"out the old content of that file to a new location."
838
842
msgstr ""
839
843
840
#: bzrlib/builtins.py:1705
844
#: bzrlib/builtins.py:1724
841
845
msgid ""
842
846
"The 'dir' argument, if given, must be the location of the root of a\n"
843
847
"working tree to update. By default, the working tree that contains the \n"
844
848
"current working directory is used."
845
849
msgstr ""
846
850
847
#: bzrlib/builtins.py:1721
851
#: bzrlib/builtins.py:1740
848
852
msgid "bzr update --revision takes exactly one revision"
849
853
msgstr ""
850
854
851
#: bzrlib/builtins.py:1729
855
#: bzrlib/builtins.py:1748
852
856
msgid "bzr update can only update a whole tree, not a file or subdirectory"
853
857
msgstr ""
854
858
855
#: bzrlib/builtins.py:1760
859
#: bzrlib/builtins.py:1779
856
860
msgid "Tree is up to date at revision {0} of branch {1}"
857
861
msgstr ""
858
862
859
#: bzrlib/builtins.py:1776
863
#: bzrlib/builtins.py:1795
860
864
#, python-format
861
865
msgid ""
862
866
"branch has no revision %s\n"
863
867
"bzr update --revision only works for a revision in the branch history"
864
868
msgstr ""
865
869
866
#: bzrlib/builtins.py:1782
870
#: bzrlib/builtins.py:1801
867
871
msgid "Updated to revision {0} of branch {1}"
868
872
msgstr ""
869
873
870
#: bzrlib/builtins.py:1786
874
#: bzrlib/builtins.py:1805
871
875
msgid ""
872
876
"Your local commits will now show as pending merges with 'bzr status', and "
873
877
"can be committed with 'bzr commit'."
874
878
msgstr ""
875
879
876
#: bzrlib/builtins.py:1795
880
#: bzrlib/builtins.py:1814
877
881
msgid "Show information about a working tree, branch or repository."
878
882
msgstr ""
879
883
880
#: bzrlib/builtins.py:1797
884
#: bzrlib/builtins.py:1816
881
885
msgid ""
882
886
"This command will show all known locations and formats associated to the\n"
883
887
"tree, branch or repository."
884
888
msgstr ""
885
889
886
#: bzrlib/builtins.py:1800
890
#: bzrlib/builtins.py:1819
887
891
msgid ""
888
892
"In verbose mode, statistical information is included with each report.\n"
889
893
"To see extended statistic information, use a verbosity level of 2 or\n"
890
894
"higher by specifying the verbose option multiple times, e.g. -vv."
891
895
msgstr ""
892
896
893
#: bzrlib/builtins.py:1804
897
#: bzrlib/builtins.py:1823
894
898
msgid "Branches and working trees will also report any missing revisions."
895
899
msgstr ""
896
900
897
#: bzrlib/builtins.py:1806 bzrlib/builtins.py:3725 bzrlib/builtins.py:4859
898
#: bzrlib/builtins.py:6433
901
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
902
#: bzrlib/builtins.py:6466
899
903
msgid ":Examples:"
900
904
msgstr ""
901
905
902
#: bzrlib/builtins.py:1808
906
#: bzrlib/builtins.py:1827
903
907
msgid " Display information on the format and related locations:"
904
908
msgstr ""
905
909
906
#: bzrlib/builtins.py:1810
910
#: bzrlib/builtins.py:1829
907
911
msgid " bzr info"
908
912
msgstr ""
909
913
910
#: bzrlib/builtins.py:1812
914
#: bzrlib/builtins.py:1831
911
915
msgid ""
912
916
" Display the above together with extended format information and\n"
913
917
" basic statistics (like the number of files in the working tree and\n"
914
918
" number of revisions in the branch and repository):"
915
919
msgstr ""
916
920
917
#: bzrlib/builtins.py:1816
921
#: bzrlib/builtins.py:1835
918
922
msgid " bzr info -v"
919
923
msgstr ""
920
924
921
#: bzrlib/builtins.py:1818
925
#: bzrlib/builtins.py:1837
922
926
msgid " Display the above together with number of committers to the branch:"
923
927
msgstr ""
924
928
925
#: bzrlib/builtins.py:1820
929
#: bzrlib/builtins.py:1839
926
930
msgid " bzr info -vv"
927
931
msgstr ""
928
932
929
#: bzrlib/builtins.py:1839
933
#: bzrlib/builtins.py:1858
930
934
msgid "Remove files or directories."
931
935
msgstr ""
932
936
933
#: bzrlib/builtins.py:1841
937
#: bzrlib/builtins.py:1860
934
938
msgid ""
935
939
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
936
940
"delete them if they can easily be recovered using revert otherwise they\n"
937
"will be backed up (adding an extention of the form .~#~). If no options or\n"
941
"will be backed up (adding an extension of the form .~#~). If no options or\n"
938
942
"parameters are given Bazaar will scan for files that are being tracked by\n"
939
943
"Bazaar but missing in your tree and stop tracking them for you."
940
944
msgstr ""
941
945
942
#: bzrlib/builtins.py:1849
946
#: bzrlib/builtins.py:1868
943
947
msgid "Only remove files that have never been committed."
944
948
msgstr ""
945
949
946
#: bzrlib/builtins.py:1851
950
#: bzrlib/builtins.py:1870
947
951
msgid "The file deletion mode to be used."
948
952
msgstr ""
949
953
950
#: bzrlib/builtins.py:1852
954
#: bzrlib/builtins.py:1871
951
955
msgid "Deletion Strategy"
952
956
msgstr ""
953
957
954
#: bzrlib/builtins.py:1853
958
#: bzrlib/builtins.py:1872
955
959
msgid "Backup changed files (default)."
956
960
msgstr ""
957
961
958
#: bzrlib/builtins.py:1854
962
#: bzrlib/builtins.py:1873
959
963
msgid "Delete from bzr but leave the working copy."
960
964
msgstr ""
961
965
962
#: bzrlib/builtins.py:1855
966
#: bzrlib/builtins.py:1874
963
967
msgid "Don't backup changed files."
964
968
msgstr ""
965
969
966
#: bzrlib/builtins.py:1856
970
#: bzrlib/builtins.py:1875
967
971
msgid ""
968
972
"Delete all the specified files, even if they can not be recovered and even "
969
973
"if they are non-empty directories. (deprecated, use no-backup)"
970
974
msgstr ""
971
975
972
#: bzrlib/builtins.py:1865
976
#: bzrlib/builtins.py:1884
973
977
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
974
978
msgstr ""
975
979
976
#: bzrlib/builtins.py:1882
980
#: bzrlib/builtins.py:1901
977
981
msgid "No matching files."
978
982
msgstr ""
979
983
980
#: bzrlib/builtins.py:1943
984
#: bzrlib/builtins.py:1962
981
985
msgid "Reconcile bzr metadata in a branch."
982
986
msgstr ""
983
987
984
#: bzrlib/builtins.py:1945
988
#: bzrlib/builtins.py:1964
985
989
msgid ""
986
990
"This can correct data mismatches that may have been caused by\n"
987
991
"previous ghost operations or bzr upgrades. You should only\n"
989
993
"advises you to run it."
990
994
msgstr ""
991
995
992
#: bzrlib/builtins.py:1950
996
#: bzrlib/builtins.py:1969
993
997
msgid ""
994
998
"If a second branch is provided, cross-branch reconciliation is\n"
995
999
"also attempted, which will check that data like the tree root\n"
997
1001
"correctly in both branches."
998
1002
msgstr ""
999
1003
1000
#: bzrlib/builtins.py:1955
1004
#: bzrlib/builtins.py:1974
1001
1005
msgid ""
1002
1006
"At the same time it is run it may recompress data resulting in\n"
1003
1007
"a potential saving in disk space or performance gain."
1004
1008
msgstr ""
1005
1009
1006
#: bzrlib/builtins.py:1958
1010
#: bzrlib/builtins.py:1977
1007
1011
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1008
1012
msgstr ""
1009
1013
1010
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1014
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1011
1015
msgid ""
1012
1016
"Format for the bzr 2.0 series.\n"
1013
1017
"Uses group-compress storage.\n"
1014
1018
"Provides rich roots which are a one-way transition.\n"
1015
1019
msgstr ""
1016
1020
1017
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1021
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1018
1022
msgid ""
1019
1023
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1020
1024
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1021
1025
msgstr ""
1022
1026
1023
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1027
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1024
1028
msgid "The 2a format with experimental support for colocated branches.\n"
1025
1029
msgstr ""
1026
1030
1027
#: bzrlib/builtins.py:2026
1031
#: bzrlib/builtins.py:2045
1028
1032
msgid "Make a directory into a versioned branch."
1029
1033
msgstr ""
1030
1034
1031
#: bzrlib/builtins.py:2028
1035
#: bzrlib/builtins.py:2047
1032
1036
msgid ""
1033
1037
"Use this to create an empty branch, or before importing an\n"
1034
1038
"existing project."
1035
1039
msgstr ""
1036
1040
1037
#: bzrlib/builtins.py:2031
1041
#: bzrlib/builtins.py:2050
1038
1042
msgid ""
1039
1043
"If there is a repository in a parent directory of the location, then\n"
1040
1044
"the history of the branch will be stored in the repository. Otherwise\n"
1042
1046
"in the .bzr directory."
1043
1047
msgstr ""
1044
1048
1045
#: bzrlib/builtins.py:2036
1049
#: bzrlib/builtins.py:2055
1046
1050
msgid ""
1047
1051
"If there is already a branch at the location but it has no working tree,\n"
1048
1052
"the tree can be populated with 'bzr checkout'."
1049
1053
msgstr ""
1050
1054
1051
#: bzrlib/builtins.py:2039
1055
#: bzrlib/builtins.py:2058
1052
1056
msgid "Recipe for importing a tree of files::"
1053
1057
msgstr ""
1054
1058
1055
#: bzrlib/builtins.py:2041
1059
#: bzrlib/builtins.py:2060
1056
1060
msgid ""
1057
1061
" cd ~/project\n"
1058
1062
" bzr init\n"
1061
1065
" bzr commit -m \"imported project\""
1062
1066
msgstr ""
1063
1067
1064
#: bzrlib/builtins.py:2052
1068
#: bzrlib/builtins.py:2071
1065
1069
msgid ""
1066
1070
"Create the path leading up to the branch if it does not already exist."
1067
1071
msgstr ""
1068
1072
1069
#: bzrlib/builtins.py:2055
1073
#: bzrlib/builtins.py:2074
1070
1074
msgid "Specify a format for this branch. See \"help formats\"."
1071
1075
msgstr ""
1072
1076
1073
#: bzrlib/builtins.py:2063
1077
#: bzrlib/builtins.py:2082
1074
1078
msgid ""
1075
1079
"Never change revnos or the existing log. Append revisions to it only."
1076
1080
msgstr ""
1077
1081
1078
#: bzrlib/builtins.py:2066
1082
#: bzrlib/builtins.py:2085
1079
1083
msgid "Create a branch without a working tree."
1080
1084
msgstr ""
1081
1085
1082
#: bzrlib/builtins.py:2086 bzrlib/push.py:110
1086
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1083
1087
#, python-format
1084
1088
msgid ""
1085
1089
"Parent directory of %s does not exist.\n"
1086
1090
"You may supply --create-prefix to create all leading parent directories."
1087
1091
msgstr ""
1088
1092
1089
#: bzrlib/builtins.py:2120
1093
#: bzrlib/builtins.py:2139
1090
1094
msgid ""
1091
1095
"This branch format cannot be set to append-revisions-only. Try --default."
1092
1096
msgstr ""
1093
1097
1094
#: bzrlib/builtins.py:2131
1098
#: bzrlib/builtins.py:2150
1095
1099
msgid "Created a {0} (format: {1})\n"
1096
1100
msgstr ""
1097
1101
1098
#: bzrlib/builtins.py:2140
1102
#: bzrlib/builtins.py:2159
1099
1103
#, python-format
1100
1104
msgid "Using shared repository: %s\n"
1101
1105
msgstr ""
1102
1106
1103
#: bzrlib/builtins.py:2144
1107
#: bzrlib/builtins.py:2163
1104
1108
msgid "Create a shared repository for branches to share storage space."
1105
1109
msgstr ""
1106
1110
1107
#: bzrlib/builtins.py:2146
1111
#: bzrlib/builtins.py:2165
1108
1112
msgid ""
1109
1113
"New branches created under the repository directory will store their\n"
1110
1114
"revisions in the repository, not in the branch directory. For branches\n"
1112
1116
"speeds up the creation of new branches."
1113
1117
msgstr ""
1114
1118
1115
#: bzrlib/builtins.py:2151
1119
#: bzrlib/builtins.py:2170
1116
1120
msgid ""
1117
1121
"If the --no-trees option is given then the branches in the repository\n"
1118
1122
"will not have working trees by default. They will still exist as \n"
1122
1126
"branches, such as on a server."
1123
1127
msgstr ""
1124
1128
1125
#: bzrlib/builtins.py:2158
1129
#: bzrlib/builtins.py:2177
1126
1130
msgid ""
1127
1131
":Examples:\n"
1128
1132
" Create a shared repository holding just branches::"
1129
1133
msgstr ""
1130
1134
1131
#: bzrlib/builtins.py:2161
1135
#: bzrlib/builtins.py:2180
1132
1136
msgid ""
1133
1137
" bzr init-repo --no-trees repo\n"
1134
1138
" bzr init repo/trunk"
1135
1139
msgstr ""
1136
1140
1137
#: bzrlib/builtins.py:2164
1141
#: bzrlib/builtins.py:2183
1138
1142
msgid " Make a lightweight checkout elsewhere::"
1139
1143
msgstr ""
1140
1144
1141
#: bzrlib/builtins.py:2166
1145
#: bzrlib/builtins.py:2185
1142
1146
msgid ""
1143
1147
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1144
1148
" cd trunk-checkout\n"
1145
1149
" (add files here)"
1146
1150
msgstr ""
1147
1151
1148
#: bzrlib/builtins.py:2174
1152
#: bzrlib/builtins.py:2193
1149
1153
msgid ""
1150
1154
"Specify a format for this repository. See \"bzr help formats\" for details."
1151
1155
msgstr ""
1152
1156
1153
#: bzrlib/builtins.py:2178
1157
#: bzrlib/builtins.py:2197
1154
1158
msgid "Repository format"
1155
1159
msgstr ""
1156
1160
1157
#: bzrlib/builtins.py:2180
1161
#: bzrlib/builtins.py:2199
1158
1162
msgid "Branches in the repository will default to not having a working tree."
1159
1163
msgstr ""
1160
1164
1161
#: bzrlib/builtins.py:2206
1165
#: bzrlib/builtins.py:2225
1162
1166
msgid "Show differences in the working tree, between revisions or branches."
1163
1167
msgstr ""
1164
1168
1165
#: bzrlib/builtins.py:2208
1169
#: bzrlib/builtins.py:2227
1166
1170
msgid ""
1167
1171
"If no arguments are given, all changes for the current tree are listed.\n"
1168
1172
"If files are given, only the changes in those files are listed.\n"
1172
1176
"given."
1173
1177
msgstr ""
1174
1178
1175
#: bzrlib/builtins.py:2215
1179
#: bzrlib/builtins.py:2234
1176
1180
msgid ""
1177
1181
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1178
1182
"produces patches suitable for \"patch -p1\"."
1179
1183
msgstr ""
1180
1184
1181
#: bzrlib/builtins.py:2218
1185
#: bzrlib/builtins.py:2237
1182
1186
msgid ""
1183
1187
"Note that when using the -r argument with a range of revisions, the\n"
1184
1188
"differences are computed between the two specified revisions. That\n"
1188
1192
"in the range."
1189
1193
msgstr ""
1190
1194
1191
#: bzrlib/builtins.py:2225
1195
#: bzrlib/builtins.py:2244
1192
1196
msgid ""
1193
1197
":Exit values:\n"
1194
1198
" 1 - changed\n"
1197
1201
" 0 - no change"
1198
1202
msgstr ""
1199
1203
1200
#: bzrlib/builtins.py:2231
1204
#: bzrlib/builtins.py:2250
1201
1205
msgid ""
1202
1206
":Examples:\n"
1203
1207
" Shows the difference in the working tree versus the last commit::"
1204
1208
msgstr ""
1205
1209
1206
#: bzrlib/builtins.py:2234
1210
#: bzrlib/builtins.py:2253
1207
1211
msgid " bzr diff"
1208
1212
msgstr ""
1209
1213
1210
#: bzrlib/builtins.py:2236
1214
#: bzrlib/builtins.py:2255
1211
1215
msgid " Difference between the working tree and revision 1::"
1212
1216
msgstr ""
1213
1217
1214
#: bzrlib/builtins.py:2238
1218
#: bzrlib/builtins.py:2257
1215
1219
msgid " bzr diff -r1"
1216
1220
msgstr ""
1217
1221
1218
#: bzrlib/builtins.py:2240
1222
#: bzrlib/builtins.py:2259
1219
1223
msgid " Difference between revision 3 and revision 1::"
1220
1224
msgstr ""
1221
1225
1222
#: bzrlib/builtins.py:2242
1226
#: bzrlib/builtins.py:2261
1223
1227
msgid " bzr diff -r1..3"
1224
1228
msgstr ""
1225
1229
1226
#: bzrlib/builtins.py:2244
1230
#: bzrlib/builtins.py:2263
1227
1231
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1228
1232
msgstr ""
1229
1233
1230
#: bzrlib/builtins.py:2246
1234
#: bzrlib/builtins.py:2265
1231
1235
msgid " bzr diff -r1..3 xxx"
1232
1236
msgstr ""
1233
1237
1234
#: bzrlib/builtins.py:2248
1238
#: bzrlib/builtins.py:2267
1235
1239
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1236
1240
msgstr ""
1237
1241
1238
#: bzrlib/builtins.py:2250
1242
#: bzrlib/builtins.py:2269
1239
1243
msgid " bzr diff -c2"
1240
1244
msgstr ""
1241
1245
1242
#: bzrlib/builtins.py:2252
1246
#: bzrlib/builtins.py:2271
1243
1247
msgid ""
1244
1248
" To see the changes introduced by revision X::\n"
1245
1249
" \n"
1246
1250
" bzr diff -cX"
1247
1251
msgstr ""
1248
1252
1249
#: bzrlib/builtins.py:2256
1253
#: bzrlib/builtins.py:2275
1250
1254
msgid ""
1251
1255
" Note that in the case of a merge, the -c option shows the changes\n"
1252
1256
" compared to the left hand parent. To see the changes against\n"
1253
1257
" another parent, use::"
1254
1258
msgstr ""
1255
1259
1256
#: bzrlib/builtins.py:2260
1260
#: bzrlib/builtins.py:2279
1257
1261
msgid " bzr diff -r<chosen_parent>..X"
1258
1262
msgstr ""
1259
1263
1260
#: bzrlib/builtins.py:2262
1264
#: bzrlib/builtins.py:2281
1261
1265
msgid ""
1262
1266
" The changes between the current revision and the previous revision\n"
1263
1267
" (equivalent to -c-1 and -r-2..-1)"
1264
1268
msgstr ""
1265
1269
1266
#: bzrlib/builtins.py:2265
1270
#: bzrlib/builtins.py:2284
1267
1271
msgid " bzr diff -r-2.."
1268
1272
msgstr ""
1269
1273
1270
#: bzrlib/builtins.py:2267
1274
#: bzrlib/builtins.py:2286
1271
1275
msgid " Show just the differences for file NEWS::"
1272
1276
msgstr ""
1273
1277
1274
#: bzrlib/builtins.py:2269
1278
#: bzrlib/builtins.py:2288
1275
1279
msgid " bzr diff NEWS"
1276
1280
msgstr ""
1277
1281
1278
#: bzrlib/builtins.py:2271
1282
#: bzrlib/builtins.py:2290
1279
1283
msgid " Show the differences in working tree xxx for file NEWS::"
1280
1284
msgstr ""
1281
1285
1282
#: bzrlib/builtins.py:2273
1286
#: bzrlib/builtins.py:2292
1283
1287
msgid " bzr diff xxx/NEWS"
1284
1288
msgstr ""
1285
1289
1286
#: bzrlib/builtins.py:2275
1290
#: bzrlib/builtins.py:2294
1287
1291
msgid " Show the differences from branch xxx to this working tree:"
1288
1292
msgstr ""
1289
1293
1290
#: bzrlib/builtins.py:2277
1294
#: bzrlib/builtins.py:2296
1291
1295
msgid " bzr diff --old xxx"
1292
1296
msgstr ""
1293
1297
1294
#: bzrlib/builtins.py:2279
1298
#: bzrlib/builtins.py:2298
1295
1299
msgid " Show the differences between two branches for file NEWS::"
1296
1300
msgstr ""
1297
1301
1298
#: bzrlib/builtins.py:2281
1302
#: bzrlib/builtins.py:2300
1299
1303
msgid " bzr diff --old xxx --new yyy NEWS"
1300
1304
msgstr ""
1301
1305
1302
#: bzrlib/builtins.py:2283
1306
#: bzrlib/builtins.py:2302
1303
1307
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1304
1308
msgstr ""
1305
1309
1306
#: bzrlib/builtins.py:2285
1310
#: bzrlib/builtins.py:2304
1307
1311
msgid ""
1308
1312
" bzr diff --prefix old/:new/\n"
1309
1313
" \n"
1312
1316
" bzr diff --using /usr/bin/diff --diff-options -wu"
1313
1317
msgstr ""
1314
1318
1315
#: bzrlib/builtins.py:2295
1319
#: bzrlib/builtins.py:2314
1316
1320
msgid "Pass these options to the external diff program."
1317
1321
msgstr ""
1318
1322
1319
#: bzrlib/builtins.py:2298
1323
#: bzrlib/builtins.py:2317
1320
1324
msgid ""
1321
1325
"Set prefixes added to old and new filenames, as two values separated by a "
1322
1326
"colon. (eg \"old/:new/\")."
1323
1327
msgstr ""
1324
1328
1325
#: bzrlib/builtins.py:2301
1329
#: bzrlib/builtins.py:2320
1326
1330
msgid "Branch/tree to compare from."
1327
1331
msgstr ""
1328
1332
1329
#: bzrlib/builtins.py:2305
1333
#: bzrlib/builtins.py:2324
1330
1334
msgid "Branch/tree to compare to."
1331
1335
msgstr ""
1332
1336
1333
#: bzrlib/builtins.py:2311
1337
#: bzrlib/builtins.py:2330
1334
1338
msgid "Use this command to compare files."
1335
1339
msgstr ""
1336
1340
1337
#: bzrlib/builtins.py:2316
1341
#: bzrlib/builtins.py:2335
1338
1342
msgid "Diff format to use."
1339
1343
msgstr ""
1340
1344
1341
#: bzrlib/builtins.py:2318
1345
#: bzrlib/builtins.py:2337
1342
1346
msgid "Diff format"
1343
1347
msgstr ""
1344
1348
1345
#: bzrlib/builtins.py:2340
1349
#: bzrlib/builtins.py:2359
1346
1350
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1347
1351
msgstr ""
1348
1352
1349
#: bzrlib/builtins.py:2344
1353
#: bzrlib/builtins.py:2363
1350
1354
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1351
1355
msgstr ""
1352
1356
1353
#: bzrlib/builtins.py:2349 bzrlib/builtins.py:2746 bzrlib/builtins.py:2759
1354
#: bzrlib/builtins.py:2767 bzrlib/builtins.py:4933
1357
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1358
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1355
1359
msgid "{0} and {1} are mutually exclusive"
1356
1360
msgstr ""
1357
1361
1358
#: bzrlib/builtins.py:2369
1362
#: bzrlib/builtins.py:2388
1359
1363
msgid ""
1360
1364
"List files deleted in the working tree.\n"
1361
1365
" "
1362
1366
msgstr ""
1363
1367
1364
#: bzrlib/builtins.py:2446
1368
#: bzrlib/builtins.py:2465
1365
1369
msgid "Show the tree root directory."
1366
1370
msgstr ""
1367
1371
1368
#: bzrlib/builtins.py:2448
1372
#: bzrlib/builtins.py:2467
1369
1373
msgid ""
1370
1374
"The root is the nearest enclosing directory with a .bzr control\n"
1371
1375
"directory."
1372
1376
msgstr ""
1373
1377
1374
#: bzrlib/builtins.py:2463
1378
#: bzrlib/builtins.py:2482
1375
1379
msgid "The limit argument must be an integer."
1376
1380
msgstr ""
1377
1381
1378
#: bzrlib/builtins.py:2471
1382
#: bzrlib/builtins.py:2490
1379
1383
msgid "The levels argument must be an integer."
1380
1384
msgstr ""
1381
1385
1382
#: bzrlib/builtins.py:2476
1386
#: bzrlib/builtins.py:2495
1383
1387
msgid "Show historical log for a branch or subset of a branch."
1384
1388
msgstr ""
1385
1389
1386
#: bzrlib/builtins.py:2478
1390
#: bzrlib/builtins.py:2497
1387
1391
msgid ""
1388
1392
"log is bzr's default tool for exploring the history of a branch.\n"
1389
1393
"The branch to use is taken from the first parameter. If no parameters\n"
1391
1395
"Here are some simple examples::"
1392
1396
msgstr ""
1393
1397
1394
#: bzrlib/builtins.py:2483
1398
#: bzrlib/builtins.py:2502
1395
1399
msgid ""
1396
1400
" bzr log log the current branch\n"
1397
1401
" bzr log foo.py log a file in its branch\n"
1398
1402
" bzr log http://server/branch log a branch on a server"
1399
1403
msgstr ""
1400
1404
1401
#: bzrlib/builtins.py:2487
1405
#: bzrlib/builtins.py:2506
1402
1406
msgid ""
1403
1407
"The filtering, ordering and information shown for each revision can\n"
1404
1408
"be controlled as explained below. By default, all revisions are\n"
1408
1412
"were merged."
1409
1413
msgstr ""
1410
1414
1411
#: bzrlib/builtins.py:2494
1415
#: bzrlib/builtins.py:2513
1412
1416
msgid ":Output control:"
1413
1417
msgstr ""
1414
1418
1415
#: bzrlib/builtins.py:2496
1419
#: bzrlib/builtins.py:2515
1416
1420
msgid ""
1417
1421
" The log format controls how information about each revision is\n"
1418
1422
" displayed. The standard log formats are called ``long``, ``short``\n"
1420
1424
" for more details on log formats."
1421
1425
msgstr ""
1422
1426
1423
#: bzrlib/builtins.py:2501
1427
#: bzrlib/builtins.py:2520
1424
1428
msgid ""
1425
1429
" The following options can be used to control what information is\n"
1426
1430
" displayed::"
1427
1431
msgstr ""
1428
1432
1429
#: bzrlib/builtins.py:2504
1433
#: bzrlib/builtins.py:2523
1430
1434
msgid ""
1431
1435
" -l N display a maximum of N revisions\n"
1432
1436
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1435
1439
" --show-ids display revision-ids (and file-ids), not just revnos"
1436
1440
msgstr ""
1437
1441
1438
#: bzrlib/builtins.py:2510
1442
#: bzrlib/builtins.py:2529
1439
1443
msgid ""
1440
1444
" Note that the default number of levels to display is a function of the\n"
1441
1445
" log format. If the -n option is not used, the standard log formats show\n"
1442
1446
" just the top level (mainline)."
1443
1447
msgstr ""
1444
1448
1445
#: bzrlib/builtins.py:2514
1449
#: bzrlib/builtins.py:2533
1446
1450
msgid ""
1447
1451
" Status summaries are shown using status flags like A, M, etc. To see\n"
1448
1452
" the changes explained using words like ``added`` and ``modified``\n"
1449
1453
" instead, use the -vv option."
1450
1454
msgstr ""
1451
1455
1452
#: bzrlib/builtins.py:2518
1456
#: bzrlib/builtins.py:2537
1453
1457
msgid ":Ordering control:"
1454
1458
msgstr ""
1455
1459
1456
#: bzrlib/builtins.py:2520
1460
#: bzrlib/builtins.py:2539
1457
1461
msgid ""
1458
1462
" To display revisions from oldest to newest, use the --forward option.\n"
1459
1463
" In most cases, using this option will have little impact on the total\n"
1461
1465
" display revisions like --reverse does when it can."
1462
1466
msgstr ""
1463
1467
1464
#: bzrlib/builtins.py:2525
1468
#: bzrlib/builtins.py:2544
1465
1469
msgid ":Revision filtering:"
1466
1470
msgstr ""
1467
1471
1468
#: bzrlib/builtins.py:2527
1472
#: bzrlib/builtins.py:2546
1469
1473
msgid ""
1470
1474
" The -r option can be used to specify what revision or range of revisions\n"
1471
1475
" to filter against. The various forms are shown below::"
1472
1476
msgstr ""
1473
1477
1474
#: bzrlib/builtins.py:2530
1478
#: bzrlib/builtins.py:2549
1475
1479
msgid ""
1476
1480
" -rX display revision X\n"
1477
1481
" -rX.. display revision X and later\n"
1479
1483
" -rX..Y display from X to Y inclusive"
1480
1484
msgstr ""
1481
1485
1482
#: bzrlib/builtins.py:2535
1486
#: bzrlib/builtins.py:2554
1483
1487
msgid ""
1484
1488
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1485
1489
" Some common examples are given below::"
1486
1490
msgstr ""
1487
1491
1488
#: bzrlib/builtins.py:2538
1492
#: bzrlib/builtins.py:2557
1489
1493
msgid ""
1490
1494
" -r-1 show just the tip\n"
1491
1495
" -r-10.. show the last 10 mainline revisions\n"
1495
1499
" -rdate:yesterday.. show changes since yesterday"
1496
1500
msgstr ""
1497
1501
1498
#: bzrlib/builtins.py:2545
1502
#: bzrlib/builtins.py:2564
1499
1503
msgid ""
1500
1504
" When logging a range of revisions using -rX..Y, log starts at\n"
1501
1505
" revision Y and searches back in history through the primary\n"
1505
1509
" a nested merge revision and the log will be truncated accordingly."
1506
1510
msgstr ""
1507
1511
1508
#: bzrlib/builtins.py:2552
1512
#: bzrlib/builtins.py:2571
1509
1513
msgid ":Path filtering:"
1510
1514
msgstr ""
1511
1515
1512
#: bzrlib/builtins.py:2554
1516
#: bzrlib/builtins.py:2573
1513
1517
msgid ""
1514
1518
" If parameters are given and the first one is not a branch, the log\n"
1515
1519
" will be filtered to show only those revisions that changed the\n"
1516
1520
" nominated files or directories."
1517
1521
msgstr ""
1518
1522
1519
#: bzrlib/builtins.py:2558
1523
#: bzrlib/builtins.py:2577
1520
1524
msgid ""
1521
1525
" Filenames are interpreted within their historical context. To log a\n"
1522
1526
" deleted file, specify a revision range so that the file existed at\n"
1523
1527
" the end or start of the range."
1524
1528
msgstr ""
1525
1529
1526
#: bzrlib/builtins.py:2562
1530
#: bzrlib/builtins.py:2581
1527
1531
msgid ""
1528
1532
" Historical context is also important when interpreting pathnames of\n"
1529
1533
" renamed files/directories. Consider the following example:"
1530
1534
msgstr ""
1531
1535
1532
#: bzrlib/builtins.py:2565
1536
#: bzrlib/builtins.py:2584
1533
1537
msgid ""
1534
1538
" * revision 1: add tutorial.txt\n"
1535
1539
" * revision 2: modify tutorial.txt\n"
1536
1540
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1537
1541
msgstr ""
1538
1542
1539
#: bzrlib/builtins.py:2569
1543
#: bzrlib/builtins.py:2588
1540
1544
msgid " In this case:"
1541
1545
msgstr ""
1542
1546
1543
#: bzrlib/builtins.py:2571
1547
#: bzrlib/builtins.py:2590
1544
1548
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1545
1549
msgstr ""
1546
1550
1547
#: bzrlib/builtins.py:2573
1551
#: bzrlib/builtins.py:2592
1548
1552
msgid ""
1549
1553
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1550
1554
msgstr ""
1551
1555
1552
#: bzrlib/builtins.py:2575
1556
#: bzrlib/builtins.py:2594
1553
1557
msgid ""
1554
1558
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1555
1559
" the original file in revision 2."
1556
1560
msgstr ""
1557
1561
1558
#: bzrlib/builtins.py:2578
1562
#: bzrlib/builtins.py:2597
1559
1563
msgid ""
1560
1564
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1561
1565
" was no file called guide.txt in revision 2."
1562
1566
msgstr ""
1563
1567
1564
#: bzrlib/builtins.py:2581
1568
#: bzrlib/builtins.py:2600
1565
1569
msgid ""
1566
1570
" Renames are always followed by log. By design, there is no need to\n"
1567
1571
" explicitly ask for this (and no way to stop logging a file back\n"
1568
1572
" until it was last renamed)."
1569
1573
msgstr ""
1570
1574
1571
#: bzrlib/builtins.py:2585
1575
#: bzrlib/builtins.py:2604
1572
1576
msgid ":Other filtering:"
1573
1577
msgstr ""
1574
1578
1575
#: bzrlib/builtins.py:2587
1579
#: bzrlib/builtins.py:2606
1576
1580
msgid ""
1577
1581
" The --match option can be used for finding revisions that match a\n"
1578
1582
" regular expression in a commit message, committer, author or bug.\n"
1581
1585
" --match-message can be used to only match a specific field."
1582
1586
msgstr ""
1583
1587
1584
#: bzrlib/builtins.py:2593
1588
#: bzrlib/builtins.py:2612
1585
1589
msgid ":Tips & tricks:"
1586
1590
msgstr ""
1587
1591
1588
#: bzrlib/builtins.py:2595
1592
#: bzrlib/builtins.py:2614
1589
1593
msgid ""
1590
1594
" GUI tools and IDEs are often better at exploring history than command\n"
1591
1595
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1594
1598
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1595
1599
msgstr ""
1596
1600
1597
#: bzrlib/builtins.py:2601
1601
#: bzrlib/builtins.py:2620
1598
1602
msgid ""
1599
1603
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1600
1604
msgstr ""
1601
1605
1602
#: bzrlib/builtins.py:2603
1606
#: bzrlib/builtins.py:2622
1603
1607
msgid ""
1604
1608
" [ALIASES]\n"
1605
1609
" tip = log -r-1\n"
1607
1611
" show = log -v -p"
1608
1612
msgstr ""
1609
1613
1610
#: bzrlib/builtins.py:2608
1614
#: bzrlib/builtins.py:2627
1611
1615
msgid ""
1612
1616
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1613
1617
" will show the last 10 mainline revisions. To see the details of a\n"
1614
1618
" particular revision X, ``bzr show -rX``."
1615
1619
msgstr ""
1616
1620
1617
#: bzrlib/builtins.py:2612
1621
#: bzrlib/builtins.py:2631
1618
1622
msgid ""
1619
1623
" If you are interested in looking deeper into a particular merge X,\n"
1620
1624
" use ``bzr log -n0 -rX``."
1621
1625
msgstr ""
1622
1626
1623
#: bzrlib/builtins.py:2615
1627
#: bzrlib/builtins.py:2634
1624
1628
msgid ""
1625
1629
" ``bzr log -v`` on a branch with lots of history is currently\n"
1626
1630
" very slow. A fix for this issue is currently under development.\n"
1628
1632
" be given when using the -v option."
1629
1633
msgstr ""
1630
1634
1631
#: bzrlib/builtins.py:2620
1635
#: bzrlib/builtins.py:2639
1632
1636
msgid ""
1633
1637
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1634
1638
" used to find revisions matching user names, commit messages, etc.\n"
1636
1640
" a list of words but not others."
1637
1641
msgstr ""
1638
1642
1639
#: bzrlib/builtins.py:2625
1643
#: bzrlib/builtins.py:2644
1640
1644
msgid ""
1641
1645
" When exploring non-mainline history on large projects with deep\n"
1642
1646
" history, the performance of log can be greatly improved by installing\n"
1644
1648
" trading disk space for faster speed."
1645
1649
msgstr ""
1646
1650
1647
#: bzrlib/builtins.py:2634
1651
#: bzrlib/builtins.py:2653
1648
1652
msgid "Show from oldest to newest."
1649
1653
msgstr ""
1650
1654
1651
#: bzrlib/builtins.py:2637
1655
#: bzrlib/builtins.py:2656
1652
1656
msgid "Show files changed in each revision."
1653
1657
msgstr ""
1654
1658
1655
#: bzrlib/builtins.py:2643
1659
#: bzrlib/builtins.py:2662
1656
1660
msgid "Show just the specified revision. See also \"help revisionspec\"."
1657
1661
msgstr ""
1658
1662
1659
#: bzrlib/builtins.py:2647
1663
#: bzrlib/builtins.py:2666
1660
1664
msgid "What names to list as authors - first, all or committer."
1661
1665
msgstr ""
1662
1666
1663
#: bzrlib/builtins.py:2648
1667
#: bzrlib/builtins.py:2667
1664
1668
msgid "Authors"
1665
1669
msgstr ""
1666
1670
1667
#: bzrlib/builtins.py:2653
1671
#: bzrlib/builtins.py:2672
1668
1672
msgid "Number of levels to display - 0 for all, 1 for flat."
1669
1673
msgstr ""
1670
1674
1671
#: bzrlib/builtins.py:2663
1675
#: bzrlib/builtins.py:2682
1672
1676
msgid "Limit the output to the first N revisions."
1673
1677
msgstr ""
1674
1678
1675
#: bzrlib/builtins.py:2668
1679
#: bzrlib/builtins.py:2687
1676
1680
msgid "Show changes made in each revision as a patch."
1677
1681
msgstr ""
1678
1682
1679
#: bzrlib/builtins.py:2670
1683
#: bzrlib/builtins.py:2689
1680
1684
msgid "Show merged revisions like --levels 0 does."
1681
1685
msgstr ""
1682
1686
1683
#: bzrlib/builtins.py:2674
1687
#: bzrlib/builtins.py:2693
1684
1688
msgid "Do not report commits with more than one parent."
1685
1689
msgstr ""
1686
1690
1687
#: bzrlib/builtins.py:2676
1691
#: bzrlib/builtins.py:2695
1688
1692
msgid ""
1689
1693
"Display only the revisions that are not part of both ancestries (require -"
1690
1694
"rX..Y)."
1691
1695
msgstr ""
1692
1696
1693
#: bzrlib/builtins.py:2680
1697
#: bzrlib/builtins.py:2699
1694
1698
msgid "Show digital signature validity."
1695
1699
msgstr ""
1696
1700
1697
#: bzrlib/builtins.py:2683
1701
#: bzrlib/builtins.py:2702
1698
1702
msgid "Show revisions whose properties match this expression."
1699
1703
msgstr ""
1700
1704
1701
#: bzrlib/builtins.py:2687
1705
#: bzrlib/builtins.py:2706
1702
1706
msgid "Show revisions whose message matches this expression."
1703
1707
msgstr ""
1704
1708
1705
#: bzrlib/builtins.py:2691
1709
#: bzrlib/builtins.py:2710
1706
1710
msgid "Show revisions whose committer matches this expression."
1707
1711
msgstr ""
1708
1712
1709
#: bzrlib/builtins.py:2695
1713
#: bzrlib/builtins.py:2714
1710
1714
msgid "Show revisions whose authors match this expression."
1711
1715
msgstr ""
1712
1716
1713
#: bzrlib/builtins.py:2699
1717
#: bzrlib/builtins.py:2718
1714
1718
msgid "Show revisions whose bugs match this expression."
1715
1719
msgstr ""
1716
1720
1717
#: bzrlib/builtins.py:2753
1721
#: bzrlib/builtins.py:2772
1718
1722
msgid "--exclude-common-ancestry requires -r with two revisions"
1719
1723
msgstr ""
1720
1724
1721
#: bzrlib/builtins.py:2781
1725
#: bzrlib/builtins.py:2800
1722
1726
#, python-format
1723
1727
msgid "Path unknown at end or start of revision range: %s"
1724
1728
msgstr ""
1725
1729
1726
#: bzrlib/builtins.py:2898
1730
#: bzrlib/builtins.py:2917
1727
1731
#, python-format
1728
1732
msgid "bzr %s doesn't accept two revisions in different branches."
1729
1733
msgstr ""
1730
1734
1731
#: bzrlib/builtins.py:2914
1735
#: bzrlib/builtins.py:2933
1732
1736
#, python-format
1733
1737
msgid "bzr %s --revision takes one or two values."
1734
1738
msgstr ""
1735
1739
1736
#: bzrlib/builtins.py:2959
1740
#: bzrlib/builtins.py:2978
1737
1741
msgid ""
1738
1742
"List files in a tree.\n"
1739
1743
" "
1740
1744
msgstr ""
1741
1745
1742
#: bzrlib/builtins.py:2968
1746
#: bzrlib/builtins.py:2987
1743
1747
msgid "Recurse into subdirectories."
1744
1748
msgstr ""
1745
1749
1746
#: bzrlib/builtins.py:2970
1750
#: bzrlib/builtins.py:2989
1747
1751
msgid "Print paths relative to the root of the branch."
1748
1752
msgstr ""
1749
1753
1750
#: bzrlib/builtins.py:2972
1754
#: bzrlib/builtins.py:2991
1751
1755
msgid "Print unknown files."
1752
1756
msgstr ""
1753
1757
1754
#: bzrlib/builtins.py:2973
1758
#: bzrlib/builtins.py:2992
1755
1759
msgid "Print versioned files."
1756
1760
msgstr ""
1757
1761
1758
#: bzrlib/builtins.py:2976
1762
#: bzrlib/builtins.py:2995
1759
1763
msgid "Print ignored files."
1760
1764
msgstr ""
1761
1765
1762
#: bzrlib/builtins.py:2978
1766
#: bzrlib/builtins.py:2997
1763
1767
msgid "List entries of a particular kind: file, directory, symlink."
1764
1768
msgstr ""
1765
1769
1766
#: bzrlib/builtins.py:2991
1770
#: bzrlib/builtins.py:3010
1767
1771
msgid "invalid kind specified"
1768
1772
msgstr ""
1769
1773
1770
#: bzrlib/builtins.py:2994
1774
#: bzrlib/builtins.py:3013
1771
1775
msgid "Cannot set both --verbose and --null"
1772
1776
msgstr ""
1773
1777
1774
#: bzrlib/builtins.py:3003
1778
#: bzrlib/builtins.py:3022
1775
1779
msgid "cannot specify both --from-root and PATH"
1776
1780
msgstr ""
1777
1781
1778
#: bzrlib/builtins.py:3090
1782
#: bzrlib/builtins.py:3109
1779
1783
msgid "Ignore specified files or patterns."
1780
1784
msgstr ""
1781
1785
1782
#: bzrlib/builtins.py:3092
1786
#: bzrlib/builtins.py:3111
1783
1787
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1784
1788
msgstr ""
1785
1789
1786
#: bzrlib/builtins.py:3094
1790
#: bzrlib/builtins.py:3113
1787
1791
msgid ""
1788
1792
"If a .bzrignore file does not exist, the ignore command\n"
1789
1793
"will create one and add the specified files or patterns to the newly\n"
1792
1796
"the use of the ignore command will require an explicit add command."
1793
1797
msgstr ""
1794
1798
1795
#: bzrlib/builtins.py:3100
1799
#: bzrlib/builtins.py:3119
1796
1800
msgid ""
1797
1801
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1798
1802
"After adding, editing or deleting that file either indirectly by\n"
1800
1804
"it."
1801
1805
msgstr ""
1802
1806
1803
#: bzrlib/builtins.py:3105
1807
#: bzrlib/builtins.py:3124
1804
1808
msgid ""
1805
1809
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1806
1810
"the global ignore file can be found in the application data directory as\n"
1809
1813
"can be edited directly using an editor."
1810
1814
msgstr ""
1811
1815
1812
#: bzrlib/builtins.py:3111
1816
#: bzrlib/builtins.py:3130
1813
1817
msgid ""
1814
1818
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1815
1819
"precedence over regular ignores. Such exceptions are used to specify\n"
1816
1820
"files that should be versioned which would otherwise be ignored."
1817
1821
msgstr ""
1818
1822
1819
#: bzrlib/builtins.py:3115
1823
#: bzrlib/builtins.py:3134
1820
1824
msgid ""
1821
1825
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1822
1826
"precedence over the '!' exception patterns."
1823
1827
msgstr ""
1824
1828
1825
#: bzrlib/builtins.py:3118
1829
#: bzrlib/builtins.py:3137
1826
1830
msgid ""
1827
1831
":Notes: \n"
1828
1832
" \n"
1830
1834
" the shell on Unix."
1831
1835
msgstr ""
1832
1836
1833
#: bzrlib/builtins.py:3123
1837
#: bzrlib/builtins.py:3142
1834
1838
msgid ""
1835
1839
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1836
1840
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1837
1841
msgstr ""
1838
1842
1839
#: bzrlib/builtins.py:3126
1843
#: bzrlib/builtins.py:3145
1840
1844
msgid ""
1841
1845
":Examples:\n"
1842
1846
" Ignore the top level Makefile::"
1843
1847
msgstr ""
1844
1848
1845
#: bzrlib/builtins.py:3129
1849
#: bzrlib/builtins.py:3148
1846
1850
msgid " bzr ignore ./Makefile"
1847
1851
msgstr ""
1848
1852
1849
#: bzrlib/builtins.py:3131
1853
#: bzrlib/builtins.py:3150
1850
1854
msgid " Ignore .class files in all directories...::"
1851
1855
msgstr ""
1852
1856
1853
#: bzrlib/builtins.py:3133
1857
#: bzrlib/builtins.py:3152
1854
1858
msgid " bzr ignore \"*.class\""
1855
1859
msgstr ""
1856
1860
1857
#: bzrlib/builtins.py:3135
1861
#: bzrlib/builtins.py:3154
1858
1862
msgid " ...but do not ignore \"special.class\"::"
1859
1863
msgstr ""
1860
1864
1861
#: bzrlib/builtins.py:3137
1865
#: bzrlib/builtins.py:3156
1862
1866
msgid " bzr ignore \"!special.class\""
1863
1867
msgstr ""
1864
1868
1865
#: bzrlib/builtins.py:3139
1869
#: bzrlib/builtins.py:3158
1866
1870
msgid " Ignore files whose name begins with the \"#\" character::"
1867
1871
msgstr ""
1868
1872
1869
#: bzrlib/builtins.py:3141
1873
#: bzrlib/builtins.py:3160
1870
1874
msgid " bzr ignore \"RE:^#\""
1871
1875
msgstr ""
1872
1876
1873
#: bzrlib/builtins.py:3143 bzrlib/builtins.py:3147
1877
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1874
1878
msgid " Ignore .o files under the lib directory::"
1875
1879
msgstr ""
1876
1880
1877
#: bzrlib/builtins.py:3145
1881
#: bzrlib/builtins.py:3164
1878
1882
msgid " bzr ignore \"lib/**/*.o\""
1879
1883
msgstr ""
1880
1884
1881
#: bzrlib/builtins.py:3149
1885
#: bzrlib/builtins.py:3168
1882
1886
msgid " bzr ignore \"RE:lib/.*\\.o\""
1883
1887
msgstr ""
1884
1888
1885
#: bzrlib/builtins.py:3151
1889
#: bzrlib/builtins.py:3170
1886
1890
msgid " Ignore everything but the \"debian\" toplevel directory::"
1887
1891
msgstr ""
1888
1892
1889
#: bzrlib/builtins.py:3153
1893
#: bzrlib/builtins.py:3172
1890
1894
msgid ""
1891
1895
" bzr ignore \"RE:(?!debian/).*\"\n"
1892
1896
" \n"
1898
1902
" bzr ignore \"!!*~\""
1899
1903
msgstr ""
1900
1904
1901
#: bzrlib/builtins.py:3167
1905
#: bzrlib/builtins.py:3186
1902
1906
msgid "Display the default ignore rules that bzr uses."
1903
1907
msgstr ""
1904
1908
1905
#: bzrlib/builtins.py:3179
1909
#: bzrlib/builtins.py:3198
1906
1910
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1907
1911
msgstr ""
1908
1912
1909
#: bzrlib/builtins.py:3190
1913
#: bzrlib/builtins.py:3209
1910
1914
#, python-format
1911
1915
msgid "Invalid ignore pattern found. %s"
1912
1916
msgid_plural "Invalid ignore patterns found. %s"
1913
1917
msgstr[0] ""
1914
1918
msgstr[1] ""
1915
1919
1916
#: bzrlib/builtins.py:3199
1920
#: bzrlib/builtins.py:3218
1917
1921
msgid "NAME_PATTERN should not be an absolute path"
1918
1922
msgstr ""
1919
1923
1920
#: bzrlib/builtins.py:3212
1924
#: bzrlib/builtins.py:3231
1921
1925
#, python-format
1922
1926
msgid ""
1923
1927
"Warning: the following files are version controlled and match your ignore "
1927
1931
"them.\n"
1928
1932
msgstr ""
1929
1933
1930
#: bzrlib/builtins.py:3219
1934
#: bzrlib/builtins.py:3238
1931
1935
msgid "List ignored files and the patterns that matched them."
1932
1936
msgstr ""
1933
1937
1934
#: bzrlib/builtins.py:3221
1938
#: bzrlib/builtins.py:3240
1935
1939
msgid ""
1936
1940
"List all the ignored files and the ignore pattern that caused the file to\n"
1937
1941
"be ignored."
1938
1942
msgstr ""
1939
1943
1940
#: bzrlib/builtins.py:3224
1944
#: bzrlib/builtins.py:3243
1941
1945
msgid "Alternatively, to list just the files::"
1942
1946
msgstr ""
1943
1947
1944
#: bzrlib/builtins.py:3226
1948
#: bzrlib/builtins.py:3245
1945
1949
msgid " bzr ls --ignored"
1946
1950
msgstr ""
1947
1951
1948
#: bzrlib/builtins.py:3260
1952
#: bzrlib/builtins.py:3279
1949
1953
#, python-format
1950
1954
msgid "not a valid revision-number: %r"
1951
1955
msgstr ""
1952
1956
1953
#: bzrlib/builtins.py:3267
1957
#: bzrlib/builtins.py:3286
1954
1958
msgid ""
1955
1959
"Export current or past revision to a destination directory or archive."
1956
1960
msgstr ""
1957
1961
1958
#: bzrlib/builtins.py:3269
1962
#: bzrlib/builtins.py:3288
1959
1963
msgid "If no revision is specified this exports the last committed revision."
1960
1964
msgstr ""
1961
1965
1962
#: bzrlib/builtins.py:3271
1966
#: bzrlib/builtins.py:3290
1963
1967
msgid ""
1964
1968
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1965
1969
"given, try to find the format with the extension. If no extension\n"
1966
1970
"is found exports to a directory (equivalent to --format=dir)."
1967
1971
msgstr ""
1968
1972
1969
#: bzrlib/builtins.py:3275
1973
#: bzrlib/builtins.py:3294
1970
1974
msgid ""
1971
1975
"If root is supplied, it will be used as the root directory inside\n"
1972
1976
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1973
1977
"to the exported filename. The root option has no effect for 'dir' format."
1974
1978
msgstr ""
1975
1979
1976
#: bzrlib/builtins.py:3279
1980
#: bzrlib/builtins.py:3298
1977
1981
msgid ""
1978
1982
"If branch is omitted then the branch containing the current working\n"
1979
1983
"directory will be used."
1980
1984
msgstr ""
1981
1985
1982
#: bzrlib/builtins.py:3282
1986
#: bzrlib/builtins.py:3301
1983
1987
msgid ""
1984
1988
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1985
1989
msgstr ""
1986
1990
1987
#: bzrlib/builtins.py:3284
1991
#: bzrlib/builtins.py:3303
1988
1992
msgid ""
1989
1993
" ================= =========================\n"
1990
1994
" Supported formats Autodetected by extension\n"
1997
2001
" ================= ========================="
1998
2002
msgstr ""
1999
2003
2000
#: bzrlib/builtins.py:3298
2004
#: bzrlib/builtins.py:3317
2001
2005
msgid "Type of file to export to."
2002
2006
msgstr ""
2003
2007
2004
#: bzrlib/builtins.py:3301
2008
#: bzrlib/builtins.py:3320
2005
2009
msgid "Apply content filters to export the convenient form."
2006
2010
msgstr ""
2007
2011
2008
#: bzrlib/builtins.py:3305
2012
#: bzrlib/builtins.py:3324
2009
2013
msgid "Name of the root directory inside the exported file."
2010
2014
msgstr ""
2011
2015
2012
#: bzrlib/builtins.py:3307
2016
#: bzrlib/builtins.py:3326
2013
2017
msgid ""
2014
2018
"Set modification time of files to that of the last revision in which it was "
2015
2019
"changed."
2016
2020
msgstr ""
2017
2021
2018
#: bzrlib/builtins.py:3310
2022
#: bzrlib/builtins.py:3329
2019
2023
msgid ""
2020
2024
"Export the working tree contents rather than that of the last revision."
2021
2025
msgstr ""
2022
2026
2023
#: bzrlib/builtins.py:3329
2027
#: bzrlib/builtins.py:3348
2024
2028
msgid "--uncommitted requires a working tree"
2025
2029
msgstr ""
2026
2030
2027
#: bzrlib/builtins.py:3338
2031
#: bzrlib/builtins.py:3357
2028
2032
#, python-format
2029
2033
msgid "Unsupported export format: %s"
2030
2034
msgstr ""
2031
2035
2032
#: bzrlib/builtins.py:3342
2036
#: bzrlib/builtins.py:3361
2033
2037
msgid ""
2034
2038
"Write the contents of a file as of a given revision to standard output."
2035
2039
msgstr ""
2036
2040
2037
#: bzrlib/builtins.py:3344
2041
#: bzrlib/builtins.py:3363
2038
2042
msgid "If no revision is nominated, the last revision is used."
2039
2043
msgstr ""
2040
2044
2041
#: bzrlib/builtins.py:3346
2045
#: bzrlib/builtins.py:3365
2042
2046
msgid ""
2043
2047
"Note: Take care to redirect standard output when using this command on a\n"
2044
2048
"binary file."
2045
2049
msgstr ""
2046
2050
2047
#: bzrlib/builtins.py:3352
2051
#: bzrlib/builtins.py:3371
2048
2052
msgid "The path name in the old tree."
2049
2053
msgstr ""
2050
2054
2051
#: bzrlib/builtins.py:3353
2055
#: bzrlib/builtins.py:3372
2052
2056
msgid "Apply content filters to display the convenience form."
2053
2057
msgstr ""
2054
2058
2055
#: bzrlib/builtins.py:3364
2059
#: bzrlib/builtins.py:3383
2056
2060
msgid "bzr cat --revision takes exactly one revision specifier"
2057
2061
msgstr ""
2058
2062
2059
#: bzrlib/builtins.py:3389 bzrlib/builtins.py:3401
2063
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2060
2064
msgid "{0!r} is not present in revision {1}"
2061
2065
msgstr ""
2062
2066
2063
#: bzrlib/builtins.py:3424
2067
#: bzrlib/builtins.py:3443
2064
2068
msgid "Commit changes into a new revision."
2065
2069
msgstr ""
2066
2070
2067
#: bzrlib/builtins.py:3426
2071
#: bzrlib/builtins.py:3445
2068
2072
msgid ""
2069
2073
"An explanatory message needs to be given for each commit. This is\n"
2070
2074
"often done by using the --message option (getting the message from the\n"
2074
2078
"boilerplate text loaded into the editor, use the --show-diff option."
2075
2079
msgstr ""
2076
2080
2077
#: bzrlib/builtins.py:3433
2081
#: bzrlib/builtins.py:3452
2078
2082
msgid ""
2079
2083
"By default, the entire tree is committed and the person doing the\n"
2080
2084
"commit is assumed to be the author. These defaults can be overridden\n"
2081
2085
"as explained below."
2082
2086
msgstr ""
2083
2087
2084
#: bzrlib/builtins.py:3437
2088
#: bzrlib/builtins.py:3456
2085
2089
msgid ":Selective commits:"
2086
2090
msgstr ""
2087
2091
2088
#: bzrlib/builtins.py:3439
2092
#: bzrlib/builtins.py:3458
2089
2093
msgid ""
2090
2094
" If selected files are specified, only changes to those files are\n"
2091
2095
" committed. If a directory is specified then the directory and\n"
2092
2096
" everything within it is committed."
2093
2097
msgstr ""
2094
2098
2095
#: bzrlib/builtins.py:3443
2099
#: bzrlib/builtins.py:3462
2096
2100
msgid ""
2097
2101
" When excludes are given, they take precedence over selected files.\n"
2098
2102
" For example, to commit only changes within foo, but not changes\n"
2099
2103
" within foo/bar::"
2100
2104
msgstr ""
2101
2105
2102
#: bzrlib/builtins.py:3447
2106
#: bzrlib/builtins.py:3466
2103
2107
msgid " bzr commit foo -x foo/bar"
2104
2108
msgstr ""
2105
2109
2106
#: bzrlib/builtins.py:3449
2110
#: bzrlib/builtins.py:3468
2107
2111
msgid " A selective commit after a merge is not yet supported."
2108
2112
msgstr ""
2109
2113
2110
#: bzrlib/builtins.py:3451
2114
#: bzrlib/builtins.py:3470
2111
2115
msgid ":Custom authors:"
2112
2116
msgstr ""
2113
2117
2114
#: bzrlib/builtins.py:3453
2118
#: bzrlib/builtins.py:3472
2115
2119
msgid ""
2116
2120
" If the author of the change is not the same person as the committer,\n"
2117
2121
" you can specify the author's name using the --author option. The\n"
2121
2125
" author."
2122
2126
msgstr ""
2123
2127
2124
#: bzrlib/builtins.py:3460
2128
#: bzrlib/builtins.py:3479
2125
2129
msgid ":Checks:"
2126
2130
msgstr ""
2127
2131
2128
#: bzrlib/builtins.py:3462
2132
#: bzrlib/builtins.py:3481
2129
2133
msgid ""
2130
2134
" A common mistake is to forget to add a new file or directory before\n"
2131
2135
" running the commit command. The --strict option checks for unknown\n"
2134
2138
" for details."
2135
2139
msgstr ""
2136
2140
2137
#: bzrlib/builtins.py:3468
2141
#: bzrlib/builtins.py:3487
2138
2142
msgid ":Things to note:"
2139
2143
msgstr ""
2140
2144
2141
#: bzrlib/builtins.py:3470
2145
#: bzrlib/builtins.py:3489
2142
2146
msgid ""
2143
2147
" If you accidentially commit the wrong changes or make a spelling\n"
2144
2148
" mistake in the commit message say, you can use the uncommit command\n"
2145
2149
" to undo it. See ``bzr help uncommit`` for details."
2146
2150
msgstr ""
2147
2151
2148
#: bzrlib/builtins.py:3474
2152
#: bzrlib/builtins.py:3493
2149
2153
msgid ""
2150
2154
" Hooks can also be configured to run after a commit. This allows you\n"
2151
2155
" to trigger updates to external systems like bug trackers. The --fixes\n"
2153
2157
" one or more bugs. See ``bzr help bugs`` for details."
2154
2158
msgstr ""
2155
2159
2156
#: bzrlib/builtins.py:3484
2160
#: bzrlib/builtins.py:3503
2157
2161
msgid "Do not consider changes made to a given path."
2158
2162
msgstr ""
2159
2163
2160
#: bzrlib/builtins.py:3487
2164
#: bzrlib/builtins.py:3506
2161
2165
msgid "Description of the new revision."
2162
2166
msgstr ""
2163
2167
2164
#: bzrlib/builtins.py:3490
2168
#: bzrlib/builtins.py:3509
2165
2169
msgid "Commit even if nothing has changed."
2166
2170
msgstr ""
2167
2171
2168
#: bzrlib/builtins.py:3494
2172
#: bzrlib/builtins.py:3513
2169
2173
msgid "Take commit message from this file."
2170
2174
msgstr ""
2171
2175
2172
#: bzrlib/builtins.py:3496
2176
#: bzrlib/builtins.py:3515
2173
2177
msgid "Refuse to commit if there are unknown files in the working tree."
2174
2178
msgstr ""
2175
2179
2176
#: bzrlib/builtins.py:3499
2180
#: bzrlib/builtins.py:3518
2177
2181
msgid ""
2178
2182
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2179
2183
"08:00:00 +0100'."
2180
2184
msgstr ""
2181
2185
2182
#: bzrlib/builtins.py:3502
2186
#: bzrlib/builtins.py:3521
2183
2187
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2184
2188
msgstr ""
2185
2189
2186
#: bzrlib/builtins.py:3505
2190
#: bzrlib/builtins.py:3524
2187
2191
msgid "Set the author's name, if it's different from the committer."
2188
2192
msgstr ""
2189
2193
2190
#: bzrlib/builtins.py:3508
2194
#: bzrlib/builtins.py:3527
2191
2195
msgid ""
2192
2196
"Perform a local commit in a bound branch. Local commits are not pushed to "
2193
2197
"the master branch until a normal commit is performed."
2194
2198
msgstr ""
2195
2199
2196
#: bzrlib/builtins.py:3514
2200
#: bzrlib/builtins.py:3533
2197
2201
msgid ""
2198
2202
"When no message is supplied, show the diff along with the status summary in "
2199
2203
"the message editor."
2200
2204
msgstr ""
2201
2205
2202
#: bzrlib/builtins.py:3517
2206
#: bzrlib/builtins.py:3536
2203
2207
msgid ""
2204
2208
"When committing to a foreign version control system do not push data that "
2205
2209
"can not be natively represented."
2206
2210
msgstr ""
2207
2211
2208
#: bzrlib/builtins.py:3535
2212
#: bzrlib/builtins.py:3554
2209
2213
#, python-format
2210
2214
msgid ""
2211
2215
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2213
2217
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2214
2218
msgstr ""
2215
2219
2216
#: bzrlib/builtins.py:3544
2220
#: bzrlib/builtins.py:3563
2217
2221
#, python-format
2218
2222
msgid ""
2219
2223
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2221
2225
"Commit refused."
2222
2226
msgstr ""
2223
2227
2224
#: bzrlib/builtins.py:3553
2228
#: bzrlib/builtins.py:3572
2225
2229
#, python-format
2226
2230
msgid "Unrecognized bug %s. Commit refused."
2227
2231
msgstr ""
2228
2232
2229
#: bzrlib/builtins.py:3556
2233
#: bzrlib/builtins.py:3575
2230
2234
#, python-format
2231
2235
msgid ""
2232
2236
"%s\n"
2233
2237
"Commit refused."
2234
2238
msgstr ""
2235
2239
2236
#: bzrlib/builtins.py:3580
2240
#: bzrlib/builtins.py:3599
2237
2241
msgid "Could not parse --commit-time: "
2238
2242
msgstr ""
2239
2243
2240
#: bzrlib/builtins.py:3620
2244
#: bzrlib/builtins.py:3639
2241
2245
msgid "please specify either --message or --file"
2242
2246
msgstr ""
2243
2247
2244
#: bzrlib/builtins.py:3649
2248
#: bzrlib/builtins.py:3668
2245
2249
msgid "please specify a commit message with either --message or --file"
2246
2250
msgstr ""
2247
2251
2248
#: bzrlib/builtins.py:3652
2252
#: bzrlib/builtins.py:3671
2249
2253
msgid ""
2250
2254
"Empty commit message specified. Please specify a commit message with either -"
2251
2255
"-message or --file or leave a blank message with --message \"\"."
2252
2256
msgstr ""
2253
2257
2254
#: bzrlib/builtins.py:3672
2258
#: bzrlib/builtins.py:3691
2255
2259
msgid ""
2256
2260
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2257
2261
"-unchanged to force an empty commit."
2258
2262
msgstr ""
2259
2263
2260
#: bzrlib/builtins.py:3676
2264
#: bzrlib/builtins.py:3695
2261
2265
msgid ""
2262
2266
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2263
2267
"resolve FILE\" to resolve."
2264
2268
msgstr ""
2265
2269
2266
#: bzrlib/builtins.py:3680
2270
#: bzrlib/builtins.py:3699
2267
2271
msgid "Commit refused because there are unknown files in the working tree."
2268
2272
msgstr ""
2269
2273
2270
#: bzrlib/builtins.py:3683
2274
#: bzrlib/builtins.py:3702
2271
2275
msgid ""
2272
2276
"\n"
2273
2277
"To commit to master branch, run update and then commit.\n"
2274
2278
"You can also pass --local to commit to continue working disconnected."
2275
2279
msgstr ""
2276
2280
2277
#: bzrlib/builtins.py:3691
2281
#: bzrlib/builtins.py:3710
2278
2282
msgid ""
2279
2283
"Validate working tree structure, branch consistency and repository history."
2280
2284
msgstr ""
2281
2285
2282
#: bzrlib/builtins.py:3693
2286
#: bzrlib/builtins.py:3712
2283
2287
msgid ""
2284
2288
"This command checks various invariants about branch and repository storage\n"
2285
2289
"to detect data corruption or bzr bugs."
2286
2290
msgstr ""
2287
2291
2288
#: bzrlib/builtins.py:3696
2292
#: bzrlib/builtins.py:3715
2289
2293
msgid ""
2290
2294
"The working tree and branch checks will only give output if a problem is\n"
2291
2295
"detected. The output fields of the repository check are:"
2292
2296
msgstr ""
2293
2297
2294
#: bzrlib/builtins.py:3699
2298
#: bzrlib/builtins.py:3718
2295
2299
msgid ""
2296
2300
"revisions\n"
2297
2301
" This is just the number of revisions checked. It doesn't\n"
2298
2302
" indicate a problem."
2299
2303
msgstr ""
2300
2304
2301
#: bzrlib/builtins.py:3703
2305
#: bzrlib/builtins.py:3722
2302
2306
msgid ""
2303
2307
"versionedfiles\n"
2304
2308
" This is just the number of versionedfiles checked. It\n"
2305
2309
" doesn't indicate a problem."
2306
2310
msgstr ""
2307
2311
2308
#: bzrlib/builtins.py:3707
2312
#: bzrlib/builtins.py:3726
2309
2313
msgid ""
2310
2314
"unreferenced ancestors\n"
2311
2315
" Texts that are ancestors of other texts, but\n"
2313
2317
" subtle problem that Bazaar can work around."
2314
2318
msgstr ""
2315
2319
2316
#: bzrlib/builtins.py:3712
2320
#: bzrlib/builtins.py:3731
2317
2321
msgid ""
2318
2322
"unique file texts\n"
2319
2323
" This is the total number of unique file contents\n"
2320
2324
" seen in the checked revisions. It does not indicate a problem."
2321
2325
msgstr ""
2322
2326
2323
#: bzrlib/builtins.py:3716
2327
#: bzrlib/builtins.py:3735
2324
2328
msgid ""
2325
2329
"repeated file texts\n"
2326
2330
" This is the total number of repeated texts seen\n"
2329
2333
" indicate a problem."
2330
2334
msgstr ""
2331
2335
2332
#: bzrlib/builtins.py:3722
2336
#: bzrlib/builtins.py:3741
2333
2337
msgid ""
2334
2338
"If no restrictions are specified, all Bazaar data that is found at the "
2335
2339
"given\n"
2336
2340
"location will be checked."
2337
2341
msgstr ""
2338
2342
2339
#: bzrlib/builtins.py:3727
2343
#: bzrlib/builtins.py:3746
2340
2344
msgid " Check the tree and branch at 'foo'::"
2341
2345
msgstr ""
2342
2346
2343
#: bzrlib/builtins.py:3729
2347
#: bzrlib/builtins.py:3748
2344
2348
msgid " bzr check --tree --branch foo"
2345
2349
msgstr ""
2346
2350
2347
#: bzrlib/builtins.py:3731
2351
#: bzrlib/builtins.py:3750
2348
2352
msgid " Check only the repository at 'bar'::"
2349
2353
msgstr ""
2350
2354
2351
#: bzrlib/builtins.py:3733
2355
#: bzrlib/builtins.py:3752
2352
2356
msgid " bzr check --repo bar"
2353
2357
msgstr ""
2354
2358
2355
#: bzrlib/builtins.py:3735
2359
#: bzrlib/builtins.py:3754
2356
2360
msgid " Check everything at 'baz'::"
2357
2361
msgstr ""
2358
2362
2359
#: bzrlib/builtins.py:3737
2363
#: bzrlib/builtins.py:3756
2360
2364
msgid " bzr check baz"
2361
2365
msgstr ""
2362
2366
2363
#: bzrlib/builtins.py:3743
2367
#: bzrlib/builtins.py:3762
2364
2368
msgid "Check the branch related to the current directory."
2365
2369
msgstr ""
2366
2370
2367
#: bzrlib/builtins.py:3745
2371
#: bzrlib/builtins.py:3764
2368
2372
msgid "Check the repository related to the current directory."
2369
2373
msgstr ""
2370
2374
2371
#: bzrlib/builtins.py:3747
2375
#: bzrlib/builtins.py:3766
2372
2376
msgid "Check the working tree related to the current directory."
2373
2377
msgstr ""
2374
2378
2375
#: bzrlib/builtins.py:3761
2379
#: bzrlib/builtins.py:3780
2376
2380
msgid "Upgrade a repository, branch or working tree to a newer format."
2377
2381
msgstr ""
2378
2382
2379
#: bzrlib/builtins.py:3763
2383
#: bzrlib/builtins.py:3782
2380
2384
msgid ""
2381
2385
"When the default format has changed after a major new release of\n"
2382
2386
"Bazaar, you may be informed during certain operations that you\n"
2385
2389
"with older repositories or with older versions of Bazaar."
2386
2390
msgstr ""
2387
2391
2388
#: bzrlib/builtins.py:3769
2392
#: bzrlib/builtins.py:3788
2389
2393
msgid ""
2390
2394
"If you wish to upgrade to a particular format rather than the\n"
2391
2395
"current default, that can be specified using the --format option.\n"
2395
2399
"2.x default) so downgrading is not always possible."
2396
2400
msgstr ""
2397
2401
2398
#: bzrlib/builtins.py:3776
2402
#: bzrlib/builtins.py:3795
2399
2403
msgid ""
2400
2404
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2401
2405
"process (where # is a number). By default, this is left there on\n"
2406
2410
"afterwards."
2407
2411
msgstr ""
2408
2412
2409
#: bzrlib/builtins.py:3784
2413
#: bzrlib/builtins.py:3803
2410
2414
msgid ""
2411
2415
"If the location given is a shared repository, dependent branches\n"
2412
2416
"are also converted provided the repository converts successfully.\n"
2414
2418
"tried."
2415
2419
msgstr ""
2416
2420
2417
#: bzrlib/builtins.py:3789
2421
#: bzrlib/builtins.py:3808
2418
2422
msgid ""
2419
2423
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2420
2424
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2421
2425
msgstr ""
2422
2426
2423
#: bzrlib/builtins.py:3797
2427
#: bzrlib/builtins.py:3816
2424
2428
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2425
2429
msgstr ""
2426
2430
2427
#: bzrlib/builtins.py:3801
2431
#: bzrlib/builtins.py:3820
2428
2432
msgid "Branch format"
2429
2433
msgstr ""
2430
2434
2431
#: bzrlib/builtins.py:3803
2435
#: bzrlib/builtins.py:3822
2432
2436
msgid "Remove the backup.bzr directory if successful."
2433
2437
msgstr ""
2434
2438
2435
#: bzrlib/builtins.py:3805
2439
#: bzrlib/builtins.py:3824
2436
2440
msgid "Show what would be done, but don't actually do anything."
2437
2441
msgstr ""
2438
2442
2439
#: bzrlib/builtins.py:3820
2443
#: bzrlib/builtins.py:3839
2440
2444
msgid "Show or set bzr user id."
2441
2445
msgstr ""
2442
2446
2443
#: bzrlib/builtins.py:3822
2447
#: bzrlib/builtins.py:3841
2444
2448
msgid ""
2445
2449
":Examples:\n"
2446
2450
" Show the email of the current user::"
2447
2451
msgstr ""
2448
2452
2449
#: bzrlib/builtins.py:3825
2453
#: bzrlib/builtins.py:3844
2450
2454
msgid " bzr whoami --email"
2451
2455
msgstr ""
2452
2456
2453
#: bzrlib/builtins.py:3827
2457
#: bzrlib/builtins.py:3846
2454
2458
msgid " Set the current user::"
2455
2459
msgstr ""
2456
2460
2457
#: bzrlib/builtins.py:3829
2461
#: bzrlib/builtins.py:3848
2458
2462
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2459
2463
msgstr ""
2460
2464
2461
#: bzrlib/builtins.py:3833
2465
#: bzrlib/builtins.py:3852
2462
2466
msgid "Display email address only."
2463
2467
msgstr ""
2464
2468
2465
#: bzrlib/builtins.py:3835
2469
#: bzrlib/builtins.py:3854
2466
2470
msgid "Set identity for the current branch instead of globally."
2467
2471
msgstr ""
2468
2472
2469
#: bzrlib/builtins.py:3861
2473
#: bzrlib/builtins.py:3880
2470
2474
msgid "--email can only be used to display existing identity"
2471
2475
msgstr ""
2472
2476
2473
#: bzrlib/builtins.py:3885
2477
#: bzrlib/builtins.py:3904
2474
2478
msgid "Print or set the branch nickname."
2475
2479
msgstr ""
2476
2480
2477
#: bzrlib/builtins.py:3887
2481
#: bzrlib/builtins.py:3906
2478
2482
msgid ""
2479
2483
"If unset, the colocated branch name is used for colocated branches, and\n"
2480
2484
"the branch directory name is used for other branches. To print the\n"
2481
2485
"current nickname, execute with no argument."
2482
2486
msgstr ""
2483
2487
2484
#: bzrlib/builtins.py:3891
2488
#: bzrlib/builtins.py:3910
2485
2489
msgid ""
2486
2490
"Bound branches use the nickname of its master branch unless it is set\n"
2487
2491
"locally."
2488
2492
msgstr ""
2489
2493
2490
#: bzrlib/builtins.py:3911
2494
#: bzrlib/builtins.py:3930
2491
2495
msgid "Set/unset and display aliases."
2492
2496
msgstr ""
2493
2497
2494
#: bzrlib/builtins.py:3913
2498
#: bzrlib/builtins.py:3932
2495
2499
msgid ""
2496
2500
":Examples:\n"
2497
2501
" Show the current aliases::"
2498
2502
msgstr ""
2499
2503
2500
#: bzrlib/builtins.py:3916
2504
#: bzrlib/builtins.py:3935
2501
2505
msgid " bzr alias"
2502
2506
msgstr ""
2503
2507
2504
#: bzrlib/builtins.py:3918
2508
#: bzrlib/builtins.py:3937
2505
2509
msgid " Show the alias specified for 'll'::"
2506
2510
msgstr ""
2507
2511
2508
#: bzrlib/builtins.py:3920
2512
#: bzrlib/builtins.py:3939
2509
2513
msgid " bzr alias ll"
2510
2514
msgstr ""
2511
2515
2512
#: bzrlib/builtins.py:3922
2516
#: bzrlib/builtins.py:3941
2513
2517
msgid " Set an alias for 'll'::"
2514
2518
msgstr ""
2515
2519
2516
#: bzrlib/builtins.py:3924
2520
#: bzrlib/builtins.py:3943
2517
2521
msgid " bzr alias ll=\"log --line -r-10..-1\""
2518
2522
msgstr ""
2519
2523
2520
#: bzrlib/builtins.py:3926
2524
#: bzrlib/builtins.py:3945
2521
2525
msgid " To remove an alias for 'll'::"
2522
2526
msgstr ""
2523
2527
2524
#: bzrlib/builtins.py:3928
2528
#: bzrlib/builtins.py:3947
2525
2529
msgid " bzr alias --remove ll"
2526
2530
msgstr ""
2527
2531
2528
#: bzrlib/builtins.py:3933
2532
#: bzrlib/builtins.py:3952
2529
2533
msgid "Remove the alias."
2530
2534
msgstr ""
2531
2535
2532
#: bzrlib/builtins.py:3951
2536
#: bzrlib/builtins.py:3970
2533
2537
msgid "bzr alias --remove expects an alias to remove."
2534
2538
msgstr ""
2535
2539
2536
#: bzrlib/builtins.py:4132
2540
#: bzrlib/builtins.py:4151
2537
2541
msgid ""
2538
2542
"subunit not available. subunit needs to be installed to use --subunit."
2539
2543
msgstr ""
2540
2544
2541
#: bzrlib/builtins.py:4149
2545
#: bzrlib/builtins.py:4168
2542
2546
msgid ""
2543
2547
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2544
2548
msgstr ""
2545
2549
2546
#: bzrlib/builtins.py:4196
2550
#: bzrlib/builtins.py:4215
2547
2551
msgid "Show version of bzr."
2548
2552
msgstr ""
2549
2553
2550
#: bzrlib/builtins.py:4200
2554
#: bzrlib/builtins.py:4219
2551
2555
msgid "Print just the version number."
2552
2556
msgstr ""
2553
2557
2554
#: bzrlib/builtins.py:4219
2558
#: bzrlib/builtins.py:4238
2555
2559
msgid "It sure does!\n"
2556
2560
msgstr ""
2557
2561
2558
#: bzrlib/builtins.py:4243
2562
#: bzrlib/builtins.py:4262
2559
2563
#, python-format
2560
2564
msgid "merge base is revision %s\n"
2561
2565
msgstr ""
2562
2566
2563
#: bzrlib/builtins.py:4247
2567
#: bzrlib/builtins.py:4266
2564
2568
msgid "Perform a three-way merge."
2565
2569
msgstr ""
2566
2570
2567
#: bzrlib/builtins.py:4249
2571
#: bzrlib/builtins.py:4268
2568
2572
msgid ""
2569
2573
"The source of the merge can be specified either in the form of a branch,\n"
2570
2574
"or in the form of a path to a file containing a merge directive generated\n"
2575
2579
"the current working tree."
2576
2580
msgstr ""
2577
2581
2578
#: bzrlib/builtins.py:4257
2582
#: bzrlib/builtins.py:4276
2579
2583
msgid ""
2580
2584
"When merging from a branch, by default bzr will try to merge in all new\n"
2581
2585
"work from the other branch, automatically determining an appropriate base\n"
2582
2586
"revision. If this fails, you may need to give an explicit base."
2583
2587
msgstr ""
2584
2588
2585
#: bzrlib/builtins.py:4261
2589
#: bzrlib/builtins.py:4280
2586
2590
msgid ""
2587
2591
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2588
2592
"try to merge in all new work up to and including revision OTHER."
2589
2593
msgstr ""
2590
2594
2591
#: bzrlib/builtins.py:4264
2595
#: bzrlib/builtins.py:4283
2592
2596
msgid ""
2593
2597
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2594
2598
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2599
2603
"changes from the other branch is not stored in the commit."
2600
2604
msgstr ""
2601
2605
2602
#: bzrlib/builtins.py:4272
2606
#: bzrlib/builtins.py:4291
2603
2607
msgid "Revision numbers are always relative to the source branch."
2604
2608
msgstr ""
2605
2609
2606
#: bzrlib/builtins.py:4274 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2610
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2607
2611
msgid ""
2608
2612
"Merge will do its best to combine the changes in two branches, but there\n"
2609
2613
"are some kinds of problems only a human can fix. When it encounters those,\n"
2611
2615
"before you can commit."
2612
2616
msgstr ""
2613
2617
2614
#: bzrlib/builtins.py:4279
2618
#: bzrlib/builtins.py:4298
2615
2619
msgid ""
2616
2620
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2617
2621
msgstr ""
2618
2622
2619
#: bzrlib/builtins.py:4281
2623
#: bzrlib/builtins.py:4300
2620
2624
msgid ""
2621
2625
"If there is no default branch set, the first merge will set it (use\n"
2622
2626
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2624
2628
"only be saved if the remote location can be accessed."
2625
2629
msgstr ""
2626
2630
2627
#: bzrlib/builtins.py:4286
2631
#: bzrlib/builtins.py:4305
2628
2632
msgid ""
2629
2633
"The results of the merge are placed into the destination working\n"
2630
2634
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2631
2635
"committed to record the result of the merge."
2632
2636
msgstr ""
2633
2637
2634
#: bzrlib/builtins.py:4290
2638
#: bzrlib/builtins.py:4309
2635
2639
msgid ""
2636
2640
"merge refuses to run if there are any uncommitted changes, unless\n"
2637
2641
"--force is given. If --force is given, then the changes from the source \n"
2640
2644
"merge revision which has more than two parents."
2641
2645
msgstr ""
2642
2646
2643
#: bzrlib/builtins.py:4296
2647
#: bzrlib/builtins.py:4315
2644
2648
msgid ""
2645
2649
"If one would like to merge changes from the working tree of the other\n"
2646
2650
"branch without merging any committed revisions, the --uncommitted option\n"
2647
2651
"can be given."
2648
2652
msgstr ""
2649
2653
2650
#: bzrlib/builtins.py:4300
2654
#: bzrlib/builtins.py:4319
2651
2655
msgid ""
2652
2656
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2653
2657
"you to apply each diff hunk and file change, similar to \"shelve\"."
2654
2658
msgstr ""
2655
2659
2656
#: bzrlib/builtins.py:4303
2660
#: bzrlib/builtins.py:4322
2657
2661
msgid ""
2658
2662
":Examples:\n"
2659
2663
" To merge all new revisions from bzr.dev::"
2660
2664
msgstr ""
2661
2665
2662
#: bzrlib/builtins.py:4306
2666
#: bzrlib/builtins.py:4325
2663
2667
msgid " bzr merge ../bzr.dev"
2664
2668
msgstr ""
2665
2669
2666
#: bzrlib/builtins.py:4308
2670
#: bzrlib/builtins.py:4327
2667
2671
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2668
2672
msgstr ""
2669
2673
2670
#: bzrlib/builtins.py:4310
2674
#: bzrlib/builtins.py:4329
2671
2675
msgid " bzr merge -r 82 ../bzr.dev"
2672
2676
msgstr ""
2673
2677
2674
#: bzrlib/builtins.py:4312
2678
#: bzrlib/builtins.py:4331
2675
2679
msgid " To merge the changes introduced by 82, without previous changes::"
2676
2680
msgstr ""
2677
2681
2678
#: bzrlib/builtins.py:4314
2682
#: bzrlib/builtins.py:4333
2679
2683
msgid " bzr merge -r 81..82 ../bzr.dev"
2680
2684
msgstr ""
2681
2685
2682
#: bzrlib/builtins.py:4316
2686
#: bzrlib/builtins.py:4335
2683
2687
msgid " To apply a merge directive contained in /tmp/merge::"
2684
2688
msgstr ""
2685
2689
2686
#: bzrlib/builtins.py:4318
2690
#: bzrlib/builtins.py:4337
2687
2691
msgid " bzr merge /tmp/merge"
2688
2692
msgstr ""
2689
2693
2690
#: bzrlib/builtins.py:4320
2694
#: bzrlib/builtins.py:4339
2691
2695
msgid ""
2692
2696
" To create a merge revision with three parents from two branches\n"
2693
2697
" feature1a and feature1b:"
2694
2698
msgstr ""
2695
2699
2696
#: bzrlib/builtins.py:4323
2700
#: bzrlib/builtins.py:4342
2697
2701
msgid ""
2698
2702
" bzr merge ../feature1a\n"
2699
2703
" bzr merge ../feature1b --force\n"
2700
2704
" bzr commit -m 'revision with three parents'"
2701
2705
msgstr ""
2702
2706
2703
#: bzrlib/builtins.py:4335
2707
#: bzrlib/builtins.py:4354
2704
2708
msgid "Merge even if the destination tree has uncommitted changes."
2705
2709
msgstr ""
2706
2710
2707
#: bzrlib/builtins.py:4341
2711
#: bzrlib/builtins.py:4360
2708
2712
msgid ""
2709
2713
"Apply uncommitted changes from a working copy, instead of branch changes."
2710
2714
msgstr ""
2711
2715
2712
#: bzrlib/builtins.py:4343
2716
#: bzrlib/builtins.py:4362
2713
2717
msgid ""
2714
2718
"If the destination is already completely merged into the source, pull from "
2715
2719
"the source rather than merging. When this happens, you do not need to "
2716
2720
"commit the result."
2717
2721
msgstr ""
2718
2722
2719
#: bzrlib/builtins.py:4348
2723
#: bzrlib/builtins.py:4367
2720
2724
msgid ""
2721
2725
"Branch to merge into, rather than the one containing the working directory."
2722
2726
msgstr ""
2723
2727
2724
#: bzrlib/builtins.py:4350
2728
#: bzrlib/builtins.py:4369
2725
2729
msgid "Instead of merging, show a diff of the merge."
2726
2730
msgstr ""
2727
2731
2728
#: bzrlib/builtins.py:4352
2732
#: bzrlib/builtins.py:4371
2729
2733
msgid "Select changes interactively."
2730
2734
msgstr ""
2731
2735
2732
#: bzrlib/builtins.py:4374
2736
#: bzrlib/builtins.py:4393
2733
2737
msgid ""
2734
2738
"Merging into empty branches not currently supported, "
2735
2739
"https://bugs.launchpad.net/bzr/+bug/308562"
2736
2740
msgstr ""
2737
2741
2738
#: bzrlib/builtins.py:4401
2742
#: bzrlib/builtins.py:4420
2739
2743
msgid "Cannot use --uncommitted with bundles or merge directives."
2740
2744
msgstr ""
2741
2745
2742
#: bzrlib/builtins.py:4412
2746
#: bzrlib/builtins.py:4431
2743
2747
msgid "Cannot use --uncommitted and --revision at the same time."
2744
2748
msgstr ""
2745
2749
2746
#: bzrlib/builtins.py:4432
2750
#: bzrlib/builtins.py:4451
2747
2751
msgid "merger: "
2748
2752
msgstr ""
2749
2753
2750
#: bzrlib/builtins.py:4434 bzrlib/bundle/apply_bundle.py:71
2754
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2751
2755
msgid "Nothing to do."
2752
2756
msgstr ""
2753
2757
2754
#: bzrlib/builtins.py:4438
2758
#: bzrlib/builtins.py:4457
2755
2759
msgid "Cannot pull individual files"
2756
2760
msgstr ""
2757
2761
2758
#: bzrlib/builtins.py:4446
2762
#: bzrlib/builtins.py:4465
2759
2763
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2760
2764
msgstr ""
2761
2765
2762
#: bzrlib/builtins.py:4504
2766
#: bzrlib/builtins.py:4523
2763
2767
#, python-format
2764
2768
msgid "Show-base is not supported for this merge type. %s"
2765
2769
msgstr ""
2766
2770
2767
#: bzrlib/builtins.py:4513
2771
#: bzrlib/builtins.py:4532
2768
2772
#, python-format
2769
2773
msgid "Conflict reduction is not supported for merge type %s."
2770
2774
msgstr ""
2771
2775
2772
#: bzrlib/builtins.py:4517
2776
#: bzrlib/builtins.py:4536
2773
2777
msgid "Cannot do conflict reduction and show base."
2774
2778
msgstr ""
2775
2779
2776
#: bzrlib/builtins.py:4628
2780
#: bzrlib/builtins.py:4647
2777
2781
msgid "No location specified or remembered"
2778
2782
msgstr ""
2779
2783
2780
#: bzrlib/builtins.py:4630
2784
#: bzrlib/builtins.py:4649
2781
2785
msgid "{0} remembered {1} location {2}"
2782
2786
msgstr ""
2783
2787
2784
#: bzrlib/builtins.py:4636
2788
#: bzrlib/builtins.py:4655
2785
2789
msgid "Redo a merge."
2786
2790
msgstr ""
2787
2791
2788
#: bzrlib/builtins.py:4638
2792
#: bzrlib/builtins.py:4657
2789
2793
msgid ""
2790
2794
"Use this if you want to try a different merge technique while resolving\n"
2791
2795
"conflicts. Some merge techniques are better than others, and remerge\n"
2792
2796
"lets you try different ones on different files."
2793
2797
msgstr ""
2794
2798
2795
#: bzrlib/builtins.py:4642
2799
#: bzrlib/builtins.py:4661
2796
2800
msgid ""
2797
2801
"The options for remerge have the same meaning and defaults as the ones for\n"
2798
2802
"merge. The difference is that remerge can (only) be run when there is a\n"
2799
2803
"pending merge, and it lets you specify particular files."
2800
2804
msgstr ""
2801
2805
2802
#: bzrlib/builtins.py:4646
2806
#: bzrlib/builtins.py:4665
2803
2807
msgid ""
2804
2808
":Examples:\n"
2805
2809
" Re-do the merge of all conflicted files, and show the base text in\n"
2806
2810
" conflict regions, in addition to the usual THIS and OTHER texts::"
2807
2811
msgstr ""
2808
2812
2809
#: bzrlib/builtins.py:4650
2813
#: bzrlib/builtins.py:4669
2810
2814
msgid " bzr remerge --show-base"
2811
2815
msgstr ""
2812
2816
2813
#: bzrlib/builtins.py:4652
2817
#: bzrlib/builtins.py:4671
2814
2818
msgid ""
2815
2819
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2816
2820
" additional processing to reduce the size of conflict regions::"
2817
2821
msgstr ""
2818
2822
2819
#: bzrlib/builtins.py:4655
2823
#: bzrlib/builtins.py:4674
2820
2824
msgid " bzr remerge --merge-type weave --reprocess foobar"
2821
2825
msgstr ""
2822
2826
2823
#: bzrlib/builtins.py:4662
2827
#: bzrlib/builtins.py:4681
2824
2828
msgid "Show base revision text in conflicts."
2825
2829
msgstr ""
2826
2830
2827
#: bzrlib/builtins.py:4674
2831
#: bzrlib/builtins.py:4693
2828
2832
msgid ""
2829
2833
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2830
2834
"merges."
2831
2835
msgstr ""
2832
2836
2833
#: bzrlib/builtins.py:4731
2834
msgid "Revert files to a previous revision."
2837
#: bzrlib/builtins.py:4751
2838
msgid ""
2839
"Set files in the working tree back to the contents of a previous revision."
2835
2840
msgstr ""
2836
2841
2837
#: bzrlib/builtins.py:4733
2842
#: bzrlib/builtins.py:4753
2838
2843
msgid ""
2839
2844
"Giving a list of files will revert only those files. Otherwise, all files\n"
2840
2845
"will be reverted. If the revision is not specified with '--revision', the\n"
2841
"last committed revision is used."
2846
"working tree basis revision is used. A revert operation affects only the\n"
2847
"working tree, not any revision history like the branch and repository or\n"
2848
"the working tree basis revision."
2842
2849
msgstr ""
2843
2850
2844
#: bzrlib/builtins.py:4737
2851
#: bzrlib/builtins.py:4759
2845
2852
msgid ""
2846
2853
"To remove only some changes, without reverting to a prior version, use\n"
2847
2854
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2848
2855
"will remove the changes introduced by the second last commit (-2), without\n"
2849
2856
"affecting the changes introduced by the last commit (-1). To remove\n"
2850
"certain changes on a hunk-by-hunk basis, see the shelve command."
2857
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2858
"To update the branch to a specific revision or the latest revision and\n"
2859
"update the working tree accordingly while preserving local changes, see the\n"
2860
"update command."
2851
2861
msgstr ""
2852
2862
2853
#: bzrlib/builtins.py:4743
2863
#: bzrlib/builtins.py:4768
2854
2864
msgid ""
2855
"By default, any files that have been manually changed will be backed up\n"
2856
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2857
"'.~#~' appended to their name, where # is a number."
2865
"Uncommitted changes to files that are reverted will be discarded.\n"
2866
"Howver, by default, any files that have been manually changed will be\n"
2867
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2868
"files have '.~#~' appended to their name, where # is a number."
2858
2869
msgstr ""
2859
2870
2860
#: bzrlib/builtins.py:4747
2871
#: bzrlib/builtins.py:4773
2861
2872
msgid ""
2862
2873
"When you provide files, you can use their current pathname or the pathname\n"
2863
2874
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2865
2876
"reverted."
2866
2877
msgstr ""
2867
2878
2868
#: bzrlib/builtins.py:4752
2879
#: bzrlib/builtins.py:4778
2869
2880
msgid ""
2870
2881
"If you have newly added files since the target revision, they will be\n"
2871
2882
"removed. If the files to be removed have been changed, backups will be\n"
2873
2884
"deleted."
2874
2885
msgstr ""
2875
2886
2876
#: bzrlib/builtins.py:4757
2887
#: bzrlib/builtins.py:4783
2877
2888
msgid ""
2878
2889
"The working tree contains a list of revisions that have been merged but\n"
2879
2890
"not yet committed. These revisions will be included as additional parents\n"
2885
2896
"reverting any files."
2886
2897
msgstr ""
2887
2898
2888
#: bzrlib/builtins.py:4766
2899
#: bzrlib/builtins.py:4792
2889
2900
msgid ""
2890
2901
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2891
2902
"changes from a branch in a single revision. To do this, perform the merge\n"
2899
2910
"target branches."
2900
2911
msgstr ""
2901
2912
2902
#: bzrlib/builtins.py:4780
2913
#: bzrlib/builtins.py:4806
2903
2914
msgid "Do not save backups of reverted files."
2904
2915
msgstr ""
2905
2916
2906
#: bzrlib/builtins.py:4782
2917
#: bzrlib/builtins.py:4808
2907
2918
msgid "Remove pending merge marker, without changing any files."
2908
2919
msgstr ""
2909
2920
2910
#: bzrlib/builtins.py:4813
2921
#: bzrlib/builtins.py:4839
2911
2922
msgid ""
2912
2923
"Show help on a command or other topic.\n"
2913
2924
" "
2914
2925
msgstr ""
2915
2926
2916
#: bzrlib/builtins.py:4818
2927
#: bzrlib/builtins.py:4844
2917
2928
msgid "Show help on all commands."
2918
2929
msgstr ""
2919
2930
2920
#: bzrlib/builtins.py:4847
2931
#: bzrlib/builtins.py:4873
2921
2932
msgid "Show unmerged/unpulled revisions between two branches."
2922
2933
msgstr ""
2923
2934
2924
#: bzrlib/builtins.py:4849
2935
#: bzrlib/builtins.py:4875
2925
2936
msgid "OTHER_BRANCH may be local or remote."
2926
2937
msgstr ""
2927
2938
2928
#: bzrlib/builtins.py:4851
2939
#: bzrlib/builtins.py:4877
2929
2940
msgid ""
2930
2941
"To filter on a range of revisions, you can use the command -r begin..end\n"
2931
2942
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2936
2947
" 0 - no missing revisions"
2937
2948
msgstr ""
2938
2949
2939
#: bzrlib/builtins.py:4861
2950
#: bzrlib/builtins.py:4887
2940
2951
msgid ""
2941
2952
" Determine the missing revisions between this and the branch at the\n"
2942
2953
" remembered pull location::"
2943
2954
msgstr ""
2944
2955
2945
#: bzrlib/builtins.py:4864
2956
#: bzrlib/builtins.py:4890
2946
2957
msgid " bzr missing"
2947
2958
msgstr ""
2948
2959
2949
#: bzrlib/builtins.py:4866
2960
#: bzrlib/builtins.py:4892
2950
2961
msgid " Determine the missing revisions between this and another branch::"
2951
2962
msgstr ""
2952
2963
2953
#: bzrlib/builtins.py:4868
2964
#: bzrlib/builtins.py:4894
2954
2965
msgid " bzr missing http://server/branch"
2955
2966
msgstr ""
2956
2967
2957
#: bzrlib/builtins.py:4870
2968
#: bzrlib/builtins.py:4896
2958
2969
msgid ""
2959
2970
" Determine the missing revisions up to a specific revision on the other\n"
2960
2971
" branch::"
2961
2972
msgstr ""
2962
2973
2963
#: bzrlib/builtins.py:4873
2974
#: bzrlib/builtins.py:4899
2964
2975
msgid " bzr missing -r ..-10"
2965
2976
msgstr ""
2966
2977
2967
#: bzrlib/builtins.py:4875
2978
#: bzrlib/builtins.py:4901
2968
2979
msgid ""
2969
2980
" Determine the missing revisions up to a specific revision on this\n"
2970
2981
" branch::"
2971
2982
msgstr ""
2972
2983
2973
#: bzrlib/builtins.py:4878
2984
#: bzrlib/builtins.py:4904
2974
2985
msgid " bzr missing --my-revision ..-10"
2975
2986
msgstr ""
2976
2987
2977
#: bzrlib/builtins.py:4885
2988
#: bzrlib/builtins.py:4911
2978
2989
msgid "Reverse the order of revisions."
2979
2990
msgstr ""
2980
2991
2981
#: bzrlib/builtins.py:4887
2992
#: bzrlib/builtins.py:4913
2982
2993
msgid "Display changes in the local branch only."
2983
2994
msgstr ""
2984
2995
2985
#: bzrlib/builtins.py:4888
2996
#: bzrlib/builtins.py:4914
2986
2997
msgid "Same as --mine-only."
2987
2998
msgstr ""
2988
2999
2989
#: bzrlib/builtins.py:4890
3000
#: bzrlib/builtins.py:4916
2990
3001
msgid "Display changes in the remote branch only."
2991
3002
msgstr ""
2992
3003
2993
#: bzrlib/builtins.py:4891
3004
#: bzrlib/builtins.py:4917
2994
3005
msgid "Same as --theirs-only."
2995
3006
msgstr ""
2996
3007
2997
#: bzrlib/builtins.py:4896
3008
#: bzrlib/builtins.py:4922
2998
3009
msgid ""
2999
3010
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3000
3011
"details."
3001
3012
msgstr ""
3002
3013
3003
#: bzrlib/builtins.py:4900
3014
#: bzrlib/builtins.py:4926
3004
3015
msgid ""
3005
3016
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3006
3017
"details."
3007
3018
msgstr ""
3008
3019
3009
#: bzrlib/builtins.py:4903
3020
#: bzrlib/builtins.py:4929
3010
3021
msgid "Show all revisions in addition to the mainline ones."
3011
3022
msgstr ""
3012
3023
3013
#: bzrlib/builtins.py:4957
3024
#: bzrlib/builtins.py:4983
3014
3025
msgid "No peer location known or specified."
3015
3026
msgstr ""
3016
3027
3017
#: bzrlib/builtins.py:4961
3028
#: bzrlib/builtins.py:4987
3018
3029
msgid "Using saved parent location: {0}\n"
3019
3030
msgstr ""
3020
3031
3021
#: bzrlib/builtins.py:4994
3032
#: bzrlib/builtins.py:5020
3022
3033
#, python-format
3023
3034
msgid "You have %d extra revision:\n"
3024
3035
msgid_plural "You have %d extra revisions:\n"
3025
3036
msgstr[0] ""
3026
3037
msgstr[1] ""
3027
3038
3028
#: bzrlib/builtins.py:5010
3039
#: bzrlib/builtins.py:5040
3029
3040
#, python-format
3030
3041
msgid "You are missing %d revision:\n"
3031
3042
msgid_plural "You are missing %d revisions:\n"
3032
3043
msgstr[0] ""
3033
3044
msgstr[1] ""
3034
3045
3035
#: bzrlib/builtins.py:5022
3046
#: bzrlib/builtins.py:5055
3036
3047
msgid "This branch has no new revisions.\n"
3037
3048
msgstr ""
3038
3049
3039
#: bzrlib/builtins.py:5025
3050
#: bzrlib/builtins.py:5058
3040
3051
msgid "Other branch has no new revisions.\n"
3041
3052
msgstr ""
3042
3053
3043
#: bzrlib/builtins.py:5030
3054
#: bzrlib/builtins.py:5063
3044
3055
msgid "Branches are up to date.\n"
3045
3056
msgstr ""
3046
3057
3047
#: bzrlib/builtins.py:5041
3058
#: bzrlib/builtins.py:5074
3048
3059
msgid "Compress the data within a repository."
3049
3060
msgstr ""
3050
3061
3051
#: bzrlib/builtins.py:5043
3062
#: bzrlib/builtins.py:5076
3052
3063
msgid ""
3053
3064
"This operation compresses the data within a bazaar repository. As\n"
3054
3065
"bazaar supports automatic packing of repository, this operation is\n"
3055
3066
"normally not required to be done manually."
3056
3067
msgstr ""
3057
3068
3058
#: bzrlib/builtins.py:5047
3069
#: bzrlib/builtins.py:5080
3059
3070
msgid ""
3060
3071
"During the pack operation, bazaar takes a backup of existing repository\n"
3061
3072
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3064
3075
"used."
3065
3076
msgstr ""
3066
3077
3067
#: bzrlib/builtins.py:5053
3078
#: bzrlib/builtins.py:5086
3068
3079
msgid ""
3069
3080
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3070
3081
"during or immediately after repacking, you may be left with a state\n"
3072
3083
"been. In this case the repository may be unusable."
3073
3084
msgstr ""
3074
3085
3075
#: bzrlib/builtins.py:5062
3086
#: bzrlib/builtins.py:5095
3076
3087
msgid "Delete obsolete packs to save disk space."
3077
3088
msgstr ""
3078
3089
3079
#: bzrlib/builtins.py:5076
3090
#: bzrlib/builtins.py:5109
3080
3091
msgid "List the installed plugins."
3081
3092
msgstr ""
3082
3093
3083
#: bzrlib/builtins.py:5078
3094
#: bzrlib/builtins.py:5111
3084
3095
msgid ""
3085
3096
"This command displays the list of installed plugins including\n"
3086
3097
"version of plugin and a short description of each."
3087
3098
msgstr ""
3088
3099
3089
#: bzrlib/builtins.py:5081
3100
#: bzrlib/builtins.py:5114
3090
3101
msgid "--verbose shows the path where each plugin is located."
3091
3102
msgstr ""
3092
3103
3093
#: bzrlib/builtins.py:5083
3104
#: bzrlib/builtins.py:5116
3094
3105
msgid ""
3095
3106
"A plugin is an external component for Bazaar that extends the\n"
3096
3107
"revision control system, by adding or replacing code in Bazaar.\n"
3099
3110
"customizing log output."
3100
3111
msgstr ""
3101
3112
3102
#: bzrlib/builtins.py:5089
3113
#: bzrlib/builtins.py:5122
3103
3114
msgid ""
3104
3115
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3105
3116
"for further information on plugins including where to find them and how to\n"
3107
3118
"plugins using the Python programming language."
3108
3119
msgstr ""
3109
3120
3110
#: bzrlib/builtins.py:5105
3121
#: bzrlib/builtins.py:5138
3111
3122
msgid "Show testament (signing-form) of a revision."
3112
3123
msgstr ""
3113
3124
3114
#: bzrlib/builtins.py:5108
3125
#: bzrlib/builtins.py:5141
3115
3126
msgid "Produce long-format testament."
3116
3127
msgstr ""
3117
3128
3118
#: bzrlib/builtins.py:5110
3129
#: bzrlib/builtins.py:5143
3119
3130
msgid "Produce a strict-format testament."
3120
3131
msgstr ""
3121
3132
3122
#: bzrlib/builtins.py:5136
3133
#: bzrlib/builtins.py:5169
3123
3134
msgid "Show the origin of each line in a file."
3124
3135
msgstr ""
3125
3136
3126
#: bzrlib/builtins.py:5138
3137
#: bzrlib/builtins.py:5171
3127
3138
msgid ""
3128
3139
"This prints out the given file with an annotation on the left side\n"
3129
3140
"indicating which revision, author and date introduced the change."
3130
3141
msgstr ""
3131
3142
3132
#: bzrlib/builtins.py:5141
3143
#: bzrlib/builtins.py:5174
3133
3144
msgid ""
3134
3145
"If the origin is the same for a run of consecutive lines, it is\n"
3135
3146
"shown only at the top, unless the --all option is given."
3136
3147
msgstr ""
3137
3148
3138
#: bzrlib/builtins.py:5149
3149
#: bzrlib/builtins.py:5182
3139
3150
msgid "Show annotations on all lines."
3140
3151
msgstr ""
3141
3152
3142
#: bzrlib/builtins.py:5150
3153
#: bzrlib/builtins.py:5183
3143
3154
msgid "Show commit date in annotations."
3144
3155
msgstr ""
3145
3156
3146
#: bzrlib/builtins.py:5237
3157
#: bzrlib/builtins.py:5270
3147
3158
msgid "Cannot sign a range of non-revision-history revisions"
3148
3159
msgstr ""
3149
3160
3150
#: bzrlib/builtins.py:5249
3161
#: bzrlib/builtins.py:5282
3151
3162
msgid "Please supply either one revision, or a range."
3152
3163
msgstr ""
3153
3164
3154
#: bzrlib/builtins.py:5253
3165
#: bzrlib/builtins.py:5286
3155
3166
msgid ""
3156
3167
"Convert the current branch into a checkout of the supplied branch.\n"
3157
3168
"If no branch is supplied, rebind to the last bound location."
3158
3169
msgstr ""
3159
3170
3160
#: bzrlib/builtins.py:5256
3171
#: bzrlib/builtins.py:5289
3161
3172
msgid ""
3162
3173
"Once converted into a checkout, commits must succeed on the master branch\n"
3163
3174
"before they will be applied to the local branch."
3164
3175
msgstr ""
3165
3176
3166
#: bzrlib/builtins.py:5259
3177
#: bzrlib/builtins.py:5292
3167
3178
msgid ""
3168
3179
"Bound branches use the nickname of its master branch unless it is set\n"
3169
3180
"locally, in which case binding will update the local nickname to be\n"
3170
3181
"that of the master."
3171
3182
msgstr ""
3172
3183
3173
#: bzrlib/builtins.py:5274
3184
#: bzrlib/builtins.py:5307
3174
3185
msgid "No location supplied. This format does not remember old locations."
3175
3186
msgstr ""
3176
3187
3177
#: bzrlib/builtins.py:5280
3188
#: bzrlib/builtins.py:5313
3178
3189
msgid "Branch is already bound"
3179
3190
msgstr ""
3180
3191
3181
#: bzrlib/builtins.py:5283
3192
#: bzrlib/builtins.py:5316
3182
3193
msgid "No location supplied and no previous location known"
3183
3194
msgstr ""
3184
3195
3185
#: bzrlib/builtins.py:5289
3196
#: bzrlib/builtins.py:5322
3186
3197
msgid "These branches have diverged. Try merging, and then bind again."
3187
3198
msgstr ""
3188
3199
3189
#: bzrlib/builtins.py:5296
3200
#: bzrlib/builtins.py:5329
3190
3201
msgid "Convert the current checkout into a regular branch."
3191
3202
msgstr ""
3192
3203
3193
#: bzrlib/builtins.py:5298
3204
#: bzrlib/builtins.py:5331
3194
3205
msgid ""
3195
3206
"After unbinding, the local branch is considered independent and subsequent\n"
3196
3207
"commits will be local only."
3197
3208
msgstr ""
3198
3209
3199
#: bzrlib/builtins.py:5309
3210
#: bzrlib/builtins.py:5342
3200
3211
msgid "Local branch is not bound"
3201
3212
msgstr ""
3202
3213
3203
#: bzrlib/builtins.py:5313
3214
#: bzrlib/builtins.py:5346
3204
3215
msgid "Remove the last committed revision."
3205
3216
msgstr ""
3206
3217
3207
#: bzrlib/builtins.py:5315
3218
#: bzrlib/builtins.py:5348
3208
3219
msgid ""
3209
3220
"--verbose will print out what is being removed.\n"
3210
3221
"--dry-run will go through all the motions, but not actually\n"
3211
3222
"remove anything."
3212
3223
msgstr ""
3213
3224
3214
#: bzrlib/builtins.py:5319
3225
#: bzrlib/builtins.py:5352
3215
3226
msgid ""
3216
3227
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3217
3228
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3218
3229
"branch at revision 15."
3219
3230
msgstr ""
3220
3231
3221
#: bzrlib/builtins.py:5323
3232
#: bzrlib/builtins.py:5356
3222
3233
msgid ""
3223
3234
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3224
3235
"it may make is to restore any pending merges that were present before\n"
3225
3236
"the commit."
3226
3237
msgstr ""
3227
3238
3228
#: bzrlib/builtins.py:5334
3239
#: bzrlib/builtins.py:5367
3229
3240
msgid "Don't actually make changes."
3230
3241
msgstr ""
3231
3242
3232
#: bzrlib/builtins.py:5335
3243
#: bzrlib/builtins.py:5368
3233
3244
msgid "Say yes to all questions."
3234
3245
msgstr ""
3235
3246
3236
#: bzrlib/builtins.py:5337
3247
#: bzrlib/builtins.py:5370
3237
3248
msgid "Keep tags that point to removed revisions."
3238
3249
msgstr ""
3239
3250
3240
#: bzrlib/builtins.py:5339
3251
#: bzrlib/builtins.py:5372
3241
3252
msgid "Only remove the commits from the local branch when in a checkout."
3242
3253
msgstr ""
3243
3254
3244
#: bzrlib/builtins.py:5388
3255
#: bzrlib/builtins.py:5421
3245
3256
msgid "No revisions to uncommit.\n"
3246
3257
msgstr ""
3247
3258
3248
#: bzrlib/builtins.py:5403
3259
#: bzrlib/builtins.py:5436
3249
3260
msgid "Dry-run, pretending to remove the above revisions.\n"
3250
3261
msgstr ""
3251
3262
3252
#: bzrlib/builtins.py:5406
3263
#: bzrlib/builtins.py:5439
3253
3264
msgid "The above revision(s) will be removed.\n"
3254
3265
msgstr ""
3255
3266
3256
#: bzrlib/builtins.py:5410
3267
#: bzrlib/builtins.py:5443
3257
3268
msgid "Uncommit these revisions"
3258
3269
msgstr ""
3259
3270
3260
#: bzrlib/builtins.py:5413
3271
#: bzrlib/builtins.py:5446
3261
3272
msgid "Canceled\n"
3262
3273
msgstr ""
3263
3274
3264
#: bzrlib/builtins.py:5420
3275
#: bzrlib/builtins.py:5453
3265
3276
#, python-format
3266
3277
msgid ""
3267
3278
"You can restore the old tip by running:\n"
3268
3279
" bzr pull . -r revid:%s\n"
3269
3280
msgstr ""
3270
3281
3271
#: bzrlib/builtins.py:5425
3282
#: bzrlib/builtins.py:5458
3272
3283
msgid "Break a dead lock."
3273
3284
msgstr ""
3274
3285
3275
#: bzrlib/builtins.py:5427
3286
#: bzrlib/builtins.py:5460
3276
3287
msgid ""
3277
3288
"This command breaks a lock on a repository, branch, working directory or\n"
3278
3289
"config file."
3279
3290
msgstr ""
3280
3291
3281
#: bzrlib/builtins.py:5430
3292
#: bzrlib/builtins.py:5463
3282
3293
msgid ""
3283
3294
"CAUTION: Locks should only be broken when you are sure that the process\n"
3284
3295
"holding the lock has been stopped."
3285
3296
msgstr ""
3286
3297
3287
#: bzrlib/builtins.py:5433
3298
#: bzrlib/builtins.py:5466
3288
3299
msgid ""
3289
3300
"You can get information on what locks are open via the 'bzr info\n"
3290
3301
"[location]' command."
3291
3302
msgstr ""
3292
3303
3293
#: bzrlib/builtins.py:5436
3304
#: bzrlib/builtins.py:5469
3294
3305
msgid ""
3295
3306
":Examples:\n"
3296
3307
" bzr break-lock\n"
3298
3309
" bzr break-lock --conf ~/.bazaar"
3299
3310
msgstr ""
3300
3311
3301
#: bzrlib/builtins.py:5445
3312
#: bzrlib/builtins.py:5478
3302
3313
msgid "LOCATION is the directory where the config lock is."
3303
3314
msgstr ""
3304
3315
3305
#: bzrlib/builtins.py:5447
3316
#: bzrlib/builtins.py:5480
3306
3317
msgid "Do not ask for confirmation before breaking the lock."
3307
3318
msgstr ""
3308
3319
3309
#: bzrlib/builtins.py:5482
3320
#: bzrlib/builtins.py:5515
3310
3321
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3311
3322
msgstr ""
3312
3323
3313
#: bzrlib/builtins.py:5483
3324
#: bzrlib/builtins.py:5516
3314
3325
msgid "Run the bzr server."
3315
3326
msgstr ""
3316
3327
3317
#: bzrlib/builtins.py:5489
3328
#: bzrlib/builtins.py:5522
3318
3329
msgid "Serve on stdin/out for use from inetd or sshd."
3319
3330
msgstr ""
3320
3331
3321
#: bzrlib/builtins.py:5490
3332
#: bzrlib/builtins.py:5523
3322
3333
msgid "protocol"
3323
3334
msgstr ""
3324
3335
3325
#: bzrlib/builtins.py:5491
3336
#: bzrlib/builtins.py:5524
3326
3337
msgid "Protocol to serve."
3327
3338
msgstr ""
3328
3339
3329
#: bzrlib/builtins.py:5495
3340
#: bzrlib/builtins.py:5528
3330
3341
msgid "Listen for connections on nominated address."
3331
3342
msgstr ""
3332
3343
3333
#: bzrlib/builtins.py:5497
3344
#: bzrlib/builtins.py:5530
3334
3345
msgid ""
3335
3346
"Listen for connections on nominated port. Passing 0 as the port number will "
3336
3347
"result in a dynamically allocated port. The default port depends on the "
3337
3348
"protocol."
3338
3349
msgstr ""
3339
3350
3340
#: bzrlib/builtins.py:5502
3351
#: bzrlib/builtins.py:5535
3341
3352
msgid "Serve contents of this directory."
3342
3353
msgstr ""
3343
3354
3344
#: bzrlib/builtins.py:5504
3355
#: bzrlib/builtins.py:5537
3345
3356
msgid ""
3346
3357
"By default the server is a readonly server. Supplying --allow-writes "
3347
3358
"enables write access to the contents of the served directory and below. "
3350
3361
"uncontrolled write access to your file system."
3351
3362
msgstr ""
3352
3363
3353
#: bzrlib/builtins.py:5513
3364
#: bzrlib/builtins.py:5546
3354
3365
msgid "Override the default idle client timeout (5min)."
3355
3366
msgstr ""
3356
3367
3357
#: bzrlib/builtins.py:5531
3368
#: bzrlib/builtins.py:5564
3358
3369
msgid "Combine a tree into its containing tree."
3359
3370
msgstr ""
3360
3371
3361
#: bzrlib/builtins.py:5533
3372
#: bzrlib/builtins.py:5566
3362
3373
msgid "This command requires the target tree to be in a rich-root format."
3363
3374
msgstr ""
3364
3375
3365
#: bzrlib/builtins.py:5535
3376
#: bzrlib/builtins.py:5568
3366
3377
msgid ""
3367
3378
"The TREE argument should be an independent tree, inside another tree, but\n"
3368
3379
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3369
3380
"running \"bzr branch\" with the target inside a tree.)"
3370
3381
msgstr ""
3371
3382
3372
#: bzrlib/builtins.py:5539
3383
#: bzrlib/builtins.py:5572
3373
3384
msgid ""
3374
3385
"The result is a combined tree, with the subtree no longer an independent\n"
3375
3386
"part. This is marked as a merge of the subtree into the containing tree,\n"
3376
3387
"and all history is preserved."
3377
3388
msgstr ""
3378
3389
3379
#: bzrlib/builtins.py:5557
3390
#: bzrlib/builtins.py:5590
3380
3391
#, python-format
3381
3392
msgid ""
3382
3393
"Can't join trees because %s doesn't support rich root data.\n"
3383
3394
"You can use bzr upgrade on the repository."
3384
3395
msgstr ""
3385
3396
3386
#: bzrlib/builtins.py:5567 bzrlib/builtins.py:5573
3397
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3387
3398
msgid "Cannot join {0}. {1}"
3388
3399
msgstr ""
3389
3400
3390
#: bzrlib/builtins.py:5577
3401
#: bzrlib/builtins.py:5610
3391
3402
msgid "Split a subdirectory of a tree into a separate tree."
3392
3403
msgstr ""
3393
3404
3394
#: bzrlib/builtins.py:5579
3405
#: bzrlib/builtins.py:5612
3395
3406
msgid ""
3396
3407
"This command will produce a target tree in a format that supports\n"
3397
3408
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3398
3409
"converted into earlier formats like 'dirstate-tags'."
3399
3410
msgstr ""
3400
3411
3401
#: bzrlib/builtins.py:5583
3412
#: bzrlib/builtins.py:5616
3402
3413
msgid ""
3403
3414
"The TREE argument should be a subdirectory of a working tree. That\n"
3404
3415
"subdirectory will be converted into an independent tree, with its own\n"
3405
3416
"branch. Commits in the top-level tree will not apply to the new subtree."
3406
3417
msgstr ""
3407
3418
3408
#: bzrlib/builtins.py:5663
3419
#: bzrlib/builtins.py:5696
3409
3420
msgid "No submit branch specified or known"
3410
3421
msgstr ""
3411
3422
3412
#: bzrlib/builtins.py:5672 bzrlib/send.py:109
3423
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3413
3424
msgid "No public branch specified or known"
3414
3425
msgstr ""
3415
3426
3416
#: bzrlib/builtins.py:5677
3427
#: bzrlib/builtins.py:5710
3417
3428
msgid "bzr merge-directive takes at most two one revision identifiers"
3418
3429
msgstr ""
3419
3430
3420
#: bzrlib/builtins.py:5686
3431
#: bzrlib/builtins.py:5719
3421
3432
msgid "No revisions to bundle."
3422
3433
msgstr ""
3423
3434
3424
#: bzrlib/builtins.py:5705
3435
#: bzrlib/builtins.py:5738
3425
3436
msgid "Mail or create a merge-directive for submitting changes."
3426
3437
msgstr ""
3427
3438
3428
#: bzrlib/builtins.py:5707
3439
#: bzrlib/builtins.py:5740
3429
3440
msgid "A merge directive provides many things needed for requesting merges:"
3430
3441
msgstr ""
3431
3442
3432
#: bzrlib/builtins.py:5709
3443
#: bzrlib/builtins.py:5742
3433
3444
msgid "* A machine-readable description of the merge to perform"
3434
3445
msgstr ""
3435
3446
3436
#: bzrlib/builtins.py:5711
3447
#: bzrlib/builtins.py:5744
3437
3448
msgid "* An optional patch that is a preview of the changes requested"
3438
3449
msgstr ""
3439
3450
3440
#: bzrlib/builtins.py:5713
3451
#: bzrlib/builtins.py:5746
3441
3452
msgid ""
3442
3453
"* An optional bundle of revision data, so that the changes can be applied\n"
3443
3454
" directly from the merge directive, without retrieving data from a\n"
3444
3455
" branch."
3445
3456
msgstr ""
3446
3457
3447
#: bzrlib/builtins.py:5717
3458
#: bzrlib/builtins.py:5750
3448
3459
msgid ""
3449
3460
"`bzr send` creates a compact data set that, when applied using bzr\n"
3450
3461
"merge, has the same effect as merging from the source branch. "
3451
3462
msgstr ""
3452
3463
3453
#: bzrlib/builtins.py:5720
3464
#: bzrlib/builtins.py:5753
3454
3465
msgid ""
3455
3466
"By default the merge directive is self-contained and can be applied to any\n"
3456
3467
"branch containing submit_branch in its ancestory without needing access to\n"
3457
3468
"the source branch."
3458
3469
msgstr ""
3459
3470
3460
#: bzrlib/builtins.py:5724
3471
#: bzrlib/builtins.py:5757
3461
3472
msgid ""
3462
3473
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3463
3474
"revisions, but only a structured request to merge from the\n"
3466
3477
"included if known, so that people can check it later."
3467
3478
msgstr ""
3468
3479
3469
#: bzrlib/builtins.py:5730
3480
#: bzrlib/builtins.py:5763
3470
3481
msgid ""
3471
3482
"The submit branch defaults to the parent of the source branch, but can be\n"
3472
3483
"overridden. Both submit branch and public branch will be remembered in\n"
3475
3486
"be changed using --from."
3476
3487
msgstr ""
3477
3488
3478
#: bzrlib/builtins.py:5736
3489
#: bzrlib/builtins.py:5769
3479
3490
msgid ""
3480
3491
"Both the submit branch and the public branch follow the usual behavior with\n"
3481
3492
"respect to --remember: If there is no default location set, the first send\n"
3484
3495
"--remember. The value will only be saved if the location can be accessed."
3485
3496
msgstr ""
3486
3497
3487
#: bzrlib/builtins.py:5742
3498
#: bzrlib/builtins.py:5775
3488
3499
msgid ""
3489
3500
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3490
3501
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3492
3503
"in the merge directive."
3493
3504
msgstr ""
3494
3505
3495
#: bzrlib/builtins.py:5747
3506
#: bzrlib/builtins.py:5780
3496
3507
msgid ""
3497
3508
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3498
3509
"given, in which case it is sent to a file."
3499
3510
msgstr ""
3500
3511
3501
#: bzrlib/builtins.py:5750
3512
#: bzrlib/builtins.py:5783
3502
3513
msgid ""
3503
3514
"Mail is sent using your preferred mail program. This should be transparent\n"
3504
3515
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3505
3516
"If the preferred client can't be found (or used), your editor will be used."
3506
3517
msgstr ""
3507
3518
3508
#: bzrlib/builtins.py:5754
3519
#: bzrlib/builtins.py:5787
3509
3520
msgid ""
3510
3521
"To use a specific mail program, set the mail_client configuration option.\n"
3511
3522
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3517
3528
"supported clients."
3518
3529
msgstr ""
3519
3530
3520
#: bzrlib/builtins.py:5761
3531
#: bzrlib/builtins.py:5794
3521
3532
msgid ""
3522
3533
"If mail is being sent, a to address is required. This can be supplied\n"
3523
3534
"either on the commandline, by setting the submit_to configuration\n"
3525
3536
"in the submit branch."
3526
3537
msgstr ""
3527
3538
3528
#: bzrlib/builtins.py:5766
3539
#: bzrlib/builtins.py:5799
3529
3540
msgid ""
3530
3541
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3531
3542
"and\n"
3535
3546
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3536
3547
msgstr ""
3537
3548
3538
#: bzrlib/builtins.py:5772
3549
#: bzrlib/builtins.py:5805
3539
3550
msgid ""
3540
3551
"The merge directives created by bzr send may be applied using bzr merge or\n"
3541
3552
"bzr pull by specifying a file containing a merge directive as the location."
3542
3553
msgstr ""
3543
3554
3544
#: bzrlib/builtins.py:5775
3555
#: bzrlib/builtins.py:5808
3545
3556
msgid ""
3546
3557
"bzr send makes extensive use of public locations to map local locations "
3547
3558
"into\n"
3549
3560
"set them, and use `bzr info` to display them."
3550
3561
msgstr ""
3551
3562
3552
#: bzrlib/builtins.py:5799
3563
#: bzrlib/builtins.py:5832
3553
3564
msgid "Write merge directive to this file or directory; use - for stdout."
3554
3565
msgstr ""
3555
3566
3556
#: bzrlib/builtins.py:5803
3567
#: bzrlib/builtins.py:5836
3557
3568
msgid ""
3558
3569
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3559
3570
"strict disables the check."
3560
3571
msgstr ""
3561
3572
3562
#: bzrlib/builtins.py:5805
3573
#: bzrlib/builtins.py:5838
3563
3574
msgid "Mail the request to this address."
3564
3575
msgstr ""
3565
3576
3566
#: bzrlib/builtins.py:5809
3577
#: bzrlib/builtins.py:5842
3567
3578
msgid "Body for the email."
3568
3579
msgstr ""
3569
3580
3570
#: bzrlib/builtins.py:5862
3581
#: bzrlib/builtins.py:5895
3571
3582
msgid "Do not include a bundle in the merge directive."
3572
3583
msgstr ""
3573
3584
3574
#: bzrlib/builtins.py:5863
3585
#: bzrlib/builtins.py:5896
3575
3586
msgid "Do not include a preview patch in the merge directive."
3576
3587
msgstr ""
3577
3588
3578
#: bzrlib/builtins.py:5866
3589
#: bzrlib/builtins.py:5899
3579
3590
msgid "Remember submit and public branch."
3580
3591
msgstr ""
3581
3592
3582
#: bzrlib/builtins.py:5868
3593
#: bzrlib/builtins.py:5901
3583
3594
msgid ""
3584
3595
"Branch to generate the submission from, rather than the one containing the "
3585
3596
"working directory."
3586
3597
msgstr ""
3587
3598
3588
#: bzrlib/builtins.py:5878 bzrlib/cmd_version_info.py:76
3599
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3589
3600
msgid "format"
3590
3601
msgstr ""
3591
3602
3592
#: bzrlib/builtins.py:5879
3603
#: bzrlib/builtins.py:5912
3593
3604
msgid "Use the specified output format."
3594
3605
msgstr ""
3595
3606
3596
#: bzrlib/builtins.py:5901
3607
#: bzrlib/builtins.py:5934
3597
3608
msgid "Create, remove or modify a tag naming a revision."
3598
3609
msgstr ""
3599
3610
3600
#: bzrlib/builtins.py:5903
3611
#: bzrlib/builtins.py:5936
3601
3612
msgid ""
3602
3613
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3603
3614
"(--revision) option can be given -rtag:X, where X is any previously\n"
3604
3615
"created tag."
3605
3616
msgstr ""
3606
3617
3607
#: bzrlib/builtins.py:5907
3618
#: bzrlib/builtins.py:5940
3608
3619
msgid ""
3609
3620
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3610
3621
"along when you branch, push, pull or merge."
3611
3622
msgstr ""
3612
3623
3613
#: bzrlib/builtins.py:5910
3624
#: bzrlib/builtins.py:5943
3614
3625
msgid ""
3615
3626
"It is an error to give a tag name that already exists unless you pass\n"
3616
3627
"--force, in which case the tag is moved to point to the new revision."
3617
3628
msgstr ""
3618
3629
3619
#: bzrlib/builtins.py:5913
3630
#: bzrlib/builtins.py:5946
3620
3631
msgid ""
3621
3632
"To rename a tag (change the name but keep it on the same revsion), run "
3622
3633
"``bzr\n"
3623
3634
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3624
3635
msgstr ""
3625
3636
3626
#: bzrlib/builtins.py:5916
3637
#: bzrlib/builtins.py:5949
3627
3638
msgid ""
3628
3639
"If no tag name is specified it will be determined through the \n"
3629
3640
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3631
3642
"details."
3632
3643
msgstr ""
3633
3644
3634
#: bzrlib/builtins.py:5926
3645
#: bzrlib/builtins.py:5959
3635
3646
msgid "Delete this tag rather than placing it."
3636
3647
msgstr ""
3637
3648
3638
#: bzrlib/builtins.py:5929
3649
#: bzrlib/builtins.py:5962
3639
3650
msgid "Branch in which to place the tag."
3640
3651
msgstr ""
3641
3652
3642
#: bzrlib/builtins.py:5931
3653
#: bzrlib/builtins.py:5964
3643
3654
msgid "Replace existing tags."
3644
3655
msgstr ""
3645
3656
3646
#: bzrlib/builtins.py:5946
3657
#: bzrlib/builtins.py:5979
3647
3658
msgid "No tag specified to delete."
3648
3659
msgstr ""
3649
3660
3650
#: bzrlib/builtins.py:5948
3661
#: bzrlib/builtins.py:5981
3651
3662
#, python-format
3652
3663
msgid "Deleted tag %s."
3653
3664
msgstr ""
3654
3665
3655
#: bzrlib/builtins.py:5962
3666
#: bzrlib/builtins.py:5995
3656
3667
msgid "Please specify a tag name."
3657
3668
msgstr ""
3658
3669
3659
#: bzrlib/builtins.py:5970
3670
#: bzrlib/builtins.py:6003
3660
3671
#, python-format
3661
3672
msgid "Tag %s already exists for that revision."
3662
3673
msgstr ""
3663
3674
3664
#: bzrlib/builtins.py:5974
3675
#: bzrlib/builtins.py:6007
3665
3676
#, python-format
3666
3677
msgid "Created tag %s."
3667
3678
msgstr ""
3668
3679
3669
#: bzrlib/builtins.py:5976
3680
#: bzrlib/builtins.py:6009
3670
3681
#, python-format
3671
3682
msgid "Updated tag %s."
3672
3683
msgstr ""
3673
3684
3674
#: bzrlib/builtins.py:5980
3685
#: bzrlib/builtins.py:6013
3675
3686
msgid "List tags."
3676
3687
msgstr ""
3677
3688
3678
#: bzrlib/builtins.py:5982
3689
#: bzrlib/builtins.py:6015
3679
3690
msgid ""
3680
3691
"This command shows a table of tag names and the revisions they reference."
3681
3692
msgstr ""
3682
3693
3683
#: bzrlib/builtins.py:5988
3694
#: bzrlib/builtins.py:6021
3684
3695
msgid "Branch whose tags should be displayed."
3685
3696
msgstr ""
3686
3697
3687
#: bzrlib/builtins.py:5990
3698
#: bzrlib/builtins.py:6023
3688
3699
msgid "Sort tags by different criteria."
3689
3700
msgstr ""
3690
3701
3691
#: bzrlib/builtins.py:5990
3702
#: bzrlib/builtins.py:6023
3692
3703
msgid "Sorting"
3693
3704
msgstr ""
3694
3705
3695
#: bzrlib/builtins.py:6059
3706
#: bzrlib/builtins.py:6092
3696
3707
msgid "Reconfigure the type of a bzr directory."
3697
3708
msgstr ""
3698
3709
3699
#: bzrlib/builtins.py:6061
3710
#: bzrlib/builtins.py:6094
3700
3711
msgid "A target configuration must be specified."
3701
3712
msgstr ""
3702
3713
3703
#: bzrlib/builtins.py:6063
3714
#: bzrlib/builtins.py:6096
3704
3715
msgid ""
3705
3716
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3706
3717
"The order of preference is\n"
3711
3722
"If none of these is available, --bind-to must be specified."
3712
3723
msgstr ""
3713
3724
3714
#: bzrlib/builtins.py:6077
3725
#: bzrlib/builtins.py:6110
3715
3726
msgid "Tree type"
3716
3727
msgstr ""
3717
3728
3718
#: bzrlib/builtins.py:6078
3729
#: bzrlib/builtins.py:6111
3719
3730
msgid "The relation between branch and tree."
3720
3731
msgstr ""
3721
3732
3722
#: bzrlib/builtins.py:6080
3733
#: bzrlib/builtins.py:6113
3723
3734
msgid "Reconfigure to be an unbound branch with no working tree."
3724
3735
msgstr ""
3725
3736
3726
#: bzrlib/builtins.py:6081
3737
#: bzrlib/builtins.py:6114
3727
3738
msgid "Reconfigure to be an unbound branch with a working tree."
3728
3739
msgstr ""
3729
3740
3730
#: bzrlib/builtins.py:6082
3741
#: bzrlib/builtins.py:6115
3731
3742
msgid "Reconfigure to be a bound branch with a working tree."
3732
3743
msgstr ""
3733
3744
3734
#: bzrlib/builtins.py:6083
3745
#: bzrlib/builtins.py:6116
3735
3746
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3736
3747
msgstr ""
3737
3748
3738
#: bzrlib/builtins.py:6088
3749
#: bzrlib/builtins.py:6121
3739
3750
msgid "Repository type"
3740
3751
msgstr ""
3741
3752
3742
#: bzrlib/builtins.py:6089
3753
#: bzrlib/builtins.py:6122
3743
3754
msgid "Location fo the repository."
3744
3755
msgstr ""
3745
3756
3746
#: bzrlib/builtins.py:6091
3757
#: bzrlib/builtins.py:6124
3747
3758
msgid ""
3748
3759
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3749
3760
msgstr ""
3750
3761
3751
#: bzrlib/builtins.py:6093
3762
#: bzrlib/builtins.py:6126
3752
3763
msgid "Reconfigure to use a shared repository."
3753
3764
msgstr ""
3754
3765
3755
#: bzrlib/builtins.py:6097
3766
#: bzrlib/builtins.py:6130
3756
3767
msgid "Trees in Repository"
3757
3768
msgstr ""
3758
3769
3759
#: bzrlib/builtins.py:6098
3770
#: bzrlib/builtins.py:6131
3760
3771
msgid "Whether new branches in the repository have trees."
3761
3772
msgstr ""
3762
3773
3763
#: bzrlib/builtins.py:6100
3774
#: bzrlib/builtins.py:6133
3764
3775
msgid ""
3765
3776
"Reconfigure repository to create working trees on branches by default."
3766
3777
msgstr ""
3767
3778
3768
#: bzrlib/builtins.py:6102
3779
#: bzrlib/builtins.py:6135
3769
3780
msgid ""
3770
3781
"Reconfigure repository to not create working trees on branches by default."
3771
3782
msgstr ""
3772
3783
3773
#: bzrlib/builtins.py:6105
3784
#: bzrlib/builtins.py:6138
3774
3785
msgid "Branch to bind checkout to."
3775
3786
msgstr ""
3776
3787
3777
#: bzrlib/builtins.py:6107
3788
#: bzrlib/builtins.py:6140
3778
3789
msgid "Perform reconfiguration even if local changes will be lost."
3779
3790
msgstr ""
3780
3791
3781
#: bzrlib/builtins.py:6110
3792
#: bzrlib/builtins.py:6143
3782
3793
msgid "Reconfigure a branch to be stacked on another branch."
3783
3794
msgstr ""
3784
3795
3785
#: bzrlib/builtins.py:6114
3796
#: bzrlib/builtins.py:6147
3786
3797
msgid ""
3787
3798
"Reconfigure a branch to be unstacked. This may require copying substantial "
3788
3799
"data into it."
3789
3800
msgstr ""
3790
3801
3791
#: bzrlib/builtins.py:6124
3802
#: bzrlib/builtins.py:6157
3792
3803
msgid "Can't use both --stacked-on and --unstacked"
3793
3804
msgstr ""
3794
3805
3795
#: bzrlib/builtins.py:6138
3806
#: bzrlib/builtins.py:6171
3796
3807
msgid "No target configuration specified"
3797
3808
msgstr ""
3798
3809
3799
#: bzrlib/builtins.py:6173
3810
#: bzrlib/builtins.py:6206
3800
3811
msgid "Set the branch of a checkout and update."
3801
3812
msgstr ""
3802
3813
3803
#: bzrlib/builtins.py:6175
3814
#: bzrlib/builtins.py:6208
3804
3815
msgid ""
3805
3816
"For lightweight checkouts, this changes the branch being referenced.\n"
3806
3817
"For heavyweight checkouts, this checks that there are no local commits\n"
3808
3819
"of the new location and binds to it."
3809
3820
msgstr ""
3810
3821
3811
#: bzrlib/builtins.py:6180
3822
#: bzrlib/builtins.py:6213
3812
3823
msgid ""
3813
3824
"In both cases, the working tree is updated and uncommitted changes\n"
3814
3825
"are merged. The user can commit or revert these as they desire."
3815
3826
msgstr ""
3816
3827
3817
#: bzrlib/builtins.py:6183
3828
#: bzrlib/builtins.py:6216
3818
3829
msgid "Pending merges need to be committed or reverted before using switch."
3819
3830
msgstr ""
3820
3831
3821
#: bzrlib/builtins.py:6185
3832
#: bzrlib/builtins.py:6218
3822
3833
msgid ""
3823
3834
"The path to the branch to switch to can be specified relative to the parent\n"
3824
3835
"directory of the current branch. For example, if you are currently in a\n"
3826
3837
"/path/to/newbranch."
3827
3838
msgstr ""
3828
3839
3829
#: bzrlib/builtins.py:6190
3840
#: bzrlib/builtins.py:6223
3830
3841
msgid ""
3831
3842
"Bound branches use the nickname of its master branch unless it is set\n"
3832
3843
"locally, in which case switching will update the local nickname to be\n"
3833
3844
"that of the master."
3834
3845
msgstr ""
3835
3846
3836
#: bzrlib/builtins.py:6198
3847
#: bzrlib/builtins.py:6231
3837
3848
msgid "Switch even if local commits will be lost."
3838
3849
msgstr ""
3839
3850
3840
#: bzrlib/builtins.py:6201
3851
#: bzrlib/builtins.py:6234
3841
3852
msgid "Create the target branch from this one before switching to it."
3842
3853
msgstr ""
3843
3854
3844
#: bzrlib/builtins.py:6215
3855
#: bzrlib/builtins.py:6248
3845
3856
msgid "You must supply either a revision or a location"
3846
3857
msgstr ""
3847
3858
3848
#: bzrlib/builtins.py:6228
3859
#: bzrlib/builtins.py:6261
3849
3860
msgid "cannot create branch without source branch"
3850
3861
msgstr ""
3851
3862
3852
#: bzrlib/builtins.py:6253
3863
#: bzrlib/builtins.py:6286
3853
3864
msgid "Manage filtered views."
3854
3865
msgstr ""
3855
3866
3856
#: bzrlib/builtins.py:6255
3867
#: bzrlib/builtins.py:6288
3857
3868
msgid ""
3858
3869
"Views provide a mask over the tree so that users can focus on\n"
3859
3870
"a subset of a tree when doing their work. After creating a view,\n"
3863
3874
"must be within the current view."
3864
3875
msgstr ""
3865
3876
3866
#: bzrlib/builtins.py:6262
3877
#: bzrlib/builtins.py:6295
3867
3878
msgid ""
3868
3879
"In most cases, a view has a short life-span: it is created to make\n"
3869
3880
"a selected change and is deleted once that change is committed.\n"
3871
3882
"and switch between them."
3872
3883
msgstr ""
3873
3884
3874
#: bzrlib/builtins.py:6267
3885
#: bzrlib/builtins.py:6300
3875
3886
msgid ""
3876
3887
"To disable the current view without deleting it, you can switch to\n"
3877
3888
"the pseudo view called ``off``. This can be useful when you need\n"
3879
3890
"want to switch back to your view after that."
3880
3891
msgstr ""
3881
3892
3882
#: bzrlib/builtins.py:6272
3893
#: bzrlib/builtins.py:6305
3883
3894
msgid ""
3884
3895
":Examples:\n"
3885
3896
" To define the current view::"
3886
3897
msgstr ""
3887
3898
3888
#: bzrlib/builtins.py:6275
3899
#: bzrlib/builtins.py:6308
3889
3900
msgid " bzr view file1 dir1 ..."
3890
3901
msgstr ""
3891
3902
3892
#: bzrlib/builtins.py:6277
3903
#: bzrlib/builtins.py:6310
3893
3904
msgid " To list the current view::"
3894
3905
msgstr ""
3895
3906
3896
#: bzrlib/builtins.py:6279
3907
#: bzrlib/builtins.py:6312
3897
3908
msgid " bzr view"
3898
3909
msgstr ""
3899
3910
3900
#: bzrlib/builtins.py:6281
3911
#: bzrlib/builtins.py:6314
3901
3912
msgid " To delete the current view::"
3902
3913
msgstr ""
3903
3914
3904
#: bzrlib/builtins.py:6283
3915
#: bzrlib/builtins.py:6316
3905
3916
msgid " bzr view --delete"
3906
3917
msgstr ""
3907
3918
3908
#: bzrlib/builtins.py:6285
3919
#: bzrlib/builtins.py:6318
3909
3920
msgid " To disable the current view without deleting it::"
3910
3921
msgstr ""
3911
3922
3912
#: bzrlib/builtins.py:6287
3923
#: bzrlib/builtins.py:6320
3913
3924
msgid " bzr view --switch off"
3914
3925
msgstr ""
3915
3926
3916
#: bzrlib/builtins.py:6289
3927
#: bzrlib/builtins.py:6322
3917
3928
msgid " To define a named view and switch to it::"
3918
3929
msgstr ""
3919
3930
3920
#: bzrlib/builtins.py:6291
3931
#: bzrlib/builtins.py:6324
3921
3932
msgid " bzr view --name view-name file1 dir1 ..."
3922
3933
msgstr ""
3923
3934
3924
#: bzrlib/builtins.py:6293
3935
#: bzrlib/builtins.py:6326
3925
3936
msgid " To list a named view::"
3926
3937
msgstr ""
3927
3938
3928
#: bzrlib/builtins.py:6295
3939
#: bzrlib/builtins.py:6328
3929
3940
msgid " bzr view --name view-name"
3930
3941
msgstr ""
3931
3942
3932
#: bzrlib/builtins.py:6297
3943
#: bzrlib/builtins.py:6330
3933
3944
msgid " To delete a named view::"
3934
3945
msgstr ""
3935
3946
3936
#: bzrlib/builtins.py:6299
3947
#: bzrlib/builtins.py:6332
3937
3948
msgid " bzr view --name view-name --delete"
3938
3949
msgstr ""
3939
3950
3940
#: bzrlib/builtins.py:6301
3951
#: bzrlib/builtins.py:6334
3941
3952
msgid " To switch to a named view::"
3942
3953
msgstr ""
3943
3954
3944
#: bzrlib/builtins.py:6303
3955
#: bzrlib/builtins.py:6336
3945
3956
msgid " bzr view --switch view-name"
3946
3957
msgstr ""
3947
3958
3948
#: bzrlib/builtins.py:6305
3959
#: bzrlib/builtins.py:6338
3949
3960
msgid " To list all views defined::"
3950
3961
msgstr ""
3951
3962
3952
#: bzrlib/builtins.py:6307
3963
#: bzrlib/builtins.py:6340
3953
3964
msgid " bzr view --all"
3954
3965
msgstr ""
3955
3966
3956
#: bzrlib/builtins.py:6309
3967
#: bzrlib/builtins.py:6342
3957
3968
msgid " To delete all views::"
3958
3969
msgstr ""
3959
3970
3960
#: bzrlib/builtins.py:6311
3971
#: bzrlib/builtins.py:6344
3961
3972
msgid " bzr view --delete --all"
3962
3973
msgstr ""
3963
3974
3964
#: bzrlib/builtins.py:6318
3975
#: bzrlib/builtins.py:6351
3965
3976
msgid "Apply list or delete action to all views."
3966
3977
msgstr ""
3967
3978
3968
#: bzrlib/builtins.py:6321
3979
#: bzrlib/builtins.py:6354
3969
3980
msgid "Delete the view."
3970
3981
msgstr ""
3971
3982
3972
#: bzrlib/builtins.py:6324
3983
#: bzrlib/builtins.py:6357
3973
3984
msgid "Name of the view to define, list or delete."
3974
3985
msgstr ""
3975
3986
3976
#: bzrlib/builtins.py:6328
3987
#: bzrlib/builtins.py:6361
3977
3988
msgid "Name of the view to switch to."
3978
3989
msgstr ""
3979
3990
3980
#: bzrlib/builtins.py:6347
3991
#: bzrlib/builtins.py:6380
3981
3992
msgid "Both --delete and a file list specified"
3982
3993
msgstr ""
3983
3994
3984
#: bzrlib/builtins.py:6350
3995
#: bzrlib/builtins.py:6383
3985
3996
msgid "Both --delete and --switch specified"
3986
3997
msgstr ""
3987
3998
3988
#: bzrlib/builtins.py:6353
3999
#: bzrlib/builtins.py:6386
3989
4000
msgid "Deleted all views.\n"
3990
4001
msgstr ""
3991
4002
3992
#: bzrlib/builtins.py:6355
4003
#: bzrlib/builtins.py:6388
3993
4004
msgid "No current view to delete"
3994
4005
msgstr ""
3995
4006
3996
#: bzrlib/builtins.py:6358
4007
#: bzrlib/builtins.py:6391
3997
4008
#, python-format
3998
4009
msgid "Deleted '%s' view.\n"
3999
4010
msgstr ""
4000
4011
4001
#: bzrlib/builtins.py:6362
4012
#: bzrlib/builtins.py:6395
4002
4013
msgid "Both --switch and a file list specified"
4003
4014
msgstr ""
4004
4015
4005
#: bzrlib/builtins.py:6365
4016
#: bzrlib/builtins.py:6398
4006
4017
msgid "Both --switch and --all specified"
4007
4018
msgstr ""
4008
4019
4009
#: bzrlib/builtins.py:6368
4020
#: bzrlib/builtins.py:6401
4010
4021
msgid "No current view to disable"
4011
4022
msgstr ""
4012
4023
4013
#: bzrlib/builtins.py:6370
4024
#: bzrlib/builtins.py:6403
4014
4025
#, python-format
4015
4026
msgid "Disabled '%s' view.\n"
4016
4027
msgstr ""
4017
4028
4018
#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396
4029
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4019
4030
msgid "Using '{0}' view: {1}\n"
4020
4031
msgstr ""
4021
4032
4022
#: bzrlib/builtins.py:6377
4033
#: bzrlib/builtins.py:6410
4023
4034
msgid "Views defined:\n"
4024
4035
msgstr ""
4025
4036
4026
#: bzrlib/builtins.py:6386
4037
#: bzrlib/builtins.py:6419
4027
4038
msgid "No views defined.\n"
4028
4039
msgstr ""
4029
4040
4030
#: bzrlib/builtins.py:6393
4041
#: bzrlib/builtins.py:6426
4031
4042
msgid "Cannot change the 'off' pseudo view"
4032
4043
msgstr ""
4033
4044
4034
#: bzrlib/builtins.py:6401
4045
#: bzrlib/builtins.py:6434
4035
4046
msgid "No current view.\n"
4036
4047
msgstr ""
4037
4048
4038
#: bzrlib/builtins.py:6404
4049
#: bzrlib/builtins.py:6437
4039
4050
msgid "'{0}' view is: {1}\n"
4040
4051
msgstr ""
4041
4052
4042
#: bzrlib/builtins.py:6424
4053
#: bzrlib/builtins.py:6457
4043
4054
msgid " <no hooks installed>\n"
4044
4055
msgstr ""
4045
4056
4046
#: bzrlib/builtins.py:6428
4057
#: bzrlib/builtins.py:6461
4047
4058
msgid "Remove a branch."
4048
4059
msgstr ""
4049
4060
4050
#: bzrlib/builtins.py:6430
4061
#: bzrlib/builtins.py:6463
4051
4062
msgid ""
4052
4063
"This will remove the branch from the specified location but \n"
4053
4064
"will keep any working tree or repository in place."
4054
4065
msgstr ""
4055
4066
4056
#: bzrlib/builtins.py:6435
4067
#: bzrlib/builtins.py:6468
4057
4068
msgid " Remove the branch at repo/trunk::"
4058
4069
msgstr ""
4059
4070
4060
#: bzrlib/builtins.py:6437
4071
#: bzrlib/builtins.py:6470
4061
4072
msgid " bzr remove-branch repo/trunk"
4062
4073
msgstr ""
4063
4074
4064
#: bzrlib/builtins.py:6444
4075
#: bzrlib/builtins.py:6477
4065
4076
msgid "Remove branch even if it is the active branch."
4066
4077
msgstr ""
4067
4078
4068
#: bzrlib/builtins.py:6458
4079
#: bzrlib/builtins.py:6491
4069
4080
msgid "Branch is active. Use --force to remove it."
4070
4081
msgstr ""
4071
4082
4072
#: bzrlib/builtins.py:6462
4083
#: bzrlib/builtins.py:6495
4073
4084
msgid "Plaintext diff output."
4074
4085
msgstr ""
4075
4086
4076
#: bzrlib/builtins.py:6463
4087
#: bzrlib/builtins.py:6496
4077
4088
msgid "Temporarily set aside some changes from the current tree."
4078
4089
msgstr ""
4079
4090
4080
#: bzrlib/builtins.py:6465
4091
#: bzrlib/builtins.py:6498
4081
4092
msgid ""
4082
4093
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4083
4094
"ie. out of the way, until a later time when you can bring them back from\n"
4086
4097
"will they survive its deletion."
4087
4098
msgstr ""
4088
4099
4089
#: bzrlib/builtins.py:6471
4100
#: bzrlib/builtins.py:6504
4090
4101
msgid "If shelve --list is specified, previously-shelved changes are listed."
4091
4102
msgstr ""
4092
4103
4093
#: bzrlib/builtins.py:6473
4104
#: bzrlib/builtins.py:6506
4094
4105
msgid ""
4095
4106
"Shelve is intended to help separate several sets of changes that have\n"
4096
4107
"been inappropriately mingled. If you just want to get rid of all changes\n"
4098
4109
"shelve all text changes at once, use shelve --all."
4099
4110
msgstr ""
4100
4111
4101
#: bzrlib/builtins.py:6478
4112
#: bzrlib/builtins.py:6511
4102
4113
msgid ""
4103
4114
"If filenames are specified, only the changes to those files will be\n"
4104
4115
"shelved. Other files will be left untouched."
4105
4116
msgstr ""
4106
4117
4107
#: bzrlib/builtins.py:6481
4118
#: bzrlib/builtins.py:6514
4108
4119
msgid ""
4109
4120
"If a revision is specified, changes since that revision will be shelved."
4110
4121
msgstr ""
4111
4122
4112
#: bzrlib/builtins.py:6483
4123
#: bzrlib/builtins.py:6516
4113
4124
msgid ""
4114
4125
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4115
4126
"restore the most recently shelved changes."
4116
4127
msgstr ""
4117
4128
4118
#: bzrlib/builtins.py:6486
4129
#: bzrlib/builtins.py:6519
4119
4130
msgid ""
4120
4131
"For complicated changes, it is possible to edit the changes in a separate\n"
4121
4132
"editor program to decide what the file remaining in the working copy\n"
4122
4133
"should look like. To do this, add the configuration option"
4123
4134
msgstr ""
4124
4135
4125
#: bzrlib/builtins.py:6490
4136
#: bzrlib/builtins.py:6523
4126
4137
msgid " change_editor = PROGRAM @new_path @old_path"
4127
4138
msgstr ""
4128
4139
4129
#: bzrlib/builtins.py:6492
4140
#: bzrlib/builtins.py:6525
4130
4141
msgid ""
4131
4142
"where @new_path is replaced with the path of the new version of the \n"
4132
4143
"file and @old_path is replaced with the path of the old version of \n"
4135
4146
" "
4136
4147
msgstr ""
4137
4148
4138
#: bzrlib/builtins.py:6504
4149
#: bzrlib/builtins.py:6537
4139
4150
msgid "Shelve all changes."
4140
4151
msgstr ""
4141
4152
4142
#: bzrlib/builtins.py:6506
4153
#: bzrlib/builtins.py:6539
4143
4154
msgid "Method to use for writing diffs."
4144
4155
msgstr ""
4145
4156
4146
#: bzrlib/builtins.py:6506
4157
#: bzrlib/builtins.py:6539
4147
4158
msgid "writer"
4148
4159
msgstr ""
4149
4160
4150
#: bzrlib/builtins.py:6510
4161
#: bzrlib/builtins.py:6543
4151
4162
msgid "List shelved changes."
4152
4163
msgstr ""
4153
4164
4154
#: bzrlib/builtins.py:6512
4165
#: bzrlib/builtins.py:6545
4155
4166
msgid "Destroy removed changes instead of shelving them."
4156
4167
msgstr ""
4157
4168
4158
#: bzrlib/builtins.py:6541
4169
#: bzrlib/builtins.py:6574
4159
4170
msgid "No shelved changes."
4160
4171
msgstr ""
4161
4172
4162
#: bzrlib/builtins.py:6552
4173
#: bzrlib/builtins.py:6585
4163
4174
msgid "Restore shelved changes."
4164
4175
msgstr ""
4165
4176
4166
#: bzrlib/builtins.py:6554
4177
#: bzrlib/builtins.py:6587
4167
4178
msgid ""
4168
4179
"By default, the most recently shelved changes are restored. However if you\n"
4169
4180
"specify a shelf by id those changes will be restored instead. This works\n"
4170
4181
"best when the changes don't depend on each other."
4171
4182
msgstr ""
4172
4183
4173
#: bzrlib/builtins.py:6563
4184
#: bzrlib/builtins.py:6596
4174
4185
msgid "The action to perform."
4175
4186
msgstr ""
4176
4187
4177
#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694
4188
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4178
4189
msgid "action"
4179
4190
msgstr ""
4180
4191
4181
#: bzrlib/builtins.py:6565
4192
#: bzrlib/builtins.py:6598
4182
4193
msgid "Apply changes and remove from the shelf."
4183
4194
msgstr ""
4184
4195
4185
#: bzrlib/builtins.py:6566
4196
#: bzrlib/builtins.py:6599
4186
4197
msgid "Show changes, but do not apply or remove them."
4187
4198
msgstr ""
4188
4199
4189
#: bzrlib/builtins.py:6567
4200
#: bzrlib/builtins.py:6600
4190
4201
msgid ""
4191
4202
"Instead of unshelving the changes, show the diff that would result from "
4192
4203
"unshelving."
4193
4204
msgstr ""
4194
4205
4195
#: bzrlib/builtins.py:6569
4206
#: bzrlib/builtins.py:6602
4196
4207
msgid "Delete changes without applying them."
4197
4208
msgstr ""
4198
4209
4199
#: bzrlib/builtins.py:6570
4210
#: bzrlib/builtins.py:6603
4200
4211
msgid "Apply changes but don't delete them."
4201
4212
msgstr ""
4202
4213
4203
#: bzrlib/builtins.py:6585
4214
#: bzrlib/builtins.py:6618
4204
4215
msgid "Remove unwanted files from working tree."
4205
4216
msgstr ""
4206
4217
4207
#: bzrlib/builtins.py:6587
4218
#: bzrlib/builtins.py:6620
4208
4219
msgid ""
4209
4220
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4210
4221
"files are never deleted."
4211
4222
msgstr ""
4212
4223
4213
#: bzrlib/builtins.py:6590
4224
#: bzrlib/builtins.py:6623
4214
4225
msgid ""
4215
4226
"Another class is 'detritus', which includes files emitted by bzr during\n"
4216
4227
"normal operations and selftests. (The value of these files decreases with\n"
4217
4228
"time.)"
4218
4229
msgstr ""
4219
4230
4220
#: bzrlib/builtins.py:6594
4231
#: bzrlib/builtins.py:6627
4221
4232
msgid ""
4222
4233
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4223
4234
"flags are respected, and may be combined."
4224
4235
msgstr ""
4225
4236
4226
#: bzrlib/builtins.py:6597
4237
#: bzrlib/builtins.py:6630
4227
4238
msgid "To check what clean-tree will do, use --dry-run."
4228
4239
msgstr ""
4229
4240
4230
#: bzrlib/builtins.py:6600
4241
#: bzrlib/builtins.py:6633
4231
4242
msgid "Delete all ignored files."
4232
4243
msgstr ""
4233
4244
4234
#: bzrlib/builtins.py:6601
4245
#: bzrlib/builtins.py:6634
4235
4246
msgid ""
4236
4247
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4237
4248
msgstr ""
4238
4249
4239
#: bzrlib/builtins.py:6604
4250
#: bzrlib/builtins.py:6637
4240
4251
msgid "Delete files unknown to bzr (default)."
4241
4252
msgstr ""
4242
4253
4243
#: bzrlib/builtins.py:6605
4254
#: bzrlib/builtins.py:6638
4244
4255
msgid "Show files to delete instead of deleting them."
4245
4256
msgstr ""
4246
4257
4247
#: bzrlib/builtins.py:6607
4258
#: bzrlib/builtins.py:6640
4248
4259
msgid "Do not prompt before deleting."
4249
4260
msgstr ""
4250
4261
4304
4315
msgstr[0] ""
4305
4316
msgstr[1] ""
4306
4317
4307
#: bzrlib/bzrdir.py:486
4318
#: bzrlib/bzrdir.py:487
4308
4319
msgid ""
4309
4320
"making backup of {0}\n"
4310
4321
" to {1}"
4311
4322
msgstr ""
4312
4323
4313
#: bzrlib/bzrdir.py:509
4324
#: bzrlib/bzrdir.py:510
4314
4325
msgid "renamed {0} to {1}"
4315
4326
msgstr ""
4316
4327
4317
#: bzrlib/bzrdir.py:1638
4328
#: bzrlib/bzrdir.py:1639
4318
4329
#, python-format
4319
4330
msgid ""
4320
4331
"Source repository format does not support stacking, using format:\n"
4321
4332
" %s"
4322
4333
msgstr ""
4323
4334
4324
#: bzrlib/bzrdir.py:1658
4335
#: bzrlib/bzrdir.py:1659
4325
4336
#, python-format
4326
4337
msgid ""
4327
4338
"Source branch format does not support stacking, using format:\n"
4328
4339
" %s"
4329
4340
msgstr ""
4330
4341
4331
#: bzrlib/bzrdir.py:1804
4342
#: bzrlib/bzrdir.py:1805
4332
4343
msgid "starting repository conversion"
4333
4344
msgstr ""
4334
4345
4335
#: bzrlib/bzrdir.py:2025
4346
#: bzrlib/bzrdir.py:2026
4336
4347
msgid "Using default stacking branch {0} at {1}"
4337
4348
msgstr ""
4338
4349
4515
4526
"supported formats or in a custom format based on a template."
4516
4527
msgstr ""
4517
4528
4518
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4519
#: en/help_topics/configuration.txt:710
4529
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4530
#: en/help_topics/configuration.txt:722
4520
4531
msgid "For example::"
4521
4532
msgstr ""
4522
4533
4760
4771
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4761
4772
msgstr ""
4762
4773
4763
#: bzrlib/config.py:2451
4774
#: bzrlib/config.py:2452
4764
4775
msgid "{0} is not an SI unit."
4765
4776
msgstr ""
4766
4777
4767
#: bzrlib/config.py:2970
4778
#: bzrlib/config.py:2971
4768
4779
msgid ""
4769
4780
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4770
4781
"will be saved."
4771
4782
msgstr ""
4772
4783
4773
#: bzrlib/config.py:3114
4784
#: bzrlib/config.py:3116
4774
4785
#, python-format
4775
4786
msgid "Invalid '%s', should be of the form 'name=value'"
4776
4787
msgstr ""
4777
4788
4778
#: bzrlib/config.py:4004
4789
#: bzrlib/config.py:4018
4779
4790
msgid "Display, set or remove a configuration option."
4780
4791
msgstr ""
4781
4792
4782
#: bzrlib/config.py:4006
4793
#: bzrlib/config.py:4020
4783
4794
msgid "Display the active value for a given option."
4784
4795
msgstr ""
4785
4796
4786
#: bzrlib/config.py:4008
4797
#: bzrlib/config.py:4022
4787
4798
msgid ""
4788
4799
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4789
4800
"matching options are displayed mentioning their scope. The active value\n"
4790
4801
"that bzr will take into account is the first one displayed for each option."
4791
4802
msgstr ""
4792
4803
4793
#: bzrlib/config.py:4012
4804
#: bzrlib/config.py:4026
4794
4805
msgid "If no NAME is given, --all .* is implied."
4795
4806
msgstr ""
4796
4807
4797
#: bzrlib/config.py:4014
4808
#: bzrlib/config.py:4028
4798
4809
msgid ""
4799
4810
"Setting a value is achieved by using name=value without spaces. The value\n"
4800
4811
"is set in the most relevant scope and can be checked by displaying the\n"
4801
4812
"option again."
4802
4813
msgstr ""
4803
4814
4804
#: bzrlib/config.py:4026
4815
#: bzrlib/config.py:4040
4805
4816
msgid "Reduce the scope to the specified configuration file."
4806
4817
msgstr ""
4807
4818
4808
#: bzrlib/config.py:4030
4819
#: bzrlib/config.py:4044
4809
4820
msgid "Display all the defined values for the matching options."
4810
4821
msgstr ""
4811
4822
4812
#: bzrlib/config.py:4032
4823
#: bzrlib/config.py:4046
4813
4824
msgid "Remove the option from the configuration file."
4814
4825
msgstr ""
4815
4826
7060
7071
msgid "bzr: ERROR (ignored): %s"
7061
7072
msgstr ""
7062
7073
7063
#: bzrlib/remote.py:2541
7074
#: bzrlib/remote.py:2534
7064
7075
msgid "Copying repository content as tarball..."
7065
7076
msgstr ""
7066
7077
7076
7087
msgid "{0} => {1}"
7077
7088
msgstr ""
7078
7089
7079
#: bzrlib/repository.py:1799
7090
#: bzrlib/repository.py:1738
7080
7091
msgid "Moving repository to repository.backup"
7081
7092
msgstr ""
7082
7093
7083
#: bzrlib/repository.py:1806
7094
#: bzrlib/repository.py:1745
7084
7095
msgid "Creating new repository"
7085
7096
msgstr ""
7086
7097
7087
#: bzrlib/repository.py:1811
7098
#: bzrlib/repository.py:1750
7088
7099
msgid "Copying content"
7089
7100
msgstr ""
7090
7101
7091
#: bzrlib/repository.py:1815
7102
#: bzrlib/repository.py:1754
7092
7103
msgid "Deleting old repository content"
7093
7104
msgstr ""
7094
7105
7095
#: bzrlib/repository.py:1817
7106
#: bzrlib/repository.py:1756
7096
7107
msgid "repository converted"
7097
7108
msgstr ""
7098
7109
7318
7329
msgid "adding file"
7319
7330
msgstr ""
7320
7331
7321
#: bzrlib/transform.py:2590
7332
#: bzrlib/transform.py:2598
7322
7333
msgid "Building tree"
7323
7334
msgstr ""
7324
7335
7325
#: bzrlib/transform.py:2680 bzrlib/transform.py:2707
7336
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7326
7337
msgid "Adding file contents"
7327
7338
msgstr ""
7328
7339
7329
#: bzrlib/transform.py:3009
7340
#: bzrlib/transform.py:3017
7330
7341
msgid "Resolution pass"
7331
7342
msgstr ""
7332
7343
7335
7346
msgid "Authenticated as %s"
7336
7347
msgstr ""
7337
7348
7338
#: bzrlib/tree.py:637
7349
#: bzrlib/tree.py:647
7339
7350
msgid "*** {0} content-filter: {1} => {2!r}"
7340
7351
msgstr ""
7341
7352
7475
7486
7476
7487
#: dummy/help_topics/basic/detail.txt:1
7477
7488
msgid ""
7478
"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"
7489
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7479
7490
"http://bazaar.canonical.com/"
7480
7491
msgstr ""
7481
7492
7793
7804
msgid "How to fix diverged branches"
7794
7805
msgstr ""
7795
7806
7796
#: dummy/help_topics/env-variables/detail.txt:1
7797
msgid "Environment Variables"
7798
msgstr ""
7799
7800
#: dummy/help_topics/env-variables/detail.txt:3
7801
msgid ""
7802
"=================== "
7803
"===========================================================\n"
7804
"BZRPATH Path where bzr is to look for shell plugin external\n"
7805
" commands.\n"
7806
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7807
"EMAIL E-Mail address of the user.\n"
7808
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7809
"EDITOR Editor for editing commit messages.\n"
7810
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7811
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7812
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7813
"BZR_PLUGIN_PATH.\n"
7814
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7815
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7816
"and\n"
7817
" HOME.\n"
7818
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7819
"URLs).\n"
7820
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7821
"sshcorp,\n"
7822
" plink or lsh.\n"
7823
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7824
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7825
"BZR_COLUMNS Override implicit terminal width.\n"
7826
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7827
"(selftest)\n"
7828
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7829
"'text'.\n"
7830
"BZR_PDB Control whether to launch a debugger on error.\n"
7831
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7832
" breakin debugger.\n"
7833
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7834
"(instead\n"
7835
" of char-based).\n"
7836
"=================== "
7837
"===========================================================\n"
7838
msgstr ""
7839
7840
7807
#: dummy/help_topics/env-variables/summary.txt:1
7841
7808
msgid "Environment variable names and values"
7842
7809
msgstr ""
8837
8804
msgid " bzr commit --fixes <tracker>:<id>"
8838
8805
msgstr ""
8839
8806
8840
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8807
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8841
8808
msgid "or::"
8842
8809
msgstr ""
8843
8810
9072
9039
"remove-tree Remove the working tree from a given branch/checkout.\n"
9073
9040
"renames Show list of renamed files.\n"
9074
9041
"resolve Mark a conflict as resolved.\n"
9075
"revert Revert files to a previous revision.\n"
9042
"revert Set files in the working tree back to the contents of a\n"
9043
" previous revision.\n"
9076
9044
"revno Show current revision number.\n"
9077
9045
"root Show the tree root directory.\n"
9078
9046
"send Mail or create a merge-directive for submitting changes.\n"
9730
9698
9731
9699
#: en/help_topics/configuration.txt:336
9732
9700
msgid ""
9701
"Another such option is ``branchname``, which refers to the name of a "
9702
"colocated\n"
9703
"branch. For non-colocated branches, it behaves like basename. It can be "
9704
"used\n"
9705
"like this::"
9706
msgstr ""
9707
9708
#: en/help_topics/configuration.txt:340
9709
msgid ""
9710
" [/home/vila/src/bzr/bugs]\n"
9711
" mypush = lp:~vila/bzr/{branchname}"
9712
msgstr ""
9713
9714
#: en/help_topics/configuration.txt:343
9715
msgid ""
9716
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9717
"get::"
9718
msgstr ""
9719
9720
#: en/help_topics/configuration.txt:345
9721
msgid ""
9722
" bzr config mypush\n"
9723
" lp:~vila/bzr/832013-expand-in-stack"
9724
msgstr ""
9725
9726
#: en/help_topics/configuration.txt:348
9727
msgid ""
9733
9728
"When an option is local to a Section, it cannot be referred to from option\n"
9734
9729
"values in any other section from the same ``Store`` nor from any other\n"
9735
9730
"``Store``."
9736
9731
msgstr ""
9737
9732
9738
#: en/help_topics/configuration.txt:340
9733
#: en/help_topics/configuration.txt:352
9739
9734
msgid ""
9740
9735
"\n"
9741
9736
"The main configuration file, bazaar.conf\n"
9742
9737
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9743
9738
msgstr ""
9744
9739
9745
#: en/help_topics/configuration.txt:344
9740
#: en/help_topics/configuration.txt:356
9746
9741
msgid ""
9747
9742
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9748
9743
"The default section contains the default\n"
9750
9745
"overriden by providing a branch-specific section in ``locations.conf``."
9751
9746
msgstr ""
9752
9747
9753
#: en/help_topics/configuration.txt:349
9748
#: en/help_topics/configuration.txt:361
9754
9749
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9755
9750
msgstr ""
9756
9751
9757
#: en/help_topics/configuration.txt:351
9752
#: en/help_topics/configuration.txt:363
9758
9753
msgid ""
9759
9754
" [DEFAULT]\n"
9760
9755
" email = John Doe <jdoe@isp.com>\n"
9762
9757
" create_signatures = when-required"
9763
9758
msgstr ""
9764
9759
9765
#: en/help_topics/configuration.txt:356
9760
#: en/help_topics/configuration.txt:368
9766
9761
msgid ""
9767
9762
"\n"
9768
9763
"The branch location configuration file, locations.conf\n"
9769
9764
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9770
9765
msgstr ""
9771
9766
9772
#: en/help_topics/configuration.txt:360
9767
#: en/help_topics/configuration.txt:372
9773
9768
msgid ""
9774
9769
"``locations.conf`` allows one to specify overriding settings for\n"
9775
9770
"a specific branch. The format is almost identical to the default section in\n"
9779
9774
"for. The '?' and '*' wildcards are supported::"
9780
9775
msgstr ""
9781
9776
9782
#: en/help_topics/configuration.txt:366
9777
#: en/help_topics/configuration.txt:378
9783
9778
msgid ""
9784
9779
" [/home/jdoe/branches/nethack]\n"
9785
9780
" email = Nethack Admin <nethack@nethack.com>"
9786
9781
msgstr ""
9787
9782
9788
#: en/help_topics/configuration.txt:369
9783
#: en/help_topics/configuration.txt:381
9789
9784
msgid ""
9790
9785
" [http://hypothetical.site.com/branches/devel-branch]\n"
9791
9786
" create_signatures = always"
9792
9787
msgstr ""
9793
9788
9794
#: en/help_topics/configuration.txt:372
9789
#: en/help_topics/configuration.txt:384
9795
9790
msgid ""
9796
9791
"The authentication configuration file, authentication.conf\n"
9797
9792
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9798
9793
msgstr ""
9799
9794
9800
#: en/help_topics/configuration.txt:375
9795
#: en/help_topics/configuration.txt:387
9801
9796
msgid ""
9802
9797
"``authentication.conf`` allows one to specify credentials for\n"
9803
9798
"remote servers. This can be used for all the supported transports and any "
9805
9800
"of bzr that requires authentication (smtp for example)."
9806
9801
msgstr ""
9807
9802
9808
#: en/help_topics/configuration.txt:379
9803
#: en/help_topics/configuration.txt:391
9809
9804
msgid ""
9810
9805
"The syntax of the file obeys the same rules as the others except for the\n"
9811
9806
"option policies which don't apply."
9812
9807
msgstr ""
9813
9808
9814
#: en/help_topics/configuration.txt:382
9809
#: en/help_topics/configuration.txt:394
9815
9810
msgid ""
9816
9811
"For more information on the possible uses of the authentication "
9817
9812
"configuration\n"
9818
9813
"file see :doc:`authentication-help`."
9819
9814
msgstr ""
9820
9815
9821
#: en/help_topics/configuration.txt:385
9816
#: en/help_topics/configuration.txt:397
9822
9817
msgid ""
9823
9818
"\n"
9824
9819
"Common options\n"
9825
9820
"--------------"
9826
9821
msgstr ""
9827
9822
9828
#: en/help_topics/configuration.txt:389
9823
#: en/help_topics/configuration.txt:401
9829
9824
msgid ""
9830
9825
"debug_flags\n"
9831
9826
"~~~~~~~~~~~"
9832
9827
msgstr ""
9833
9828
9834
#: en/help_topics/configuration.txt:392
9829
#: en/help_topics/configuration.txt:404
9835
9830
msgid ""
9836
9831
"A comma-separated list of debugging options to turn on. The same values\n"
9837
9832
"can be used as with the -D command-line option (see `help global-options`).\n"
9838
9833
"For example::"
9839
9834
msgstr ""
9840
9835
9841
#: en/help_topics/configuration.txt:396
9836
#: en/help_topics/configuration.txt:408
9842
9837
msgid " debug_flags = hpss"
9843
9838
msgstr ""
9844
9839
9845
#: en/help_topics/configuration.txt:400
9840
#: en/help_topics/configuration.txt:412
9846
9841
msgid " debug_flags = hpss,evil"
9847
9842
msgstr ""
9848
9843
9849
#: en/help_topics/configuration.txt:402
9844
#: en/help_topics/configuration.txt:414
9850
9845
msgid ""
9851
9846
"email\n"
9852
9847
"~~~~~"
9853
9848
msgstr ""
9854
9849
9855
#: en/help_topics/configuration.txt:405
9850
#: en/help_topics/configuration.txt:417
9856
9851
msgid ""
9857
9852
"The email address to use when committing a branch. Typically takes the form\n"
9858
9853
"of::"
9859
9854
msgstr ""
9860
9855
9861
#: en/help_topics/configuration.txt:408
9856
#: en/help_topics/configuration.txt:420
9862
9857
msgid " email = Full Name <account@hostname.tld>"
9863
9858
msgstr ""
9864
9859
9865
#: en/help_topics/configuration.txt:410
9860
#: en/help_topics/configuration.txt:422
9866
9861
msgid ""
9867
9862
"editor\n"
9868
9863
"~~~~~~"
9869
9864
msgstr ""
9870
9865
9871
#: en/help_topics/configuration.txt:413
9866
#: en/help_topics/configuration.txt:425
9872
9867
msgid ""
9873
9868
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9874
9869
"a commit message. This setting is trumped by the environment variable\n"
9876
9871
"variables."
9877
9872
msgstr ""
9878
9873
9879
#: en/help_topics/configuration.txt:418
9874
#: en/help_topics/configuration.txt:430
9880
9875
msgid ""
9881
9876
"log_format\n"
9882
9877
"~~~~~~~~~~"
9883
9878
msgstr ""
9884
9879
9885
#: en/help_topics/configuration.txt:421
9880
#: en/help_topics/configuration.txt:433
9886
9881
msgid ""
9887
9882
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9888
9883
"and ``line``. Additional formats may be provided by plugins. The default\n"
9889
9884
"value is ``long``."
9890
9885
msgstr ""
9891
9886
9892
#: en/help_topics/configuration.txt:425
9887
#: en/help_topics/configuration.txt:437
9893
9888
msgid ""
9894
9889
"check_signatures\n"
9895
9890
"~~~~~~~~~~~~~~~~"
9896
9891
msgstr ""
9897
9892
9898
#: en/help_topics/configuration.txt:428
9893
#: en/help_topics/configuration.txt:440
9899
9894
msgid ""
9900
9895
"Reserved for future use. These options will allow a policy for branches to\n"
9901
9896
"require signatures."
9902
9897
msgstr ""
9903
9898
9904
#: en/help_topics/configuration.txt:431
9899
#: en/help_topics/configuration.txt:443
9905
9900
msgid ""
9906
9901
"require\n"
9907
9902
" The gnupg signature for revisions must be present and must be valid."
9908
9903
msgstr ""
9909
9904
9910
#: en/help_topics/configuration.txt:434
9905
#: en/help_topics/configuration.txt:446
9911
9906
msgid ""
9912
9907
"ignore\n"
9913
9908
" Do not check gnupg signatures of revisions."
9914
9909
msgstr ""
9915
9910
9916
#: en/help_topics/configuration.txt:437
9911
#: en/help_topics/configuration.txt:449
9917
9912
msgid ""
9918
9913
"check-available\n"
9919
9914
" (default) If gnupg signatures for revisions are present, check them.\n"
9921
9916
" no signature is present."
9922
9917
msgstr ""
9923
9918
9924
#: en/help_topics/configuration.txt:442
9919
#: en/help_topics/configuration.txt:454
9925
9920
msgid ""
9926
9921
"create_signatures\n"
9927
9922
"~~~~~~~~~~~~~~~~~"
9928
9923
msgstr ""
9929
9924
9930
#: en/help_topics/configuration.txt:445
9925
#: en/help_topics/configuration.txt:457
9931
9926
msgid ""
9932
9927
"Defines the behaviour of signing revisions on commits. By default bzr will "
9933
9928
"not\n"
9934
9929
"sign new commits."
9935
9930
msgstr ""
9936
9931
9937
#: en/help_topics/configuration.txt:448
9932
#: en/help_topics/configuration.txt:460
9938
9933
msgid ""
9939
9934
"always\n"
9940
9935
" Sign every new revision that is committed. If the signing fails then "
9942
9937
" commit will not be made."
9943
9938
msgstr ""
9944
9939
9945
#: en/help_topics/configuration.txt:452
9940
#: en/help_topics/configuration.txt:464
9946
9941
msgid ""
9947
9942
"when-required\n"
9948
9943
" Reserved for future use."
9949
9944
msgstr ""
9950
9945
9951
#: en/help_topics/configuration.txt:455
9946
#: en/help_topics/configuration.txt:467
9952
9947
msgid ""
9953
9948
"never\n"
9954
9949
" Reserved for future use."
9955
9950
msgstr ""
9956
9951
9957
#: en/help_topics/configuration.txt:458
9952
#: en/help_topics/configuration.txt:470
9958
9953
msgid ""
9959
9954
"In future it is planned that ``when-required`` will sign newly\n"
9960
9955
"committed revisions only when the branch requires them. ``never`` will "
9962
9957
"to sign newly committed revisions, even if the branch requires signatures."
9963
9958
msgstr ""
9964
9959
9965
#: en/help_topics/configuration.txt:462
9960
#: en/help_topics/configuration.txt:474
9966
9961
msgid ""
9967
9962
"dirstate.fdatasync\n"
9968
9963
"~~~~~~~~~~~~~~~~~~"
9969
9964
msgstr ""
9970
9965
9971
#: en/help_topics/configuration.txt:465
9966
#: en/help_topics/configuration.txt:477
9972
9967
msgid ""
9973
9968
"If true (default), working tree metadata changes are flushed through the\n"
9974
9969
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9975
9970
"should not be lost if the machine crashes. See also repository.fdatasync."
9976
9971
msgstr ""
9977
9972
9978
#: en/help_topics/configuration.txt:469
9973
#: en/help_topics/configuration.txt:481
9979
9974
msgid ""
9980
9975
"gpg_signing_key\n"
9981
9976
"~~~~~~~~~~~~~~~"
9982
9977
msgstr ""
9983
9978
9984
#: en/help_topics/configuration.txt:472
9979
#: en/help_topics/configuration.txt:484
9985
9980
msgid ""
9986
9981
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9987
9982
"address, key fingerprint or full key ID. When unset or when set to\n"
9988
9983
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9989
9984
msgstr ""
9990
9985
9991
#: en/help_topics/configuration.txt:476
9986
#: en/help_topics/configuration.txt:488
9992
9987
msgid ""
9993
9988
"recurse\n"
9994
9989
"~~~~~~~"
9995
9990
msgstr ""
9996
9991
9997
#: en/help_topics/configuration.txt:479
9992
#: en/help_topics/configuration.txt:491
9998
9993
msgid ""
9999
9994
"Only useful in ``locations.conf``. Defines whether or not the\n"
10000
9995
"configuration for this section applies to subdirectories:"
10001
9996
msgstr ""
10002
9997
10003
#: en/help_topics/configuration.txt:482
9998
#: en/help_topics/configuration.txt:494
10004
9999
msgid ""
10005
10000
"true\n"
10006
10001
" (default) This section applies to subdirectories as well."
10007
10002
msgstr ""
10008
10003
10009
#: en/help_topics/configuration.txt:485
10004
#: en/help_topics/configuration.txt:497
10010
10005
msgid ""
10011
10006
"false\n"
10012
10007
" This section only applies to the branch at this directory and not\n"
10013
10008
" branches below it."
10014
10009
msgstr ""
10015
10010
10016
#: en/help_topics/configuration.txt:489
10011
#: en/help_topics/configuration.txt:501
10017
10012
msgid ""
10018
10013
"gpg_signing_command\n"
10019
10014
"~~~~~~~~~~~~~~~~~~~"
10020
10015
msgstr ""
10021
10016
10022
#: en/help_topics/configuration.txt:492
10017
#: en/help_topics/configuration.txt:504
10023
10018
msgid ""
10024
10019
"(Default: \"gpg\"). Which program should be used to sign and check "
10025
10020
"revisions.\n"
10026
10021
"For example::"
10027
10022
msgstr ""
10028
10023
10029
#: en/help_topics/configuration.txt:495
10024
#: en/help_topics/configuration.txt:507
10030
10025
msgid " gpg_signing_command = /usr/bin/gnpg"
10031
10026
msgstr ""
10032
10027
10033
#: en/help_topics/configuration.txt:497
10028
#: en/help_topics/configuration.txt:509
10034
10029
msgid ""
10035
10030
"The specified command must accept the options \"--clearsign\" and \"-u "
10036
10031
"<email>\"."
10037
10032
msgstr ""
10038
10033
10039
#: en/help_topics/configuration.txt:499
10034
#: en/help_topics/configuration.txt:511
10040
10035
msgid ""
10041
10036
"bzr_remote_path\n"
10042
10037
"~~~~~~~~~~~~~~~"
10043
10038
msgstr ""
10044
10039
10045
#: en/help_topics/configuration.txt:502
10040
#: en/help_topics/configuration.txt:514
10046
10041
msgid ""
10047
10042
"(Default: \"bzr\"). The path to the command that should be used to run the "
10048
10043
"smart\n"
10049
10044
"server for bzr. This value may only be specified in locations.conf, because:"
10050
10045
msgstr ""
10051
10046
10052
#: en/help_topics/configuration.txt:505
10047
#: en/help_topics/configuration.txt:517
10053
10048
msgid ""
10054
10049
"- it's needed before branch.conf is accessible\n"
10055
10050
"- allowing remote branch.conf files to specify commands would be a security\n"
10056
10051
" risk"
10057
10052
msgstr ""
10058
10053
10059
#: en/help_topics/configuration.txt:509
10054
#: en/help_topics/configuration.txt:521
10060
10055
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10061
10056
msgstr ""
10062
10057
10063
#: en/help_topics/configuration.txt:511
10058
#: en/help_topics/configuration.txt:523
10064
10059
msgid ""
10065
10060
"smtp_server\n"
10066
10061
"~~~~~~~~~~~"
10067
10062
msgstr ""
10068
10063
10069
#: en/help_topics/configuration.txt:514
10064
#: en/help_topics/configuration.txt:526
10070
10065
msgid ""
10071
10066
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10072
10067
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10073
10068
msgstr ""
10074
10069
10075
#: en/help_topics/configuration.txt:517
10070
#: en/help_topics/configuration.txt:529
10076
10071
msgid ""
10077
10072
"smtp_username, smtp_password\n"
10078
10073
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10079
10074
msgstr ""
10080
10075
10081
#: en/help_topics/configuration.txt:520
10076
#: en/help_topics/configuration.txt:532
10082
10077
msgid ""
10083
10078
"User and password to authenticate to the SMTP server. If smtp_username\n"
10084
10079
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10086
10081
"to send mail."
10087
10082
msgstr ""
10088
10083
10089
#: en/help_topics/configuration.txt:525
10084
#: en/help_topics/configuration.txt:537
10090
10085
msgid ""
10091
10086
"locks.steal_dead\n"
10092
10087
"~~~~~~~~~~~~~~~~"
10093
10088
msgstr ""
10094
10089
10095
#: en/help_topics/configuration.txt:528
10090
#: en/help_topics/configuration.txt:540
10096
10091
msgid ""
10097
10092
"If set to true, bzr will automatically break locks held by processes from\n"
10098
10093
"the same machine and user that are no longer alive. Otherwise, it will\n"
10100
10095
"the object is no longer in use."
10101
10096
msgstr ""
10102
10097
10103
#: en/help_topics/configuration.txt:533
10098
#: en/help_topics/configuration.txt:545
10104
10099
msgid ""
10105
10100
"mail_client\n"
10106
10101
"~~~~~~~~~~~"
10107
10102
msgstr ""
10108
10103
10109
#: en/help_topics/configuration.txt:536
10104
#: en/help_topics/configuration.txt:548
10110
10105
msgid ""
10111
10106
"A mail client to use for sending merge requests.\n"
10112
10107
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10115
10110
"``editor``."
10116
10111
msgstr ""
10117
10112
10118
#: en/help_topics/configuration.txt:541
10113
#: en/help_topics/configuration.txt:553
10119
10114
msgid "Supported values for specific clients:"
10120
10115
msgstr ""
10121
10116
10122
#: en/help_topics/configuration.txt:543
10117
#: en/help_topics/configuration.txt:555
10123
10118
msgid ""
10124
10119
":claws: Use Claws. This skips a dialog for attaching files.\n"
10125
10120
":evolution: Use Evolution.\n"
10130
10125
" this works around some bugs that xdg-email doesn't handle."
10131
10126
msgstr ""
10132
10127
10133
#: en/help_topics/configuration.txt:550
10128
#: en/help_topics/configuration.txt:562
10134
10129
msgid "Supported generic values are:"
10135
10130
msgstr ""
10136
10131
10137
#: en/help_topics/configuration.txt:552
10132
#: en/help_topics/configuration.txt:564
10138
10133
msgid ""
10139
10134
":default: See above.\n"
10140
10135
":editor: Use your editor to compose the merge request. This also uses\n"
10144
10139
":xdg-email: Use xdg-email to run your preferred mail program"
10145
10140
msgstr ""
10146
10141
10147
#: en/help_topics/configuration.txt:559
10142
#: en/help_topics/configuration.txt:571
10148
10143
msgid ""
10149
10144
"repository.fdatasync\n"
10150
10145
"~~~~~~~~~~~~~~~~~~~~"
10151
10146
msgstr ""
10152
10147
10153
#: en/help_topics/configuration.txt:562
10148
#: en/help_topics/configuration.txt:574
10154
10149
msgid ""
10155
10150
"If true (default), repository changes are flushed through the OS buffers\n"
10156
10151
"to physical disk. This is somewhat slower, but means data should not be\n"
10157
10152
"lost if the machine crashes. See also dirstate.fdatasync."
10158
10153
msgstr ""
10159
10154
10160
#: en/help_topics/configuration.txt:566
10155
#: en/help_topics/configuration.txt:578
10161
10156
msgid ""
10162
10157
"submit_branch\n"
10163
10158
"~~~~~~~~~~~~~"
10164
10159
msgstr ""
10165
10160
10166
#: en/help_topics/configuration.txt:569
10161
#: en/help_topics/configuration.txt:581
10167
10162
msgid ""
10168
10163
"The branch you intend to submit your current work to. This is "
10169
10164
"automatically\n"
10172
10167
"should usually be set on a per-branch or per-location basis."
10173
10168
msgstr ""
10174
10169
10175
#: en/help_topics/configuration.txt:573
10170
#: en/help_topics/configuration.txt:585
10176
10171
msgid ""
10177
10172
"public_branch\n"
10178
10173
"~~~~~~~~~~~~~"
10179
10174
msgstr ""
10180
10175
10181
#: en/help_topics/configuration.txt:576
10176
#: en/help_topics/configuration.txt:588
10182
10177
msgid ""
10183
10178
"A publically-accessible version of this branch (implying that this version "
10184
10179
"is\n"
10185
10180
"not publically-accessible). Used (and set) by ``bzr send``."
10186
10181
msgstr ""
10187
10182
10188
#: en/help_topics/configuration.txt:579
10183
#: en/help_topics/configuration.txt:591
10189
10184
msgid ""
10190
10185
"suppress_warnings\n"
10191
10186
"~~~~~~~~~~~~~~~~~"
10192
10187
msgstr ""
10193
10188
10194
#: en/help_topics/configuration.txt:582
10189
#: en/help_topics/configuration.txt:594
10195
10190
msgid ""
10196
10191
"A list of strings, each string represent a warning that can be emitted by\n"
10197
10192
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10198
10193
msgstr ""
10199
10194
10200
#: en/help_topics/configuration.txt:585
10195
#: en/help_topics/configuration.txt:597
10201
10196
msgid "Valid values:"
10202
10197
msgstr ""
10203
10198
10204
#: en/help_topics/configuration.txt:587
10199
#: en/help_topics/configuration.txt:599
10205
10200
msgid ""
10206
10201
"* ``format_deprecation``:\n"
10207
10202
" whether the format deprecation warning is shown on repositories that "
10209
10204
" using deprecated formats."
10210
10205
msgstr ""
10211
10206
10212
#: en/help_topics/configuration.txt:591
10207
#: en/help_topics/configuration.txt:603
10213
10208
msgid ""
10214
10209
"default_format\n"
10215
10210
"~~~~~~~~~~~~~~"
10216
10211
msgstr ""
10217
10212
10218
#: en/help_topics/configuration.txt:594
10213
#: en/help_topics/configuration.txt:606
10219
10214
msgid ""
10220
10215
"A format name for the default format used when creating branches. See "
10221
10216
"``bzr\n"
10222
10217
"help formats`` for possible values."
10223
10218
msgstr ""
10224
10219
10225
#: en/help_topics/configuration.txt:597
10220
#: en/help_topics/configuration.txt:609
10226
10221
msgid ""
10227
10222
"\n"
10228
10223
"Unicode options\n"
10229
10224
"---------------"
10230
10225
msgstr ""
10231
10226
10232
#: en/help_topics/configuration.txt:601
10227
#: en/help_topics/configuration.txt:613
10233
10228
msgid ""
10234
10229
"output_encoding\n"
10235
10230
"~~~~~~~~~~~~~~~"
10236
10231
msgstr ""
10237
10232
10238
#: en/help_topics/configuration.txt:604
10233
#: en/help_topics/configuration.txt:616
10239
10234
msgid ""
10240
10235
"A Python unicode encoding name for text output from bzr, such as log\n"
10241
10236
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10242
10237
"is the terminal encoding prefered by the operating system."
10243
10238
msgstr ""
10244
10239
10245
#: en/help_topics/configuration.txt:608
10240
#: en/help_topics/configuration.txt:620
10246
10241
msgid ""
10247
10242
"\n"
10248
10243
"Branch type specific options\n"
10249
10244
"----------------------------"
10250
10245
msgstr ""
10251
10246
10252
#: en/help_topics/configuration.txt:612
10247
#: en/help_topics/configuration.txt:624
10253
10248
msgid ""
10254
10249
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10255
10250
"later format. They\n"
10257
10252
"manually set in ``locations.conf`` or ``bazaar.conf``."
10258
10253
msgstr ""
10259
10254
10260
#: en/help_topics/configuration.txt:617
10255
#: en/help_topics/configuration.txt:629
10261
10256
msgid ""
10262
10257
"append_revisions_only\n"
10263
10258
"~~~~~~~~~~~~~~~~~~~~~"
10264
10259
msgstr ""
10265
10260
10266
#: en/help_topics/configuration.txt:620
10261
#: en/help_topics/configuration.txt:632
10267
10262
msgid ""
10268
10263
"If set to \"True\" then revisions can only be appended to the log, not\n"
10269
10264
"removed. A branch with this setting enabled can only pull from another\n"
10273
10268
"compatibility with previous bzr versions (older than 2.2)."
10274
10269
msgstr ""
10275
10270
10276
#: en/help_topics/configuration.txt:627
10271
#: en/help_topics/configuration.txt:639
10277
10272
msgid ""
10278
10273
"parent_location\n"
10279
10274
"~~~~~~~~~~~~~~~"
10280
10275
msgstr ""
10281
10276
10282
#: en/help_topics/configuration.txt:630
10277
#: en/help_topics/configuration.txt:642
10283
10278
msgid ""
10284
10279
"If present, the location of the default branch for pull or merge. This "
10285
10280
"option\n"
10287
10282
"--remember``."
10288
10283
msgstr ""
10289
10284
10290
#: en/help_topics/configuration.txt:634
10285
#: en/help_topics/configuration.txt:646
10291
10286
msgid ""
10292
10287
"push_location\n"
10293
10288
"~~~~~~~~~~~~~"
10294
10289
msgstr ""
10295
10290
10296
#: en/help_topics/configuration.txt:637
10291
#: en/help_topics/configuration.txt:649
10297
10292
msgid ""
10298
10293
"If present, the location of the default branch for push. This option\n"
10299
10294
"is normally set by the first ``push`` or ``push --remember``."
10300
10295
msgstr ""
10301
10296
10302
#: en/help_topics/configuration.txt:640
10297
#: en/help_topics/configuration.txt:652
10303
10298
msgid ""
10304
10299
"push_strict\n"
10305
10300
"~~~~~~~~~~~"
10306
10301
msgstr ""
10307
10302
10308
#: en/help_topics/configuration.txt:643
10303
#: en/help_topics/configuration.txt:655
10309
10304
msgid ""
10310
10305
"If present, defines the ``--strict`` option default value for checking\n"
10311
10306
"uncommitted changes before pushing."
10312
10307
msgstr ""
10313
10308
10314
#: en/help_topics/configuration.txt:646
10309
#: en/help_topics/configuration.txt:658
10315
10310
msgid ""
10316
10311
"dpush_strict\n"
10317
10312
"~~~~~~~~~~~~"
10318
10313
msgstr ""
10319
10314
10320
#: en/help_topics/configuration.txt:649
10315
#: en/help_topics/configuration.txt:661
10321
10316
msgid ""
10322
10317
"If present, defines the ``--strict`` option default value for checking\n"
10323
10318
"uncommitted changes before pushing into a different VCS without any\n"
10324
10319
"custom bzr metadata."
10325
10320
msgstr ""
10326
10321
10327
#: en/help_topics/configuration.txt:653
10322
#: en/help_topics/configuration.txt:665
10328
10323
msgid ""
10329
10324
"bound_location\n"
10330
10325
"~~~~~~~~~~~~~~"
10331
10326
msgstr ""
10332
10327
10333
#: en/help_topics/configuration.txt:656
10328
#: en/help_topics/configuration.txt:668
10334
10329
msgid ""
10335
10330
"The location that commits should go to when acting as a checkout.\n"
10336
10331
"This option is normally set by ``bind``."
10337
10332
msgstr ""
10338
10333
10339
#: en/help_topics/configuration.txt:659
10334
#: en/help_topics/configuration.txt:671
10340
10335
msgid ""
10341
10336
"bound\n"
10342
10337
"~~~~~"
10343
10338
msgstr ""
10344
10339
10345
#: en/help_topics/configuration.txt:662
10340
#: en/help_topics/configuration.txt:674
10346
10341
msgid ""
10347
10342
"If set to \"True\", the branch should act as a checkout, and push each "
10348
10343
"commit to\n"
10349
10344
"the bound_location. This option is normally set by ``bind``/``unbind``."
10350
10345
msgstr ""
10351
10346
10352
#: en/help_topics/configuration.txt:665
10347
#: en/help_topics/configuration.txt:677
10353
10348
msgid ""
10354
10349
"send_strict\n"
10355
10350
"~~~~~~~~~~~"
10356
10351
msgstr ""
10357
10352
10358
#: en/help_topics/configuration.txt:668
10353
#: en/help_topics/configuration.txt:680
10359
10354
msgid ""
10360
10355
"If present, defines the ``--strict`` option default value for checking\n"
10361
10356
"uncommitted changes before sending a merge directive."
10362
10357
msgstr ""
10363
10358
10364
#: en/help_topics/configuration.txt:671
10359
#: en/help_topics/configuration.txt:683
10365
10360
msgid ""
10366
10361
"add.maximum_file_size\n"
10367
10362
"~~~~~~~~~~~~~~~~~~~~~"
10368
10363
msgstr ""
10369
10364
10370
#: en/help_topics/configuration.txt:674
10365
#: en/help_topics/configuration.txt:686
10371
10366
msgid ""
10372
10367
"Defines the maximum file size the command line \"add\" operation will allow\n"
10373
10368
"in recursive mode, with files larger than this value being skipped. You may "
10379
10374
"will disable skipping."
10380
10375
msgstr ""
10381
10376
10382
#: en/help_topics/configuration.txt:680
10377
#: en/help_topics/configuration.txt:692
10383
10378
msgid ""
10384
10379
"External Merge Tools\n"
10385
10380
"--------------------"
10386
10381
msgstr ""
10387
10382
10388
#: en/help_topics/configuration.txt:683
10383
#: en/help_topics/configuration.txt:695
10389
10384
msgid ""
10390
10385
"bzr.mergetool.<name>\n"
10391
10386
"~~~~~~~~~~~~~~~~~~~~"
10392
10387
msgstr ""
10393
10388
10394
#: en/help_topics/configuration.txt:686
10389
#: en/help_topics/configuration.txt:698
10395
10390
msgid ""
10396
10391
"Defines an external merge tool called <name> with the given command-line.\n"
10397
10392
"Arguments containing spaces should be quoted using single or double quotes. "
10399
10394
"executable may omit its path if it can be found on the PATH."
10400
10395
msgstr ""
10401
10396
10402
#: en/help_topics/configuration.txt:690
10397
#: en/help_topics/configuration.txt:702
10403
10398
msgid ""
10404
10399
"The following markers can be used in the command-line to substitute "
10405
10400
"filenames\n"
10406
10401
"involved in the merge conflict::"
10407
10402
msgstr ""
10408
10403
10409
#: en/help_topics/configuration.txt:693
10404
#: en/help_topics/configuration.txt:705
10410
10405
msgid ""
10411
10406
" {base} file.BASE\n"
10412
10407
" {this} file.THIS\n"
10417
10412
" succeeds."
10418
10413
msgstr ""
10419
10414
10420
#: en/help_topics/configuration.txt:702
10415
#: en/help_topics/configuration.txt:714
10421
10416
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10422
10417
msgstr ""
10423
10418
10424
#: en/help_topics/configuration.txt:704
10419
#: en/help_topics/configuration.txt:716
10425
10420
msgid ""
10426
10421
"bzr.default_mergetool\n"
10427
10422
"~~~~~~~~~~~~~~~~~~~~~"
10428
10423
msgstr ""
10429
10424
10430
#: en/help_topics/configuration.txt:707
10425
#: en/help_topics/configuration.txt:719
10431
10426
msgid ""
10432
10427
"Specifies which external merge tool (as defined above) should be selected "
10433
10428
"by\n"
10434
10429
"default in tools such as ``bzr qconflicts``."
10435
10430
msgstr ""
10436
10431
10437
#: en/help_topics/configuration.txt:712
10432
#: en/help_topics/configuration.txt:724
10438
10433
msgid " bzr.default_mergetool = kdiff3\n"
10439
10434
msgstr ""
10440
10435
11385
11380
"branch can now be pushed to the mainline.\n"
11386
11381
msgstr ""
11387
11382
11383
#: en/help_topics/env-variables.txt:1
11384
msgid "Environment Variables"
11385
msgstr ""
11386
11387
#: en/help_topics/env-variables.txt:3
11388
msgid ""
11389
"=================== "
11390
"===========================================================\n"
11391
"BZRPATH Path where bzr is to look for shell plugin external\n"
11392
" commands.\n"
11393
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11394
"EMAIL E-Mail address of the user.\n"
11395
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11396
"EDITOR Editor for editing commit messages.\n"
11397
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11398
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11399
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11400
"BZR_PLUGIN_PATH.\n"
11401
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11402
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11403
"and\n"
11404
" HOME.\n"
11405
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11406
"URLs).\n"
11407
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11408
"sshcorp,\n"
11409
" plink or lsh.\n"
11410
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11411
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11412
"BZR_COLUMNS Override implicit terminal width.\n"
11413
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11414
"(selftest)\n"
11415
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11416
"'text'.\n"
11417
"BZR_PDB Control whether to launch a debugger on error.\n"
11418
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11419
" breakin debugger.\n"
11420
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11421
"(instead\n"
11422
" of char-based).\n"
11423
"=================== "
11424
"===========================================================\n"
11425
msgstr ""
11426
11388
11427
#: en/help_topics/eol.txt:1
11389
11428
msgid ""
11390
11429
"End of Line Conversion\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1