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