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