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