« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6562.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6562.1.1
- Committer: John Arbash Meinel
- Date: 2012-09-19 07:58:27 UTC
- mfrom: (6437.63.9 2.5)
- mto: This revision was merged to the branch mainline in revision 6563.
- Revision ID: john@arbash-meinel.com-20120919075827-36b2b042kiaps0d3
Merge bzr-2.5.2 into trunk to get the fixes for ConnectionReset.
- files removed:
- bzrlib/tests/blackbox/test_verify_signatures.py
- files modified:
- .bzrignore
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: 2013-07-27 12:45+0200\n"
11
"POT-Creation-Date: 2012-07-10 11:35+0200\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"
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr ""
24
24
25
#: bzrlib/branch.py:872
25
#: bzrlib/branch.py:854
26
26
msgid "Unstacking"
27
27
msgstr ""
28
28
29
#: bzrlib/branch.py:3012
29
#: bzrlib/branch.py:2955
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr ""
33
33
34
#: bzrlib/branch.py:3014
34
#: bzrlib/branch.py:2957
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] ""
39
39
msgstr[1] ""
40
40
41
#: bzrlib/branch.py:3017
41
#: bzrlib/branch.py:2960
42
42
msgid "No new revisions or tags to push."
43
43
msgstr ""
44
44
45
#: bzrlib/branch.py:3019
45
#: bzrlib/branch.py:2962
46
46
msgid "No new revisions to push."
47
47
msgstr ""
48
48
49
#: bzrlib/branch.py:3039
49
#: bzrlib/branch.py:2982
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3042
53
#: bzrlib/branch.py:2985
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr ""
57
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr ""
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:5229
191
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
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:5231
195
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
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
272
msgid "Revision numbers only make sense for single revisions, not ranges"
271
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
272
msgid "Tags can only be placed on a single revision, not on a range"
273
273
msgstr ""
274
274
275
275
# help of 'tree' option of 'revno' command
521
521
"master branch."
522
522
msgstr ""
523
523
524
#: bzrlib/builtins.py:1188
525
msgid "No working tree, ignoring --show-base"
524
#: bzrlib/builtins.py:1189
525
msgid "Need working tree for --show-base."
526
526
msgstr ""
527
527
528
#: bzrlib/builtins.py:1204
528
#: bzrlib/builtins.py:1205
529
529
msgid "No pull location known or specified."
530
530
msgstr ""
531
531
532
#: bzrlib/builtins.py:1210
532
#: bzrlib/builtins.py:1211
533
533
#, python-format
534
534
msgid "Using saved parent location: %s\n"
535
535
msgstr ""
536
536
537
#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423
537
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
538
538
msgid "Cannot use -r with merge directives or bundles"
539
539
msgstr ""
540
540
541
#: bzrlib/builtins.py:1260
541
#: bzrlib/builtins.py:1261
542
542
msgid "Update a mirror of this branch."
543
543
msgstr ""
544
544
545
#: bzrlib/builtins.py:1262
545
#: bzrlib/builtins.py:1263
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:1265
551
#: bzrlib/builtins.py:1266
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:1268
557
#: bzrlib/builtins.py:1269
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:1272
564
#: bzrlib/builtins.py:1273
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:1275
570
#: bzrlib/builtins.py:1276
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:1279
577
#: bzrlib/builtins.py:1280
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:1284
585
#: bzrlib/builtins.py:1285
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:1295 bzrlib/foreign.py:272
594
#: bzrlib/builtins.py:1296 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:1298
600
#: bzrlib/builtins.py:1299
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:1303
607
#: bzrlib/builtins.py:1304
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:1306
614
#: bzrlib/builtins.py:1307
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:1311 bzrlib/foreign.py:279
623
#: bzrlib/builtins.py:1312 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:1314
630
#: bzrlib/builtins.py:1315
631
631
msgid "Don't populate the working tree, even for protocols that support it."
632
632
msgstr ""
633
633
634
634
# help of 'overwrite-tags' option of 'pull' command
635
635
# help of 'overwrite-tags' option of 'push' command
636
#: bzrlib/builtins.py:1317
636
#: bzrlib/builtins.py:1318
637
637
msgid "Overwrite tags only."
638
638
msgstr ""
639
639
640
#: bzrlib/builtins.py:1368
640
#: bzrlib/builtins.py:1369
641
641
msgid "Could not determine branch to refer to."
642
642
msgstr ""
643
643
644
#: bzrlib/builtins.py:1377
644
#: bzrlib/builtins.py:1378
645
645
#, python-format
646
646
msgid ""
647
647
"No push location known or specified. To push to the parent branch (at %s), "
648
648
"use 'bzr push :parent'."
649
649
msgstr ""
650
650
651
#: bzrlib/builtins.py:1383 bzrlib/foreign.py:306
651
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
652
652
msgid "No push location known or specified."
653
653
msgstr ""
654
654
655
#: bzrlib/builtins.py:1387
655
#: bzrlib/builtins.py:1388
656
656
#, python-format
657
657
msgid "Using saved push location: %s"
658
658
msgstr ""
659
659
660
#: bzrlib/builtins.py:1397
660
#: bzrlib/builtins.py:1398
661
661
msgid "Create a new branch that is a copy of an existing branch."
662
662
msgstr ""
663
663
664
#: bzrlib/builtins.py:1399
664
#: bzrlib/builtins.py:1400
665
665
msgid ""
666
666
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
667
667
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
672
672
"create ./foo-bar."
673
673
msgstr ""
674
674
675
#: bzrlib/builtins.py:1406
675
#: bzrlib/builtins.py:1407
676
676
msgid ""
677
677
"To retrieve the branch as of a particular revision, supply the --revision\n"
678
678
"parameter, as in \"branch foo/bar -r 5\"."
679
679
msgstr ""
680
680
681
#: bzrlib/builtins.py:1409
681
#: bzrlib/builtins.py:1410
682
682
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
683
683
msgstr ""
684
684
685
685
# help of 'no-tree' option of 'branch' command
686
#: bzrlib/builtins.py:1419
686
#: bzrlib/builtins.py:1420
687
687
msgid "Create a branch without a working-tree."
688
688
msgstr ""
689
689
690
690
# help of 'switch' option of 'branch' command
691
#: bzrlib/builtins.py:1421
691
#: bzrlib/builtins.py:1422
692
692
msgid "Switch the checkout in the current directory to the new branch."
693
693
msgstr ""
694
694
695
695
# help of 'stacked' option of 'branch' command
696
#: bzrlib/builtins.py:1424
696
#: bzrlib/builtins.py:1425
697
697
msgid ""
698
698
"Create a stacked branch referring to the source branch. The new branch will "
699
699
"depend on the availability of the source branch for all operations."
700
700
msgstr ""
701
701
702
702
# help of 'standalone' option of 'branch' command
703
#: bzrlib/builtins.py:1428
703
#: bzrlib/builtins.py:1429
704
704
msgid "Do not use a shared repository, even if available."
705
705
msgstr ""
706
706
707
707
# help of 'use-existing-dir' option of 'branch' command
708
#: bzrlib/builtins.py:1430
708
#: bzrlib/builtins.py:1431
709
709
msgid ""
710
710
"By default branch will fail if the target directory exists, but does not "
711
711
"already have a control directory. This flag will allow branch to proceed."
712
712
msgstr ""
713
713
714
714
# help of 'bind' option of 'branch' command
715
#: bzrlib/builtins.py:1435
715
#: bzrlib/builtins.py:1436
716
716
msgid "Bind new branch to from location."
717
717
msgstr ""
718
718
719
#: bzrlib/builtins.py:1482
719
#: bzrlib/builtins.py:1483
720
720
#, python-format
721
721
msgid "Target directory \"%s\" already exists."
722
722
msgstr ""
723
723
724
#: bzrlib/builtins.py:1494
724
#: bzrlib/builtins.py:1495
725
725
#, python-format
726
726
msgid "Parent of \"%s\" does not exist."
727
727
msgstr ""
728
728
729
#: bzrlib/builtins.py:1513
729
#: bzrlib/builtins.py:1514
730
730
msgid "The branch {0} has no revision {1}."
731
731
msgstr ""
732
732
733
#: bzrlib/builtins.py:1528 bzrlib/push.py:53
733
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
734
734
#, python-format
735
735
msgid "Created new stacked branch referring to %s."
736
736
msgstr ""
737
737
738
#: bzrlib/builtins.py:1532
738
#: bzrlib/builtins.py:1533
739
739
#, python-format
740
740
msgid "Branched %d revision."
741
741
msgid_plural "Branched %d revisions."
742
742
msgstr[0] ""
743
743
msgstr[1] ""
744
744
745
#: bzrlib/builtins.py:1537
745
#: bzrlib/builtins.py:1538
746
746
#, python-format
747
747
msgid "New branch bound to %s"
748
748
msgstr ""
749
749
750
#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283
750
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
751
751
#, python-format
752
752
msgid "Switched to branch: %s"
753
753
msgstr ""
754
754
755
#: bzrlib/builtins.py:1547
755
#: bzrlib/builtins.py:1548
756
756
msgid "List the branches available at the current location."
757
757
msgstr ""
758
758
759
#: bzrlib/builtins.py:1549
759
#: bzrlib/builtins.py:1550
760
760
msgid ""
761
761
"This command will print the names of all the branches at the current\n"
762
762
"location."
763
763
msgstr ""
764
764
765
765
# help of 'recursive' option of 'branches' command
766
#: bzrlib/builtins.py:1556
766
#: bzrlib/builtins.py:1557
767
767
msgid ""
768
768
"Recursively scan for branches rather than just looking in the specified "
769
769
"location."
770
770
msgstr ""
771
771
772
#: bzrlib/builtins.py:1585
772
#: bzrlib/builtins.py:1586
773
773
msgid "(default)"
774
774
msgstr ""
775
775
776
#: bzrlib/builtins.py:1597
776
#: bzrlib/builtins.py:1598
777
777
msgid "Create a new checkout of an existing branch."
778
778
msgstr ""
779
779
780
#: bzrlib/builtins.py:1599
780
#: bzrlib/builtins.py:1600
781
781
msgid ""
782
782
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
783
783
"for\n"
787
787
"location using SFTP."
788
788
msgstr ""
789
789
790
#: bzrlib/builtins.py:1604
790
#: bzrlib/builtins.py:1605
791
791
msgid ""
792
792
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
793
793
"will\n"
799
799
"create ./foo-bar."
800
800
msgstr ""
801
801
802
#: bzrlib/builtins.py:1611
802
#: bzrlib/builtins.py:1612
803
803
msgid ""
804
804
"To retrieve the branch as of a particular revision, supply the --revision\n"
805
805
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
810
810
msgstr ""
811
811
812
812
# help of 'lightweight' option of 'checkout' command
813
#: bzrlib/builtins.py:1621
813
#: bzrlib/builtins.py:1622
814
814
msgid ""
815
815
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
816
816
"the branch for every operation. Normal checkouts can perform common "
820
820
821
821
# help of 'files-from' option of 'branch' command
822
822
# help of 'files-from' option of 'checkout' command
823
#: bzrlib/builtins.py:1628
823
#: bzrlib/builtins.py:1629
824
824
msgid "Get file contents from this tree."
825
825
msgstr ""
826
826
827
827
# help of 'hardlink' option of 'branch' command
828
828
# help of 'hardlink' option of 'checkout' command
829
#: bzrlib/builtins.py:1630
829
#: bzrlib/builtins.py:1631
830
830
msgid "Hard-link working tree files where possible."
831
831
msgstr ""
832
832
833
#: bzrlib/builtins.py:1671
833
#: bzrlib/builtins.py:1672
834
834
msgid ""
835
835
"Show list of renamed files.\n"
836
836
" "
837
837
msgstr ""
838
838
839
#: bzrlib/builtins.py:1699
839
#: bzrlib/builtins.py:1700
840
840
msgid "Update a working tree to a new revision."
841
841
msgstr ""
842
842
843
#: bzrlib/builtins.py:1701
843
#: bzrlib/builtins.py:1702
844
844
msgid ""
845
845
"This will perform a merge of the destination revision (the tip of the\n"
846
846
"branch, or the specified revision) into the working tree, and then make\n"
847
847
"that revision the basis revision for the working tree. "
848
848
msgstr ""
849
849
850
#: bzrlib/builtins.py:1705
850
#: bzrlib/builtins.py:1706
851
851
msgid ""
852
852
"You can use this to visit an older revision, or to update a working tree\n"
853
853
"that is out of date from its branch."
854
854
msgstr ""
855
855
856
#: bzrlib/builtins.py:1708
856
#: bzrlib/builtins.py:1709
857
857
msgid ""
858
858
"If there are any uncommitted changes in the tree, they will be carried\n"
859
859
"across and remain as uncommitted changes after the update. To discard\n"
861
861
"with the changes brought in by the change in basis revision."
862
862
msgstr ""
863
863
864
#: bzrlib/builtins.py:1713
864
#: bzrlib/builtins.py:1714
865
865
msgid ""
866
866
"If the tree's branch is bound to a master branch, bzr will also update\n"
867
867
"the branch from the master."
868
868
msgstr ""
869
869
870
#: bzrlib/builtins.py:1716
870
#: bzrlib/builtins.py:1717
871
871
msgid ""
872
872
"You cannot update just a single file or directory, because each Bazaar\n"
873
873
"working tree has just a single basis revision. If you want to restore a\n"
877
877
"out the old content of that file to a new location."
878
878
msgstr ""
879
879
880
#: bzrlib/builtins.py:1723
880
#: bzrlib/builtins.py:1724
881
881
msgid ""
882
882
"The 'dir' argument, if given, must be the location of the root of a\n"
883
883
"working tree to update. By default, the working tree that contains the \n"
884
884
"current working directory is used."
885
885
msgstr ""
886
886
887
#: bzrlib/builtins.py:1739
887
#: bzrlib/builtins.py:1740
888
888
msgid "bzr update --revision takes exactly one revision"
889
889
msgstr ""
890
890
891
#: bzrlib/builtins.py:1747
891
#: bzrlib/builtins.py:1748
892
892
msgid "bzr update can only update a whole tree, not a file or subdirectory"
893
893
msgstr ""
894
894
895
#: bzrlib/builtins.py:1778
895
#: bzrlib/builtins.py:1779
896
896
msgid "Tree is up to date at revision {0} of branch {1}"
897
897
msgstr ""
898
898
899
#: bzrlib/builtins.py:1794
899
#: bzrlib/builtins.py:1795
900
900
#, python-format
901
901
msgid ""
902
902
"branch has no revision %s\n"
903
903
"bzr update --revision only works for a revision in the branch history"
904
904
msgstr ""
905
905
906
#: bzrlib/builtins.py:1800
906
#: bzrlib/builtins.py:1801
907
907
msgid "Updated to revision {0} of branch {1}"
908
908
msgstr ""
909
909
910
#: bzrlib/builtins.py:1804
910
#: bzrlib/builtins.py:1805
911
911
msgid ""
912
912
"Your local commits will now show as pending merges with 'bzr status', and "
913
913
"can be committed with 'bzr commit'."
914
914
msgstr ""
915
915
916
#: bzrlib/builtins.py:1813
916
#: bzrlib/builtins.py:1814
917
917
msgid "Show information about a working tree, branch or repository."
918
918
msgstr ""
919
919
920
#: bzrlib/builtins.py:1815
920
#: bzrlib/builtins.py:1816
921
921
msgid ""
922
922
"This command will show all known locations and formats associated to the\n"
923
923
"tree, branch or repository."
924
924
msgstr ""
925
925
926
#: bzrlib/builtins.py:1818
926
#: bzrlib/builtins.py:1819
927
927
msgid ""
928
928
"In verbose mode, statistical information is included with each report.\n"
929
929
"To see extended statistic information, use a verbosity level of 2 or\n"
930
930
"higher by specifying the verbose option multiple times, e.g. -vv."
931
931
msgstr ""
932
932
933
#: bzrlib/builtins.py:1822
933
#: bzrlib/builtins.py:1823
934
934
msgid "Branches and working trees will also report any missing revisions."
935
935
msgstr ""
936
936
937
#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883
938
#: bzrlib/builtins.py:6469
937
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
938
#: bzrlib/builtins.py:6466
939
939
msgid ":Examples:"
940
940
msgstr ""
941
941
942
#: bzrlib/builtins.py:1826
942
#: bzrlib/builtins.py:1827
943
943
msgid " Display information on the format and related locations:"
944
944
msgstr ""
945
945
946
#: bzrlib/builtins.py:1828
946
#: bzrlib/builtins.py:1829
947
947
msgid " bzr info"
948
948
msgstr ""
949
949
950
#: bzrlib/builtins.py:1830
950
#: bzrlib/builtins.py:1831
951
951
msgid ""
952
952
" Display the above together with extended format information and\n"
953
953
" basic statistics (like the number of files in the working tree and\n"
954
954
" number of revisions in the branch and repository):"
955
955
msgstr ""
956
956
957
#: bzrlib/builtins.py:1834
957
#: bzrlib/builtins.py:1835
958
958
msgid " bzr info -v"
959
959
msgstr ""
960
960
961
#: bzrlib/builtins.py:1836
961
#: bzrlib/builtins.py:1837
962
962
msgid " Display the above together with number of committers to the branch:"
963
963
msgstr ""
964
964
965
#: bzrlib/builtins.py:1838
965
#: bzrlib/builtins.py:1839
966
966
msgid " bzr info -vv"
967
967
msgstr ""
968
968
969
#: bzrlib/builtins.py:1857
969
#: bzrlib/builtins.py:1858
970
970
msgid "Remove files or directories."
971
971
msgstr ""
972
972
973
#: bzrlib/builtins.py:1859
973
#: bzrlib/builtins.py:1860
974
974
msgid ""
975
975
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
976
976
"delete them if they can easily be recovered using revert otherwise they\n"
980
980
msgstr ""
981
981
982
982
# help of 'new' option of 'remove' command
983
#: bzrlib/builtins.py:1867
983
#: bzrlib/builtins.py:1868
984
984
msgid "Only remove files that have never been committed."
985
985
msgstr ""
986
986
987
987
# help of 'file-deletion-strategy' option of 'remove' command
988
#: bzrlib/builtins.py:1869
988
#: bzrlib/builtins.py:1870
989
989
msgid "The file deletion mode to be used."
990
990
msgstr ""
991
991
992
992
# title of 'file-deletion-strategy' option of 'remove' command
993
#: bzrlib/builtins.py:1870
993
#: bzrlib/builtins.py:1871
994
994
msgid "Deletion Strategy"
995
995
msgstr ""
996
996
997
997
# help of 'file-deletion-strategy=safe' option of 'remove' command
998
#: bzrlib/builtins.py:1871
998
#: bzrlib/builtins.py:1872
999
999
msgid "Backup changed files (default)."
1000
1000
msgstr ""
1001
1001
1002
1002
# help of 'file-deletion-strategy=keep' option of 'remove' command
1003
#: bzrlib/builtins.py:1872
1003
#: bzrlib/builtins.py:1873
1004
1004
msgid "Delete from bzr but leave the working copy."
1005
1005
msgstr ""
1006
1006
1007
1007
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
1008
#: bzrlib/builtins.py:1873
1008
#: bzrlib/builtins.py:1874
1009
1009
msgid "Don't backup changed files."
1010
1010
msgstr ""
1011
1011
1012
#: bzrlib/builtins.py:1894
1012
# help of 'file-deletion-strategy=force' option of 'remove' command
1013
#: bzrlib/builtins.py:1875
1014
msgid ""
1015
"Delete all the specified files, even if they can not be recovered and even "
1016
"if they are non-empty directories. (deprecated, use no-backup)"
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:1884
1020
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1021
msgstr ""
1022
1023
#: bzrlib/builtins.py:1901
1013
1024
msgid "No matching files."
1014
1025
msgstr ""
1015
1026
1016
#: bzrlib/builtins.py:1955
1027
#: bzrlib/builtins.py:1962
1017
1028
msgid "Reconcile bzr metadata in a branch."
1018
1029
msgstr ""
1019
1030
1020
#: bzrlib/builtins.py:1957
1031
#: bzrlib/builtins.py:1964
1021
1032
msgid ""
1022
1033
"This can correct data mismatches that may have been caused by\n"
1023
1034
"previous ghost operations or bzr upgrades. You should only\n"
1025
1036
"advises you to run it."
1026
1037
msgstr ""
1027
1038
1028
#: bzrlib/builtins.py:1962
1039
#: bzrlib/builtins.py:1969
1029
1040
msgid ""
1030
1041
"If a second branch is provided, cross-branch reconciliation is\n"
1031
1042
"also attempted, which will check that data like the tree root\n"
1033
1044
"correctly in both branches."
1034
1045
msgstr ""
1035
1046
1036
#: bzrlib/builtins.py:1967
1047
#: bzrlib/builtins.py:1974
1037
1048
msgid ""
1038
1049
"At the same time it is run it may recompress data resulting in\n"
1039
1050
"a potential saving in disk space or performance gain."
1040
1051
msgstr ""
1041
1052
1042
#: bzrlib/builtins.py:1970
1053
#: bzrlib/builtins.py:1977
1043
1054
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1044
1055
msgstr ""
1045
1056
1049
1060
# help of 'format=default' option of 'init-repository' command
1050
1061
# help of 'format=2a' option of 'upgrade' command
1051
1062
# help of 'format=default' option of 'upgrade' command
1052
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1063
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1053
1064
msgid ""
1054
1065
"Format for the bzr 2.0 series.\n"
1055
1066
"Uses group-compress storage.\n"
1059
1070
# help of 'format=pack-0.92' option of 'init' command
1060
1071
# help of 'format=pack-0.92' option of 'init-repository' command
1061
1072
# help of 'format=pack-0.92' option of 'upgrade' command
1062
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1073
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1063
1074
msgid ""
1064
1075
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1065
1076
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1068
1079
# help of 'format=development-colo' option of 'init' command
1069
1080
# help of 'format=development-colo' option of 'init-repository' command
1070
1081
# help of 'format=development-colo' option of 'upgrade' command
1071
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1082
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1072
1083
msgid "The 2a format with experimental support for colocated branches.\n"
1073
1084
msgstr ""
1074
1085
1075
#: bzrlib/builtins.py:2038
1086
#: bzrlib/builtins.py:2045
1076
1087
msgid "Make a directory into a versioned branch."
1077
1088
msgstr ""
1078
1089
1079
#: bzrlib/builtins.py:2040
1090
#: bzrlib/builtins.py:2047
1080
1091
msgid ""
1081
1092
"Use this to create an empty branch, or before importing an\n"
1082
1093
"existing project."
1083
1094
msgstr ""
1084
1095
1085
#: bzrlib/builtins.py:2043
1096
#: bzrlib/builtins.py:2050
1086
1097
msgid ""
1087
1098
"If there is a repository in a parent directory of the location, then\n"
1088
1099
"the history of the branch will be stored in the repository. Otherwise\n"
1090
1101
"in the .bzr directory."
1091
1102
msgstr ""
1092
1103
1093
#: bzrlib/builtins.py:2048
1104
#: bzrlib/builtins.py:2055
1094
1105
msgid ""
1095
1106
"If there is already a branch at the location but it has no working tree,\n"
1096
1107
"the tree can be populated with 'bzr checkout'."
1097
1108
msgstr ""
1098
1109
1099
#: bzrlib/builtins.py:2051
1110
#: bzrlib/builtins.py:2058
1100
1111
msgid "Recipe for importing a tree of files::"
1101
1112
msgstr ""
1102
1113
1103
#: bzrlib/builtins.py:2053
1114
#: bzrlib/builtins.py:2060
1104
1115
msgid ""
1105
1116
" cd ~/project\n"
1106
1117
" bzr init\n"
1111
1122
1112
1123
# help of 'create-prefix' option of 'init' command
1113
1124
# help of 'create-prefix' option of 'push' command
1114
#: bzrlib/builtins.py:2064
1125
#: bzrlib/builtins.py:2071
1115
1126
msgid "Create the path leading up to the branch if it does not already exist."
1116
1127
msgstr ""
1117
1128
1118
1129
# help of 'format' option of 'init' command
1119
#: bzrlib/builtins.py:2067
1130
#: bzrlib/builtins.py:2074
1120
1131
msgid "Specify a format for this branch. See \"help formats\"."
1121
1132
msgstr ""
1122
1133
1123
1134
# help of 'append-revisions-only' option of 'init' command
1124
#: bzrlib/builtins.py:2075
1135
#: bzrlib/builtins.py:2082
1125
1136
msgid "Never change revnos or the existing log. Append revisions to it only."
1126
1137
msgstr ""
1127
1138
1128
1139
# help of 'no-tree' option of 'init' command
1129
#: bzrlib/builtins.py:2078
1140
#: bzrlib/builtins.py:2085
1130
1141
msgid "Create a branch without a working tree."
1131
1142
msgstr ""
1132
1143
1133
#: bzrlib/builtins.py:2098 bzrlib/push.py:110
1144
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1134
1145
#, python-format
1135
1146
msgid ""
1136
1147
"Parent directory of %s does not exist.\n"
1137
1148
"You may supply --create-prefix to create all leading parent directories."
1138
1149
msgstr ""
1139
1150
1140
#: bzrlib/builtins.py:2132
1151
#: bzrlib/builtins.py:2139
1141
1152
msgid ""
1142
1153
"This branch format cannot be set to append-revisions-only. Try --default."
1143
1154
msgstr ""
1144
1155
1145
#: bzrlib/builtins.py:2143
1156
#: bzrlib/builtins.py:2150
1146
1157
msgid "Created a {0} (format: {1})\n"
1147
1158
msgstr ""
1148
1159
1149
#: bzrlib/builtins.py:2152
1160
#: bzrlib/builtins.py:2159
1150
1161
#, python-format
1151
1162
msgid "Using shared repository: %s\n"
1152
1163
msgstr ""
1153
1164
1154
#: bzrlib/builtins.py:2156
1165
#: bzrlib/builtins.py:2163
1155
1166
msgid "Create a shared repository for branches to share storage space."
1156
1167
msgstr ""
1157
1168
1158
#: bzrlib/builtins.py:2158
1169
#: bzrlib/builtins.py:2165
1159
1170
msgid ""
1160
1171
"New branches created under the repository directory will store their\n"
1161
1172
"revisions in the repository, not in the branch directory. For branches\n"
1163
1174
"speeds up the creation of new branches."
1164
1175
msgstr ""
1165
1176
1166
#: bzrlib/builtins.py:2163
1177
#: bzrlib/builtins.py:2170
1167
1178
msgid ""
1168
1179
"If the --no-trees option is given then the branches in the repository\n"
1169
1180
"will not have working trees by default. They will still exist as \n"
1173
1184
"branches, such as on a server."
1174
1185
msgstr ""
1175
1186
1176
#: bzrlib/builtins.py:2170
1187
#: bzrlib/builtins.py:2177
1177
1188
msgid ""
1178
1189
":Examples:\n"
1179
1190
" Create a shared repository holding just branches::"
1180
1191
msgstr ""
1181
1192
1182
#: bzrlib/builtins.py:2173
1193
#: bzrlib/builtins.py:2180
1183
1194
msgid ""
1184
1195
" bzr init-repo --no-trees repo\n"
1185
1196
" bzr init repo/trunk"
1186
1197
msgstr ""
1187
1198
1188
#: bzrlib/builtins.py:2176
1199
#: bzrlib/builtins.py:2183
1189
1200
msgid " Make a lightweight checkout elsewhere::"
1190
1201
msgstr ""
1191
1202
1192
#: bzrlib/builtins.py:2178
1203
#: bzrlib/builtins.py:2185
1193
1204
msgid ""
1194
1205
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1195
1206
" cd trunk-checkout\n"
1197
1208
msgstr ""
1198
1209
1199
1210
# help of 'format' option of 'init-repository' command
1200
#: bzrlib/builtins.py:2186
1211
#: bzrlib/builtins.py:2193
1201
1212
msgid ""
1202
1213
"Specify a format for this repository. See \"bzr help formats\" for details."
1203
1214
msgstr ""
1204
1215
1205
1216
# title of 'format' option of 'init-repository' command
1206
#: bzrlib/builtins.py:2190
1217
#: bzrlib/builtins.py:2197
1207
1218
msgid "Repository format"
1208
1219
msgstr ""
1209
1220
1210
1221
# help of 'no-trees' option of 'init-repository' command
1211
#: bzrlib/builtins.py:2192
1222
#: bzrlib/builtins.py:2199
1212
1223
msgid "Branches in the repository will default to not having a working tree."
1213
1224
msgstr ""
1214
1225
1215
#: bzrlib/builtins.py:2218
1226
#: bzrlib/builtins.py:2225
1216
1227
msgid "Show differences in the working tree, between revisions or branches."
1217
1228
msgstr ""
1218
1229
1219
#: bzrlib/builtins.py:2220
1230
#: bzrlib/builtins.py:2227
1220
1231
msgid ""
1221
1232
"If no arguments are given, all changes for the current tree are listed.\n"
1222
1233
"If files are given, only the changes in those files are listed.\n"
1226
1237
"given."
1227
1238
msgstr ""
1228
1239
1229
#: bzrlib/builtins.py:2227
1240
#: bzrlib/builtins.py:2234
1230
1241
msgid ""
1231
1242
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1232
1243
"produces patches suitable for \"patch -p1\"."
1233
1244
msgstr ""
1234
1245
1235
#: bzrlib/builtins.py:2230
1246
#: bzrlib/builtins.py:2237
1236
1247
msgid ""
1237
1248
"Note that when using the -r argument with a range of revisions, the\n"
1238
1249
"differences are computed between the two specified revisions. That\n"
1242
1253
"in the range."
1243
1254
msgstr ""
1244
1255
1245
#: bzrlib/builtins.py:2237
1256
#: bzrlib/builtins.py:2244
1246
1257
msgid ""
1247
1258
":Exit values:\n"
1248
1259
" 1 - changed\n"
1251
1262
" 0 - no change"
1252
1263
msgstr ""
1253
1264
1254
#: bzrlib/builtins.py:2243
1265
#: bzrlib/builtins.py:2250
1255
1266
msgid ""
1256
1267
":Examples:\n"
1257
1268
" Shows the difference in the working tree versus the last commit::"
1258
1269
msgstr ""
1259
1270
1260
#: bzrlib/builtins.py:2246
1271
#: bzrlib/builtins.py:2253
1261
1272
msgid " bzr diff"
1262
1273
msgstr ""
1263
1274
1264
#: bzrlib/builtins.py:2248
1275
#: bzrlib/builtins.py:2255
1265
1276
msgid " Difference between the working tree and revision 1::"
1266
1277
msgstr ""
1267
1278
1268
#: bzrlib/builtins.py:2250
1279
#: bzrlib/builtins.py:2257
1269
1280
msgid " bzr diff -r1"
1270
1281
msgstr ""
1271
1282
1272
#: bzrlib/builtins.py:2252
1283
#: bzrlib/builtins.py:2259
1273
1284
msgid " Difference between revision 3 and revision 1::"
1274
1285
msgstr ""
1275
1286
1276
#: bzrlib/builtins.py:2254
1287
#: bzrlib/builtins.py:2261
1277
1288
msgid " bzr diff -r1..3"
1278
1289
msgstr ""
1279
1290
1280
#: bzrlib/builtins.py:2256
1291
#: bzrlib/builtins.py:2263
1281
1292
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1282
1293
msgstr ""
1283
1294
1284
#: bzrlib/builtins.py:2258
1295
#: bzrlib/builtins.py:2265
1285
1296
msgid " bzr diff -r1..3 xxx"
1286
1297
msgstr ""
1287
1298
1288
#: bzrlib/builtins.py:2260
1299
#: bzrlib/builtins.py:2267
1289
1300
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1290
1301
msgstr ""
1291
1302
1292
#: bzrlib/builtins.py:2262
1303
#: bzrlib/builtins.py:2269
1293
1304
msgid " bzr diff -c2"
1294
1305
msgstr ""
1295
1306
1296
#: bzrlib/builtins.py:2264
1307
#: bzrlib/builtins.py:2271
1297
1308
msgid ""
1298
1309
" To see the changes introduced by revision X::\n"
1299
1310
" \n"
1300
1311
" bzr diff -cX"
1301
1312
msgstr ""
1302
1313
1303
#: bzrlib/builtins.py:2268
1314
#: bzrlib/builtins.py:2275
1304
1315
msgid ""
1305
1316
" Note that in the case of a merge, the -c option shows the changes\n"
1306
1317
" compared to the left hand parent. To see the changes against\n"
1307
1318
" another parent, use::"
1308
1319
msgstr ""
1309
1320
1310
#: bzrlib/builtins.py:2272
1321
#: bzrlib/builtins.py:2279
1311
1322
msgid " bzr diff -r<chosen_parent>..X"
1312
1323
msgstr ""
1313
1324
1314
#: bzrlib/builtins.py:2274
1325
#: bzrlib/builtins.py:2281
1315
1326
msgid ""
1316
1327
" The changes between the current revision and the previous revision\n"
1317
1328
" (equivalent to -c-1 and -r-2..-1)"
1318
1329
msgstr ""
1319
1330
1320
#: bzrlib/builtins.py:2277
1331
#: bzrlib/builtins.py:2284
1321
1332
msgid " bzr diff -r-2.."
1322
1333
msgstr ""
1323
1334
1324
#: bzrlib/builtins.py:2279
1335
#: bzrlib/builtins.py:2286
1325
1336
msgid " Show just the differences for file NEWS::"
1326
1337
msgstr ""
1327
1338
1328
#: bzrlib/builtins.py:2281
1339
#: bzrlib/builtins.py:2288
1329
1340
msgid " bzr diff NEWS"
1330
1341
msgstr ""
1331
1342
1332
#: bzrlib/builtins.py:2283
1343
#: bzrlib/builtins.py:2290
1333
1344
msgid " Show the differences in working tree xxx for file NEWS::"
1334
1345
msgstr ""
1335
1346
1336
#: bzrlib/builtins.py:2285
1347
#: bzrlib/builtins.py:2292
1337
1348
msgid " bzr diff xxx/NEWS"
1338
1349
msgstr ""
1339
1350
1340
#: bzrlib/builtins.py:2287
1351
#: bzrlib/builtins.py:2294
1341
1352
msgid " Show the differences from branch xxx to this working tree:"
1342
1353
msgstr ""
1343
1354
1344
#: bzrlib/builtins.py:2289
1355
#: bzrlib/builtins.py:2296
1345
1356
msgid " bzr diff --old xxx"
1346
1357
msgstr ""
1347
1358
1348
#: bzrlib/builtins.py:2291
1359
#: bzrlib/builtins.py:2298
1349
1360
msgid " Show the differences between two branches for file NEWS::"
1350
1361
msgstr ""
1351
1362
1352
#: bzrlib/builtins.py:2293
1363
#: bzrlib/builtins.py:2300
1353
1364
msgid " bzr diff --old xxx --new yyy NEWS"
1354
1365
msgstr ""
1355
1366
1356
#: bzrlib/builtins.py:2295
1367
#: bzrlib/builtins.py:2302
1357
1368
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1358
1369
msgstr ""
1359
1370
1360
#: bzrlib/builtins.py:2297
1371
#: bzrlib/builtins.py:2304
1361
1372
msgid ""
1362
1373
" bzr diff --prefix old/:new/\n"
1363
1374
" \n"
1367
1378
msgstr ""
1368
1379
1369
1380
# help of 'diff-options' option of 'diff' command
1370
#: bzrlib/builtins.py:2307
1381
#: bzrlib/builtins.py:2314
1371
1382
msgid "Pass these options to the external diff program."
1372
1383
msgstr ""
1373
1384
1374
1385
# help of 'prefix' option of 'diff' command
1375
#: bzrlib/builtins.py:2310
1386
#: bzrlib/builtins.py:2317
1376
1387
msgid ""
1377
1388
"Set prefixes added to old and new filenames, as two values separated by a "
1378
1389
"colon. (eg \"old/:new/\")."
1379
1390
msgstr ""
1380
1391
1381
1392
# help of 'old' option of 'diff' command
1382
#: bzrlib/builtins.py:2313
1393
#: bzrlib/builtins.py:2320
1383
1394
msgid "Branch/tree to compare from."
1384
1395
msgstr ""
1385
1396
1386
1397
# help of 'new' option of 'diff' command
1387
#: bzrlib/builtins.py:2317
1398
#: bzrlib/builtins.py:2324
1388
1399
msgid "Branch/tree to compare to."
1389
1400
msgstr ""
1390
1401
1391
1402
# help of 'using' option of 'diff' command
1392
#: bzrlib/builtins.py:2323
1403
#: bzrlib/builtins.py:2330
1393
1404
msgid "Use this command to compare files."
1394
1405
msgstr ""
1395
1406
1396
1407
# help of 'format' option of 'diff' command
1397
#: bzrlib/builtins.py:2328
1408
#: bzrlib/builtins.py:2335
1398
1409
msgid "Diff format to use."
1399
1410
msgstr ""
1400
1411
1401
1412
# title of 'format' option of 'diff' command
1402
#: bzrlib/builtins.py:2330
1413
#: bzrlib/builtins.py:2337
1403
1414
msgid "Diff format"
1404
1415
msgstr ""
1405
1416
1406
# help of 'context' option of 'diff' command
1407
#: bzrlib/builtins.py:2332
1408
msgid "How many lines of context to show."
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2357
1417
#: bzrlib/builtins.py:2359
1412
1418
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1413
1419
msgstr ""
1414
1420
1415
#: bzrlib/builtins.py:2361
1421
#: bzrlib/builtins.py:2363
1416
1422
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1417
1423
msgstr ""
1418
1424
1419
#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776
1420
#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957
1425
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1426
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1421
1427
msgid "{0} and {1} are mutually exclusive"
1422
1428
msgstr ""
1423
1429
1424
#: bzrlib/builtins.py:2386
1430
#: bzrlib/builtins.py:2388
1425
1431
msgid ""
1426
1432
"List files deleted in the working tree.\n"
1427
1433
" "
1428
1434
msgstr ""
1429
1435
1430
#: bzrlib/builtins.py:2463
1436
#: bzrlib/builtins.py:2465
1431
1437
msgid "Show the tree root directory."
1432
1438
msgstr ""
1433
1439
1434
#: bzrlib/builtins.py:2465
1440
#: bzrlib/builtins.py:2467
1435
1441
msgid ""
1436
1442
"The root is the nearest enclosing directory with a .bzr control\n"
1437
1443
"directory."
1438
1444
msgstr ""
1439
1445
1440
#: bzrlib/builtins.py:2480
1446
#: bzrlib/builtins.py:2482
1441
1447
msgid "The limit argument must be an integer."
1442
1448
msgstr ""
1443
1449
1444
#: bzrlib/builtins.py:2488
1450
#: bzrlib/builtins.py:2490
1445
1451
msgid "The levels argument must be an integer."
1446
1452
msgstr ""
1447
1453
1448
#: bzrlib/builtins.py:2493
1454
#: bzrlib/builtins.py:2495
1449
1455
msgid "Show historical log for a branch or subset of a branch."
1450
1456
msgstr ""
1451
1457
1452
#: bzrlib/builtins.py:2495
1458
#: bzrlib/builtins.py:2497
1453
1459
msgid ""
1454
1460
"log is bzr's default tool for exploring the history of a branch.\n"
1455
1461
"The branch to use is taken from the first parameter. If no parameters\n"
1457
1463
"Here are some simple examples::"
1458
1464
msgstr ""
1459
1465
1460
#: bzrlib/builtins.py:2500
1466
#: bzrlib/builtins.py:2502
1461
1467
msgid ""
1462
1468
" bzr log log the current branch\n"
1463
1469
" bzr log foo.py log a file in its branch\n"
1464
1470
" bzr log http://server/branch log a branch on a server"
1465
1471
msgstr ""
1466
1472
1467
#: bzrlib/builtins.py:2504
1473
#: bzrlib/builtins.py:2506
1468
1474
msgid ""
1469
1475
"The filtering, ordering and information shown for each revision can\n"
1470
1476
"be controlled as explained below. By default, all revisions are\n"
1474
1480
"were merged."
1475
1481
msgstr ""
1476
1482
1477
#: bzrlib/builtins.py:2511
1483
#: bzrlib/builtins.py:2513
1478
1484
msgid ":Output control:"
1479
1485
msgstr ""
1480
1486
1481
#: bzrlib/builtins.py:2513
1487
#: bzrlib/builtins.py:2515
1482
1488
msgid ""
1483
1489
" The log format controls how information about each revision is\n"
1484
1490
" displayed. The standard log formats are called ``long``, ``short``\n"
1486
1492
" for more details on log formats."
1487
1493
msgstr ""
1488
1494
1489
#: bzrlib/builtins.py:2518
1495
#: bzrlib/builtins.py:2520
1490
1496
msgid ""
1491
1497
" The following options can be used to control what information is\n"
1492
1498
" displayed::"
1493
1499
msgstr ""
1494
1500
1495
#: bzrlib/builtins.py:2521
1501
#: bzrlib/builtins.py:2523
1496
1502
msgid ""
1497
1503
" -l N display a maximum of N revisions\n"
1498
1504
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1501
1507
" --show-ids display revision-ids (and file-ids), not just revnos"
1502
1508
msgstr ""
1503
1509
1504
#: bzrlib/builtins.py:2527
1510
#: bzrlib/builtins.py:2529
1505
1511
msgid ""
1506
1512
" Note that the default number of levels to display is a function of the\n"
1507
1513
" log format. If the -n option is not used, the standard log formats show\n"
1508
1514
" just the top level (mainline)."
1509
1515
msgstr ""
1510
1516
1511
#: bzrlib/builtins.py:2531
1517
#: bzrlib/builtins.py:2533
1512
1518
msgid ""
1513
1519
" Status summaries are shown using status flags like A, M, etc. To see\n"
1514
1520
" the changes explained using words like ``added`` and ``modified``\n"
1515
1521
" instead, use the -vv option."
1516
1522
msgstr ""
1517
1523
1518
#: bzrlib/builtins.py:2535
1524
#: bzrlib/builtins.py:2537
1519
1525
msgid ":Ordering control:"
1520
1526
msgstr ""
1521
1527
1522
#: bzrlib/builtins.py:2537
1528
#: bzrlib/builtins.py:2539
1523
1529
msgid ""
1524
1530
" To display revisions from oldest to newest, use the --forward option.\n"
1525
1531
" In most cases, using this option will have little impact on the total\n"
1527
1533
" display revisions like --reverse does when it can."
1528
1534
msgstr ""
1529
1535
1530
#: bzrlib/builtins.py:2542
1536
#: bzrlib/builtins.py:2544
1531
1537
msgid ":Revision filtering:"
1532
1538
msgstr ""
1533
1539
1534
#: bzrlib/builtins.py:2544
1540
#: bzrlib/builtins.py:2546
1535
1541
msgid ""
1536
1542
" The -r option can be used to specify what revision or range of revisions\n"
1537
1543
" to filter against. The various forms are shown below::"
1538
1544
msgstr ""
1539
1545
1540
#: bzrlib/builtins.py:2547
1546
#: bzrlib/builtins.py:2549
1541
1547
msgid ""
1542
1548
" -rX display revision X\n"
1543
1549
" -rX.. display revision X and later\n"
1545
1551
" -rX..Y display from X to Y inclusive"
1546
1552
msgstr ""
1547
1553
1548
#: bzrlib/builtins.py:2552
1554
#: bzrlib/builtins.py:2554
1549
1555
msgid ""
1550
1556
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1551
1557
" Some common examples are given below::"
1552
1558
msgstr ""
1553
1559
1554
#: bzrlib/builtins.py:2555
1560
#: bzrlib/builtins.py:2557
1555
1561
msgid ""
1556
1562
" -r-1 show just the tip\n"
1557
1563
" -r-10.. show the last 10 mainline revisions\n"
1561
1567
" -rdate:yesterday.. show changes since yesterday"
1562
1568
msgstr ""
1563
1569
1564
#: bzrlib/builtins.py:2562
1570
#: bzrlib/builtins.py:2564
1565
1571
msgid ""
1566
1572
" When logging a range of revisions using -rX..Y, log starts at\n"
1567
1573
" revision Y and searches back in history through the primary\n"
1571
1577
" a nested merge revision and the log will be truncated accordingly."
1572
1578
msgstr ""
1573
1579
1574
#: bzrlib/builtins.py:2569
1580
#: bzrlib/builtins.py:2571
1575
1581
msgid ":Path filtering:"
1576
1582
msgstr ""
1577
1583
1578
#: bzrlib/builtins.py:2571
1584
#: bzrlib/builtins.py:2573
1579
1585
msgid ""
1580
1586
" If parameters are given and the first one is not a branch, the log\n"
1581
1587
" will be filtered to show only those revisions that changed the\n"
1582
1588
" nominated files or directories."
1583
1589
msgstr ""
1584
1590
1585
#: bzrlib/builtins.py:2575
1591
#: bzrlib/builtins.py:2577
1586
1592
msgid ""
1587
1593
" Filenames are interpreted within their historical context. To log a\n"
1588
1594
" deleted file, specify a revision range so that the file existed at\n"
1589
1595
" the end or start of the range."
1590
1596
msgstr ""
1591
1597
1592
#: bzrlib/builtins.py:2579
1598
#: bzrlib/builtins.py:2581
1593
1599
msgid ""
1594
1600
" Historical context is also important when interpreting pathnames of\n"
1595
1601
" renamed files/directories. Consider the following example:"
1596
1602
msgstr ""
1597
1603
1598
#: bzrlib/builtins.py:2582
1604
#: bzrlib/builtins.py:2584
1599
1605
msgid ""
1600
1606
" * revision 1: add tutorial.txt\n"
1601
1607
" * revision 2: modify tutorial.txt\n"
1602
1608
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1603
1609
msgstr ""
1604
1610
1605
#: bzrlib/builtins.py:2586
1611
#: bzrlib/builtins.py:2588
1606
1612
msgid " In this case:"
1607
1613
msgstr ""
1608
1614
1609
#: bzrlib/builtins.py:2588
1615
#: bzrlib/builtins.py:2590
1610
1616
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1611
1617
msgstr ""
1612
1618
1613
#: bzrlib/builtins.py:2590
1619
#: bzrlib/builtins.py:2592
1614
1620
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1615
1621
msgstr ""
1616
1622
1617
#: bzrlib/builtins.py:2592
1623
#: bzrlib/builtins.py:2594
1618
1624
msgid ""
1619
1625
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1620
1626
" the original file in revision 2."
1621
1627
msgstr ""
1622
1628
1623
#: bzrlib/builtins.py:2595
1629
#: bzrlib/builtins.py:2597
1624
1630
msgid ""
1625
1631
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1626
1632
" was no file called guide.txt in revision 2."
1627
1633
msgstr ""
1628
1634
1629
#: bzrlib/builtins.py:2598
1635
#: bzrlib/builtins.py:2600
1630
1636
msgid ""
1631
1637
" Renames are always followed by log. By design, there is no need to\n"
1632
1638
" explicitly ask for this (and no way to stop logging a file back\n"
1633
1639
" until it was last renamed)."
1634
1640
msgstr ""
1635
1641
1636
#: bzrlib/builtins.py:2602
1642
#: bzrlib/builtins.py:2604
1637
1643
msgid ":Other filtering:"
1638
1644
msgstr ""
1639
1645
1640
#: bzrlib/builtins.py:2604
1646
#: bzrlib/builtins.py:2606
1641
1647
msgid ""
1642
1648
" The --match option can be used for finding revisions that match a\n"
1643
1649
" regular expression in a commit message, committer, author or bug.\n"
1646
1652
" --match-message can be used to only match a specific field."
1647
1653
msgstr ""
1648
1654
1649
#: bzrlib/builtins.py:2610
1655
#: bzrlib/builtins.py:2612
1650
1656
msgid ":Tips & tricks:"
1651
1657
msgstr ""
1652
1658
1653
#: bzrlib/builtins.py:2612
1659
#: bzrlib/builtins.py:2614
1654
1660
msgid ""
1655
1661
" GUI tools and IDEs are often better at exploring history than command\n"
1656
1662
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1659
1665
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1660
1666
msgstr ""
1661
1667
1662
#: bzrlib/builtins.py:2618
1668
#: bzrlib/builtins.py:2620
1663
1669
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1664
1670
msgstr ""
1665
1671
1666
#: bzrlib/builtins.py:2620
1672
#: bzrlib/builtins.py:2622
1667
1673
msgid ""
1668
1674
" [ALIASES]\n"
1669
1675
" tip = log -r-1\n"
1671
1677
" show = log -v -p"
1672
1678
msgstr ""
1673
1679
1674
#: bzrlib/builtins.py:2625
1680
#: bzrlib/builtins.py:2627
1675
1681
msgid ""
1676
1682
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1677
1683
" will show the last 10 mainline revisions. To see the details of a\n"
1678
1684
" particular revision X, ``bzr show -rX``."
1679
1685
msgstr ""
1680
1686
1681
#: bzrlib/builtins.py:2629
1687
#: bzrlib/builtins.py:2631
1682
1688
msgid ""
1683
1689
" If you are interested in looking deeper into a particular merge X,\n"
1684
1690
" use ``bzr log -n0 -rX``."
1685
1691
msgstr ""
1686
1692
1687
#: bzrlib/builtins.py:2632
1693
#: bzrlib/builtins.py:2634
1688
1694
msgid ""
1689
1695
" ``bzr log -v`` on a branch with lots of history is currently\n"
1690
1696
" very slow. A fix for this issue is currently under development.\n"
1692
1698
" be given when using the -v option."
1693
1699
msgstr ""
1694
1700
1695
#: bzrlib/builtins.py:2637
1701
#: bzrlib/builtins.py:2639
1696
1702
msgid ""
1697
1703
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1698
1704
" used to find revisions matching user names, commit messages, etc.\n"
1700
1706
" a list of words but not others."
1701
1707
msgstr ""
1702
1708
1703
#: bzrlib/builtins.py:2642
1709
#: bzrlib/builtins.py:2644
1704
1710
msgid ""
1705
1711
" When exploring non-mainline history on large projects with deep\n"
1706
1712
" history, the performance of log can be greatly improved by installing\n"
1709
1715
msgstr ""
1710
1716
1711
1717
# help of 'forward' option of 'log' command
1712
#: bzrlib/builtins.py:2651
1718
#: bzrlib/builtins.py:2653
1713
1719
msgid "Show from oldest to newest."
1714
1720
msgstr ""
1715
1721
1716
1722
# help of 'verbose' option of 'log' command
1717
#: bzrlib/builtins.py:2654
1723
#: bzrlib/builtins.py:2656
1718
1724
msgid "Show files changed in each revision."
1719
1725
msgstr ""
1720
1726
1721
1727
# help of 'change' option of 'log' command
1722
#: bzrlib/builtins.py:2660
1728
#: bzrlib/builtins.py:2662
1723
1729
msgid "Show just the specified revision. See also \"help revisionspec\"."
1724
1730
msgstr ""
1725
1731
1726
1732
# help of 'authors' option of 'log' command
1727
#: bzrlib/builtins.py:2664
1733
#: bzrlib/builtins.py:2666
1728
1734
msgid "What names to list as authors - first, all or committer."
1729
1735
msgstr ""
1730
1736
1731
1737
# title of 'authors' option of 'log' command
1732
#: bzrlib/builtins.py:2665
1738
#: bzrlib/builtins.py:2667
1733
1739
msgid "Authors"
1734
1740
msgstr ""
1735
1741
1736
1742
# help of 'levels' option of 'log' command
1737
#: bzrlib/builtins.py:2670
1743
#: bzrlib/builtins.py:2672
1738
1744
msgid "Number of levels to display - 0 for all, 1 for flat."
1739
1745
msgstr ""
1740
1746
1741
1747
# help of 'limit' option of 'log' command
1742
#: bzrlib/builtins.py:2680
1748
#: bzrlib/builtins.py:2682
1743
1749
msgid "Limit the output to the first N revisions."
1744
1750
msgstr ""
1745
1751
1746
1752
# help of 'show-diff' option of 'log' command
1747
#: bzrlib/builtins.py:2685
1753
#: bzrlib/builtins.py:2687
1748
1754
msgid "Show changes made in each revision as a patch."
1749
1755
msgstr ""
1750
1756
1751
1757
# help of 'include-merged' option of 'log' command
1752
#: bzrlib/builtins.py:2687
1758
#: bzrlib/builtins.py:2689
1753
1759
msgid "Show merged revisions like --levels 0 does."
1754
1760
msgstr ""
1755
1761
1756
1762
# help of 'omit-merges' option of 'log' command
1757
#: bzrlib/builtins.py:2691
1763
#: bzrlib/builtins.py:2693
1758
1764
msgid "Do not report commits with more than one parent."
1759
1765
msgstr ""
1760
1766
1761
1767
# help of 'exclude-common-ancestry' option of 'log' command
1762
#: bzrlib/builtins.py:2693
1768
#: bzrlib/builtins.py:2695
1763
1769
msgid ""
1764
1770
"Display only the revisions that are not part of both ancestries (require -"
1765
1771
"rX..Y)."
1766
1772
msgstr ""
1767
1773
1768
1774
# help of 'signatures' option of 'log' command
1769
#: bzrlib/builtins.py:2697
1775
#: bzrlib/builtins.py:2699
1770
1776
msgid "Show digital signature validity."
1771
1777
msgstr ""
1772
1778
1773
1779
# help of 'match' option of 'log' command
1774
#: bzrlib/builtins.py:2700
1780
#: bzrlib/builtins.py:2702
1775
1781
msgid "Show revisions whose properties match this expression."
1776
1782
msgstr ""
1777
1783
1778
1784
# help of 'match-message' option of 'log' command
1779
#: bzrlib/builtins.py:2704
1785
#: bzrlib/builtins.py:2706
1780
1786
msgid "Show revisions whose message matches this expression."
1781
1787
msgstr ""
1782
1788
1783
1789
# help of 'match-committer' option of 'log' command
1784
#: bzrlib/builtins.py:2708
1790
#: bzrlib/builtins.py:2710
1785
1791
msgid "Show revisions whose committer matches this expression."
1786
1792
msgstr ""
1787
1793
1788
1794
# help of 'match-author' option of 'log' command
1789
#: bzrlib/builtins.py:2712
1795
#: bzrlib/builtins.py:2714
1790
1796
msgid "Show revisions whose authors match this expression."
1791
1797
msgstr ""
1792
1798
1793
1799
# help of 'match-bugs' option of 'log' command
1794
#: bzrlib/builtins.py:2716
1800
#: bzrlib/builtins.py:2718
1795
1801
msgid "Show revisions whose bugs match this expression."
1796
1802
msgstr ""
1797
1803
1798
#: bzrlib/builtins.py:2770
1804
#: bzrlib/builtins.py:2772
1799
1805
msgid "--exclude-common-ancestry requires -r with two revisions"
1800
1806
msgstr ""
1801
1807
1802
#: bzrlib/builtins.py:2798
1808
#: bzrlib/builtins.py:2800
1803
1809
#, python-format
1804
1810
msgid "Path unknown at end or start of revision range: %s"
1805
1811
msgstr ""
1806
1812
1807
#: bzrlib/builtins.py:2915
1813
#: bzrlib/builtins.py:2917
1808
1814
#, python-format
1809
1815
msgid "bzr %s doesn't accept two revisions in different branches."
1810
1816
msgstr ""
1811
1817
1812
#: bzrlib/builtins.py:2931
1818
#: bzrlib/builtins.py:2933
1813
1819
#, python-format
1814
1820
msgid "bzr %s --revision takes one or two values."
1815
1821
msgstr ""
1816
1822
1817
#: bzrlib/builtins.py:2976
1823
#: bzrlib/builtins.py:2978
1818
1824
msgid ""
1819
1825
"List files in a tree.\n"
1820
1826
" "
1821
1827
msgstr ""
1822
1828
1823
1829
# help of 'recursive' option of 'ls' command
1824
#: bzrlib/builtins.py:2985
1830
#: bzrlib/builtins.py:2987
1825
1831
msgid "Recurse into subdirectories."
1826
1832
msgstr ""
1827
1833
1828
1834
# help of 'from-root' option of 'ls' command
1829
#: bzrlib/builtins.py:2987
1835
#: bzrlib/builtins.py:2989
1830
1836
msgid "Print paths relative to the root of the branch."
1831
1837
msgstr ""
1832
1838
1833
1839
# help of 'unknown' option of 'ls' command
1834
#: bzrlib/builtins.py:2989
1840
#: bzrlib/builtins.py:2991
1835
1841
msgid "Print unknown files."
1836
1842
msgstr ""
1837
1843
1838
1844
# help of 'versioned' option of 'ls' command
1839
#: bzrlib/builtins.py:2990
1845
#: bzrlib/builtins.py:2992
1840
1846
msgid "Print versioned files."
1841
1847
msgstr ""
1842
1848
1843
1849
# help of 'ignored' option of 'ls' command
1844
#: bzrlib/builtins.py:2993
1850
#: bzrlib/builtins.py:2995
1845
1851
msgid "Print ignored files."
1846
1852
msgstr ""
1847
1853
1848
1854
# help of 'kind' option of 'ls' command
1849
#: bzrlib/builtins.py:2995
1855
#: bzrlib/builtins.py:2997
1850
1856
msgid "List entries of a particular kind: file, directory, symlink."
1851
1857
msgstr ""
1852
1858
1853
#: bzrlib/builtins.py:3008
1859
#: bzrlib/builtins.py:3010
1854
1860
msgid "invalid kind specified"
1855
1861
msgstr ""
1856
1862
1857
#: bzrlib/builtins.py:3011
1863
#: bzrlib/builtins.py:3013
1858
1864
msgid "Cannot set both --verbose and --null"
1859
1865
msgstr ""
1860
1866
1861
#: bzrlib/builtins.py:3020
1867
#: bzrlib/builtins.py:3022
1862
1868
msgid "cannot specify both --from-root and PATH"
1863
1869
msgstr ""
1864
1870
1865
#: bzrlib/builtins.py:3107
1871
#: bzrlib/builtins.py:3109
1866
1872
msgid "Ignore specified files or patterns."
1867
1873
msgstr ""
1868
1874
1869
#: bzrlib/builtins.py:3109
1875
#: bzrlib/builtins.py:3111
1870
1876
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1871
1877
msgstr ""
1872
1878
1873
#: bzrlib/builtins.py:3111
1879
#: bzrlib/builtins.py:3113
1874
1880
msgid ""
1875
1881
"If a .bzrignore file does not exist, the ignore command\n"
1876
1882
"will create one and add the specified files or patterns to the newly\n"
1879
1885
"the use of the ignore command will require an explicit add command."
1880
1886
msgstr ""
1881
1887
1882
#: bzrlib/builtins.py:3117
1888
#: bzrlib/builtins.py:3119
1883
1889
msgid ""
1884
1890
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1885
1891
"After adding, editing or deleting that file either indirectly by\n"
1887
1893
"it."
1888
1894
msgstr ""
1889
1895
1890
#: bzrlib/builtins.py:3122
1896
#: bzrlib/builtins.py:3124
1891
1897
msgid ""
1892
1898
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1893
1899
"the global ignore file can be found in the application data directory as\n"
1896
1902
"can be edited directly using an editor."
1897
1903
msgstr ""
1898
1904
1899
#: bzrlib/builtins.py:3128
1905
#: bzrlib/builtins.py:3130
1900
1906
msgid ""
1901
1907
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1902
1908
"precedence over regular ignores. Such exceptions are used to specify\n"
1903
1909
"files that should be versioned which would otherwise be ignored."
1904
1910
msgstr ""
1905
1911
1906
#: bzrlib/builtins.py:3132
1912
#: bzrlib/builtins.py:3134
1907
1913
msgid ""
1908
1914
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1909
1915
"precedence over the '!' exception patterns."
1910
1916
msgstr ""
1911
1917
1912
#: bzrlib/builtins.py:3135
1918
#: bzrlib/builtins.py:3137
1913
1919
msgid ""
1914
1920
":Notes: \n"
1915
1921
" \n"
1917
1923
" the shell on Unix."
1918
1924
msgstr ""
1919
1925
1920
#: bzrlib/builtins.py:3140
1926
#: bzrlib/builtins.py:3142
1921
1927
msgid ""
1922
1928
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1923
1929
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1924
1930
msgstr ""
1925
1931
1926
#: bzrlib/builtins.py:3143
1932
#: bzrlib/builtins.py:3145
1927
1933
msgid ""
1928
1934
":Examples:\n"
1929
1935
" Ignore the top level Makefile::"
1930
1936
msgstr ""
1931
1937
1932
#: bzrlib/builtins.py:3146
1938
#: bzrlib/builtins.py:3148
1933
1939
msgid " bzr ignore ./Makefile"
1934
1940
msgstr ""
1935
1941
1936
#: bzrlib/builtins.py:3148
1942
#: bzrlib/builtins.py:3150
1937
1943
msgid " Ignore .class files in all directories...::"
1938
1944
msgstr ""
1939
1945
1940
#: bzrlib/builtins.py:3150
1946
#: bzrlib/builtins.py:3152
1941
1947
msgid " bzr ignore \"*.class\""
1942
1948
msgstr ""
1943
1949
1944
#: bzrlib/builtins.py:3152
1950
#: bzrlib/builtins.py:3154
1945
1951
msgid " ...but do not ignore \"special.class\"::"
1946
1952
msgstr ""
1947
1953
1948
#: bzrlib/builtins.py:3154
1954
#: bzrlib/builtins.py:3156
1949
1955
msgid " bzr ignore \"!special.class\""
1950
1956
msgstr ""
1951
1957
1952
#: bzrlib/builtins.py:3156
1958
#: bzrlib/builtins.py:3158
1953
1959
msgid " Ignore files whose name begins with the \"#\" character::"
1954
1960
msgstr ""
1955
1961
1956
#: bzrlib/builtins.py:3158
1962
#: bzrlib/builtins.py:3160
1957
1963
msgid " bzr ignore \"RE:^#\""
1958
1964
msgstr ""
1959
1965
1960
#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164
1966
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1961
1967
msgid " Ignore .o files under the lib directory::"
1962
1968
msgstr ""
1963
1969
1964
#: bzrlib/builtins.py:3162
1970
#: bzrlib/builtins.py:3164
1965
1971
msgid " bzr ignore \"lib/**/*.o\""
1966
1972
msgstr ""
1967
1973
1968
#: bzrlib/builtins.py:3166
1974
#: bzrlib/builtins.py:3168
1969
1975
msgid " bzr ignore \"RE:lib/.*\\.o\""
1970
1976
msgstr ""
1971
1977
1972
#: bzrlib/builtins.py:3168
1978
#: bzrlib/builtins.py:3170
1973
1979
msgid " Ignore everything but the \"debian\" toplevel directory::"
1974
1980
msgstr ""
1975
1981
1976
#: bzrlib/builtins.py:3170
1982
#: bzrlib/builtins.py:3172
1977
1983
msgid ""
1978
1984
" bzr ignore \"RE:(?!debian/).*\"\n"
1979
1985
" \n"
1986
1992
msgstr ""
1987
1993
1988
1994
# help of 'default-rules' option of 'ignore' command
1989
#: bzrlib/builtins.py:3184
1995
#: bzrlib/builtins.py:3186
1990
1996
msgid "Display the default ignore rules that bzr uses."
1991
1997
msgstr ""
1992
1998
1993
#: bzrlib/builtins.py:3196
1999
#: bzrlib/builtins.py:3198
1994
2000
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1995
2001
msgstr ""
1996
2002
1997
#: bzrlib/builtins.py:3207
2003
#: bzrlib/builtins.py:3209
1998
2004
#, python-format
1999
2005
msgid "Invalid ignore pattern found. %s"
2000
2006
msgid_plural "Invalid ignore patterns found. %s"
2001
2007
msgstr[0] ""
2002
2008
msgstr[1] ""
2003
2009
2004
#: bzrlib/builtins.py:3216
2010
#: bzrlib/builtins.py:3218
2005
2011
msgid "NAME_PATTERN should not be an absolute path"
2006
2012
msgstr ""
2007
2013
2008
#: bzrlib/builtins.py:3229
2014
#: bzrlib/builtins.py:3231
2009
2015
#, python-format
2010
2016
msgid ""
2011
2017
"Warning: the following files are version controlled and match your ignore "
2015
2021
"them.\n"
2016
2022
msgstr ""
2017
2023
2018
#: bzrlib/builtins.py:3236
2024
#: bzrlib/builtins.py:3238
2019
2025
msgid "List ignored files and the patterns that matched them."
2020
2026
msgstr ""
2021
2027
2022
#: bzrlib/builtins.py:3238
2028
#: bzrlib/builtins.py:3240
2023
2029
msgid ""
2024
2030
"List all the ignored files and the ignore pattern that caused the file to\n"
2025
2031
"be ignored."
2026
2032
msgstr ""
2027
2033
2028
#: bzrlib/builtins.py:3241
2034
#: bzrlib/builtins.py:3243
2029
2035
msgid "Alternatively, to list just the files::"
2030
2036
msgstr ""
2031
2037
2032
#: bzrlib/builtins.py:3243
2038
#: bzrlib/builtins.py:3245
2033
2039
msgid " bzr ls --ignored"
2034
2040
msgstr ""
2035
2041
2036
#: bzrlib/builtins.py:3277
2042
#: bzrlib/builtins.py:3279
2037
2043
#, python-format
2038
2044
msgid "not a valid revision-number: %r"
2039
2045
msgstr ""
2040
2046
2041
#: bzrlib/builtins.py:3284
2047
#: bzrlib/builtins.py:3286
2042
2048
msgid "Export current or past revision to a destination directory or archive."
2043
2049
msgstr ""
2044
2050
2045
#: bzrlib/builtins.py:3286
2051
#: bzrlib/builtins.py:3288
2046
2052
msgid "If no revision is specified this exports the last committed revision."
2047
2053
msgstr ""
2048
2054
2049
#: bzrlib/builtins.py:3288
2055
#: bzrlib/builtins.py:3290
2050
2056
msgid ""
2051
2057
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2052
2058
"given, try to find the format with the extension. If no extension\n"
2053
2059
"is found exports to a directory (equivalent to --format=dir)."
2054
2060
msgstr ""
2055
2061
2056
#: bzrlib/builtins.py:3292
2062
#: bzrlib/builtins.py:3294
2057
2063
msgid ""
2058
2064
"If root is supplied, it will be used as the root directory inside\n"
2059
2065
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2060
2066
"to the exported filename. The root option has no effect for 'dir' format."
2061
2067
msgstr ""
2062
2068
2063
#: bzrlib/builtins.py:3296
2069
#: bzrlib/builtins.py:3298
2064
2070
msgid ""
2065
2071
"If branch is omitted then the branch containing the current working\n"
2066
2072
"directory will be used."
2067
2073
msgstr ""
2068
2074
2069
#: bzrlib/builtins.py:3299
2075
#: bzrlib/builtins.py:3301
2070
2076
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2071
2077
msgstr ""
2072
2078
2073
#: bzrlib/builtins.py:3301
2079
#: bzrlib/builtins.py:3303
2074
2080
msgid ""
2075
2081
" ================= =========================\n"
2076
2082
" Supported formats Autodetected by extension\n"
2084
2090
msgstr ""
2085
2091
2086
2092
# help of 'format' option of 'export' command
2087
#: bzrlib/builtins.py:3315
2093
#: bzrlib/builtins.py:3317
2088
2094
msgid "Type of file to export to."
2089
2095
msgstr ""
2090
2096
2091
2097
# help of 'filters' option of 'export' command
2092
#: bzrlib/builtins.py:3318
2098
#: bzrlib/builtins.py:3320
2093
2099
msgid "Apply content filters to export the convenient form."
2094
2100
msgstr ""
2095
2101
2096
2102
# help of 'root' option of 'export' command
2097
#: bzrlib/builtins.py:3322
2103
#: bzrlib/builtins.py:3324
2098
2104
msgid "Name of the root directory inside the exported file."
2099
2105
msgstr ""
2100
2106
2101
2107
# help of 'per-file-timestamps' option of 'export' command
2102
#: bzrlib/builtins.py:3324
2108
#: bzrlib/builtins.py:3326
2103
2109
msgid ""
2104
2110
"Set modification time of files to that of the last revision in which it was "
2105
2111
"changed."
2106
2112
msgstr ""
2107
2113
2108
2114
# help of 'uncommitted' option of 'export' command
2109
#: bzrlib/builtins.py:3327
2115
#: bzrlib/builtins.py:3329
2110
2116
msgid "Export the working tree contents rather than that of the last revision."
2111
2117
msgstr ""
2112
2118
2113
#: bzrlib/builtins.py:3346
2119
#: bzrlib/builtins.py:3348
2114
2120
msgid "--uncommitted requires a working tree"
2115
2121
msgstr ""
2116
2122
2117
#: bzrlib/builtins.py:3355
2123
#: bzrlib/builtins.py:3357
2118
2124
#, python-format
2119
2125
msgid "Unsupported export format: %s"
2120
2126
msgstr ""
2121
2127
2122
#: bzrlib/builtins.py:3359
2128
#: bzrlib/builtins.py:3361
2123
2129
msgid "Write the contents of a file as of a given revision to standard output."
2124
2130
msgstr ""
2125
2131
2126
#: bzrlib/builtins.py:3361
2132
#: bzrlib/builtins.py:3363
2127
2133
msgid "If no revision is nominated, the last revision is used."
2128
2134
msgstr ""
2129
2135
2130
#: bzrlib/builtins.py:3363
2136
#: bzrlib/builtins.py:3365
2131
2137
msgid ""
2132
2138
"Note: Take care to redirect standard output when using this command on a\n"
2133
2139
"binary file."
2134
2140
msgstr ""
2135
2141
2136
2142
# help of 'name-from-revision' option of 'cat' command
2137
#: bzrlib/builtins.py:3369
2143
#: bzrlib/builtins.py:3371
2138
2144
msgid "The path name in the old tree."
2139
2145
msgstr ""
2140
2146
2141
2147
# help of 'filters' option of 'cat' command
2142
#: bzrlib/builtins.py:3370
2148
#: bzrlib/builtins.py:3372
2143
2149
msgid "Apply content filters to display the convenience form."
2144
2150
msgstr ""
2145
2151
2146
#: bzrlib/builtins.py:3381
2152
#: bzrlib/builtins.py:3383
2147
2153
msgid "bzr cat --revision takes exactly one revision specifier"
2148
2154
msgstr ""
2149
2155
2150
#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418
2156
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2151
2157
msgid "{0!r} is not present in revision {1}"
2152
2158
msgstr ""
2153
2159
2154
#: bzrlib/builtins.py:3441
2160
#: bzrlib/builtins.py:3443
2155
2161
msgid "Commit changes into a new revision."
2156
2162
msgstr ""
2157
2163
2158
#: bzrlib/builtins.py:3443
2164
#: bzrlib/builtins.py:3445
2159
2165
msgid ""
2160
2166
"An explanatory message needs to be given for each commit. This is\n"
2161
2167
"often done by using the --message option (getting the message from the\n"
2165
2171
"boilerplate text loaded into the editor, use the --show-diff option."
2166
2172
msgstr ""
2167
2173
2168
#: bzrlib/builtins.py:3450
2174
#: bzrlib/builtins.py:3452
2169
2175
msgid ""
2170
2176
"By default, the entire tree is committed and the person doing the\n"
2171
2177
"commit is assumed to be the author. These defaults can be overridden\n"
2172
2178
"as explained below."
2173
2179
msgstr ""
2174
2180
2175
#: bzrlib/builtins.py:3454
2181
#: bzrlib/builtins.py:3456
2176
2182
msgid ":Selective commits:"
2177
2183
msgstr ""
2178
2184
2179
#: bzrlib/builtins.py:3456
2185
#: bzrlib/builtins.py:3458
2180
2186
msgid ""
2181
2187
" If selected files are specified, only changes to those files are\n"
2182
2188
" committed. If a directory is specified then the directory and\n"
2183
2189
" everything within it is committed."
2184
2190
msgstr ""
2185
2191
2186
#: bzrlib/builtins.py:3460
2192
#: bzrlib/builtins.py:3462
2187
2193
msgid ""
2188
2194
" When excludes are given, they take precedence over selected files.\n"
2189
2195
" For example, to commit only changes within foo, but not changes\n"
2190
2196
" within foo/bar::"
2191
2197
msgstr ""
2192
2198
2193
#: bzrlib/builtins.py:3464
2199
#: bzrlib/builtins.py:3466
2194
2200
msgid " bzr commit foo -x foo/bar"
2195
2201
msgstr ""
2196
2202
2197
#: bzrlib/builtins.py:3466
2203
#: bzrlib/builtins.py:3468
2198
2204
msgid " A selective commit after a merge is not yet supported."
2199
2205
msgstr ""
2200
2206
2201
#: bzrlib/builtins.py:3468
2207
#: bzrlib/builtins.py:3470
2202
2208
msgid ":Custom authors:"
2203
2209
msgstr ""
2204
2210
2205
#: bzrlib/builtins.py:3470
2211
#: bzrlib/builtins.py:3472
2206
2212
msgid ""
2207
2213
" If the author of the change is not the same person as the committer,\n"
2208
2214
" you can specify the author's name using the --author option. The\n"
2212
2218
" author."
2213
2219
msgstr ""
2214
2220
2215
#: bzrlib/builtins.py:3477
2221
#: bzrlib/builtins.py:3479
2216
2222
msgid ":Checks:"
2217
2223
msgstr ""
2218
2224
2219
#: bzrlib/builtins.py:3479
2225
#: bzrlib/builtins.py:3481
2220
2226
msgid ""
2221
2227
" A common mistake is to forget to add a new file or directory before\n"
2222
2228
" running the commit command. The --strict option checks for unknown\n"
2225
2231
" for details."
2226
2232
msgstr ""
2227
2233
2228
#: bzrlib/builtins.py:3485
2234
#: bzrlib/builtins.py:3487
2229
2235
msgid ":Things to note:"
2230
2236
msgstr ""
2231
2237
2232
#: bzrlib/builtins.py:3487
2238
#: bzrlib/builtins.py:3489
2233
2239
msgid ""
2234
2240
" If you accidentially commit the wrong changes or make a spelling\n"
2235
2241
" mistake in the commit message say, you can use the uncommit command\n"
2236
2242
" to undo it. See ``bzr help uncommit`` for details."
2237
2243
msgstr ""
2238
2244
2239
#: bzrlib/builtins.py:3491
2245
#: bzrlib/builtins.py:3493
2240
2246
msgid ""
2241
2247
" Hooks can also be configured to run after a commit. This allows you\n"
2242
2248
" to trigger updates to external systems like bug trackers. The --fixes\n"
2245
2251
msgstr ""
2246
2252
2247
2253
# help of 'exclude' option of 'commit' command
2248
#: bzrlib/builtins.py:3501
2254
#: bzrlib/builtins.py:3503
2249
2255
msgid "Do not consider changes made to a given path."
2250
2256
msgstr ""
2251
2257
2252
2258
# help of 'message' option of 'commit' command
2253
#: bzrlib/builtins.py:3504
2259
#: bzrlib/builtins.py:3506
2254
2260
msgid "Description of the new revision."
2255
2261
msgstr ""
2256
2262
2257
2263
# help of 'unchanged' option of 'commit' command
2258
#: bzrlib/builtins.py:3507
2264
#: bzrlib/builtins.py:3509
2259
2265
msgid "Commit even if nothing has changed."
2260
2266
msgstr ""
2261
2267
2262
2268
# help of 'file' option of 'commit' command
2263
#: bzrlib/builtins.py:3511
2269
#: bzrlib/builtins.py:3513
2264
2270
msgid "Take commit message from this file."
2265
2271
msgstr ""
2266
2272
2267
2273
# help of 'strict' option of 'commit' command
2268
#: bzrlib/builtins.py:3513
2274
#: bzrlib/builtins.py:3515
2269
2275
msgid "Refuse to commit if there are unknown files in the working tree."
2270
2276
msgstr ""
2271
2277
2272
2278
# help of 'commit-time' option of 'commit' command
2273
#: bzrlib/builtins.py:3516
2279
#: bzrlib/builtins.py:3518
2274
2280
msgid ""
2275
2281
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2276
2282
"08:00:00 +0100'."
2277
2283
msgstr ""
2278
2284
2279
2285
# help of 'fixes' option of 'commit' command
2280
#: bzrlib/builtins.py:3519
2286
#: bzrlib/builtins.py:3521
2281
2287
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2282
2288
msgstr ""
2283
2289
2284
2290
# help of 'author' option of 'commit' command
2285
#: bzrlib/builtins.py:3522
2291
#: bzrlib/builtins.py:3524
2286
2292
msgid "Set the author's name, if it's different from the committer."
2287
2293
msgstr ""
2288
2294
2289
2295
# help of 'local' option of 'commit' command
2290
#: bzrlib/builtins.py:3525
2296
#: bzrlib/builtins.py:3527
2291
2297
msgid ""
2292
2298
"Perform a local commit in a bound branch. Local commits are not pushed to "
2293
2299
"the master branch until a normal commit is performed."
2294
2300
msgstr ""
2295
2301
2296
2302
# help of 'show-diff' option of 'commit' command
2297
#: bzrlib/builtins.py:3531
2303
#: bzrlib/builtins.py:3533
2298
2304
msgid ""
2299
2305
"When no message is supplied, show the diff along with the status summary in "
2300
2306
"the message editor."
2301
2307
msgstr ""
2302
2308
2303
2309
# help of 'lossy' option of 'commit' command
2304
#: bzrlib/builtins.py:3534
2310
#: bzrlib/builtins.py:3536
2305
2311
msgid ""
2306
2312
"When committing to a foreign version control system do not push data that "
2307
2313
"can not be natively represented."
2308
2314
msgstr ""
2309
2315
2310
#: bzrlib/builtins.py:3552
2316
#: bzrlib/builtins.py:3554
2311
2317
#, python-format
2312
2318
msgid ""
2313
2319
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2315
2321
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2316
2322
msgstr ""
2317
2323
2318
#: bzrlib/builtins.py:3561
2324
#: bzrlib/builtins.py:3563
2319
2325
#, python-format
2320
2326
msgid ""
2321
2327
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2323
2329
"Commit refused."
2324
2330
msgstr ""
2325
2331
2326
#: bzrlib/builtins.py:3570
2332
#: bzrlib/builtins.py:3572
2327
2333
#, python-format
2328
2334
msgid "Unrecognized bug %s. Commit refused."
2329
2335
msgstr ""
2330
2336
2331
#: bzrlib/builtins.py:3573
2337
#: bzrlib/builtins.py:3575
2332
2338
#, python-format
2333
2339
msgid ""
2334
2340
"%s\n"
2335
2341
"Commit refused."
2336
2342
msgstr ""
2337
2343
2338
#: bzrlib/builtins.py:3597
2344
#: bzrlib/builtins.py:3599
2339
2345
msgid "Could not parse --commit-time: "
2340
2346
msgstr ""
2341
2347
2342
#: bzrlib/builtins.py:3637
2348
#: bzrlib/builtins.py:3639
2343
2349
msgid "please specify either --message or --file"
2344
2350
msgstr ""
2345
2351
2346
#: bzrlib/builtins.py:3666
2352
#: bzrlib/builtins.py:3668
2347
2353
msgid "please specify a commit message with either --message or --file"
2348
2354
msgstr ""
2349
2355
2350
#: bzrlib/builtins.py:3669
2356
#: bzrlib/builtins.py:3671
2351
2357
msgid ""
2352
2358
"Empty commit message specified. Please specify a commit message with either "
2353
2359
"--message or --file or leave a blank message with --message \"\"."
2354
2360
msgstr ""
2355
2361
2356
#: bzrlib/builtins.py:3689
2362
#: bzrlib/builtins.py:3691
2357
2363
msgid ""
2358
2364
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2359
2365
"--unchanged to force an empty commit."
2360
2366
msgstr ""
2361
2367
2362
#: bzrlib/builtins.py:3693
2368
#: bzrlib/builtins.py:3695
2363
2369
msgid ""
2364
2370
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2365
2371
"resolve FILE\" to resolve."
2366
2372
msgstr ""
2367
2373
2368
#: bzrlib/builtins.py:3697
2374
#: bzrlib/builtins.py:3699
2369
2375
msgid "Commit refused because there are unknown files in the working tree."
2370
2376
msgstr ""
2371
2377
2372
#: bzrlib/builtins.py:3700
2378
#: bzrlib/builtins.py:3702
2373
2379
msgid ""
2374
2380
"\n"
2375
2381
"To commit to master branch, run update and then commit.\n"
2376
2382
"You can also pass --local to commit to continue working disconnected."
2377
2383
msgstr ""
2378
2384
2379
#: bzrlib/builtins.py:3708
2385
#: bzrlib/builtins.py:3710
2380
2386
msgid ""
2381
2387
"Validate working tree structure, branch consistency and repository history."
2382
2388
msgstr ""
2383
2389
2384
#: bzrlib/builtins.py:3710
2390
#: bzrlib/builtins.py:3712
2385
2391
msgid ""
2386
2392
"This command checks various invariants about branch and repository storage\n"
2387
2393
"to detect data corruption or bzr bugs."
2388
2394
msgstr ""
2389
2395
2390
#: bzrlib/builtins.py:3713
2396
#: bzrlib/builtins.py:3715
2391
2397
msgid ""
2392
2398
"The working tree and branch checks will only give output if a problem is\n"
2393
2399
"detected. The output fields of the repository check are:"
2394
2400
msgstr ""
2395
2401
2396
#: bzrlib/builtins.py:3716
2402
#: bzrlib/builtins.py:3718
2397
2403
msgid ""
2398
2404
"revisions\n"
2399
2405
" This is just the number of revisions checked. It doesn't\n"
2400
2406
" indicate a problem."
2401
2407
msgstr ""
2402
2408
2403
#: bzrlib/builtins.py:3720
2409
#: bzrlib/builtins.py:3722
2404
2410
msgid ""
2405
2411
"versionedfiles\n"
2406
2412
" This is just the number of versionedfiles checked. It\n"
2407
2413
" doesn't indicate a problem."
2408
2414
msgstr ""
2409
2415
2410
#: bzrlib/builtins.py:3724
2416
#: bzrlib/builtins.py:3726
2411
2417
msgid ""
2412
2418
"unreferenced ancestors\n"
2413
2419
" Texts that are ancestors of other texts, but\n"
2415
2421
" subtle problem that Bazaar can work around."
2416
2422
msgstr ""
2417
2423
2418
#: bzrlib/builtins.py:3729
2424
#: bzrlib/builtins.py:3731
2419
2425
msgid ""
2420
2426
"unique file texts\n"
2421
2427
" This is the total number of unique file contents\n"
2422
2428
" seen in the checked revisions. It does not indicate a problem."
2423
2429
msgstr ""
2424
2430
2425
#: bzrlib/builtins.py:3733
2431
#: bzrlib/builtins.py:3735
2426
2432
msgid ""
2427
2433
"repeated file texts\n"
2428
2434
" This is the total number of repeated texts seen\n"
2431
2437
" indicate a problem."
2432
2438
msgstr ""
2433
2439
2434
#: bzrlib/builtins.py:3739
2440
#: bzrlib/builtins.py:3741
2435
2441
msgid ""
2436
2442
"If no restrictions are specified, all Bazaar data that is found at the "
2437
2443
"given\n"
2438
2444
"location will be checked."
2439
2445
msgstr ""
2440
2446
2441
#: bzrlib/builtins.py:3744
2447
#: bzrlib/builtins.py:3746
2442
2448
msgid " Check the tree and branch at 'foo'::"
2443
2449
msgstr ""
2444
2450
2445
#: bzrlib/builtins.py:3746
2451
#: bzrlib/builtins.py:3748
2446
2452
msgid " bzr check --tree --branch foo"
2447
2453
msgstr ""
2448
2454
2449
#: bzrlib/builtins.py:3748
2455
#: bzrlib/builtins.py:3750
2450
2456
msgid " Check only the repository at 'bar'::"
2451
2457
msgstr ""
2452
2458
2453
#: bzrlib/builtins.py:3750
2459
#: bzrlib/builtins.py:3752
2454
2460
msgid " bzr check --repo bar"
2455
2461
msgstr ""
2456
2462
2457
#: bzrlib/builtins.py:3752
2463
#: bzrlib/builtins.py:3754
2458
2464
msgid " Check everything at 'baz'::"
2459
2465
msgstr ""
2460
2466
2461
#: bzrlib/builtins.py:3754
2467
#: bzrlib/builtins.py:3756
2462
2468
msgid " bzr check baz"
2463
2469
msgstr ""
2464
2470
2465
2471
# help of 'branch' option of 'check' command
2466
#: bzrlib/builtins.py:3760
2472
#: bzrlib/builtins.py:3762
2467
2473
msgid "Check the branch related to the current directory."
2468
2474
msgstr ""
2469
2475
2470
2476
# help of 'repo' option of 'check' command
2471
#: bzrlib/builtins.py:3762
2477
#: bzrlib/builtins.py:3764
2472
2478
msgid "Check the repository related to the current directory."
2473
2479
msgstr ""
2474
2480
2475
2481
# help of 'tree' option of 'check' command
2476
#: bzrlib/builtins.py:3764
2482
#: bzrlib/builtins.py:3766
2477
2483
msgid "Check the working tree related to the current directory."
2478
2484
msgstr ""
2479
2485
2480
#: bzrlib/builtins.py:3778
2486
#: bzrlib/builtins.py:3780
2481
2487
msgid "Upgrade a repository, branch or working tree to a newer format."
2482
2488
msgstr ""
2483
2489
2484
#: bzrlib/builtins.py:3780
2490
#: bzrlib/builtins.py:3782
2485
2491
msgid ""
2486
2492
"When the default format has changed after a major new release of\n"
2487
2493
"Bazaar, you may be informed during certain operations that you\n"
2490
2496
"with older repositories or with older versions of Bazaar."
2491
2497
msgstr ""
2492
2498
2493
#: bzrlib/builtins.py:3786
2499
#: bzrlib/builtins.py:3788
2494
2500
msgid ""
2495
2501
"If you wish to upgrade to a particular format rather than the\n"
2496
2502
"current default, that can be specified using the --format option.\n"
2500
2506
"2.x default) so downgrading is not always possible."
2501
2507
msgstr ""
2502
2508
2503
#: bzrlib/builtins.py:3793
2509
#: bzrlib/builtins.py:3795
2504
2510
msgid ""
2505
2511
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2506
2512
"process (where # is a number). By default, this is left there on\n"
2511
2517
"afterwards."
2512
2518
msgstr ""
2513
2519
2514
#: bzrlib/builtins.py:3801
2520
#: bzrlib/builtins.py:3803
2515
2521
msgid ""
2516
2522
"If the location given is a shared repository, dependent branches\n"
2517
2523
"are also converted provided the repository converts successfully.\n"
2519
2525
"tried."
2520
2526
msgstr ""
2521
2527
2522
#: bzrlib/builtins.py:3806
2528
#: bzrlib/builtins.py:3808
2523
2529
msgid ""
2524
2530
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2525
2531
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2526
2532
msgstr ""
2527
2533
2528
2534
# help of 'format' option of 'upgrade' command
2529
#: bzrlib/builtins.py:3814
2535
#: bzrlib/builtins.py:3816
2530
2536
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2531
2537
msgstr ""
2532
2538
2533
2539
# title of 'format' option of 'init' command
2534
2540
# title of 'format' option of 'upgrade' command
2535
#: bzrlib/builtins.py:3818
2541
#: bzrlib/builtins.py:3820
2536
2542
msgid "Branch format"
2537
2543
msgstr ""
2538
2544
2539
2545
# help of 'clean' option of 'upgrade' command
2540
#: bzrlib/builtins.py:3820
2546
#: bzrlib/builtins.py:3822
2541
2547
msgid "Remove the backup.bzr directory if successful."
2542
2548
msgstr ""
2543
2549
2544
2550
# help of 'dry-run' option of 'add' command
2545
2551
# help of 'dry-run' option of 'upgrade' command
2546
#: bzrlib/builtins.py:3822
2552
#: bzrlib/builtins.py:3824
2547
2553
msgid "Show what would be done, but don't actually do anything."
2548
2554
msgstr ""
2549
2555
2550
#: bzrlib/builtins.py:3837
2556
#: bzrlib/builtins.py:3839
2551
2557
msgid "Show or set bzr user id."
2552
2558
msgstr ""
2553
2559
2554
#: bzrlib/builtins.py:3839
2560
#: bzrlib/builtins.py:3841
2555
2561
msgid ""
2556
2562
":Examples:\n"
2557
2563
" Show the email of the current user::"
2558
2564
msgstr ""
2559
2565
2560
#: bzrlib/builtins.py:3842
2566
#: bzrlib/builtins.py:3844
2561
2567
msgid " bzr whoami --email"
2562
2568
msgstr ""
2563
2569
2564
#: bzrlib/builtins.py:3844
2570
#: bzrlib/builtins.py:3846
2565
2571
msgid " Set the current user::"
2566
2572
msgstr ""
2567
2573
2568
#: bzrlib/builtins.py:3846
2574
#: bzrlib/builtins.py:3848
2569
2575
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2570
2576
msgstr ""
2571
2577
2572
2578
# help of 'email' option of 'whoami' command
2573
#: bzrlib/builtins.py:3850
2579
#: bzrlib/builtins.py:3852
2574
2580
msgid "Display email address only."
2575
2581
msgstr ""
2576
2582
2577
2583
# help of 'branch' option of 'whoami' command
2578
#: bzrlib/builtins.py:3852
2584
#: bzrlib/builtins.py:3854
2579
2585
msgid "Set identity for the current branch instead of globally."
2580
2586
msgstr ""
2581
2587
2582
#: bzrlib/builtins.py:3878
2588
#: bzrlib/builtins.py:3880
2583
2589
msgid "--email can only be used to display existing identity"
2584
2590
msgstr ""
2585
2591
2586
#: bzrlib/builtins.py:3902
2592
#: bzrlib/builtins.py:3904
2587
2593
msgid "Print or set the branch nickname."
2588
2594
msgstr ""
2589
2595
2590
#: bzrlib/builtins.py:3904
2596
#: bzrlib/builtins.py:3906
2591
2597
msgid ""
2592
2598
"If unset, the colocated branch name is used for colocated branches, and\n"
2593
2599
"the branch directory name is used for other branches. To print the\n"
2594
2600
"current nickname, execute with no argument."
2595
2601
msgstr ""
2596
2602
2597
#: bzrlib/builtins.py:3908
2603
#: bzrlib/builtins.py:3910
2598
2604
msgid ""
2599
2605
"Bound branches use the nickname of its master branch unless it is set\n"
2600
2606
"locally."
2601
2607
msgstr ""
2602
2608
2603
#: bzrlib/builtins.py:3928
2609
#: bzrlib/builtins.py:3930
2604
2610
msgid "Set/unset and display aliases."
2605
2611
msgstr ""
2606
2612
2607
#: bzrlib/builtins.py:3930
2613
#: bzrlib/builtins.py:3932
2608
2614
msgid ""
2609
2615
":Examples:\n"
2610
2616
" Show the current aliases::"
2611
2617
msgstr ""
2612
2618
2613
#: bzrlib/builtins.py:3933
2619
#: bzrlib/builtins.py:3935
2614
2620
msgid " bzr alias"
2615
2621
msgstr ""
2616
2622
2617
#: bzrlib/builtins.py:3935
2623
#: bzrlib/builtins.py:3937
2618
2624
msgid " Show the alias specified for 'll'::"
2619
2625
msgstr ""
2620
2626
2621
#: bzrlib/builtins.py:3937
2627
#: bzrlib/builtins.py:3939
2622
2628
msgid " bzr alias ll"
2623
2629
msgstr ""
2624
2630
2625
#: bzrlib/builtins.py:3939
2631
#: bzrlib/builtins.py:3941
2626
2632
msgid " Set an alias for 'll'::"
2627
2633
msgstr ""
2628
2634
2629
#: bzrlib/builtins.py:3941
2635
#: bzrlib/builtins.py:3943
2630
2636
msgid " bzr alias ll=\"log --line -r-10..-1\""
2631
2637
msgstr ""
2632
2638
2633
#: bzrlib/builtins.py:3943
2639
#: bzrlib/builtins.py:3945
2634
2640
msgid " To remove an alias for 'll'::"
2635
2641
msgstr ""
2636
2642
2637
#: bzrlib/builtins.py:3945
2643
#: bzrlib/builtins.py:3947
2638
2644
msgid " bzr alias --remove ll"
2639
2645
msgstr ""
2640
2646
2641
2647
# help of 'remove' option of 'alias' command
2642
#: bzrlib/builtins.py:3950
2648
#: bzrlib/builtins.py:3952
2643
2649
msgid "Remove the alias."
2644
2650
msgstr ""
2645
2651
2646
#: bzrlib/builtins.py:3968
2652
#: bzrlib/builtins.py:3970
2647
2653
msgid "bzr alias --remove expects an alias to remove."
2648
2654
msgstr ""
2649
2655
2650
#: bzrlib/builtins.py:4149
2656
#: bzrlib/builtins.py:4151
2651
2657
msgid "subunit not available. subunit needs to be installed to use --subunit."
2652
2658
msgstr ""
2653
2659
2654
#: bzrlib/builtins.py:4166
2660
#: bzrlib/builtins.py:4168
2655
2661
msgid ""
2656
2662
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2657
2663
msgstr ""
2658
2664
2659
#: bzrlib/builtins.py:4213
2665
#: bzrlib/builtins.py:4215
2660
2666
msgid "Show version of bzr."
2661
2667
msgstr ""
2662
2668
2663
2669
# help of 'short' option of 'version' command
2664
#: bzrlib/builtins.py:4217
2670
#: bzrlib/builtins.py:4219
2665
2671
msgid "Print just the version number."
2666
2672
msgstr ""
2667
2673
2668
#: bzrlib/builtins.py:4236
2674
#: bzrlib/builtins.py:4238
2669
2675
msgid "It sure does!\n"
2670
2676
msgstr ""
2671
2677
2672
#: bzrlib/builtins.py:4260
2678
#: bzrlib/builtins.py:4262
2673
2679
#, python-format
2674
2680
msgid "merge base is revision %s\n"
2675
2681
msgstr ""
2676
2682
2677
#: bzrlib/builtins.py:4264
2683
#: bzrlib/builtins.py:4266
2678
2684
msgid "Perform a three-way merge."
2679
2685
msgstr ""
2680
2686
2681
#: bzrlib/builtins.py:4266
2687
#: bzrlib/builtins.py:4268
2682
2688
msgid ""
2683
2689
"The source of the merge can be specified either in the form of a branch,\n"
2684
2690
"or in the form of a path to a file containing a merge directive generated\n"
2689
2695
"the current working tree."
2690
2696
msgstr ""
2691
2697
2692
#: bzrlib/builtins.py:4274
2698
#: bzrlib/builtins.py:4276
2693
2699
msgid ""
2694
2700
"When merging from a branch, by default bzr will try to merge in all new\n"
2695
2701
"work from the other branch, automatically determining an appropriate base\n"
2696
2702
"revision. If this fails, you may need to give an explicit base."
2697
2703
msgstr ""
2698
2704
2699
#: bzrlib/builtins.py:4278
2705
#: bzrlib/builtins.py:4280
2700
2706
msgid ""
2701
2707
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2702
2708
"try to merge in all new work up to and including revision OTHER."
2703
2709
msgstr ""
2704
2710
2705
#: bzrlib/builtins.py:4281
2711
#: bzrlib/builtins.py:4283
2706
2712
msgid ""
2707
2713
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2708
2714
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2713
2719
"changes from the other branch is not stored in the commit."
2714
2720
msgstr ""
2715
2721
2716
#: bzrlib/builtins.py:4289
2722
#: bzrlib/builtins.py:4291
2717
2723
msgid "Revision numbers are always relative to the source branch."
2718
2724
msgstr ""
2719
2725
2720
#: bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2726
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2721
2727
msgid ""
2722
2728
"Merge will do its best to combine the changes in two branches, but there\n"
2723
2729
"are some kinds of problems only a human can fix. When it encounters those,\n"
2725
2731
"before you can commit."
2726
2732
msgstr ""
2727
2733
2728
#: bzrlib/builtins.py:4296
2734
#: bzrlib/builtins.py:4298
2729
2735
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2730
2736
msgstr ""
2731
2737
2732
#: bzrlib/builtins.py:4298
2738
#: bzrlib/builtins.py:4300
2733
2739
msgid ""
2734
2740
"If there is no default branch set, the first merge will set it (use\n"
2735
2741
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2737
2743
"only be saved if the remote location can be accessed."
2738
2744
msgstr ""
2739
2745
2740
#: bzrlib/builtins.py:4303
2746
#: bzrlib/builtins.py:4305
2741
2747
msgid ""
2742
2748
"The results of the merge are placed into the destination working\n"
2743
2749
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2744
2750
"committed to record the result of the merge."
2745
2751
msgstr ""
2746
2752
2747
#: bzrlib/builtins.py:4307
2753
#: bzrlib/builtins.py:4309
2748
2754
msgid ""
2749
2755
"merge refuses to run if there are any uncommitted changes, unless\n"
2750
2756
"--force is given. If --force is given, then the changes from the source \n"
2753
2759
"merge revision which has more than two parents."
2754
2760
msgstr ""
2755
2761
2756
#: bzrlib/builtins.py:4313
2762
#: bzrlib/builtins.py:4315
2757
2763
msgid ""
2758
2764
"If one would like to merge changes from the working tree of the other\n"
2759
2765
"branch without merging any committed revisions, the --uncommitted option\n"
2760
2766
"can be given."
2761
2767
msgstr ""
2762
2768
2763
#: bzrlib/builtins.py:4317
2769
#: bzrlib/builtins.py:4319
2764
2770
msgid ""
2765
2771
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2766
2772
"you to apply each diff hunk and file change, similar to \"shelve\"."
2767
2773
msgstr ""
2768
2774
2769
#: bzrlib/builtins.py:4320
2775
#: bzrlib/builtins.py:4322
2770
2776
msgid ""
2771
2777
":Examples:\n"
2772
2778
" To merge all new revisions from bzr.dev::"
2773
2779
msgstr ""
2774
2780
2775
#: bzrlib/builtins.py:4323
2781
#: bzrlib/builtins.py:4325
2776
2782
msgid " bzr merge ../bzr.dev"
2777
2783
msgstr ""
2778
2784
2779
#: bzrlib/builtins.py:4325
2785
#: bzrlib/builtins.py:4327
2780
2786
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2781
2787
msgstr ""
2782
2788
2783
#: bzrlib/builtins.py:4327
2789
#: bzrlib/builtins.py:4329
2784
2790
msgid " bzr merge -r 82 ../bzr.dev"
2785
2791
msgstr ""
2786
2792
2787
#: bzrlib/builtins.py:4329
2793
#: bzrlib/builtins.py:4331
2788
2794
msgid " To merge the changes introduced by 82, without previous changes::"
2789
2795
msgstr ""
2790
2796
2791
#: bzrlib/builtins.py:4331
2797
#: bzrlib/builtins.py:4333
2792
2798
msgid " bzr merge -r 81..82 ../bzr.dev"
2793
2799
msgstr ""
2794
2800
2795
#: bzrlib/builtins.py:4333
2801
#: bzrlib/builtins.py:4335
2796
2802
msgid " To apply a merge directive contained in /tmp/merge::"
2797
2803
msgstr ""
2798
2804
2799
#: bzrlib/builtins.py:4335
2805
#: bzrlib/builtins.py:4337
2800
2806
msgid " bzr merge /tmp/merge"
2801
2807
msgstr ""
2802
2808
2803
#: bzrlib/builtins.py:4337
2809
#: bzrlib/builtins.py:4339
2804
2810
msgid ""
2805
2811
" To create a merge revision with three parents from two branches\n"
2806
2812
" feature1a and feature1b:"
2807
2813
msgstr ""
2808
2814
2809
#: bzrlib/builtins.py:4340
2815
#: bzrlib/builtins.py:4342
2810
2816
msgid ""
2811
2817
" bzr merge ../feature1a\n"
2812
2818
" bzr merge ../feature1b --force\n"
2814
2820
msgstr ""
2815
2821
2816
2822
# help of 'force' option of 'merge' command
2817
#: bzrlib/builtins.py:4352
2823
#: bzrlib/builtins.py:4354
2818
2824
msgid "Merge even if the destination tree has uncommitted changes."
2819
2825
msgstr ""
2820
2826
2821
2827
# help of 'uncommitted' option of 'merge' command
2822
#: bzrlib/builtins.py:4358
2828
#: bzrlib/builtins.py:4360
2823
2829
msgid ""
2824
2830
"Apply uncommitted changes from a working copy, instead of branch changes."
2825
2831
msgstr ""
2826
2832
2827
2833
# help of 'pull' option of 'merge' command
2828
#: bzrlib/builtins.py:4360
2834
#: bzrlib/builtins.py:4362
2829
2835
msgid ""
2830
2836
"If the destination is already completely merged into the source, pull from "
2831
2837
"the source rather than merging. When this happens, you do not need to "
2833
2839
msgstr ""
2834
2840
2835
2841
# help of 'directory' option of 'merge' command
2836
#: bzrlib/builtins.py:4365
2842
#: bzrlib/builtins.py:4367
2837
2843
msgid ""
2838
2844
"Branch to merge into, rather than the one containing the working directory."
2839
2845
msgstr ""
2840
2846
2841
2847
# help of 'preview' option of 'merge' command
2842
#: bzrlib/builtins.py:4367
2848
#: bzrlib/builtins.py:4369
2843
2849
msgid "Instead of merging, show a diff of the merge."
2844
2850
msgstr ""
2845
2851
2846
2852
# help of 'interactive' option of 'merge' command
2847
#: bzrlib/builtins.py:4369
2853
#: bzrlib/builtins.py:4371
2848
2854
msgid "Select changes interactively."
2849
2855
msgstr ""
2850
2856
2851
#: bzrlib/builtins.py:4391
2857
#: bzrlib/builtins.py:4393
2852
2858
msgid ""
2853
2859
"Merging into empty branches not currently supported, https://bugs.launchpad."
2854
2860
"net/bzr/+bug/308562"
2855
2861
msgstr ""
2856
2862
2857
#: bzrlib/builtins.py:4418
2863
#: bzrlib/builtins.py:4420
2858
2864
msgid "Cannot use --uncommitted with bundles or merge directives."
2859
2865
msgstr ""
2860
2866
2861
#: bzrlib/builtins.py:4429
2867
#: bzrlib/builtins.py:4431
2862
2868
msgid "Cannot use --uncommitted and --revision at the same time."
2863
2869
msgstr ""
2864
2870
2865
#: bzrlib/builtins.py:4449
2871
#: bzrlib/builtins.py:4451
2866
2872
msgid "merger: "
2867
2873
msgstr ""
2868
2874
2869
#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
2875
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2870
2876
msgid "Nothing to do."
2871
2877
msgstr ""
2872
2878
2873
#: bzrlib/builtins.py:4455
2879
#: bzrlib/builtins.py:4457
2874
2880
msgid "Cannot pull individual files"
2875
2881
msgstr ""
2876
2882
2877
#: bzrlib/builtins.py:4463
2883
#: bzrlib/builtins.py:4465
2878
2884
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2879
2885
msgstr ""
2880
2886
2881
#: bzrlib/builtins.py:4521
2887
#: bzrlib/builtins.py:4523
2882
2888
#, python-format
2883
2889
msgid "Show-base is not supported for this merge type. %s"
2884
2890
msgstr ""
2885
2891
2886
#: bzrlib/builtins.py:4530
2892
#: bzrlib/builtins.py:4532
2887
2893
#, python-format
2888
2894
msgid "Conflict reduction is not supported for merge type %s."
2889
2895
msgstr ""
2890
2896
2891
#: bzrlib/builtins.py:4534
2897
#: bzrlib/builtins.py:4536
2892
2898
msgid "Cannot do conflict reduction and show base."
2893
2899
msgstr ""
2894
2900
2895
#: bzrlib/builtins.py:4645
2901
#: bzrlib/builtins.py:4647
2896
2902
msgid "No location specified or remembered"
2897
2903
msgstr ""
2898
2904
2899
#: bzrlib/builtins.py:4647
2905
#: bzrlib/builtins.py:4649
2900
2906
msgid "{0} remembered {1} location {2}"
2901
2907
msgstr ""
2902
2908
2903
#: bzrlib/builtins.py:4653
2909
#: bzrlib/builtins.py:4655
2904
2910
msgid "Redo a merge."
2905
2911
msgstr ""
2906
2912
2907
#: bzrlib/builtins.py:4655
2913
#: bzrlib/builtins.py:4657
2908
2914
msgid ""
2909
2915
"Use this if you want to try a different merge technique while resolving\n"
2910
2916
"conflicts. Some merge techniques are better than others, and remerge\n"
2911
2917
"lets you try different ones on different files."
2912
2918
msgstr ""
2913
2919
2914
#: bzrlib/builtins.py:4659
2920
#: bzrlib/builtins.py:4661
2915
2921
msgid ""
2916
2922
"The options for remerge have the same meaning and defaults as the ones for\n"
2917
2923
"merge. The difference is that remerge can (only) be run when there is a\n"
2918
2924
"pending merge, and it lets you specify particular files."
2919
2925
msgstr ""
2920
2926
2921
#: bzrlib/builtins.py:4663
2927
#: bzrlib/builtins.py:4665
2922
2928
msgid ""
2923
2929
":Examples:\n"
2924
2930
" Re-do the merge of all conflicted files, and show the base text in\n"
2925
2931
" conflict regions, in addition to the usual THIS and OTHER texts::"
2926
2932
msgstr ""
2927
2933
2928
#: bzrlib/builtins.py:4667
2934
#: bzrlib/builtins.py:4669
2929
2935
msgid " bzr remerge --show-base"
2930
2936
msgstr ""
2931
2937
2932
#: bzrlib/builtins.py:4669
2938
#: bzrlib/builtins.py:4671
2933
2939
msgid ""
2934
2940
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2935
2941
" additional processing to reduce the size of conflict regions::"
2936
2942
msgstr ""
2937
2943
2938
#: bzrlib/builtins.py:4672
2944
#: bzrlib/builtins.py:4674
2939
2945
msgid " bzr remerge --merge-type weave --reprocess foobar"
2940
2946
msgstr ""
2941
2947
2943
2949
# help of 'show-base' option of 'pull' command
2944
2950
# help of 'show-base' option of 'remerge' command
2945
2951
# help of 'show-base' option of 'update' command
2946
#: bzrlib/builtins.py:4679
2952
#: bzrlib/builtins.py:4681
2947
2953
msgid "Show base revision text in conflicts."
2948
2954
msgstr ""
2949
2955
2950
#: bzrlib/builtins.py:4691
2956
#: bzrlib/builtins.py:4693
2951
2957
msgid ""
2952
2958
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2953
2959
"merges."
2954
2960
msgstr ""
2955
2961
2956
#: bzrlib/builtins.py:4749
2962
#: bzrlib/builtins.py:4751
2957
2963
msgid ""
2958
2964
"Set files in the working tree back to the contents of a previous revision."
2959
2965
msgstr ""
2960
2966
2961
#: bzrlib/builtins.py:4751
2967
#: bzrlib/builtins.py:4753
2962
2968
msgid ""
2963
2969
"Giving a list of files will revert only those files. Otherwise, all files\n"
2964
2970
"will be reverted. If the revision is not specified with '--revision', the\n"
2967
2973
"the working tree basis revision."
2968
2974
msgstr ""
2969
2975
2970
#: bzrlib/builtins.py:4757
2976
#: bzrlib/builtins.py:4759
2971
2977
msgid ""
2972
2978
"To remove only some changes, without reverting to a prior version, use\n"
2973
2979
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2979
2985
"update command."
2980
2986
msgstr ""
2981
2987
2982
#: bzrlib/builtins.py:4766
2988
#: bzrlib/builtins.py:4768
2983
2989
msgid ""
2984
2990
"Uncommitted changes to files that are reverted will be discarded.\n"
2985
2991
"Howver, by default, any files that have been manually changed will be\n"
2987
2993
"files have '.~#~' appended to their name, where # is a number."
2988
2994
msgstr ""
2989
2995
2990
#: bzrlib/builtins.py:4771
2996
#: bzrlib/builtins.py:4773
2991
2997
msgid ""
2992
2998
"When you provide files, you can use their current pathname or the pathname\n"
2993
2999
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2995
3001
"reverted."
2996
3002
msgstr ""
2997
3003
2998
#: bzrlib/builtins.py:4776
3004
#: bzrlib/builtins.py:4778
2999
3005
msgid ""
3000
3006
"If you have newly added files since the target revision, they will be\n"
3001
3007
"removed. If the files to be removed have been changed, backups will be\n"
3003
3009
"deleted."
3004
3010
msgstr ""
3005
3011
3006
#: bzrlib/builtins.py:4781
3012
#: bzrlib/builtins.py:4783
3007
3013
msgid ""
3008
3014
"The working tree contains a list of revisions that have been merged but\n"
3009
3015
"not yet committed. These revisions will be included as additional parents\n"
3015
3021
"reverting any files."
3016
3022
msgstr ""
3017
3023
3018
#: bzrlib/builtins.py:4790
3024
#: bzrlib/builtins.py:4792
3019
3025
msgid ""
3020
3026
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3021
3027
"changes from a branch in a single revision. To do this, perform the merge\n"
3030
3036
msgstr ""
3031
3037
3032
3038
# help of 'no-backup' option of 'revert' command
3033
#: bzrlib/builtins.py:4804
3039
#: bzrlib/builtins.py:4806
3034
3040
msgid "Do not save backups of reverted files."
3035
3041
msgstr ""
3036
3042
3037
3043
# help of 'forget-merges' option of 'revert' command
3038
#: bzrlib/builtins.py:4806
3044
#: bzrlib/builtins.py:4808
3039
3045
msgid "Remove pending merge marker, without changing any files."
3040
3046
msgstr ""
3041
3047
3042
#: bzrlib/builtins.py:4837
3048
#: bzrlib/builtins.py:4839
3043
3049
msgid ""
3044
3050
"Show help on a command or other topic.\n"
3045
3051
" "
3046
3052
msgstr ""
3047
3053
3048
3054
# help of 'long' option of 'help' command
3049
#: bzrlib/builtins.py:4842
3055
#: bzrlib/builtins.py:4844
3050
3056
msgid "Show help on all commands."
3051
3057
msgstr ""
3052
3058
3053
#: bzrlib/builtins.py:4871
3059
#: bzrlib/builtins.py:4873
3054
3060
msgid "Show unmerged/unpulled revisions between two branches."
3055
3061
msgstr ""
3056
3062
3057
#: bzrlib/builtins.py:4873
3063
#: bzrlib/builtins.py:4875
3058
3064
msgid "OTHER_BRANCH may be local or remote."
3059
3065
msgstr ""
3060
3066
3061
#: bzrlib/builtins.py:4875
3067
#: bzrlib/builtins.py:4877
3062
3068
msgid ""
3063
3069
"To filter on a range of revisions, you can use the command -r begin..end\n"
3064
3070
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3069
3075
" 0 - no missing revisions"
3070
3076
msgstr ""
3071
3077
3072
#: bzrlib/builtins.py:4885
3078
#: bzrlib/builtins.py:4887
3073
3079
msgid ""
3074
3080
" Determine the missing revisions between this and the branch at the\n"
3075
3081
" remembered pull location::"
3076
3082
msgstr ""
3077
3083
3078
#: bzrlib/builtins.py:4888
3084
#: bzrlib/builtins.py:4890
3079
3085
msgid " bzr missing"
3080
3086
msgstr ""
3081
3087
3082
#: bzrlib/builtins.py:4890
3088
#: bzrlib/builtins.py:4892
3083
3089
msgid " Determine the missing revisions between this and another branch::"
3084
3090
msgstr ""
3085
3091
3086
#: bzrlib/builtins.py:4892
3092
#: bzrlib/builtins.py:4894
3087
3093
msgid " bzr missing http://server/branch"
3088
3094
msgstr ""
3089
3095
3090
#: bzrlib/builtins.py:4894
3096
#: bzrlib/builtins.py:4896
3091
3097
msgid ""
3092
3098
" Determine the missing revisions up to a specific revision on the other\n"
3093
3099
" branch::"
3094
3100
msgstr ""
3095
3101
3096
#: bzrlib/builtins.py:4897
3102
#: bzrlib/builtins.py:4899
3097
3103
msgid " bzr missing -r ..-10"
3098
3104
msgstr ""
3099
3105
3100
#: bzrlib/builtins.py:4899
3106
#: bzrlib/builtins.py:4901
3101
3107
msgid ""
3102
3108
" Determine the missing revisions up to a specific revision on this\n"
3103
3109
" branch::"
3104
3110
msgstr ""
3105
3111
3106
#: bzrlib/builtins.py:4902
3112
#: bzrlib/builtins.py:4904
3107
3113
msgid " bzr missing --my-revision ..-10"
3108
3114
msgstr ""
3109
3115
3110
3116
# help of 'reverse' option of 'missing' command
3111
#: bzrlib/builtins.py:4909
3117
#: bzrlib/builtins.py:4911
3112
3118
msgid "Reverse the order of revisions."
3113
3119
msgstr ""
3114
3120
3115
3121
# help of 'mine-only' option of 'missing' command
3116
#: bzrlib/builtins.py:4911
3122
#: bzrlib/builtins.py:4913
3117
3123
msgid "Display changes in the local branch only."
3118
3124
msgstr ""
3119
3125
3120
3126
# help of 'this' option of 'missing' command
3121
#: bzrlib/builtins.py:4912
3127
#: bzrlib/builtins.py:4914
3122
3128
msgid "Same as --mine-only."
3123
3129
msgstr ""
3124
3130
3125
3131
# help of 'theirs-only' option of 'missing' command
3126
#: bzrlib/builtins.py:4914
3132
#: bzrlib/builtins.py:4916
3127
3133
msgid "Display changes in the remote branch only."
3128
3134
msgstr ""
3129
3135
3130
3136
# help of 'other' option of 'missing' command
3131
#: bzrlib/builtins.py:4915
3137
#: bzrlib/builtins.py:4917
3132
3138
msgid "Same as --theirs-only."
3133
3139
msgstr ""
3134
3140
3135
3141
# help of 'revision' option of 'missing' command
3136
#: bzrlib/builtins.py:4920
3142
#: bzrlib/builtins.py:4922
3137
3143
msgid ""
3138
3144
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3139
3145
"details."
3140
3146
msgstr ""
3141
3147
3142
3148
# help of 'my-revision' option of 'missing' command
3143
#: bzrlib/builtins.py:4924
3149
#: bzrlib/builtins.py:4926
3144
3150
msgid ""
3145
3151
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3146
3152
"details."
3147
3153
msgstr ""
3148
3154
3149
3155
# help of 'include-merged' option of 'missing' command
3150
#: bzrlib/builtins.py:4927
3156
#: bzrlib/builtins.py:4929
3151
3157
msgid "Show all revisions in addition to the mainline ones."
3152
3158
msgstr ""
3153
3159
3154
#: bzrlib/builtins.py:4981
3160
#: bzrlib/builtins.py:4983
3155
3161
msgid "No peer location known or specified."
3156
3162
msgstr ""
3157
3163
3158
#: bzrlib/builtins.py:4985
3164
#: bzrlib/builtins.py:4987
3159
3165
msgid "Using saved parent location: {0}\n"
3160
3166
msgstr ""
3161
3167
3162
#: bzrlib/builtins.py:5018
3168
#: bzrlib/builtins.py:5020
3163
3169
#, python-format
3164
3170
msgid "You have %d extra revision:\n"
3165
3171
msgid_plural "You have %d extra revisions:\n"
3166
3172
msgstr[0] ""
3167
3173
msgstr[1] ""
3168
3174
3169
#: bzrlib/builtins.py:5038
3175
#: bzrlib/builtins.py:5040
3170
3176
#, python-format
3171
3177
msgid "You are missing %d revision:\n"
3172
3178
msgid_plural "You are missing %d revisions:\n"
3173
3179
msgstr[0] ""
3174
3180
msgstr[1] ""
3175
3181
3176
#: bzrlib/builtins.py:5053
3182
#: bzrlib/builtins.py:5055
3177
3183
msgid "This branch has no new revisions.\n"
3178
3184
msgstr ""
3179
3185
3180
#: bzrlib/builtins.py:5056
3186
#: bzrlib/builtins.py:5058
3181
3187
msgid "Other branch has no new revisions.\n"
3182
3188
msgstr ""
3183
3189
3184
#: bzrlib/builtins.py:5061
3190
#: bzrlib/builtins.py:5063
3185
3191
msgid "Branches are up to date.\n"
3186
3192
msgstr ""
3187
3193
3188
#: bzrlib/builtins.py:5072
3194
#: bzrlib/builtins.py:5074
3189
3195
msgid "Compress the data within a repository."
3190
3196
msgstr ""
3191
3197
3192
#: bzrlib/builtins.py:5074
3198
#: bzrlib/builtins.py:5076
3193
3199
msgid ""
3194
3200
"This operation compresses the data within a bazaar repository. As\n"
3195
3201
"bazaar supports automatic packing of repository, this operation is\n"
3196
3202
"normally not required to be done manually."
3197
3203
msgstr ""
3198
3204
3199
#: bzrlib/builtins.py:5078
3205
#: bzrlib/builtins.py:5080
3200
3206
msgid ""
3201
3207
"During the pack operation, bazaar takes a backup of existing repository\n"
3202
3208
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3205
3211
"used."
3206
3212
msgstr ""
3207
3213
3208
#: bzrlib/builtins.py:5084
3214
#: bzrlib/builtins.py:5086
3209
3215
msgid ""
3210
3216
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3211
3217
"during or immediately after repacking, you may be left with a state\n"
3214
3220
msgstr ""
3215
3221
3216
3222
# help of 'clean-obsolete-packs' option of 'pack' command
3217
#: bzrlib/builtins.py:5093
3223
#: bzrlib/builtins.py:5095
3218
3224
msgid "Delete obsolete packs to save disk space."
3219
3225
msgstr ""
3220
3226
3221
#: bzrlib/builtins.py:5107
3227
#: bzrlib/builtins.py:5109
3222
3228
msgid "List the installed plugins."
3223
3229
msgstr ""
3224
3230
3225
#: bzrlib/builtins.py:5109
3231
#: bzrlib/builtins.py:5111
3226
3232
msgid ""
3227
3233
"This command displays the list of installed plugins including\n"
3228
3234
"version of plugin and a short description of each."
3229
3235
msgstr ""
3230
3236
3231
#: bzrlib/builtins.py:5112
3237
#: bzrlib/builtins.py:5114
3232
3238
msgid "--verbose shows the path where each plugin is located."
3233
3239
msgstr ""
3234
3240
3235
#: bzrlib/builtins.py:5114
3241
#: bzrlib/builtins.py:5116
3236
3242
msgid ""
3237
3243
"A plugin is an external component for Bazaar that extends the\n"
3238
3244
"revision control system, by adding or replacing code in Bazaar.\n"
3241
3247
"customizing log output."
3242
3248
msgstr ""
3243
3249
3244
#: bzrlib/builtins.py:5120
3250
#: bzrlib/builtins.py:5122
3245
3251
msgid ""
3246
3252
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3247
3253
"for further information on plugins including where to find them and how to\n"
3249
3255
"plugins using the Python programming language."
3250
3256
msgstr ""
3251
3257
3252
#: bzrlib/builtins.py:5136
3258
#: bzrlib/builtins.py:5138
3253
3259
msgid "Show testament (signing-form) of a revision."
3254
3260
msgstr ""
3255
3261
3256
3262
# help of 'long' option of 'testament' command
3257
#: bzrlib/builtins.py:5139
3263
#: bzrlib/builtins.py:5141
3258
3264
msgid "Produce long-format testament."
3259
3265
msgstr ""
3260
3266
3261
3267
# help of 'strict' option of 'testament' command
3262
#: bzrlib/builtins.py:5141
3268
#: bzrlib/builtins.py:5143
3263
3269
msgid "Produce a strict-format testament."
3264
3270
msgstr ""
3265
3271
3266
#: bzrlib/builtins.py:5168
3272
#: bzrlib/builtins.py:5169
3267
3273
msgid "Show the origin of each line in a file."
3268
3274
msgstr ""
3269
3275
3270
#: bzrlib/builtins.py:5170
3276
#: bzrlib/builtins.py:5171
3271
3277
msgid ""
3272
3278
"This prints out the given file with an annotation on the left side\n"
3273
3279
"indicating which revision, author and date introduced the change."
3274
3280
msgstr ""
3275
3281
3276
#: bzrlib/builtins.py:5173
3282
#: bzrlib/builtins.py:5174
3277
3283
msgid ""
3278
3284
"If the origin is the same for a run of consecutive lines, it is\n"
3279
3285
"shown only at the top, unless the --all option is given."
3280
3286
msgstr ""
3281
3287
3282
3288
# help of 'all' option of 'annotate' command
3283
#: bzrlib/builtins.py:5181
3289
#: bzrlib/builtins.py:5182
3284
3290
msgid "Show annotations on all lines."
3285
3291
msgstr ""
3286
3292
3287
3293
# help of 'long' option of 'annotate' command
3288
#: bzrlib/builtins.py:5182
3294
#: bzrlib/builtins.py:5183
3289
3295
msgid "Show commit date in annotations."
3290
3296
msgstr ""
3291
3297
3292
#: bzrlib/builtins.py:5269
3298
#: bzrlib/builtins.py:5270
3293
3299
msgid "Cannot sign a range of non-revision-history revisions"
3294
3300
msgstr ""
3295
3301
3296
#: bzrlib/builtins.py:5281
3302
#: bzrlib/builtins.py:5282
3297
3303
msgid "Please supply either one revision, or a range."
3298
3304
msgstr ""
3299
3305
3300
#: bzrlib/builtins.py:5285
3306
#: bzrlib/builtins.py:5286
3301
3307
msgid ""
3302
3308
"Convert the current branch into a checkout of the supplied branch.\n"
3303
3309
"If no branch is supplied, rebind to the last bound location."
3304
3310
msgstr ""
3305
3311
3306
#: bzrlib/builtins.py:5288
3312
#: bzrlib/builtins.py:5289
3307
3313
msgid ""
3308
3314
"Once converted into a checkout, commits must succeed on the master branch\n"
3309
3315
"before they will be applied to the local branch."
3310
3316
msgstr ""
3311
3317
3312
#: bzrlib/builtins.py:5291
3318
#: bzrlib/builtins.py:5292
3313
3319
msgid ""
3314
3320
"Bound branches use the nickname of its master branch unless it is set\n"
3315
3321
"locally, in which case binding will update the local nickname to be\n"
3316
3322
"that of the master."
3317
3323
msgstr ""
3318
3324
3319
#: bzrlib/builtins.py:5306
3325
#: bzrlib/builtins.py:5307
3320
3326
msgid "No location supplied. This format does not remember old locations."
3321
3327
msgstr ""
3322
3328
3323
#: bzrlib/builtins.py:5312
3329
#: bzrlib/builtins.py:5313
3324
3330
msgid "Branch is already bound"
3325
3331
msgstr ""
3326
3332
3327
#: bzrlib/builtins.py:5315
3333
#: bzrlib/builtins.py:5316
3328
3334
msgid "No location supplied and no previous location known"
3329
3335
msgstr ""
3330
3336
3331
#: bzrlib/builtins.py:5321
3337
#: bzrlib/builtins.py:5322
3332
3338
msgid "These branches have diverged. Try merging, and then bind again."
3333
3339
msgstr ""
3334
3340
3335
#: bzrlib/builtins.py:5328
3341
#: bzrlib/builtins.py:5329
3336
3342
msgid "Convert the current checkout into a regular branch."
3337
3343
msgstr ""
3338
3344
3339
#: bzrlib/builtins.py:5330
3345
#: bzrlib/builtins.py:5331
3340
3346
msgid ""
3341
3347
"After unbinding, the local branch is considered independent and subsequent\n"
3342
3348
"commits will be local only."
3343
3349
msgstr ""
3344
3350
3345
#: bzrlib/builtins.py:5341
3351
#: bzrlib/builtins.py:5342
3346
3352
msgid "Local branch is not bound"
3347
3353
msgstr ""
3348
3354
3349
#: bzrlib/builtins.py:5345
3355
#: bzrlib/builtins.py:5346
3350
3356
msgid "Remove the last committed revision."
3351
3357
msgstr ""
3352
3358
3353
#: bzrlib/builtins.py:5347
3359
#: bzrlib/builtins.py:5348
3354
3360
msgid ""
3355
3361
"--verbose will print out what is being removed.\n"
3356
3362
"--dry-run will go through all the motions, but not actually\n"
3357
3363
"remove anything."
3358
3364
msgstr ""
3359
3365
3360
#: bzrlib/builtins.py:5351
3366
#: bzrlib/builtins.py:5352
3361
3367
msgid ""
3362
3368
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3363
3369
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3364
3370
"branch at revision 15."
3365
3371
msgstr ""
3366
3372
3367
#: bzrlib/builtins.py:5355
3373
#: bzrlib/builtins.py:5356
3368
3374
msgid ""
3369
3375
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3370
3376
"it may make is to restore any pending merges that were present before\n"
3372
3378
msgstr ""
3373
3379
3374
3380
# help of 'dry-run' option of 'uncommit' command
3375
#: bzrlib/builtins.py:5366
3381
#: bzrlib/builtins.py:5367
3376
3382
msgid "Don't actually make changes."
3377
3383
msgstr ""
3378
3384
3379
3385
# help of 'force' option of 'uncommit' command
3380
#: bzrlib/builtins.py:5367
3386
#: bzrlib/builtins.py:5368
3381
3387
msgid "Say yes to all questions."
3382
3388
msgstr ""
3383
3389
3384
3390
# help of 'keep-tags' option of 'uncommit' command
3385
#: bzrlib/builtins.py:5369
3391
#: bzrlib/builtins.py:5370
3386
3392
msgid "Keep tags that point to removed revisions."
3387
3393
msgstr ""
3388
3394
3389
3395
# help of 'local' option of 'uncommit' command
3390
#: bzrlib/builtins.py:5371
3396
#: bzrlib/builtins.py:5372
3391
3397
msgid "Only remove the commits from the local branch when in a checkout."
3392
3398
msgstr ""
3393
3399
3394
#: bzrlib/builtins.py:5420
3400
#: bzrlib/builtins.py:5421
3395
3401
msgid "No revisions to uncommit.\n"
3396
3402
msgstr ""
3397
3403
3398
#: bzrlib/builtins.py:5435
3404
#: bzrlib/builtins.py:5436
3399
3405
msgid "Dry-run, pretending to remove the above revisions.\n"
3400
3406
msgstr ""
3401
3407
3402
#: bzrlib/builtins.py:5438
3408
#: bzrlib/builtins.py:5439
3403
3409
msgid "The above revision(s) will be removed.\n"
3404
3410
msgstr ""
3405
3411
3406
#: bzrlib/builtins.py:5442
3412
#: bzrlib/builtins.py:5443
3407
3413
msgid "Uncommit these revisions"
3408
3414
msgstr ""
3409
3415
3410
#: bzrlib/builtins.py:5445
3416
#: bzrlib/builtins.py:5446
3411
3417
msgid "Canceled\n"
3412
3418
msgstr ""
3413
3419
3414
#: bzrlib/builtins.py:5452
3420
#: bzrlib/builtins.py:5453
3415
3421
#, python-format
3416
3422
msgid ""
3417
3423
"You can restore the old tip by running:\n"
3418
3424
" bzr pull . -r revid:%s\n"
3419
3425
msgstr ""
3420
3426
3421
#: bzrlib/builtins.py:5457
3427
#: bzrlib/builtins.py:5458
3422
3428
msgid "Break a dead lock."
3423
3429
msgstr ""
3424
3430
3425
#: bzrlib/builtins.py:5459
3431
#: bzrlib/builtins.py:5460
3426
3432
msgid ""
3427
3433
"This command breaks a lock on a repository, branch, working directory or\n"
3428
3434
"config file."
3429
3435
msgstr ""
3430
3436
3431
#: bzrlib/builtins.py:5462
3437
#: bzrlib/builtins.py:5463
3432
3438
msgid ""
3433
3439
"CAUTION: Locks should only be broken when you are sure that the process\n"
3434
3440
"holding the lock has been stopped."
3435
3441
msgstr ""
3436
3442
3437
#: bzrlib/builtins.py:5465
3443
#: bzrlib/builtins.py:5466
3438
3444
msgid ""
3439
3445
"You can get information on what locks are open via the 'bzr info\n"
3440
3446
"[location]' command."
3441
3447
msgstr ""
3442
3448
3443
#: bzrlib/builtins.py:5468
3449
#: bzrlib/builtins.py:5469
3444
3450
msgid ""
3445
3451
":Examples:\n"
3446
3452
" bzr break-lock\n"
3449
3455
msgstr ""
3450
3456
3451
3457
# help of 'config' option of 'break-lock' command
3452
#: bzrlib/builtins.py:5477
3458
#: bzrlib/builtins.py:5478
3453
3459
msgid "LOCATION is the directory where the config lock is."
3454
3460
msgstr ""
3455
3461
3456
3462
# help of 'force' option of 'break-lock' command
3457
#: bzrlib/builtins.py:5479
3463
#: bzrlib/builtins.py:5480
3458
3464
msgid "Do not ask for confirmation before breaking the lock."
3459
3465
msgstr ""
3460
3466
3461
3467
# help of 'protocol=bzr' option of 'serve' command
3462
#: bzrlib/builtins.py:5514
3468
#: bzrlib/builtins.py:5515
3463
3469
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3464
3470
msgstr ""
3465
3471
3466
#: bzrlib/builtins.py:5515
3472
#: bzrlib/builtins.py:5516
3467
3473
msgid "Run the bzr server."
3468
3474
msgstr ""
3469
3475
3470
3476
# help of 'inet' option of 'serve' command
3471
#: bzrlib/builtins.py:5521
3477
#: bzrlib/builtins.py:5522
3472
3478
msgid "Serve on stdin/out for use from inetd or sshd."
3473
3479
msgstr ""
3474
3480
3475
3481
# title of 'protocol' option of 'serve' command
3476
#: bzrlib/builtins.py:5522
3482
#: bzrlib/builtins.py:5523
3477
3483
msgid "protocol"
3478
3484
msgstr ""
3479
3485
3480
3486
# help of 'protocol' option of 'serve' command
3481
#: bzrlib/builtins.py:5523
3487
#: bzrlib/builtins.py:5524
3482
3488
msgid "Protocol to serve."
3483
3489
msgstr ""
3484
3490
3485
3491
# help of 'listen' option of 'serve' command
3486
#: bzrlib/builtins.py:5527
3492
#: bzrlib/builtins.py:5528
3487
3493
msgid "Listen for connections on nominated address."
3488
3494
msgstr ""
3489
3495
3490
3496
# help of 'port' option of 'serve' command
3491
#: bzrlib/builtins.py:5529
3497
#: bzrlib/builtins.py:5530
3492
3498
msgid ""
3493
3499
"Listen for connections on nominated port. Passing 0 as the port number will "
3494
3500
"result in a dynamically allocated port. The default port depends on the "
3496
3502
msgstr ""
3497
3503
3498
3504
# help of 'directory' option of 'serve' command
3499
#: bzrlib/builtins.py:5534
3505
#: bzrlib/builtins.py:5535
3500
3506
msgid "Serve contents of this directory."
3501
3507
msgstr ""
3502
3508
3503
3509
# help of 'allow-writes' option of 'serve' command
3504
#: bzrlib/builtins.py:5536
3510
#: bzrlib/builtins.py:5537
3505
3511
msgid ""
3506
3512
"By default the server is a readonly server. Supplying --allow-writes "
3507
3513
"enables write access to the contents of the served directory and below. "
3511
3517
msgstr ""
3512
3518
3513
3519
# help of 'client-timeout' option of 'serve' command
3514
#: bzrlib/builtins.py:5545
3520
#: bzrlib/builtins.py:5546
3515
3521
msgid "Override the default idle client timeout (5min)."
3516
3522
msgstr ""
3517
3523
3518
#: bzrlib/builtins.py:5563
3524
#: bzrlib/builtins.py:5564
3519
3525
msgid "Combine a tree into its containing tree."
3520
3526
msgstr ""
3521
3527
3522
#: bzrlib/builtins.py:5565
3528
#: bzrlib/builtins.py:5566
3523
3529
msgid "This command requires the target tree to be in a rich-root format."
3524
3530
msgstr ""
3525
3531
3526
#: bzrlib/builtins.py:5567
3532
#: bzrlib/builtins.py:5568
3527
3533
msgid ""
3528
3534
"The TREE argument should be an independent tree, inside another tree, but\n"
3529
3535
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3530
3536
"running \"bzr branch\" with the target inside a tree.)"
3531
3537
msgstr ""
3532
3538
3533
#: bzrlib/builtins.py:5571
3539
#: bzrlib/builtins.py:5572
3534
3540
msgid ""
3535
3541
"The result is a combined tree, with the subtree no longer an independent\n"
3536
3542
"part. This is marked as a merge of the subtree into the containing tree,\n"
3537
3543
"and all history is preserved."
3538
3544
msgstr ""
3539
3545
3540
#: bzrlib/builtins.py:5589
3546
#: bzrlib/builtins.py:5590
3541
3547
#, python-format
3542
3548
msgid ""
3543
3549
"Can't join trees because %s doesn't support rich root data.\n"
3544
3550
"You can use bzr upgrade on the repository."
3545
3551
msgstr ""
3546
3552
3547
#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605
3553
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3548
3554
msgid "Cannot join {0}. {1}"
3549
3555
msgstr ""
3550
3556
3551
#: bzrlib/builtins.py:5609
3557
#: bzrlib/builtins.py:5610
3552
3558
msgid "Split a subdirectory of a tree into a separate tree."
3553
3559
msgstr ""
3554
3560
3555
#: bzrlib/builtins.py:5611
3561
#: bzrlib/builtins.py:5612
3556
3562
msgid ""
3557
3563
"This command will produce a target tree in a format that supports\n"
3558
3564
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3559
3565
"converted into earlier formats like 'dirstate-tags'."
3560
3566
msgstr ""
3561
3567
3562
#: bzrlib/builtins.py:5615
3568
#: bzrlib/builtins.py:5616
3563
3569
msgid ""
3564
3570
"The TREE argument should be a subdirectory of a working tree. That\n"
3565
3571
"subdirectory will be converted into an independent tree, with its own\n"
3566
3572
"branch. Commits in the top-level tree will not apply to the new subtree."
3567
3573
msgstr ""
3568
3574
3569
#: bzrlib/builtins.py:5695
3575
#: bzrlib/builtins.py:5696
3570
3576
msgid "No submit branch specified or known"
3571
3577
msgstr ""
3572
3578
3573
#: bzrlib/builtins.py:5704 bzrlib/send.py:109
3579
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3574
3580
msgid "No public branch specified or known"
3575
3581
msgstr ""
3576
3582
3577
#: bzrlib/builtins.py:5709
3583
#: bzrlib/builtins.py:5710
3578
3584
msgid "bzr merge-directive takes at most two one revision identifiers"
3579
3585
msgstr ""
3580
3586
3581
#: bzrlib/builtins.py:5718
3587
#: bzrlib/builtins.py:5719
3582
3588
msgid "No revisions to bundle."
3583
3589
msgstr ""
3584
3590
3585
#: bzrlib/builtins.py:5737
3591
#: bzrlib/builtins.py:5738
3586
3592
msgid "Mail or create a merge-directive for submitting changes."
3587
3593
msgstr ""
3588
3594
3589
#: bzrlib/builtins.py:5739
3595
#: bzrlib/builtins.py:5740
3590
3596
msgid "A merge directive provides many things needed for requesting merges:"
3591
3597
msgstr ""
3592
3598
3593
#: bzrlib/builtins.py:5741
3599
#: bzrlib/builtins.py:5742
3594
3600
msgid "* A machine-readable description of the merge to perform"
3595
3601
msgstr ""
3596
3602
3597
#: bzrlib/builtins.py:5743
3603
#: bzrlib/builtins.py:5744
3598
3604
msgid "* An optional patch that is a preview of the changes requested"
3599
3605
msgstr ""
3600
3606
3601
#: bzrlib/builtins.py:5745
3607
#: bzrlib/builtins.py:5746
3602
3608
msgid ""
3603
3609
"* An optional bundle of revision data, so that the changes can be applied\n"
3604
3610
" directly from the merge directive, without retrieving data from a\n"
3605
3611
" branch."
3606
3612
msgstr ""
3607
3613
3608
#: bzrlib/builtins.py:5749
3614
#: bzrlib/builtins.py:5750
3609
3615
msgid ""
3610
3616
"`bzr send` creates a compact data set that, when applied using bzr\n"
3611
3617
"merge, has the same effect as merging from the source branch. "
3612
3618
msgstr ""
3613
3619
3614
#: bzrlib/builtins.py:5752
3620
#: bzrlib/builtins.py:5753
3615
3621
msgid ""
3616
3622
"By default the merge directive is self-contained and can be applied to any\n"
3617
3623
"branch containing submit_branch in its ancestory without needing access to\n"
3618
3624
"the source branch."
3619
3625
msgstr ""
3620
3626
3621
#: bzrlib/builtins.py:5756
3627
#: bzrlib/builtins.py:5757
3622
3628
msgid ""
3623
3629
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3624
3630
"revisions, but only a structured request to merge from the\n"
3627
3633
"included if known, so that people can check it later."
3628
3634
msgstr ""
3629
3635
3630
#: bzrlib/builtins.py:5762
3636
#: bzrlib/builtins.py:5763
3631
3637
msgid ""
3632
3638
"The submit branch defaults to the parent of the source branch, but can be\n"
3633
3639
"overridden. Both submit branch and public branch will be remembered in\n"
3636
3642
"be changed using --from."
3637
3643
msgstr ""
3638
3644
3639
#: bzrlib/builtins.py:5768
3645
#: bzrlib/builtins.py:5769
3640
3646
msgid ""
3641
3647
"Both the submit branch and the public branch follow the usual behavior with\n"
3642
3648
"respect to --remember: If there is no default location set, the first send\n"
3645
3651
"--remember. The value will only be saved if the location can be accessed."
3646
3652
msgstr ""
3647
3653
3648
#: bzrlib/builtins.py:5774
3654
#: bzrlib/builtins.py:5775
3649
3655
msgid ""
3650
3656
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3651
3657
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3653
3659
"in the merge directive."
3654
3660
msgstr ""
3655
3661
3656
#: bzrlib/builtins.py:5779
3662
#: bzrlib/builtins.py:5780
3657
3663
msgid ""
3658
3664
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3659
3665
"given, in which case it is sent to a file."
3660
3666
msgstr ""
3661
3667
3662
#: bzrlib/builtins.py:5782
3668
#: bzrlib/builtins.py:5783
3663
3669
msgid ""
3664
3670
"Mail is sent using your preferred mail program. This should be transparent\n"
3665
3671
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3666
3672
"If the preferred client can't be found (or used), your editor will be used."
3667
3673
msgstr ""
3668
3674
3669
#: bzrlib/builtins.py:5786
3675
#: bzrlib/builtins.py:5787
3670
3676
msgid ""
3671
3677
"To use a specific mail program, set the mail_client configuration option.\n"
3672
3678
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3678
3684
"supported clients."
3679
3685
msgstr ""
3680
3686
3681
#: bzrlib/builtins.py:5793
3687
#: bzrlib/builtins.py:5794
3682
3688
msgid ""
3683
3689
"If mail is being sent, a to address is required. This can be supplied\n"
3684
3690
"either on the commandline, by setting the submit_to configuration\n"
3686
3692
"in the submit branch."
3687
3693
msgstr ""
3688
3694
3689
#: bzrlib/builtins.py:5798
3695
#: bzrlib/builtins.py:5799
3690
3696
msgid ""
3691
3697
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3692
3698
"and\n"
3696
3702
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3697
3703
msgstr ""
3698
3704
3699
#: bzrlib/builtins.py:5804
3705
#: bzrlib/builtins.py:5805
3700
3706
msgid ""
3701
3707
"The merge directives created by bzr send may be applied using bzr merge or\n"
3702
3708
"bzr pull by specifying a file containing a merge directive as the location."
3703
3709
msgstr ""
3704
3710
3705
#: bzrlib/builtins.py:5807
3711
#: bzrlib/builtins.py:5808
3706
3712
msgid ""
3707
3713
"bzr send makes extensive use of public locations to map local locations "
3708
3714
"into\n"
3711
3717
msgstr ""
3712
3718
3713
3719
# help of 'output' option of 'send' command
3714
#: bzrlib/builtins.py:5831
3720
#: bzrlib/builtins.py:5832
3715
3721
msgid "Write merge directive to this file or directory; use - for stdout."
3716
3722
msgstr ""
3717
3723
3718
3724
# help of 'strict' option of 'send' command
3719
#: bzrlib/builtins.py:5835
3725
#: bzrlib/builtins.py:5836
3720
3726
msgid ""
3721
3727
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3722
3728
"strict disables the check."
3723
3729
msgstr ""
3724
3730
3725
3731
# help of 'mail-to' option of 'send' command
3726
#: bzrlib/builtins.py:5837
3732
#: bzrlib/builtins.py:5838
3727
3733
msgid "Mail the request to this address."
3728
3734
msgstr ""
3729
3735
3730
3736
# help of 'body' option of 'send' command
3731
#: bzrlib/builtins.py:5841
3737
#: bzrlib/builtins.py:5842
3732
3738
msgid "Body for the email."
3733
3739
msgstr ""
3734
3740
3735
3741
# help of 'no-bundle' option of 'send' command
3736
#: bzrlib/builtins.py:5894
3742
#: bzrlib/builtins.py:5895
3737
3743
msgid "Do not include a bundle in the merge directive."
3738
3744
msgstr ""
3739
3745
3740
3746
# help of 'no-patch' option of 'send' command
3741
#: bzrlib/builtins.py:5895
3747
#: bzrlib/builtins.py:5896
3742
3748
msgid "Do not include a preview patch in the merge directive."
3743
3749
msgstr ""
3744
3750
3745
3751
# help of 'remember' option of 'send' command
3746
#: bzrlib/builtins.py:5898
3752
#: bzrlib/builtins.py:5899
3747
3753
msgid "Remember submit and public branch."
3748
3754
msgstr ""
3749
3755
3750
3756
# help of 'from' option of 'send' command
3751
#: bzrlib/builtins.py:5900
3757
#: bzrlib/builtins.py:5901
3752
3758
msgid ""
3753
3759
"Branch to generate the submission from, rather than the one containing the "
3754
3760
"working directory."
3756
3762
3757
3763
# title of 'format' option of 'send' command
3758
3764
# title of 'format' option of 'version-info' command
3759
#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76
3765
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3760
3766
msgid "format"
3761
3767
msgstr ""
3762
3768
3763
3769
# help of 'format' option of 'send' command
3764
#: bzrlib/builtins.py:5911
3770
#: bzrlib/builtins.py:5912
3765
3771
msgid "Use the specified output format."
3766
3772
msgstr ""
3767
3773
3768
#: bzrlib/builtins.py:5933
3774
#: bzrlib/builtins.py:5934
3769
3775
msgid "Create, remove or modify a tag naming a revision."
3770
3776
msgstr ""
3771
3777
3772
#: bzrlib/builtins.py:5935
3778
#: bzrlib/builtins.py:5936
3773
3779
msgid ""
3774
3780
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3775
3781
"(--revision) option can be given -rtag:X, where X is any previously\n"
3776
3782
"created tag."
3777
3783
msgstr ""
3778
3784
3779
#: bzrlib/builtins.py:5939
3785
#: bzrlib/builtins.py:5940
3780
3786
msgid ""
3781
3787
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3782
3788
"along when you branch, push, pull or merge."
3783
3789
msgstr ""
3784
3790
3785
#: bzrlib/builtins.py:5942
3791
#: bzrlib/builtins.py:5943
3786
3792
msgid ""
3787
3793
"It is an error to give a tag name that already exists unless you pass\n"
3788
3794
"--force, in which case the tag is moved to point to the new revision."
3789
3795
msgstr ""
3790
3796
3791
#: bzrlib/builtins.py:5945
3797
#: bzrlib/builtins.py:5946
3792
3798
msgid ""
3793
3799
"To rename a tag (change the name but keep it on the same revsion), run "
3794
3800
"``bzr\n"
3795
3801
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3796
3802
msgstr ""
3797
3803
3798
#: bzrlib/builtins.py:5948
3804
#: bzrlib/builtins.py:5949
3799
3805
msgid ""
3800
3806
"If no tag name is specified it will be determined through the \n"
3801
3807
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3804
3810
msgstr ""
3805
3811
3806
3812
# help of 'delete' option of 'tag' command
3807
#: bzrlib/builtins.py:5958
3813
#: bzrlib/builtins.py:5959
3808
3814
msgid "Delete this tag rather than placing it."
3809
3815
msgstr ""
3810
3816
3811
3817
# help of 'directory' option of 'tag' command
3812
#: bzrlib/builtins.py:5961
3818
#: bzrlib/builtins.py:5962
3813
3819
msgid "Branch in which to place the tag."
3814
3820
msgstr ""
3815
3821
3816
3822
# help of 'force' option of 'tag' command
3817
#: bzrlib/builtins.py:5963
3823
#: bzrlib/builtins.py:5964
3818
3824
msgid "Replace existing tags."
3819
3825
msgstr ""
3820
3826
3821
#: bzrlib/builtins.py:5978
3827
#: bzrlib/builtins.py:5979
3822
3828
msgid "No tag specified to delete."
3823
3829
msgstr ""
3824
3830
3825
#: bzrlib/builtins.py:5980
3831
#: bzrlib/builtins.py:5981
3826
3832
#, python-format
3827
3833
msgid "Deleted tag %s."
3828
3834
msgstr ""
3829
3835
3830
#: bzrlib/builtins.py:5985
3831
msgid "Tags can only be placed on a single revision, not on a range"
3832
msgstr ""
3833
3834
#: bzrlib/builtins.py:5994
3836
#: bzrlib/builtins.py:5995
3835
3837
msgid "Please specify a tag name."
3836
3838
msgstr ""
3837
3839
3838
#: bzrlib/builtins.py:6002
3840
#: bzrlib/builtins.py:6003
3839
3841
#, python-format
3840
3842
msgid "Tag %s already exists for that revision."
3841
3843
msgstr ""
3842
3844
3843
#: bzrlib/builtins.py:6006
3845
#: bzrlib/builtins.py:6007
3844
3846
#, python-format
3845
3847
msgid "Created tag %s."
3846
3848
msgstr ""
3847
3849
3848
#: bzrlib/builtins.py:6008
3850
#: bzrlib/builtins.py:6009
3849
3851
#, python-format
3850
3852
msgid "Updated tag %s."
3851
3853
msgstr ""
3852
3854
3853
#: bzrlib/builtins.py:6012
3855
#: bzrlib/builtins.py:6013
3854
3856
msgid "List tags."
3855
3857
msgstr ""
3856
3858
3857
#: bzrlib/builtins.py:6014
3859
#: bzrlib/builtins.py:6015
3858
3860
msgid ""
3859
3861
"This command shows a table of tag names and the revisions they reference."
3860
3862
msgstr ""
3861
3863
3862
3864
# help of 'directory' option of 'tags' command
3863
#: bzrlib/builtins.py:6020
3865
#: bzrlib/builtins.py:6021
3864
3866
msgid "Branch whose tags should be displayed."
3865
3867
msgstr ""
3866
3868
3867
3869
# help of 'sort' option of 'tags' command
3868
#: bzrlib/builtins.py:6022
3870
#: bzrlib/builtins.py:6023
3869
3871
msgid "Sort tags by different criteria."
3870
3872
msgstr ""
3871
3873
3872
3874
# title of 'sort' option of 'tags' command
3873
#: bzrlib/builtins.py:6022
3875
#: bzrlib/builtins.py:6023
3874
3876
msgid "Sorting"
3875
3877
msgstr ""
3876
3878
3877
#: bzrlib/builtins.py:6091
3879
#: bzrlib/builtins.py:6092
3878
3880
msgid "Reconfigure the type of a bzr directory."
3879
3881
msgstr ""
3880
3882
3881
#: bzrlib/builtins.py:6093
3883
#: bzrlib/builtins.py:6094
3882
3884
msgid "A target configuration must be specified."
3883
3885
msgstr ""
3884
3886
3885
#: bzrlib/builtins.py:6095
3887
#: bzrlib/builtins.py:6096
3886
3888
msgid ""
3887
3889
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3888
3890
"The order of preference is\n"
3894
3896
msgstr ""
3895
3897
3896
3898
# title of 'tree_type' option of 'reconfigure' command
3897
#: bzrlib/builtins.py:6109
3899
#: bzrlib/builtins.py:6110
3898
3900
msgid "Tree type"
3899
3901
msgstr ""
3900
3902
3901
3903
# help of 'tree_type' option of 'reconfigure' command
3902
#: bzrlib/builtins.py:6110
3904
#: bzrlib/builtins.py:6111
3903
3905
msgid "The relation between branch and tree."
3904
3906
msgstr ""
3905
3907
3906
3908
# help of 'tree_type=branch' option of 'reconfigure' command
3907
#: bzrlib/builtins.py:6112
3909
#: bzrlib/builtins.py:6113
3908
3910
msgid "Reconfigure to be an unbound branch with no working tree."
3909
3911
msgstr ""
3910
3912
3911
3913
# help of 'tree_type=tree' option of 'reconfigure' command
3912
#: bzrlib/builtins.py:6113
3914
#: bzrlib/builtins.py:6114
3913
3915
msgid "Reconfigure to be an unbound branch with a working tree."
3914
3916
msgstr ""
3915
3917
3916
3918
# help of 'tree_type=checkout' option of 'reconfigure' command
3917
#: bzrlib/builtins.py:6114
3919
#: bzrlib/builtins.py:6115
3918
3920
msgid "Reconfigure to be a bound branch with a working tree."
3919
3921
msgstr ""
3920
3922
3921
3923
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3922
#: bzrlib/builtins.py:6115
3924
#: bzrlib/builtins.py:6116
3923
3925
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3924
3926
msgstr ""
3925
3927
3926
3928
# title of 'repository_type' option of 'reconfigure' command
3927
#: bzrlib/builtins.py:6120
3929
#: bzrlib/builtins.py:6121
3928
3930
msgid "Repository type"
3929
3931
msgstr ""
3930
3932
3931
3933
# help of 'repository_type' option of 'reconfigure' command
3932
#: bzrlib/builtins.py:6121
3934
#: bzrlib/builtins.py:6122
3933
3935
msgid "Location fo the repository."
3934
3936
msgstr ""
3935
3937
3936
3938
# help of 'repository_type=standalone' option of 'reconfigure' command
3937
#: bzrlib/builtins.py:6123
3939
#: bzrlib/builtins.py:6124
3938
3940
msgid ""
3939
3941
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3940
3942
msgstr ""
3941
3943
3942
3944
# help of 'repository_type=use-shared' option of 'reconfigure' command
3943
#: bzrlib/builtins.py:6125
3945
#: bzrlib/builtins.py:6126
3944
3946
msgid "Reconfigure to use a shared repository."
3945
3947
msgstr ""
3946
3948
3947
3949
# title of 'repository_trees' option of 'reconfigure' command
3948
#: bzrlib/builtins.py:6129
3950
#: bzrlib/builtins.py:6130
3949
3951
msgid "Trees in Repository"
3950
3952
msgstr ""
3951
3953
3952
3954
# help of 'repository_trees' option of 'reconfigure' command
3953
#: bzrlib/builtins.py:6130
3955
#: bzrlib/builtins.py:6131
3954
3956
msgid "Whether new branches in the repository have trees."
3955
3957
msgstr ""
3956
3958
3957
3959
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3958
#: bzrlib/builtins.py:6132
3960
#: bzrlib/builtins.py:6133
3959
3961
msgid "Reconfigure repository to create working trees on branches by default."
3960
3962
msgstr ""
3961
3963
3962
3964
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3963
#: bzrlib/builtins.py:6134
3965
#: bzrlib/builtins.py:6135
3964
3966
msgid ""
3965
3967
"Reconfigure repository to not create working trees on branches by default."
3966
3968
msgstr ""
3967
3969
3968
3970
# help of 'bind-to' option of 'reconfigure' command
3969
#: bzrlib/builtins.py:6137
3971
#: bzrlib/builtins.py:6138
3970
3972
msgid "Branch to bind checkout to."
3971
3973
msgstr ""
3972
3974
3973
3975
# help of 'force' option of 'reconfigure' command
3974
#: bzrlib/builtins.py:6139
3976
#: bzrlib/builtins.py:6140
3975
3977
msgid "Perform reconfiguration even if local changes will be lost."
3976
3978
msgstr ""
3977
3979
3978
3980
# help of 'stacked-on' option of 'reconfigure' command
3979
#: bzrlib/builtins.py:6142
3981
#: bzrlib/builtins.py:6143
3980
3982
msgid "Reconfigure a branch to be stacked on another branch."
3981
3983
msgstr ""
3982
3984
3983
3985
# help of 'unstacked' option of 'reconfigure' command
3984
#: bzrlib/builtins.py:6146
3986
#: bzrlib/builtins.py:6147
3985
3987
msgid ""
3986
3988
"Reconfigure a branch to be unstacked. This may require copying substantial "
3987
3989
"data into it."
3988
3990
msgstr ""
3989
3991
3990
#: bzrlib/builtins.py:6156
3992
#: bzrlib/builtins.py:6157
3991
3993
msgid "Can't use both --stacked-on and --unstacked"
3992
3994
msgstr ""
3993
3995
3994
#: bzrlib/builtins.py:6170
3996
#: bzrlib/builtins.py:6171
3995
3997
msgid "No target configuration specified"
3996
3998
msgstr ""
3997
3999
3998
#: bzrlib/builtins.py:6205
4000
#: bzrlib/builtins.py:6206
3999
4001
msgid "Set the branch of a checkout and update."
4000
4002
msgstr ""
4001
4003
4002
#: bzrlib/builtins.py:6207
4004
#: bzrlib/builtins.py:6208
4003
4005
msgid ""
4004
4006
"For lightweight checkouts, this changes the branch being referenced.\n"
4005
4007
"For heavyweight checkouts, this checks that there are no local commits\n"
4007
4009
"of the new location and binds to it."
4008
4010
msgstr ""
4009
4011
4010
#: bzrlib/builtins.py:6212
4012
#: bzrlib/builtins.py:6213
4011
4013
msgid ""
4012
4014
"In both cases, the working tree is updated and uncommitted changes\n"
4013
4015
"are merged. The user can commit or revert these as they desire."
4014
4016
msgstr ""
4015
4017
4016
#: bzrlib/builtins.py:6215
4018
#: bzrlib/builtins.py:6216
4017
4019
msgid "Pending merges need to be committed or reverted before using switch."
4018
4020
msgstr ""
4019
4021
4020
#: bzrlib/builtins.py:6217
4022
#: bzrlib/builtins.py:6218
4021
4023
msgid ""
4022
4024
"The path to the branch to switch to can be specified relative to the parent\n"
4023
4025
"directory of the current branch. For example, if you are currently in a\n"
4025
4027
"/path/to/newbranch."
4026
4028
msgstr ""
4027
4029
4028
#: bzrlib/builtins.py:6222
4030
#: bzrlib/builtins.py:6223
4029
4031
msgid ""
4030
4032
"Bound branches use the nickname of its master branch unless it is set\n"
4031
4033
"locally, in which case switching will update the local nickname to be\n"
4033
4035
msgstr ""
4034
4036
4035
4037
# help of 'force' option of 'switch' command
4036
#: bzrlib/builtins.py:6230
4038
#: bzrlib/builtins.py:6231
4037
4039
msgid "Switch even if local commits will be lost."
4038
4040
msgstr ""
4039
4041
4040
4042
# help of 'create-branch' option of 'switch' command
4041
#: bzrlib/builtins.py:6233
4043
#: bzrlib/builtins.py:6234
4042
4044
msgid "Create the target branch from this one before switching to it."
4043
4045
msgstr ""
4044
4046
4045
# help of 'store' option of 'switch' command
4046
#: bzrlib/builtins.py:6236
4047
msgid "Store and restore uncommitted changes in the branch."
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6250
4047
#: bzrlib/builtins.py:6248
4051
4048
msgid "You must supply either a revision or a location"
4052
4049
msgstr ""
4053
4050
4054
#: bzrlib/builtins.py:6263
4051
#: bzrlib/builtins.py:6261
4055
4052
msgid "cannot create branch without source branch"
4056
4053
msgstr ""
4057
4054
4058
#: bzrlib/builtins.py:6289
4055
#: bzrlib/builtins.py:6286
4059
4056
msgid "Manage filtered views."
4060
4057
msgstr ""
4061
4058
4062
#: bzrlib/builtins.py:6291
4059
#: bzrlib/builtins.py:6288
4063
4060
msgid ""
4064
4061
"Views provide a mask over the tree so that users can focus on\n"
4065
4062
"a subset of a tree when doing their work. After creating a view,\n"
4069
4066
"must be within the current view."
4070
4067
msgstr ""
4071
4068
4072
#: bzrlib/builtins.py:6298
4069
#: bzrlib/builtins.py:6295
4073
4070
msgid ""
4074
4071
"In most cases, a view has a short life-span: it is created to make\n"
4075
4072
"a selected change and is deleted once that change is committed.\n"
4077
4074
"and switch between them."
4078
4075
msgstr ""
4079
4076
4080
#: bzrlib/builtins.py:6303
4077
#: bzrlib/builtins.py:6300
4081
4078
msgid ""
4082
4079
"To disable the current view without deleting it, you can switch to\n"
4083
4080
"the pseudo view called ``off``. This can be useful when you need\n"
4085
4082
"want to switch back to your view after that."
4086
4083
msgstr ""
4087
4084
4085
#: bzrlib/builtins.py:6305
4086
msgid ""
4087
":Examples:\n"
4088
" To define the current view::"
4089
msgstr ""
4090
4088
4091
#: bzrlib/builtins.py:6308
4089
msgid ""
4090
":Examples:\n"
4091
" To define the current view::"
4092
msgstr ""
4093
4094
#: bzrlib/builtins.py:6311
4095
4092
msgid " bzr view file1 dir1 ..."
4096
4093
msgstr ""
4097
4094
4098
#: bzrlib/builtins.py:6313
4095
#: bzrlib/builtins.py:6310
4099
4096
msgid " To list the current view::"
4100
4097
msgstr ""
4101
4098
4102
#: bzrlib/builtins.py:6315
4099
#: bzrlib/builtins.py:6312
4103
4100
msgid " bzr view"
4104
4101
msgstr ""
4105
4102
4106
#: bzrlib/builtins.py:6317
4103
#: bzrlib/builtins.py:6314
4107
4104
msgid " To delete the current view::"
4108
4105
msgstr ""
4109
4106
4110
#: bzrlib/builtins.py:6319
4107
#: bzrlib/builtins.py:6316
4111
4108
msgid " bzr view --delete"
4112
4109
msgstr ""
4113
4110
4114
#: bzrlib/builtins.py:6321
4111
#: bzrlib/builtins.py:6318
4115
4112
msgid " To disable the current view without deleting it::"
4116
4113
msgstr ""
4117
4114
4118
#: bzrlib/builtins.py:6323
4115
#: bzrlib/builtins.py:6320
4119
4116
msgid " bzr view --switch off"
4120
4117
msgstr ""
4121
4118
4122
#: bzrlib/builtins.py:6325
4119
#: bzrlib/builtins.py:6322
4123
4120
msgid " To define a named view and switch to it::"
4124
4121
msgstr ""
4125
4122
4126
#: bzrlib/builtins.py:6327
4123
#: bzrlib/builtins.py:6324
4127
4124
msgid " bzr view --name view-name file1 dir1 ..."
4128
4125
msgstr ""
4129
4126
4130
#: bzrlib/builtins.py:6329
4127
#: bzrlib/builtins.py:6326
4131
4128
msgid " To list a named view::"
4132
4129
msgstr ""
4133
4130
4134
#: bzrlib/builtins.py:6331
4131
#: bzrlib/builtins.py:6328
4135
4132
msgid " bzr view --name view-name"
4136
4133
msgstr ""
4137
4134
4138
#: bzrlib/builtins.py:6333
4135
#: bzrlib/builtins.py:6330
4139
4136
msgid " To delete a named view::"
4140
4137
msgstr ""
4141
4138
4142
#: bzrlib/builtins.py:6335
4139
#: bzrlib/builtins.py:6332
4143
4140
msgid " bzr view --name view-name --delete"
4144
4141
msgstr ""
4145
4142
4146
#: bzrlib/builtins.py:6337
4143
#: bzrlib/builtins.py:6334
4147
4144
msgid " To switch to a named view::"
4148
4145
msgstr ""
4149
4146
4150
#: bzrlib/builtins.py:6339
4147
#: bzrlib/builtins.py:6336
4151
4148
msgid " bzr view --switch view-name"
4152
4149
msgstr ""
4153
4150
4154
#: bzrlib/builtins.py:6341
4151
#: bzrlib/builtins.py:6338
4155
4152
msgid " To list all views defined::"
4156
4153
msgstr ""
4157
4154
4158
#: bzrlib/builtins.py:6343
4155
#: bzrlib/builtins.py:6340
4159
4156
msgid " bzr view --all"
4160
4157
msgstr ""
4161
4158
4162
#: bzrlib/builtins.py:6345
4159
#: bzrlib/builtins.py:6342
4163
4160
msgid " To delete all views::"
4164
4161
msgstr ""
4165
4162
4166
#: bzrlib/builtins.py:6347
4163
#: bzrlib/builtins.py:6344
4167
4164
msgid " bzr view --delete --all"
4168
4165
msgstr ""
4169
4166
4170
4167
# help of 'all' option of 'view' command
4171
#: bzrlib/builtins.py:6354
4168
#: bzrlib/builtins.py:6351
4172
4169
msgid "Apply list or delete action to all views."
4173
4170
msgstr ""
4174
4171
4175
4172
# help of 'delete' option of 'view' command
4176
#: bzrlib/builtins.py:6357
4173
#: bzrlib/builtins.py:6354
4177
4174
msgid "Delete the view."
4178
4175
msgstr ""
4179
4176
4180
4177
# help of 'name' option of 'view' command
4181
#: bzrlib/builtins.py:6360
4178
#: bzrlib/builtins.py:6357
4182
4179
msgid "Name of the view to define, list or delete."
4183
4180
msgstr ""
4184
4181
4185
4182
# help of 'switch' option of 'view' command
4186
#: bzrlib/builtins.py:6364
4183
#: bzrlib/builtins.py:6361
4187
4184
msgid "Name of the view to switch to."
4188
4185
msgstr ""
4189
4186
4187
#: bzrlib/builtins.py:6380
4188
msgid "Both --delete and a file list specified"
4189
msgstr ""
4190
4190
4191
#: bzrlib/builtins.py:6383
4191
msgid "Both --delete and a file list specified"
4192
msgid "Both --delete and --switch specified"
4192
4193
msgstr ""
4193
4194
4194
4195
#: bzrlib/builtins.py:6386
4195
msgid "Both --delete and --switch specified"
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:6389
4199
4196
msgid "Deleted all views.\n"
4200
4197
msgstr ""
4201
4198
4199
#: bzrlib/builtins.py:6388
4200
msgid "No current view to delete"
4201
msgstr ""
4202
4202
4203
#: bzrlib/builtins.py:6391
4203
msgid "No current view to delete"
4204
msgstr ""
4205
4206
#: bzrlib/builtins.py:6394
4207
4204
#, python-format
4208
4205
msgid "Deleted '%s' view.\n"
4209
4206
msgstr ""
4210
4207
4208
#: bzrlib/builtins.py:6395
4209
msgid "Both --switch and a file list specified"
4210
msgstr ""
4211
4211
4212
#: bzrlib/builtins.py:6398
4212
msgid "Both --switch and a file list specified"
4213
msgid "Both --switch and --all specified"
4213
4214
msgstr ""
4214
4215
4215
4216
#: bzrlib/builtins.py:6401
4216
msgid "Both --switch and --all specified"
4217
msgstr ""
4218
4219
#: bzrlib/builtins.py:6404
4220
4217
msgid "No current view to disable"
4221
4218
msgstr ""
4222
4219
4223
#: bzrlib/builtins.py:6406
4220
#: bzrlib/builtins.py:6403
4224
4221
#, python-format
4225
4222
msgid "Disabled '%s' view.\n"
4226
4223
msgstr ""
4227
4224
4228
#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432
4225
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4229
4226
msgid "Using '{0}' view: {1}\n"
4230
4227
msgstr ""
4231
4228
4232
#: bzrlib/builtins.py:6413
4229
#: bzrlib/builtins.py:6410
4233
4230
msgid "Views defined:\n"
4234
4231
msgstr ""
4235
4232
4236
#: bzrlib/builtins.py:6422
4233
#: bzrlib/builtins.py:6419
4237
4234
msgid "No views defined.\n"
4238
4235
msgstr ""
4239
4236
4240
#: bzrlib/builtins.py:6429
4237
#: bzrlib/builtins.py:6426
4241
4238
msgid "Cannot change the 'off' pseudo view"
4242
4239
msgstr ""
4243
4240
4241
#: bzrlib/builtins.py:6434
4242
msgid "No current view.\n"
4243
msgstr ""
4244
4244
4245
#: bzrlib/builtins.py:6437
4245
msgid "No current view.\n"
4246
msgstr ""
4247
4248
#: bzrlib/builtins.py:6440
4249
4246
msgid "'{0}' view is: {1}\n"
4250
4247
msgstr ""
4251
4248
4252
#: bzrlib/builtins.py:6460
4249
#: bzrlib/builtins.py:6457
4253
4250
msgid " <no hooks installed>\n"
4254
4251
msgstr ""
4255
4252
4256
#: bzrlib/builtins.py:6464
4253
#: bzrlib/builtins.py:6461
4257
4254
msgid "Remove a branch."
4258
4255
msgstr ""
4259
4256
4260
#: bzrlib/builtins.py:6466
4257
#: bzrlib/builtins.py:6463
4261
4258
msgid ""
4262
4259
"This will remove the branch from the specified location but \n"
4263
4260
"will keep any working tree or repository in place."
4264
4261
msgstr ""
4265
4262
4266
#: bzrlib/builtins.py:6471
4263
#: bzrlib/builtins.py:6468
4267
4264
msgid " Remove the branch at repo/trunk::"
4268
4265
msgstr ""
4269
4266
4270
#: bzrlib/builtins.py:6473
4267
#: bzrlib/builtins.py:6470
4271
4268
msgid " bzr remove-branch repo/trunk"
4272
4269
msgstr ""
4273
4270
4274
4271
# help of 'force' option of 'remove-branch' command
4275
#: bzrlib/builtins.py:6480
4272
#: bzrlib/builtins.py:6477
4276
4273
msgid "Remove branch even if it is the active branch."
4277
4274
msgstr ""
4278
4275
4279
#: bzrlib/builtins.py:6494
4276
#: bzrlib/builtins.py:6491
4280
4277
msgid "Branch is active. Use --force to remove it."
4281
4278
msgstr ""
4282
4279
4283
4280
# help of 'writer=plain' option of 'shelve' command
4284
#: bzrlib/builtins.py:6498
4281
#: bzrlib/builtins.py:6495
4285
4282
msgid "Plaintext diff output."
4286
4283
msgstr ""
4287
4284
4288
#: bzrlib/builtins.py:6499
4285
#: bzrlib/builtins.py:6496
4289
4286
msgid "Temporarily set aside some changes from the current tree."
4290
4287
msgstr ""
4291
4288
4292
#: bzrlib/builtins.py:6501
4289
#: bzrlib/builtins.py:6498
4293
4290
msgid ""
4294
4291
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4295
4292
"ie. out of the way, until a later time when you can bring them back from\n"
4298
4295
"will they survive its deletion."
4299
4296
msgstr ""
4300
4297
4301
#: bzrlib/builtins.py:6507
4298
#: bzrlib/builtins.py:6504
4302
4299
msgid "If shelve --list is specified, previously-shelved changes are listed."
4303
4300
msgstr ""
4304
4301
4305
#: bzrlib/builtins.py:6509
4302
#: bzrlib/builtins.py:6506
4306
4303
msgid ""
4307
4304
"Shelve is intended to help separate several sets of changes that have\n"
4308
4305
"been inappropriately mingled. If you just want to get rid of all changes\n"
4310
4307
"shelve all text changes at once, use shelve --all."
4311
4308
msgstr ""
4312
4309
4313
#: bzrlib/builtins.py:6514
4310
#: bzrlib/builtins.py:6511
4314
4311
msgid ""
4315
4312
"If filenames are specified, only the changes to those files will be\n"
4316
4313
"shelved. Other files will be left untouched."
4317
4314
msgstr ""
4318
4315
4319
#: bzrlib/builtins.py:6517
4316
#: bzrlib/builtins.py:6514
4320
4317
msgid ""
4321
4318
"If a revision is specified, changes since that revision will be shelved."
4322
4319
msgstr ""
4323
4320
4324
#: bzrlib/builtins.py:6519
4321
#: bzrlib/builtins.py:6516
4325
4322
msgid ""
4326
4323
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4327
4324
"restore the most recently shelved changes."
4328
4325
msgstr ""
4329
4326
4330
#: bzrlib/builtins.py:6522
4327
#: bzrlib/builtins.py:6519
4331
4328
msgid ""
4332
4329
"For complicated changes, it is possible to edit the changes in a separate\n"
4333
4330
"editor program to decide what the file remaining in the working copy\n"
4334
4331
"should look like. To do this, add the configuration option"
4335
4332
msgstr ""
4336
4333
4337
#: bzrlib/builtins.py:6526
4334
#: bzrlib/builtins.py:6523
4338
4335
msgid " change_editor = PROGRAM @new_path @old_path"
4339
4336
msgstr ""
4340
4337
4341
#: bzrlib/builtins.py:6528
4338
#: bzrlib/builtins.py:6525
4342
4339
msgid ""
4343
4340
"where @new_path is replaced with the path of the new version of the \n"
4344
4341
"file and @old_path is replaced with the path of the old version of \n"
4348
4345
msgstr ""
4349
4346
4350
4347
# help of 'all' option of 'shelve' command
4351
#: bzrlib/builtins.py:6540
4348
#: bzrlib/builtins.py:6537
4352
4349
msgid "Shelve all changes."
4353
4350
msgstr ""
4354
4351
4355
4352
# help of 'writer' option of 'shelve' command
4356
#: bzrlib/builtins.py:6542
4353
#: bzrlib/builtins.py:6539
4357
4354
msgid "Method to use for writing diffs."
4358
4355
msgstr ""
4359
4356
4360
4357
# title of 'writer' option of 'shelve' command
4361
#: bzrlib/builtins.py:6542
4358
#: bzrlib/builtins.py:6539
4362
4359
msgid "writer"
4363
4360
msgstr ""
4364
4361
4365
4362
# help of 'list' option of 'shelve' command
4366
#: bzrlib/builtins.py:6546
4363
#: bzrlib/builtins.py:6543
4367
4364
msgid "List shelved changes."
4368
4365
msgstr ""
4369
4366
4370
4367
# help of 'destroy' option of 'shelve' command
4371
#: bzrlib/builtins.py:6548
4368
#: bzrlib/builtins.py:6545
4372
4369
msgid "Destroy removed changes instead of shelving them."
4373
4370
msgstr ""
4374
4371
4375
#: bzrlib/builtins.py:6577
4372
#: bzrlib/builtins.py:6574
4376
4373
msgid "No shelved changes."
4377
4374
msgstr ""
4378
4375
4379
#: bzrlib/builtins.py:6588
4376
#: bzrlib/builtins.py:6585
4380
4377
msgid "Restore shelved changes."
4381
4378
msgstr ""
4382
4379
4383
#: bzrlib/builtins.py:6590
4380
#: bzrlib/builtins.py:6587
4384
4381
msgid ""
4385
4382
"By default, the most recently shelved changes are restored. However if you\n"
4386
4383
"specify a shelf by id those changes will be restored instead. This works\n"
4388
4385
msgstr ""
4389
4386
4390
4387
# help of 'action' option of 'unshelve' command
4391
#: bzrlib/builtins.py:6599
4388
#: bzrlib/builtins.py:6596
4392
4389
msgid "The action to perform."
4393
4390
msgstr ""
4394
4391
4395
4392
# title of 'action' option of 'resolve' command
4396
4393
# title of 'action' option of 'unshelve' command
4397
#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694
4394
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4398
4395
msgid "action"
4399
4396
msgstr ""
4400
4397
4401
4398
# help of 'action=apply' option of 'unshelve' command
4402
#: bzrlib/builtins.py:6601
4399
#: bzrlib/builtins.py:6598
4403
4400
msgid "Apply changes and remove from the shelf."
4404
4401
msgstr ""
4405
4402
4406
4403
# help of 'action=dry-run' option of 'unshelve' command
4407
#: bzrlib/builtins.py:6602
4404
#: bzrlib/builtins.py:6599
4408
4405
msgid "Show changes, but do not apply or remove them."
4409
4406
msgstr ""
4410
4407
4411
4408
# help of 'action=preview' option of 'unshelve' command
4412
#: bzrlib/builtins.py:6603
4409
#: bzrlib/builtins.py:6600
4413
4410
msgid ""
4414
4411
"Instead of unshelving the changes, show the diff that would result from "
4415
4412
"unshelving."
4416
4413
msgstr ""
4417
4414
4418
4415
# help of 'action=delete-only' option of 'unshelve' command
4419
#: bzrlib/builtins.py:6605
4416
#: bzrlib/builtins.py:6602
4420
4417
msgid "Delete changes without applying them."
4421
4418
msgstr ""
4422
4419
4423
4420
# help of 'action=keep' option of 'unshelve' command
4424
#: bzrlib/builtins.py:6606
4421
#: bzrlib/builtins.py:6603
4425
4422
msgid "Apply changes but don't delete them."
4426
4423
msgstr ""
4427
4424
4428
#: bzrlib/builtins.py:6621
4425
#: bzrlib/builtins.py:6618
4429
4426
msgid "Remove unwanted files from working tree."
4430
4427
msgstr ""
4431
4428
4432
#: bzrlib/builtins.py:6623
4429
#: bzrlib/builtins.py:6620
4433
4430
msgid ""
4434
4431
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4435
4432
"files are never deleted."
4436
4433
msgstr ""
4437
4434
4438
#: bzrlib/builtins.py:6626
4435
#: bzrlib/builtins.py:6623
4439
4436
msgid ""
4440
4437
"Another class is 'detritus', which includes files emitted by bzr during\n"
4441
4438
"normal operations and selftests. (The value of these files decreases with\n"
4442
4439
"time.)"
4443
4440
msgstr ""
4444
4441
4445
#: bzrlib/builtins.py:6630
4442
#: bzrlib/builtins.py:6627
4446
4443
msgid ""
4447
4444
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4448
4445
"flags are respected, and may be combined."
4449
4446
msgstr ""
4450
4447
4451
#: bzrlib/builtins.py:6633
4448
#: bzrlib/builtins.py:6630
4452
4449
msgid "To check what clean-tree will do, use --dry-run."
4453
4450
msgstr ""
4454
4451
4455
4452
# help of 'ignored' option of 'clean-tree' command
4456
#: bzrlib/builtins.py:6636
4453
#: bzrlib/builtins.py:6633
4457
4454
msgid "Delete all ignored files."
4458
4455
msgstr ""
4459
4456
4460
4457
# help of 'detritus' option of 'clean-tree' command
4461
#: bzrlib/builtins.py:6637
4458
#: bzrlib/builtins.py:6634
4462
4459
msgid ""
4463
4460
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4464
4461
msgstr ""
4465
4462
4466
4463
# help of 'unknown' option of 'clean-tree' command
4467
#: bzrlib/builtins.py:6640
4464
#: bzrlib/builtins.py:6637
4468
4465
msgid "Delete files unknown to bzr (default)."
4469
4466
msgstr ""
4470
4467
4471
4468
# help of 'dry-run' option of 'clean-tree' command
4472
#: bzrlib/builtins.py:6641
4469
#: bzrlib/builtins.py:6638
4473
4470
msgid "Show files to delete instead of deleting them."
4474
4471
msgstr ""
4475
4472
4476
4473
# help of 'force' option of 'clean-tree' command
4477
#: bzrlib/builtins.py:6643
4474
#: bzrlib/builtins.py:6640
4478
4475
msgid "Do not prompt before deleting."
4479
4476
msgstr ""
4480
4477
4749
4746
msgstr ""
4750
4747
4751
4748
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4752
#: en/help_topics/configuration.txt:738
4749
#: en/help_topics/configuration.txt:722
4753
4750
msgid "For example::"
4754
4751
msgstr ""
4755
4752
4890
4887
msgid "extra argument to command {0}: {1}"
4891
4888
msgstr ""
4892
4889
4893
#: bzrlib/commands.py:952
4890
#: bzrlib/commands.py:972
4894
4891
#, python-format
4895
4892
msgid "Profile data written to \"%s\"."
4896
4893
msgstr ""
4996
4993
msgid "All commits signed with verifiable keys"
4997
4994
msgstr ""
4998
4995
4999
#: bzrlib/config.py:438
4996
#: bzrlib/config.py:436
5000
4997
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5001
4998
msgstr ""
5002
4999
5003
#: bzrlib/config.py:2468
5000
#: bzrlib/config.py:2452
5004
5001
msgid "{0} is not an SI unit."
5005
5002
msgstr ""
5006
5003
5007
#: bzrlib/config.py:2989
5004
#: bzrlib/config.py:2971
5008
5005
msgid ""
5009
5006
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5010
5007
"will be saved."
5011
5008
msgstr ""
5012
5009
5013
#: bzrlib/config.py:3134
5010
#: bzrlib/config.py:3116
5014
5011
#, python-format
5015
5012
msgid "Invalid '%s', should be of the form 'name=value'"
5016
5013
msgstr ""
5017
5014
5018
#: bzrlib/config.py:4089
5015
#: bzrlib/config.py:4018
5019
5016
msgid "Display, set or remove a configuration option."
5020
5017
msgstr ""
5021
5018
5022
#: bzrlib/config.py:4091
5023
msgid "Display the active value for option NAME."
5019
#: bzrlib/config.py:4020
5020
msgid "Display the active value for a given option."
5024
5021
msgstr ""
5025
5022
5026
#: bzrlib/config.py:4093
5023
#: bzrlib/config.py:4022
5027
5024
msgid ""
5028
5025
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5029
"matching options are displayed mentioning their scope and without resolving\n"
5030
"option references in the value). The active value that bzr will take into\n"
5031
"account is the first one displayed for each option."
5032
msgstr ""
5033
5034
#: bzrlib/config.py:4098
5035
msgid ""
5036
"If NAME is not given, --all .* is implied (all options are displayed for "
5037
"the\n"
5038
"current scope)."
5039
msgstr ""
5040
5041
#: bzrlib/config.py:4101
5042
msgid ""
5043
"Setting a value is achieved by using NAME=value without spaces. The value\n"
5026
"matching options are displayed mentioning their scope. The active value\n"
5027
"that bzr will take into account is the first one displayed for each option."
5028
msgstr ""
5029
5030
#: bzrlib/config.py:4026
5031
msgid "If no NAME is given, --all .* is implied."
5032
msgstr ""
5033
5034
#: bzrlib/config.py:4028
5035
msgid ""
5036
"Setting a value is achieved by using name=value without spaces. The value\n"
5044
5037
"is set in the most relevant scope and can be checked by displaying the\n"
5045
5038
"option again."
5046
5039
msgstr ""
5047
5040
5048
#: bzrlib/config.py:4105
5049
msgid "Removing a value is achieved by using --remove NAME."
5050
msgstr ""
5051
5052
5041
# help of 'scope' option of 'config' command
5053
#: bzrlib/config.py:4115
5042
#: bzrlib/config.py:4040
5054
5043
msgid "Reduce the scope to the specified configuration file."
5055
5044
msgstr ""
5056
5045
5057
5046
# help of 'all' option of 'config' command
5058
#: bzrlib/config.py:4119
5047
#: bzrlib/config.py:4044
5059
5048
msgid "Display all the defined values for the matching options."
5060
5049
msgstr ""
5061
5050
5062
5051
# help of 'remove' option of 'config' command
5063
#: bzrlib/config.py:4121
5052
#: bzrlib/config.py:4046
5064
5053
msgid "Remove the option from the configuration file."
5065
5054
msgstr ""
5066
5055
5150
5139
msgid "{0} is{1} redirected to {2}"
5151
5140
msgstr ""
5152
5141
5153
#: bzrlib/diff.py:400
5142
#: bzrlib/diff.py:399
5154
5143
#, python-format
5155
5144
msgid "*** Ignoring files outside view. View is %s"
5156
5145
msgstr ""
6218
6207
6219
6208
#: bzrlib/errors.py:2898
6220
6209
msgid ""
6221
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6222
msgstr ""
6223
6224
#: bzrlib/errors.py:2913
6225
msgid ""
6226
6210
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6227
6211
"%(more)s"
6228
6212
msgstr ""
6229
6213
6230
#: bzrlib/errors.py:2919
6214
#: bzrlib/errors.py:2904
6231
6215
msgid "Variable {%(name)s} is not available."
6232
6216
msgstr ""
6233
6217
6234
#: bzrlib/errors.py:2927
6218
#: bzrlib/errors.py:2912
6235
6219
msgid "No template specified."
6236
6220
msgstr ""
6237
6221
6222
#: bzrlib/errors.py:2917
6223
msgid "Unable to create symlink %(path_str)son this platform"
6224
msgstr ""
6225
6238
6226
#: bzrlib/errors.py:2932
6239
msgid "Unable to create symlink %(path_str)son this platform"
6240
msgstr ""
6241
6242
#: bzrlib/errors.py:2947
6243
6227
msgid ""
6244
6228
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6245
6229
"\", \"local\"."
6246
6230
msgstr ""
6247
6231
6248
#: bzrlib/errors.py:2981
6232
#: bzrlib/errors.py:2966
6249
6233
msgid ""
6250
6234
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6251
6235
msgstr ""
6252
6236
6253
#: bzrlib/errors.py:2993
6237
#: bzrlib/errors.py:2978
6254
6238
msgid "The \"%(config_id)s\" configuration does not exist."
6255
6239
msgstr ""
6256
6240
6257
#: bzrlib/errors.py:3001
6241
#: bzrlib/errors.py:2986
6258
6242
msgid "The \"%(option_name)s\" configuration option does not exist."
6259
6243
msgstr ""
6260
6244
6261
#: bzrlib/errors.py:3009
6245
#: bzrlib/errors.py:2994
6262
6246
msgid "The alias \"%(alias_name)s\" does not exist."
6263
6247
msgstr ""
6264
6248
6265
#: bzrlib/errors.py:3023
6249
#: bzrlib/errors.py:3008
6266
6250
msgid "\"%(alias_name)s\" is not a valid location alias."
6267
6251
msgstr ""
6268
6252
6269
#: bzrlib/errors.py:3031
6253
#: bzrlib/errors.py:3016
6270
6254
msgid "No %(alias_name)s location assigned."
6271
6255
msgstr ""
6272
6256
6273
#: bzrlib/errors.py:3039
6257
#: bzrlib/errors.py:3024
6274
6258
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6275
6259
msgstr ""
6276
6260
6277
#: bzrlib/errors.py:3049
6261
#: bzrlib/errors.py:3034
6278
6262
msgid "Unknown rules detected: %(unknowns_str)s."
6279
6263
msgstr ""
6280
6264
6281
#: bzrlib/errors.py:3060
6265
#: bzrlib/errors.py:3045
6282
6266
msgid "Tip change rejected: %(msg)s"
6283
6267
msgstr ""
6284
6268
6285
#: bzrlib/errors.py:3068
6269
#: bzrlib/errors.py:3053
6286
6270
msgid "Shelf corrupt."
6287
6271
msgstr ""
6288
6272
6289
#: bzrlib/errors.py:3073
6273
#: bzrlib/errors.py:3058
6290
6274
msgid "Corruption while decompressing repository file%(orig_error)s"
6291
6275
msgstr ""
6292
6276
6293
#: bzrlib/errors.py:3085
6277
#: bzrlib/errors.py:3070
6294
6278
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6295
6279
msgstr ""
6296
6280
6297
#: bzrlib/errors.py:3093
6281
#: bzrlib/errors.py:3078
6298
6282
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6299
6283
msgstr ""
6300
6284
6301
#: bzrlib/errors.py:3101
6285
#: bzrlib/errors.py:3086
6302
6286
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6303
6287
msgstr ""
6304
6288
6305
#: bzrlib/errors.py:3109
6289
#: bzrlib/errors.py:3094
6306
6290
msgid "The user aborted the operation."
6307
6291
msgstr ""
6308
6292
6309
#: bzrlib/errors.py:3114
6293
#: bzrlib/errors.py:3099
6310
6294
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6311
6295
msgstr ""
6312
6296
6313
#: bzrlib/errors.py:3124
6297
#: bzrlib/errors.py:3109
6314
6298
msgid "No such view: %(view_name)s."
6315
6299
msgstr ""
6316
6300
6317
#: bzrlib/errors.py:3134
6301
#: bzrlib/errors.py:3119
6318
6302
msgid ""
6319
6303
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6320
6304
"to a later format."
6321
6305
msgstr ""
6322
6306
6323
#: bzrlib/errors.py:3143
6307
#: bzrlib/errors.py:3128
6324
6308
msgid ""
6325
6309
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6326
6310
msgstr ""
6327
6311
6328
#: bzrlib/errors.py:3210
6312
#: bzrlib/errors.py:3195
6329
6313
msgid "%(bzrdir)r does not support co-located branches."
6330
6314
msgstr ""
6331
6315
6332
#: bzrlib/errors.py:3216
6316
#: bzrlib/errors.py:3201
6333
6317
msgid ""
6334
6318
"Unable to determine your name.\n"
6335
6319
"Please, set your name with the 'whoami' command.\n"
6336
6320
"E.g. bzr whoami \"Your Name <name@example.com>\""
6337
6321
msgstr ""
6338
6322
6339
#: bzrlib/errors.py:3225
6323
#: bzrlib/errors.py:3210
6340
6324
msgid "Invalid pattern(s) found. %(msg)s"
6341
6325
msgstr ""
6342
6326
6343
#: bzrlib/errors.py:3233
6327
#: bzrlib/errors.py:3218
6344
6328
msgid ""
6345
6329
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6346
6330
"unbind` to fix."
6347
6331
msgstr ""
6348
6332
6349
#: bzrlib/errors.py:3244
6333
#: bzrlib/errors.py:3229
6350
6334
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6351
6335
msgstr ""
6352
6336
6353
#: bzrlib/errors.py:3253
6337
#: bzrlib/errors.py:3238
6354
6338
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6355
6339
msgstr ""
6356
6340
6357
#: bzrlib/errors.py:3262
6341
#: bzrlib/errors.py:3247
6358
6342
msgid ""
6359
6343
"No compatible object available for operations from %(source)r to %(target)r."
6360
6344
msgstr ""
6361
6345
6362
#: bzrlib/errors.py:3272
6346
#: bzrlib/errors.py:3257
6363
6347
msgid ""
6364
6348
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6365
6349
"%(arguments)s."
6366
6350
msgstr ""
6367
6351
6368
#: bzrlib/errors.py:3282
6352
#: bzrlib/errors.py:3267
6369
6353
msgid ""
6370
6354
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6371
6355
"format %(format)r"
6372
6356
msgstr ""
6373
6357
6374
#: bzrlib/errors.py:3294
6358
#: bzrlib/errors.py:3279
6375
6359
msgid ""
6376
6360
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6377
6361
"plugin."
6378
6362
msgstr ""
6379
6363
6380
#: bzrlib/errors.py:3307
6364
#: bzrlib/errors.py:3292
6381
6365
msgid "Binary files section encountered."
6382
6366
msgstr ""
6383
6367
6384
#: bzrlib/errors.py:3315
6368
#: bzrlib/errors.py:3300
6385
6369
msgid ""
6386
6370
"Malformed patch header. %(desc)s\n"
6387
6371
"%(line)r"
6388
6372
msgstr ""
6389
6373
6390
#: bzrlib/errors.py:3324
6374
#: bzrlib/errors.py:3309
6391
6375
msgid ""
6392
6376
"Malformed hunk header. %(desc)s\n"
6393
6377
"%(line)r"
6394
6378
msgstr ""
6395
6379
6396
#: bzrlib/errors.py:3333
6380
#: bzrlib/errors.py:3318
6397
6381
msgid ""
6398
6382
"Malformed line. %(desc)s\n"
6399
6383
"%(line)r"
6400
6384
msgstr ""
6401
6385
6402
#: bzrlib/errors.py:3343
6386
#: bzrlib/errors.py:3328
6403
6387
msgid ""
6404
6388
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6405
6389
"but patch says it should be \"%(patch_line)s\""
6406
6390
msgstr ""
6407
6391
6408
#: bzrlib/errors.py:3354
6392
#: bzrlib/errors.py:3339
6409
6393
msgid "The feature %(feature)s has already been registered."
6410
6394
msgstr ""
6411
6395
6412
#: bzrlib/errors.py:3362
6413
msgid ""
6414
"Cannot store uncommitted changes because this branch already stores "
6415
"uncommitted changes."
6416
msgstr ""
6417
6418
6396
#: bzrlib/export_pot.py:252
6419
6397
#, python-format
6420
6398
msgid "Exporting messages from builtin command: %s"
6543
6521
msgid "annotating"
6544
6522
msgstr ""
6545
6523
6546
#: bzrlib/lock.py:549
6524
#: bzrlib/lock.py:548
6547
6525
msgid "{0!r} was {1} locked again"
6548
6526
msgstr ""
6549
6527
6815
6793
msgid "Generate only the shell function, don't enable it"
6816
6794
msgstr ""
6817
6795
6818
#: bzrlib/plugins/grep/cmds.py:77
6819
msgid "Print lines matching PATTERN for specified files and revisions."
6820
msgstr ""
6821
6822
#: bzrlib/plugins/grep/cmds.py:79
6823
msgid ""
6824
"This command searches the specified files and revisions for a given\n"
6825
"pattern. The pattern is specified as a Python regular expressions[1]."
6826
msgstr ""
6827
6828
#: bzrlib/plugins/grep/cmds.py:82
6829
msgid ""
6830
"If the file name is not specified, the revisions starting with the\n"
6831
"current directory are searched recursively. If the revision number is\n"
6832
"not specified, the working copy is searched. To search the last committed\n"
6833
"revision, use the '-r -1' or '-r last:1' option."
6834
msgstr ""
6835
6836
#: bzrlib/plugins/grep/cmds.py:87
6837
msgid ""
6838
"Unversioned files are not searched unless explicitly specified on the\n"
6839
"command line. Unversioned directores are not searched."
6840
msgstr ""
6841
6842
#: bzrlib/plugins/grep/cmds.py:90
6843
msgid ""
6844
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6845
"format. If a revision is explicitly searched, the output is shown as\n"
6846
"'filepath~N:string', where N is the revision number."
6847
msgstr ""
6848
6849
#: bzrlib/plugins/grep/cmds.py:94
6850
msgid ""
6851
"--include and --exclude options can be used to search only (or exclude\n"
6852
"from search) files with base name matches the specified Unix style GLOB\n"
6853
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6854
"to quote wildcard or backslash character literally. Note that the glob\n"
6855
"pattern is not a regular expression."
6856
msgstr ""
6857
6858
#: bzrlib/plugins/grep/cmds.py:100
6859
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6860
msgstr ""
6861
6862
# help of 'color' option of 'grep' command
6863
#: bzrlib/plugins/grep/cmds.py:109
6864
msgid "Show match in color. WHEN is never, always or auto."
6865
msgstr ""
6866
6867
# help of 'diff' option of 'grep' command
6868
#: bzrlib/plugins/grep/cmds.py:111
6869
msgid "Grep for pattern in changeset for each revision."
6870
msgstr ""
6871
6872
# help of 'exclude' option of 'grep' command
6873
#: bzrlib/plugins/grep/cmds.py:113
6874
msgid "Skip files whose base name matches GLOB."
6875
msgstr ""
6876
6877
# help of 'include' option of 'grep' command
6878
#: bzrlib/plugins/grep/cmds.py:115
6879
msgid "Search only files whose base name matches GLOB."
6880
msgstr ""
6881
6882
# help of 'files-with-matches' option of 'grep' command
6883
#: bzrlib/plugins/grep/cmds.py:117
6884
msgid "Print only the name of each input file in which PATTERN is found."
6885
msgstr ""
6886
6887
# help of 'files-without-match' option of 'grep' command
6888
#: bzrlib/plugins/grep/cmds.py:120
6889
msgid "Print only the name of each input file in which PATTERN is not found."
6890
msgstr ""
6891
6892
# help of 'fixed-string' option of 'grep' command
6893
#: bzrlib/plugins/grep/cmds.py:123
6894
msgid "Interpret PATTERN is a single fixed string (not regex)."
6895
msgstr ""
6896
6897
# help of 'from-root' option of 'grep' command
6898
#: bzrlib/plugins/grep/cmds.py:125
6899
msgid ""
6900
"Search for pattern starting from the root of the branch. (implies --"
6901
"recursive)"
6902
msgstr ""
6903
6904
# help of 'ignore-case' option of 'grep' command
6905
#: bzrlib/plugins/grep/cmds.py:128
6906
msgid "ignore case distinctions while matching."
6907
msgstr ""
6908
6909
# help of 'levels' option of 'grep' command
6910
#: bzrlib/plugins/grep/cmds.py:130
6911
msgid ""
6912
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6913
msgstr ""
6914
6915
# help of 'line-number' option of 'grep' command
6916
#: bzrlib/plugins/grep/cmds.py:135
6917
msgid "show 1-based line number."
6918
msgstr ""
6919
6920
# help of 'no-recursive' option of 'grep' command
6921
#: bzrlib/plugins/grep/cmds.py:137
6922
msgid "Don't recurse into subdirectories. (default is --recursive)"
6923
msgstr ""
6924
6925
# help of 'null' option of 'grep' command
6926
#: bzrlib/plugins/grep/cmds.py:139
6927
msgid ""
6928
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6929
"newline."
6930
msgstr ""
6931
6932
6796
#: bzrlib/plugins/launchpad/account.py:66
6933
6797
msgid "Setting ssh/sftp usernames for launchpad.net."
6934
6798
msgstr ""
6935
6799
6936
#: bzrlib/plugins/launchpad/cmds.py:43
6800
#: bzrlib/plugins/launchpad/cmds.py:44
6937
6801
msgid "Register a branch with launchpad.net."
6938
6802
msgstr ""
6939
6803
6940
#: bzrlib/plugins/launchpad/cmds.py:45
6804
#: bzrlib/plugins/launchpad/cmds.py:46
6941
6805
msgid ""
6942
6806
"This command lists a bzr branch in the directory of branches on\n"
6943
6807
"launchpad.net. Registration allows the branch to be associated with\n"
6944
6808
"bugs or specifications."
6945
6809
msgstr ""
6946
6810
6947
#: bzrlib/plugins/launchpad/cmds.py:49
6811
#: bzrlib/plugins/launchpad/cmds.py:50
6948
6812
msgid ""
6949
6813
"Before using this command you must register the project to which the\n"
6950
6814
"branch belongs, and create an account for yourself on launchpad.net."
6951
6815
msgstr ""
6952
6816
6953
#: bzrlib/plugins/launchpad/cmds.py:52
6817
#: bzrlib/plugins/launchpad/cmds.py:53
6954
6818
msgid ""
6955
6819
"arguments:\n"
6956
6820
" public_url: The publicly visible url for the branch to register.\n"
6962
6826
" otherwise error."
6963
6827
msgstr ""
6964
6828
6965
#: bzrlib/plugins/launchpad/cmds.py:61
6829
#: bzrlib/plugins/launchpad/cmds.py:62
6966
6830
msgid ""
6967
6831
"example:\n"
6968
6832
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6970
6834
msgstr ""
6971
6835
6972
6836
# help of 'project' option of 'register-branch' command
6973
#: bzrlib/plugins/launchpad/cmds.py:68
6837
#: bzrlib/plugins/launchpad/cmds.py:69
6974
6838
msgid "Launchpad project short name to associate with the branch."
6975
6839
msgstr ""
6976
6840
6977
6841
# help of 'branch-name' option of 'register-branch' command
6978
#: bzrlib/plugins/launchpad/cmds.py:75
6842
#: bzrlib/plugins/launchpad/cmds.py:76
6979
6843
msgid ""
6980
6844
"Short name for the branch; by default taken from the last component of the "
6981
6845
"url."
6982
6846
msgstr ""
6983
6847
6984
6848
# help of 'branch-title' option of 'register-branch' command
6985
#: bzrlib/plugins/launchpad/cmds.py:79
6849
#: bzrlib/plugins/launchpad/cmds.py:80
6986
6850
msgid "One-sentence description of the branch."
6987
6851
msgstr ""
6988
6852
6989
6853
# help of 'branch-description' option of 'register-branch' command
6990
#: bzrlib/plugins/launchpad/cmds.py:82
6854
#: bzrlib/plugins/launchpad/cmds.py:83
6991
6855
msgid "Longer description of the purpose or contents of the branch."
6992
6856
msgstr ""
6993
6857
6994
6858
# help of 'author' option of 'register-branch' command
6995
#: bzrlib/plugins/launchpad/cmds.py:85
6859
#: bzrlib/plugins/launchpad/cmds.py:86
6996
6860
msgid "Branch author's email address, if not yourself."
6997
6861
msgstr ""
6998
6862
6999
6863
# help of 'link-bug' option of 'register-branch' command
7000
#: bzrlib/plugins/launchpad/cmds.py:88
6864
#: bzrlib/plugins/launchpad/cmds.py:89
7001
6865
msgid "The bug this branch fixes."
7002
6866
msgstr ""
7003
6867
7004
6868
# help of 'dry-run' option of 'register-branch' command
7005
#: bzrlib/plugins/launchpad/cmds.py:91
6869
#: bzrlib/plugins/launchpad/cmds.py:92
7006
6870
msgid "Prepare the request but don't actually send it."
7007
6871
msgstr ""
7008
6872
7009
#: bzrlib/plugins/launchpad/cmds.py:113
6873
#: bzrlib/plugins/launchpad/cmds.py:114
7010
6874
msgid ""
7011
6875
"register-branch requires a public branch url - see bzr help register-branch."
7012
6876
msgstr ""
7013
6877
7014
#: bzrlib/plugins/launchpad/cmds.py:121
6878
#: bzrlib/plugins/launchpad/cmds.py:122
7015
6879
msgid "--product is deprecated; please use --project."
7016
6880
msgstr ""
7017
6881
7018
#: bzrlib/plugins/launchpad/cmds.py:151
6882
#: bzrlib/plugins/launchpad/cmds.py:152
7019
6883
msgid "Open a Launchpad branch page in your web browser."
7020
6884
msgstr ""
7021
6885
7022
6886
# help of 'dry-run' option of 'launchpad-open' command
7023
#: bzrlib/plugins/launchpad/cmds.py:156
6887
#: bzrlib/plugins/launchpad/cmds.py:157
7024
6888
msgid "Do not actually open the browser. Just say the URL we would use."
7025
6889
msgstr ""
7026
6890
7027
#: bzrlib/plugins/launchpad/cmds.py:191
6891
#: bzrlib/plugins/launchpad/cmds.py:192
7028
6892
#, python-format
7029
6893
msgid "Opening %s in web browser"
7030
6894
msgstr ""
7031
6895
7032
#: bzrlib/plugins/launchpad/cmds.py:199
6896
#: bzrlib/plugins/launchpad/cmds.py:200
7033
6897
msgid "Show or set the Launchpad user ID."
7034
6898
msgstr ""
7035
6899
7036
#: bzrlib/plugins/launchpad/cmds.py:201
6900
#: bzrlib/plugins/launchpad/cmds.py:202
7037
6901
msgid ""
7038
6902
"When communicating with Launchpad, some commands need to know your\n"
7039
6903
"Launchpad user ID. This command can be used to set or show the\n"
7040
6904
"user ID that Bazaar will use for such communication."
7041
6905
msgstr ""
7042
6906
7043
#: bzrlib/plugins/launchpad/cmds.py:205
6907
#: bzrlib/plugins/launchpad/cmds.py:206
7044
6908
msgid ""
7045
6909
":Examples:\n"
7046
6910
" Show the Launchpad ID of the current user::"
7047
6911
msgstr ""
7048
6912
7049
#: bzrlib/plugins/launchpad/cmds.py:208
6913
#: bzrlib/plugins/launchpad/cmds.py:209
7050
6914
msgid " bzr launchpad-login"
7051
6915
msgstr ""
7052
6916
7053
#: bzrlib/plugins/launchpad/cmds.py:210
6917
#: bzrlib/plugins/launchpad/cmds.py:211
7054
6918
msgid " Set the Launchpad ID of the current user to 'bob'::"
7055
6919
msgstr ""
7056
6920
7057
#: bzrlib/plugins/launchpad/cmds.py:212
6921
#: bzrlib/plugins/launchpad/cmds.py:213
7058
6922
msgid " bzr launchpad-login bob"
7059
6923
msgstr ""
7060
6924
7061
6925
# help of 'no-check' option of 'launchpad-login' command
7062
#: bzrlib/plugins/launchpad/cmds.py:219
6926
#: bzrlib/plugins/launchpad/cmds.py:220
7063
6927
msgid "Don't check that the user name is valid."
7064
6928
msgstr ""
7065
6929
7066
#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245
6930
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7067
6931
msgid "Launchpad user ID exists and has SSH keys.\n"
7068
6932
msgstr ""
7069
6933
7070
#: bzrlib/plugins/launchpad/cmds.py:237
6934
#: bzrlib/plugins/launchpad/cmds.py:238
7071
6935
msgid "No Launchpad user ID configured.\n"
7072
6936
msgstr ""
7073
6937
7074
#: bzrlib/plugins/launchpad/cmds.py:248
6938
#: bzrlib/plugins/launchpad/cmds.py:249
7075
6939
#, python-format
7076
6940
msgid "Launchpad user ID set to '%s'.\n"
7077
6941
msgstr ""
7078
6942
7079
#: bzrlib/plugins/launchpad/cmds.py:254
6943
#: bzrlib/plugins/launchpad/cmds.py:255
7080
6944
msgid "Ask Launchpad to mirror a branch now."
7081
6945
msgstr ""
7082
6946
7083
#: bzrlib/plugins/launchpad/cmds.py:271
6947
#: bzrlib/plugins/launchpad/cmds.py:272
7084
6948
msgid "Propose merging a branch on Launchpad."
7085
6949
msgstr ""
7086
6950
7087
#: bzrlib/plugins/launchpad/cmds.py:273
6951
#: bzrlib/plugins/launchpad/cmds.py:274
7088
6952
msgid ""
7089
6953
"This will open your usual editor to provide the initial comment. When it\n"
7090
6954
"has created the proposal, it will open it in your default web browser."
7091
6955
msgstr ""
7092
6956
7093
#: bzrlib/plugins/launchpad/cmds.py:276
6957
#: bzrlib/plugins/launchpad/cmds.py:277
7094
6958
msgid ""
7095
6959
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7096
6960
"is not supplied, the remembered submit branch will be used. If no submit\n"
7097
6961
"branch is remembered, the development focus will be used."
7098
6962
msgstr ""
7099
6963
7100
#: bzrlib/plugins/launchpad/cmds.py:280
6964
#: bzrlib/plugins/launchpad/cmds.py:281
7101
6965
msgid ""
7102
6966
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7103
6967
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7105
6969
"may optionally be followed by '=' and the review type. For example:"
7106
6970
msgstr ""
7107
6971
7108
#: bzrlib/plugins/launchpad/cmds.py:285
6972
#: bzrlib/plugins/launchpad/cmds.py:286
7109
6973
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7110
6974
msgstr ""
7111
6975
7112
#: bzrlib/plugins/launchpad/cmds.py:287
6976
#: bzrlib/plugins/launchpad/cmds.py:288
7113
6977
msgid ""
7114
6978
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7115
6979
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7116
6980
msgstr ""
7117
6981
7118
6982
# help of 'staging' option of 'lp-propose-merge' command
7119
#: bzrlib/plugins/launchpad/cmds.py:292
6983
#: bzrlib/plugins/launchpad/cmds.py:293
7120
6984
msgid "Propose the merge on staging."
7121
6985
msgstr ""
7122
6986
7123
6987
# help of 'message' option of 'lp-propose-merge' command
7124
#: bzrlib/plugins/launchpad/cmds.py:294
6988
#: bzrlib/plugins/launchpad/cmds.py:295
7125
6989
msgid "Commit message."
7126
6990
msgstr ""
7127
6991
7128
6992
# help of 'approve' option of 'lp-propose-merge' command
7129
#: bzrlib/plugins/launchpad/cmds.py:296
7130
msgid ""
7131
"Mark the proposal as approved immediately, setting the approved revision to "
7132
"tip."
6993
#: bzrlib/plugins/launchpad/cmds.py:297
6994
msgid "Mark the proposal as approved immediately."
7133
6995
msgstr ""
7134
6996
7135
6997
# help of 'fixes' option of 'lp-propose-merge' command
7149
7011
#: bzrlib/plugins/launchpad/cmds.py:337
7150
7012
msgid ""
7151
7013
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7152
"This works only if the if the merged_revno was recorded for the merge\n"
7153
"proposal. The proposal(s) are opened in a web browser."
7014
"This works only if the selected branch was the merge proposal target, and\n"
7015
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7016
"are opened in a web browser."
7154
7017
msgstr ""
7155
7018
7156
#: bzrlib/plugins/launchpad/cmds.py:341
7019
#: bzrlib/plugins/launchpad/cmds.py:342
7157
7020
msgid ""
7158
"Only the revision specified is searched for. To find the mainline\n"
7159
"revision that merged it into mainline, use the \"mainline\" revision spec."
7021
"Any revision involved in the merge may be specified-- the revision in\n"
7022
"which the merge was performed, or one of the revisions that was merged."
7160
7023
msgstr ""
7161
7024
7162
#: bzrlib/plugins/launchpad/cmds.py:344
7025
#: bzrlib/plugins/launchpad/cmds.py:345
7163
7026
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7164
7027
msgstr ""
7165
7028
7166
#: bzrlib/plugins/launchpad/cmds.py:346
7167
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
7029
#: bzrlib/plugins/launchpad/cmds.py:347
7030
msgid " bzr lp-find-proposal -r annotate:README:1"
7168
7031
msgstr ""
7169
7032
7170
#: bzrlib/plugins/launchpad/cmds.py:365
7033
#: bzrlib/plugins/launchpad/cmds.py:363
7171
7034
msgid "No review found."
7172
7035
msgstr ""
7173
7036
7174
#: bzrlib/plugins/launchpad/cmds.py:366
7037
#: bzrlib/plugins/launchpad/cmds.py:364
7175
7038
#, python-format
7176
7039
msgid "%d proposals(s) found."
7177
7040
msgstr ""
7178
7041
7179
#: bzrlib/plugins/launchpad/cmds.py:378
7042
#: bzrlib/plugins/launchpad/cmds.py:374
7043
msgid "Finding revision-id"
7044
msgstr ""
7045
7046
#: bzrlib/plugins/launchpad/cmds.py:381
7047
msgid "Finding merge"
7048
msgstr ""
7049
7050
#: bzrlib/plugins/launchpad/cmds.py:386
7051
msgid "Finding revno"
7052
msgstr ""
7053
7054
#: bzrlib/plugins/launchpad/cmds.py:392
7055
msgid "Finding Launchpad branch"
7056
msgstr ""
7057
7058
#: bzrlib/plugins/launchpad/cmds.py:395
7180
7059
msgid "Finding proposals"
7181
7060
msgstr ""
7182
7061
7183
#: bzrlib/plugins/launchpad/lp_api.py:228
7184
#: bzrlib/plugins/launchpad/lp_api.py:233
7062
#: bzrlib/plugins/launchpad/lp_api.py:241
7063
#: bzrlib/plugins/launchpad/lp_api.py:246
7185
7064
#, python-format
7186
7065
msgid "%s is not registered on Launchpad"
7187
7066
msgstr ""
7188
7067
7189
#: bzrlib/plugins/launchpad/lp_api.py:243
7068
#: bzrlib/plugins/launchpad/lp_api.py:256
7190
7069
#, python-format
7191
7070
msgid "%s has no development focus."
7192
7071
msgstr ""
7193
7072
7194
#: bzrlib/plugins/launchpad/lp_api.py:248
7073
#: bzrlib/plugins/launchpad/lp_api.py:261
7195
7074
#, python-format
7196
7075
msgid "development focus %s has no branch."
7197
7076
msgstr ""
7198
7077
7199
#: bzrlib/plugins/launchpad/lp_api.py:253
7078
#: bzrlib/plugins/launchpad/lp_api.py:266
7200
7079
#, python-format
7201
7080
msgid "source package %s has no branch."
7202
7081
msgstr ""
7203
7082
7204
#: bzrlib/plugins/launchpad/lp_api.py:257
7083
#: bzrlib/plugins/launchpad/lp_api.py:270
7205
7084
#, python-format
7206
7085
msgid "%s has no associated product or source package."
7207
7086
msgstr ""
7208
7087
7209
#: bzrlib/plugins/launchpad/lp_api.py:269
7088
#: bzrlib/plugins/launchpad/lp_api.py:282
7210
7089
#, python-format
7211
7090
msgid "%s is already up-to-date."
7212
7091
msgstr ""
7213
7092
7214
#: bzrlib/plugins/launchpad/lp_api.py:276
7093
#: bzrlib/plugins/launchpad/lp_api.py:289
7215
7094
#, python-format
7216
7095
msgid "Pushing to %s"
7217
7096
msgstr ""
7223
7102
" remote: {2}"
7224
7103
msgstr ""
7225
7104
7226
#: bzrlib/plugins/launchpad/lp_propose.py:159
7105
#: bzrlib/plugins/launchpad/lp_propose.py:150
7227
7106
#, python-format
7228
7107
msgid "There is already a branch merge proposal: %s"
7229
7108
msgstr ""
7659
7538
msgid "HPSS calls: {0} ({1} vfs) {2}"
7660
7539
msgstr ""
7661
7540
7662
#: bzrlib/smart/ping.py:32
7663
msgid "Pings a Bazaar smart server."
7664
msgstr ""
7665
7666
#: bzrlib/smart/ping.py:34
7667
msgid ""
7668
"This command sends a 'hello' request to the given location using the bzr\n"
7669
"smart protocol, and reports the response."
7670
msgstr ""
7671
7672
7541
#: bzrlib/smart/server.py:169
7673
7542
msgid "Requested to stop gracefully"
7674
7543
msgstr ""
7693
7562
msgid "listening on port: %s"
7694
7563
msgstr ""
7695
7564
7696
#: bzrlib/switch.py:84
7565
#: bzrlib/switch.py:73
7697
7566
msgid "Pending merges must be committed or reverted before using switch."
7698
7567
msgstr ""
7699
7568
7700
#: bzrlib/switch.py:111
7569
#: bzrlib/switch.py:100
7701
7570
msgid ""
7702
7571
"Cannot switch as local commits found in the checkout. Commit these to the "
7703
7572
"bound branch or use --force to throw them away."
7704
7573
msgstr ""
7705
7574
7706
#: bzrlib/switch.py:116
7575
#: bzrlib/switch.py:105
7707
7576
#, python-format
7708
7577
msgid ""
7709
7578
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7710
7579
"anyway, use --force."
7711
7580
msgstr ""
7712
7581
7713
#: bzrlib/switch.py:140
7582
#: bzrlib/switch.py:129
7714
7583
msgid "Cannot switch a branch, only a checkout."
7715
7584
msgstr ""
7716
7585
7717
#: bzrlib/switch.py:183
7586
#: bzrlib/switch.py:167
7718
7587
#, python-format
7719
7588
msgid "Tree is up to date at revision %d."
7720
7589
msgstr ""
7721
7590
7722
#: bzrlib/switch.py:190
7591
#: bzrlib/switch.py:173
7723
7592
#, python-format
7724
7593
msgid "Updated to revision %d."
7725
7594
msgstr ""
7883
7752
msgid "PageFaultCount %8d"
7884
7753
msgstr ""
7885
7754
7886
#: bzrlib/workingtree.py:1516
7755
#: bzrlib/workingtree.py:1482
7887
7756
msgid "Rerun update after fixing the conflicts."
7888
7757
msgstr ""
7889
7758
7893
7762
7894
7763
#: dummy/help_topics/basic/detail.txt:1
7895
7764
msgid ""
7896
"Bazaar 2.6.0 -- a free distributed version-control tool\n"
7765
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7897
7766
"http://bazaar.canonical.com/"
7898
7767
msgstr ""
7899
7768
9409
9278
"export Export current or past revision to a destination directory "
9410
9279
"or\n"
9411
9280
" archive.\n"
9412
"grep Print lines matching PATTERN for specified files and\n"
9413
" revisions. [grep]\n"
9414
9281
"help Show help on a command or other topic.\n"
9415
9282
"ignore Ignore specified files or patterns.\n"
9416
9283
"ignored List ignored files and the patterns that matched them.\n"
9434
9301
"mv Move or rename a file.\n"
9435
9302
"nick Print or set the branch nickname.\n"
9436
9303
"pack Compress the data within a repository.\n"
9437
"ping Pings a Bazaar smart server.\n"
9438
9304
"plugins List the installed plugins.\n"
9439
9305
"pull Turn this branch into a mirror of another branch.\n"
9440
9306
"push Update a mirror of this branch.\n"
10824
10690
10825
10691
#: en/help_topics/configuration.txt:716
10826
10692
msgid ""
10827
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10828
"interpolation markers, trying to display the mergetool line results in the\n"
10829
"following problem::"
10830
msgstr ""
10831
10832
#: en/help_topics/configuration.txt:720
10833
msgid ""
10834
"\n"
10835
" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10836
"{result}'\n"
10837
" $ bzr config bzr.mergetool.kdiff3\n"
10838
" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10839
"{this} {other} -o {result}\"."
10840
msgstr ""
10841
10842
#: en/help_topics/configuration.txt:725
10843
msgid ""
10844
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10845
msgstr ""
10846
10847
#: en/help_topics/configuration.txt:727
10848
msgid ""
10849
" $ bzr config --all bzr.mergetool.kdiff3\n"
10850
" branch:\n"
10851
" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10852
msgstr ""
10853
10854
#: en/help_topics/configuration.txt:731
10855
msgid ""
10856
"\n"
10857
10693
"bzr.default_mergetool\n"
10858
10694
"~~~~~~~~~~~~~~~~~~~~~"
10859
10695
msgstr ""
10860
10696
10861
#: en/help_topics/configuration.txt:735
10697
#: en/help_topics/configuration.txt:719
10862
10698
msgid ""
10863
10699
"Specifies which external merge tool (as defined above) should be selected "
10864
10700
"by\n"
10865
10701
"default in tools such as ``bzr qconflicts``."
10866
10702
msgstr ""
10867
10703
10868
#: en/help_topics/configuration.txt:740
10704
#: en/help_topics/configuration.txt:724
10869
10705
msgid " bzr.default_mergetool = kdiff3\n"
10870
10706
msgstr ""
10871
10707
11820
11656
msgstr ""
11821
11657
11822
11658
#: en/help_topics/env-variables.txt:3
11823
msgid "See bzr help configuration for more details."
11824
msgstr ""
11825
11826
#: en/help_topics/env-variables.txt:5
11827
11659
msgid ""
11828
11660
"=================== "
11829
11661
"===========================================================\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1