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