« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6213.1.41
- compare with another revision
- compare with revision 5401
- download diff
- download tarball
- view history from revision 6213.1.41
- Committer: Jelmer Vernooij
- Date: 2011-12-12 10:26:53 UTC
- mfrom: (6355 +trunk)
- mto: This revision was merged to the branch mainline in revision 6404.
- Revision ID: jelmer@samba.org-20111212102653-tpymqjoodukcgb2v
merge bzr.dev.
- 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: 2011-11-10 13:40+0100\n"
11
"POT-Creation-Date: 2011-12-08 09:21+0100\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr ""
24
24
25
#: bzrlib/branch.py:866
25
#: bzrlib/branch.py:871
26
26
msgid "Unstacking"
27
27
msgstr ""
28
28
29
#: bzrlib/branch.py:3153
29
#: bzrlib/branch.py:3173
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr ""
33
33
34
#: bzrlib/branch.py:3155
34
#: bzrlib/branch.py:3175
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:3158
41
#: bzrlib/branch.py:3178
42
42
msgid "No new revisions or tags to push."
43
43
msgstr ""
44
44
45
#: bzrlib/branch.py:3160
45
#: bzrlib/branch.py:3180
46
46
msgid "No new revisions to push."
47
47
msgstr ""
48
48
49
#: bzrlib/branch.py:3180
49
#: bzrlib/branch.py:3200
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3183
53
#: bzrlib/branch.py:3203
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr ""
57
57
58
#: bzrlib/builtins.py:118 bzrlib/builtins.py:2864 bzrlib/workingtree.py:306
58
#: bzrlib/builtins.py:118 bzrlib/builtins.py:2868 bzrlib/workingtree.py:304
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:338 bzrlib/builtins.py:5009
191
#: bzrlib/builtins.py:338 bzrlib/builtins.py:5024
192
192
msgid "You can only supply one of revision_id or --revision"
193
193
msgstr ""
194
194
195
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5011
195
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5026
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:585 bzrlib/builtins.py:5793
271
#: bzrlib/builtins.py:585 bzrlib/builtins.py:5808
272
272
msgid "Tags can only be placed on a single revision, not on a range"
273
273
msgstr ""
274
274
275
275
# help of 'tree' option of 'revno' command
276
276
#: bzrlib/builtins.py:609
277
msgid "Show revno of working tree"
277
msgid "Show revno of working tree."
278
278
msgstr ""
279
279
280
280
#: bzrlib/builtins.py:657
529
529
msgid "Using saved parent location: %s\n"
530
530
msgstr ""
531
531
532
#: bzrlib/builtins.py:1082 bzrlib/builtins.py:4219
532
#: bzrlib/builtins.py:1082 bzrlib/builtins.py:4234
533
533
msgid "Cannot use -r with merge directives or bundles"
534
534
msgstr ""
535
535
584
584
"-Olog_format=<other_format>."
585
585
msgstr ""
586
586
587
# help of 'directory' option of 'push' command
588
#: bzrlib/builtins.py:1158
589
msgid ""
590
"Branch to push from, rather than the one containing the working directory."
591
msgstr ""
592
593
587
# help of 'use-existing-dir' option of 'push' command
594
588
#: bzrlib/builtins.py:1161
595
589
msgid ""
612
606
"the branch created."
613
607
msgstr ""
614
608
615
# help of 'strict' option of 'push' command
616
#: bzrlib/builtins.py:1174
617
msgid ""
618
"Refuse to push if there are uncommitted changes in the working tree, --no-"
619
"strict disables the check."
620
msgstr ""
621
622
609
# help of 'no-tree' option of 'push' command
623
610
#: bzrlib/builtins.py:1177
624
611
msgid "Don't populate the working tree, even for protocols that support it."
628
615
msgid "Could not determine branch to refer to."
629
616
msgstr ""
630
617
631
#: bzrlib/builtins.py:1228 bzrlib/foreign.py:306
618
#: bzrlib/builtins.py:1228 bzrlib/foreign.py:305
632
619
msgid "No push location known or specified."
633
620
msgstr ""
634
621
696
683
msgid "Bind new branch to from location."
697
684
msgstr ""
698
685
699
#: bzrlib/builtins.py:1321
686
#: bzrlib/builtins.py:1327
700
687
#, python-format
701
688
msgid "Target directory \"%s\" already exists."
702
689
msgstr ""
703
690
704
#: bzrlib/builtins.py:1337
691
#: bzrlib/builtins.py:1339
705
692
#, python-format
706
693
msgid "Parent of \"%s\" does not exist."
707
694
msgstr ""
708
695
709
#: bzrlib/builtins.py:1354
696
#: bzrlib/builtins.py:1358
710
697
msgid "The branch {0} has no revision {1}."
711
698
msgstr ""
712
699
713
#: bzrlib/builtins.py:1364 bzrlib/push.py:51
700
#: bzrlib/builtins.py:1368 bzrlib/push.py:51
714
701
#, python-format
715
702
msgid "Created new stacked branch referring to %s."
716
703
msgstr ""
717
704
718
#: bzrlib/builtins.py:1368
705
#: bzrlib/builtins.py:1372
719
706
#, python-format
720
707
msgid "Branched %d revision."
721
708
msgid_plural "Branched %d revisions."
722
709
msgstr[0] ""
723
710
msgstr[1] ""
724
711
725
#: bzrlib/builtins.py:1373
712
#: bzrlib/builtins.py:1377
726
713
#, python-format
727
714
msgid "New branch bound to %s"
728
715
msgstr ""
729
716
730
#: bzrlib/builtins.py:1378 bzrlib/builtins.py:6088
717
#: bzrlib/builtins.py:1382 bzrlib/builtins.py:6121
731
718
#, python-format
732
719
msgid "Switched to branch: %s"
733
720
msgstr ""
734
721
735
#: bzrlib/builtins.py:1383
722
#: bzrlib/builtins.py:1387
736
723
msgid "List the branches available at the current location."
737
724
msgstr ""
738
725
739
#: bzrlib/builtins.py:1385
726
#: bzrlib/builtins.py:1389
740
727
msgid ""
741
728
"This command will print the names of all the branches at the current\n"
742
729
"location."
743
730
msgstr ""
744
731
745
732
# help of 'recursive' option of 'branches' command
746
#: bzrlib/builtins.py:1392
733
#: bzrlib/builtins.py:1396
747
734
msgid ""
748
735
"Recursively scan for branches rather than just looking in the specified "
749
736
"location."
750
737
msgstr ""
751
738
752
#: bzrlib/builtins.py:1409
739
#: bzrlib/builtins.py:1413
753
740
msgid " (default)\n"
754
741
msgstr ""
755
742
756
#: bzrlib/builtins.py:1416
743
#: bzrlib/builtins.py:1420
757
744
msgid "Create a new checkout of an existing branch."
758
745
msgstr ""
759
746
760
#: bzrlib/builtins.py:1418
747
#: bzrlib/builtins.py:1422
761
748
msgid ""
762
749
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
763
750
"for\n"
767
754
"location using SFTP."
768
755
msgstr ""
769
756
770
#: bzrlib/builtins.py:1423
757
#: bzrlib/builtins.py:1427
771
758
msgid ""
772
759
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
773
760
"will\n"
779
766
"create ./foo-bar."
780
767
msgstr ""
781
768
782
#: bzrlib/builtins.py:1430
769
#: bzrlib/builtins.py:1434
783
770
msgid ""
784
771
"To retrieve the branch as of a particular revision, supply the --revision\n"
785
772
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
790
777
msgstr ""
791
778
792
779
# help of 'lightweight' option of 'checkout' command
793
#: bzrlib/builtins.py:1440
780
#: bzrlib/builtins.py:1444
794
781
msgid ""
795
782
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
796
783
"the branch for every operation. Normal checkouts can perform common "
799
786
msgstr ""
800
787
801
788
# help of 'files-from' option of 'branch' command
802
#: bzrlib/builtins.py:1447
789
#: bzrlib/builtins.py:1451
803
790
msgid "Get file contents from this tree."
804
791
msgstr ""
805
792
806
793
# help of 'hardlink' option of 'branch' command
807
#: bzrlib/builtins.py:1449
794
#: bzrlib/builtins.py:1453
808
795
msgid "Hard-link working tree files where possible."
809
796
msgstr ""
810
797
811
#: bzrlib/builtins.py:1490
798
#: bzrlib/builtins.py:1494
812
799
msgid ""
813
800
"Show list of renamed files.\n"
814
801
" "
815
802
msgstr ""
816
803
817
#: bzrlib/builtins.py:1520
804
#: bzrlib/builtins.py:1524
818
805
msgid "Update a working tree to a new revision."
819
806
msgstr ""
820
807
821
#: bzrlib/builtins.py:1522
808
#: bzrlib/builtins.py:1526
822
809
msgid ""
823
810
"This will perform a merge of the destination revision (the tip of the\n"
824
811
"branch, or the specified revision) into the working tree, and then make\n"
825
812
"that revision the basis revision for the working tree. "
826
813
msgstr ""
827
814
828
#: bzrlib/builtins.py:1526
815
#: bzrlib/builtins.py:1530
829
816
msgid ""
830
817
"You can use this to visit an older revision, or to update a working tree\n"
831
818
"that is out of date from its branch."
832
819
msgstr ""
833
820
834
#: bzrlib/builtins.py:1529
821
#: bzrlib/builtins.py:1533
835
822
msgid ""
836
823
"If there are any uncommitted changes in the tree, they will be carried\n"
837
824
"across and remain as uncommitted changes after the update. To discard\n"
839
826
"with the changes brought in by the change in basis revision."
840
827
msgstr ""
841
828
842
#: bzrlib/builtins.py:1534
829
#: bzrlib/builtins.py:1538
843
830
msgid ""
844
831
"If the tree's branch is bound to a master branch, bzr will also update\n"
845
832
"the branch from the master."
846
833
msgstr ""
847
834
848
#: bzrlib/builtins.py:1537
835
#: bzrlib/builtins.py:1541
849
836
msgid ""
850
837
"You cannot update just a single file or directory, because each Bazaar\n"
851
838
"working tree has just a single basis revision. If you want to restore a\n"
855
842
"out the old content of that file to a new location."
856
843
msgstr ""
857
844
858
#: bzrlib/builtins.py:1544
845
#: bzrlib/builtins.py:1548
859
846
msgid ""
860
847
"The 'dir' argument, if given, must be the location of the root of a\n"
861
848
"working tree to update. By default, the working tree that contains the \n"
862
849
"current working directory is used."
863
850
msgstr ""
864
851
865
#: bzrlib/builtins.py:1560
852
#: bzrlib/builtins.py:1564
866
853
msgid "bzr update --revision takes exactly one revision"
867
854
msgstr ""
868
855
869
#: bzrlib/builtins.py:1568
856
#: bzrlib/builtins.py:1572
870
857
msgid "bzr update can only update a whole tree, not a file or subdirectory"
871
858
msgstr ""
872
859
873
#: bzrlib/builtins.py:1599
860
#: bzrlib/builtins.py:1603
874
861
msgid "Tree is up to date at revision {0} of branch {1}"
875
862
msgstr ""
876
863
877
#: bzrlib/builtins.py:1615
864
#: bzrlib/builtins.py:1619
878
865
#, python-format
879
866
msgid ""
880
867
"branch has no revision %s\n"
881
868
"bzr update --revision only works for a revision in the branch history"
882
869
msgstr ""
883
870
884
#: bzrlib/builtins.py:1621
871
#: bzrlib/builtins.py:1625
885
872
msgid "Updated to revision {0} of branch {1}"
886
873
msgstr ""
887
874
888
#: bzrlib/builtins.py:1625
875
#: bzrlib/builtins.py:1629
889
876
msgid ""
890
877
"Your local commits will now show as pending merges with 'bzr status', and "
891
878
"can be committed with 'bzr commit'."
892
879
msgstr ""
893
880
894
#: bzrlib/builtins.py:1634
881
#: bzrlib/builtins.py:1638
895
882
msgid "Show information about a working tree, branch or repository."
896
883
msgstr ""
897
884
898
#: bzrlib/builtins.py:1636
885
#: bzrlib/builtins.py:1640
899
886
msgid ""
900
887
"This command will show all known locations and formats associated to the\n"
901
888
"tree, branch or repository."
902
889
msgstr ""
903
890
904
#: bzrlib/builtins.py:1639
891
#: bzrlib/builtins.py:1643
905
892
msgid ""
906
893
"In verbose mode, statistical information is included with each report.\n"
907
894
"To see extended statistic information, use a verbosity level of 2 or\n"
908
895
"higher by specifying the verbose option multiple times, e.g. -vv."
909
896
msgstr ""
910
897
911
#: bzrlib/builtins.py:1643
898
#: bzrlib/builtins.py:1647
912
899
msgid "Branches and working trees will also report any missing revisions."
913
900
msgstr ""
914
901
915
#: bzrlib/builtins.py:1647
902
#: bzrlib/builtins.py:1651
916
903
msgid " Display information on the format and related locations:"
917
904
msgstr ""
918
905
919
#: bzrlib/builtins.py:1649
906
#: bzrlib/builtins.py:1653
920
907
msgid " bzr info"
921
908
msgstr ""
922
909
923
#: bzrlib/builtins.py:1651
910
#: bzrlib/builtins.py:1655
924
911
msgid ""
925
912
" Display the above together with extended format information and\n"
926
913
" basic statistics (like the number of files in the working tree and\n"
927
914
" number of revisions in the branch and repository):"
928
915
msgstr ""
929
916
930
#: bzrlib/builtins.py:1655
917
#: bzrlib/builtins.py:1659
931
918
msgid " bzr info -v"
932
919
msgstr ""
933
920
934
#: bzrlib/builtins.py:1657
921
#: bzrlib/builtins.py:1661
935
922
msgid " Display the above together with number of committers to the branch:"
936
923
msgstr ""
937
924
938
#: bzrlib/builtins.py:1659
925
#: bzrlib/builtins.py:1663
939
926
msgid " bzr info -vv"
940
927
msgstr ""
941
928
942
#: bzrlib/builtins.py:1678
929
#: bzrlib/builtins.py:1682
943
930
msgid "Remove files or directories."
944
931
msgstr ""
945
932
946
#: bzrlib/builtins.py:1680
933
#: bzrlib/builtins.py:1684
947
934
msgid ""
948
935
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
949
936
"delete them if they can easily be recovered using revert otherwise they\n"
953
940
msgstr ""
954
941
955
942
# help of 'new' option of 'remove' command
956
#: bzrlib/builtins.py:1688
943
#: bzrlib/builtins.py:1692
957
944
msgid "Only remove files that have never been committed."
958
945
msgstr ""
959
946
960
947
# help of 'file-deletion-strategy' option of 'remove' command
961
#: bzrlib/builtins.py:1690
948
#: bzrlib/builtins.py:1694
962
949
msgid "The file deletion mode to be used."
963
950
msgstr ""
964
951
965
952
# title of 'file-deletion-strategy' option of 'remove' command
966
#: bzrlib/builtins.py:1691
953
#: bzrlib/builtins.py:1695
967
954
msgid "Deletion Strategy"
968
955
msgstr ""
969
956
970
#: bzrlib/builtins.py:1704
957
# help of 'file-deletion-strategy=safe' option of 'remove' command
958
#: bzrlib/builtins.py:1696
959
msgid "Backup changed files (default)."
960
msgstr ""
961
962
# help of 'file-deletion-strategy=keep' option of 'remove' command
963
#: bzrlib/builtins.py:1697
964
msgid "Delete from bzr but leave the working copy."
965
msgstr ""
966
967
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
968
#: bzrlib/builtins.py:1698
969
msgid "Don't backup changed files."
970
msgstr ""
971
972
# help of 'file-deletion-strategy=force' option of 'remove' command
973
#: bzrlib/builtins.py:1699
974
msgid ""
975
"Delete all the specified files, even if they can not be recovered and even "
976
"if they are non-empty directories. (deprecated, use no-backup)"
977
msgstr ""
978
979
#: bzrlib/builtins.py:1708
971
980
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
972
981
msgstr ""
973
982
974
#: bzrlib/builtins.py:1721
983
#: bzrlib/builtins.py:1725
975
984
msgid "No matching files."
976
985
msgstr ""
977
986
978
#: bzrlib/builtins.py:1782
987
#: bzrlib/builtins.py:1786
979
988
msgid "Reconcile bzr metadata in a branch."
980
989
msgstr ""
981
990
982
#: bzrlib/builtins.py:1784
991
#: bzrlib/builtins.py:1788
983
992
msgid ""
984
993
"This can correct data mismatches that may have been caused by\n"
985
994
"previous ghost operations or bzr upgrades. You should only\n"
987
996
"advises you to run it."
988
997
msgstr ""
989
998
990
#: bzrlib/builtins.py:1789
999
#: bzrlib/builtins.py:1793
991
1000
msgid ""
992
1001
"If a second branch is provided, cross-branch reconciliation is\n"
993
1002
"also attempted, which will check that data like the tree root\n"
995
1004
"correctly in both branches."
996
1005
msgstr ""
997
1006
998
#: bzrlib/builtins.py:1794
1007
#: bzrlib/builtins.py:1798
999
1008
msgid ""
1000
1009
"At the same time it is run it may recompress data resulting in\n"
1001
1010
"a potential saving in disk space or performance gain."
1002
1011
msgstr ""
1003
1012
1004
#: bzrlib/builtins.py:1797
1013
#: bzrlib/builtins.py:1801
1005
1014
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1006
1015
msgstr ""
1007
1016
1008
#: bzrlib/builtins.py:1865
1017
# help of 'format=2a' option of 'init' command
1018
#: bzrlib/builtins.py:1868
1019
msgid ""
1020
"Format for the bzr 2.0 series.\n"
1021
"Uses group-compress storage.\n"
1022
"Provides rich roots which are a one-way transition.\n"
1023
msgstr ""
1024
1025
# help of 'format=pack-0.92' option of 'init' command
1026
#: bzrlib/builtins.py:1868
1027
msgid ""
1028
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1029
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1030
msgstr ""
1031
1032
# help of 'format=development-colo' option of 'init' command
1033
#: bzrlib/builtins.py:1868
1034
msgid "The 2a format with experimental support for colocated branches.\n"
1035
msgstr ""
1036
1037
#: bzrlib/builtins.py:1869
1009
1038
msgid "Make a directory into a versioned branch."
1010
1039
msgstr ""
1011
1040
1012
#: bzrlib/builtins.py:1867
1041
#: bzrlib/builtins.py:1871
1013
1042
msgid ""
1014
1043
"Use this to create an empty branch, or before importing an\n"
1015
1044
"existing project."
1016
1045
msgstr ""
1017
1046
1018
#: bzrlib/builtins.py:1870
1047
#: bzrlib/builtins.py:1874
1019
1048
msgid ""
1020
1049
"If there is a repository in a parent directory of the location, then\n"
1021
1050
"the history of the branch will be stored in the repository. Otherwise\n"
1023
1052
"in the .bzr directory."
1024
1053
msgstr ""
1025
1054
1026
#: bzrlib/builtins.py:1875
1055
#: bzrlib/builtins.py:1879
1027
1056
msgid ""
1028
1057
"If there is already a branch at the location but it has no working tree,\n"
1029
1058
"the tree can be populated with 'bzr checkout'."
1030
1059
msgstr ""
1031
1060
1032
#: bzrlib/builtins.py:1878
1061
#: bzrlib/builtins.py:1882
1033
1062
msgid "Recipe for importing a tree of files::"
1034
1063
msgstr ""
1035
1064
1036
#: bzrlib/builtins.py:1880
1065
#: bzrlib/builtins.py:1884
1037
1066
msgid ""
1038
1067
" cd ~/project\n"
1039
1068
" bzr init\n"
1043
1072
msgstr ""
1044
1073
1045
1074
# help of 'create-prefix' option of 'init' command
1046
#: bzrlib/builtins.py:1891
1075
#: bzrlib/builtins.py:1895
1047
1076
msgid "Create the path leading up to the branch if it does not already exist."
1048
1077
msgstr ""
1049
1078
1050
1079
# help of 'format' option of 'init' command
1051
#: bzrlib/builtins.py:1894
1080
#: bzrlib/builtins.py:1898
1052
1081
msgid "Specify a format for this branch. See \"help formats\"."
1053
1082
msgstr ""
1054
1083
1055
1084
# help of 'append-revisions-only' option of 'init' command
1056
#: bzrlib/builtins.py:1902
1085
#: bzrlib/builtins.py:1906
1057
1086
msgid "Never change revnos or the existing log. Append revisions to it only."
1058
1087
msgstr ""
1059
1088
1060
1089
# help of 'no-tree' option of 'init' command
1061
#: bzrlib/builtins.py:1905
1090
#: bzrlib/builtins.py:1909
1062
1091
msgid "Create a branch without a working tree."
1063
1092
msgstr ""
1064
1093
1065
#: bzrlib/builtins.py:1925 bzrlib/push.py:108
1094
#: bzrlib/builtins.py:1929 bzrlib/push.py:108
1066
1095
#, python-format
1067
1096
msgid ""
1068
1097
"Parent directory of %s does not exist.\n"
1069
1098
"You may supply --create-prefix to create all leading parent directories."
1070
1099
msgstr ""
1071
1100
1072
#: bzrlib/builtins.py:1959
1101
#: bzrlib/builtins.py:1963
1073
1102
msgid ""
1074
1103
"This branch format cannot be set to append-revisions-only. Try --default."
1075
1104
msgstr ""
1076
1105
1077
#: bzrlib/builtins.py:1970
1106
#: bzrlib/builtins.py:1974
1078
1107
msgid "Created a {0} (format: {1})\n"
1079
1108
msgstr ""
1080
1109
1081
#: bzrlib/builtins.py:1979
1110
#: bzrlib/builtins.py:1983
1082
1111
#, python-format
1083
1112
msgid "Using shared repository: %s\n"
1084
1113
msgstr ""
1085
1114
1086
#: bzrlib/builtins.py:1983
1115
#: bzrlib/builtins.py:1987
1087
1116
msgid "Create a shared repository for branches to share storage space."
1088
1117
msgstr ""
1089
1118
1090
#: bzrlib/builtins.py:1985
1119
#: bzrlib/builtins.py:1989
1091
1120
msgid ""
1092
1121
"New branches created under the repository directory will store their\n"
1093
1122
"revisions in the repository, not in the branch directory. For branches\n"
1095
1124
"speeds up the creation of new branches."
1096
1125
msgstr ""
1097
1126
1098
#: bzrlib/builtins.py:1990
1127
#: bzrlib/builtins.py:1994
1099
1128
msgid ""
1100
1129
"If the --no-trees option is given then the branches in the repository\n"
1101
1130
"will not have working trees by default. They will still exist as \n"
1105
1134
"branches, such as on a server."
1106
1135
msgstr ""
1107
1136
1108
#: bzrlib/builtins.py:1997
1137
#: bzrlib/builtins.py:2001
1109
1138
msgid ""
1110
1139
":Examples:\n"
1111
1140
" Create a shared repository holding just branches::"
1112
1141
msgstr ""
1113
1142
1114
#: bzrlib/builtins.py:2000
1143
#: bzrlib/builtins.py:2004
1115
1144
msgid ""
1116
1145
" bzr init-repo --no-trees repo\n"
1117
1146
" bzr init repo/trunk"
1118
1147
msgstr ""
1119
1148
1120
#: bzrlib/builtins.py:2003
1149
#: bzrlib/builtins.py:2007
1121
1150
msgid " Make a lightweight checkout elsewhere::"
1122
1151
msgstr ""
1123
1152
1124
#: bzrlib/builtins.py:2005
1153
#: bzrlib/builtins.py:2009
1125
1154
msgid ""
1126
1155
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1127
1156
" cd trunk-checkout\n"
1129
1158
msgstr ""
1130
1159
1131
1160
# help of 'format' option of 'init-repository' command
1132
#: bzrlib/builtins.py:2013
1161
#: bzrlib/builtins.py:2017
1133
1162
msgid ""
1134
1163
"Specify a format for this repository. See \"bzr help formats\" for details."
1135
1164
msgstr ""
1136
1165
1137
1166
# title of 'format' option of 'init-repository' command
1138
#: bzrlib/builtins.py:2017
1167
#: bzrlib/builtins.py:2021
1139
1168
msgid "Repository format"
1140
1169
msgstr ""
1141
1170
1142
1171
# help of 'no-trees' option of 'init-repository' command
1143
#: bzrlib/builtins.py:2019
1172
#: bzrlib/builtins.py:2023
1144
1173
msgid "Branches in the repository will default to not having a working tree."
1145
1174
msgstr ""
1146
1175
1147
#: bzrlib/builtins.py:2043
1176
#: bzrlib/builtins.py:2047
1148
1177
msgid "Show differences in the working tree, between revisions or branches."
1149
1178
msgstr ""
1150
1179
1151
#: bzrlib/builtins.py:2045
1180
#: bzrlib/builtins.py:2049
1152
1181
msgid ""
1153
1182
"If no arguments are given, all changes for the current tree are listed.\n"
1154
1183
"If files are given, only the changes in those files are listed.\n"
1158
1187
"given."
1159
1188
msgstr ""
1160
1189
1161
#: bzrlib/builtins.py:2052
1190
#: bzrlib/builtins.py:2056
1162
1191
msgid ""
1163
1192
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1164
1193
"produces patches suitable for \"patch -p1\"."
1165
1194
msgstr ""
1166
1195
1167
#: bzrlib/builtins.py:2055
1196
#: bzrlib/builtins.py:2059
1168
1197
msgid ""
1169
1198
"Note that when using the -r argument with a range of revisions, the\n"
1170
1199
"differences are computed between the two specified revisions. That\n"
1174
1203
"in the range."
1175
1204
msgstr ""
1176
1205
1177
#: bzrlib/builtins.py:2062
1206
#: bzrlib/builtins.py:2066
1178
1207
msgid ""
1179
1208
":Exit values:\n"
1180
1209
" 1 - changed\n"
1183
1212
" 0 - no change"
1184
1213
msgstr ""
1185
1214
1186
#: bzrlib/builtins.py:2068
1215
#: bzrlib/builtins.py:2072
1187
1216
msgid ""
1188
1217
":Examples:\n"
1189
1218
" Shows the difference in the working tree versus the last commit::"
1190
1219
msgstr ""
1191
1220
1192
#: bzrlib/builtins.py:2071
1221
#: bzrlib/builtins.py:2075
1193
1222
msgid " bzr diff"
1194
1223
msgstr ""
1195
1224
1196
#: bzrlib/builtins.py:2073
1225
#: bzrlib/builtins.py:2077
1197
1226
msgid " Difference between the working tree and revision 1::"
1198
1227
msgstr ""
1199
1228
1200
#: bzrlib/builtins.py:2075
1229
#: bzrlib/builtins.py:2079
1201
1230
msgid " bzr diff -r1"
1202
1231
msgstr ""
1203
1232
1204
#: bzrlib/builtins.py:2077
1233
#: bzrlib/builtins.py:2081
1205
1234
msgid " Difference between revision 3 and revision 1::"
1206
1235
msgstr ""
1207
1236
1208
#: bzrlib/builtins.py:2079
1237
#: bzrlib/builtins.py:2083
1209
1238
msgid " bzr diff -r1..3"
1210
1239
msgstr ""
1211
1240
1212
#: bzrlib/builtins.py:2081
1241
#: bzrlib/builtins.py:2085
1213
1242
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1214
1243
msgstr ""
1215
1244
1216
#: bzrlib/builtins.py:2083
1245
#: bzrlib/builtins.py:2087
1217
1246
msgid " bzr diff -r1..3 xxx"
1218
1247
msgstr ""
1219
1248
1220
#: bzrlib/builtins.py:2085
1249
#: bzrlib/builtins.py:2089
1221
1250
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1222
1251
msgstr ""
1223
1252
1224
#: bzrlib/builtins.py:2087
1253
#: bzrlib/builtins.py:2091
1225
1254
msgid " bzr diff -c2"
1226
1255
msgstr ""
1227
1256
1228
#: bzrlib/builtins.py:2089
1257
#: bzrlib/builtins.py:2093
1229
1258
msgid ""
1230
1259
" To see the changes introduced by revision X::\n"
1231
1260
" \n"
1232
1261
" bzr diff -cX"
1233
1262
msgstr ""
1234
1263
1235
#: bzrlib/builtins.py:2093
1264
#: bzrlib/builtins.py:2097
1236
1265
msgid ""
1237
1266
" Note that in the case of a merge, the -c option shows the changes\n"
1238
1267
" compared to the left hand parent. To see the changes against\n"
1239
1268
" another parent, use::"
1240
1269
msgstr ""
1241
1270
1242
#: bzrlib/builtins.py:2097
1271
#: bzrlib/builtins.py:2101
1243
1272
msgid " bzr diff -r<chosen_parent>..X"
1244
1273
msgstr ""
1245
1274
1246
#: bzrlib/builtins.py:2099
1275
#: bzrlib/builtins.py:2103
1247
1276
msgid ""
1248
1277
" The changes between the current revision and the previous revision\n"
1249
1278
" (equivalent to -c-1 and -r-2..-1)"
1250
1279
msgstr ""
1251
1280
1252
#: bzrlib/builtins.py:2102
1281
#: bzrlib/builtins.py:2106
1253
1282
msgid " bzr diff -r-2.."
1254
1283
msgstr ""
1255
1284
1256
#: bzrlib/builtins.py:2104
1285
#: bzrlib/builtins.py:2108
1257
1286
msgid " Show just the differences for file NEWS::"
1258
1287
msgstr ""
1259
1288
1260
#: bzrlib/builtins.py:2106
1289
#: bzrlib/builtins.py:2110
1261
1290
msgid " bzr diff NEWS"
1262
1291
msgstr ""
1263
1292
1264
#: bzrlib/builtins.py:2108
1293
#: bzrlib/builtins.py:2112
1265
1294
msgid " Show the differences in working tree xxx for file NEWS::"
1266
1295
msgstr ""
1267
1296
1268
#: bzrlib/builtins.py:2110
1297
#: bzrlib/builtins.py:2114
1269
1298
msgid " bzr diff xxx/NEWS"
1270
1299
msgstr ""
1271
1300
1272
#: bzrlib/builtins.py:2112
1301
#: bzrlib/builtins.py:2116
1273
1302
msgid " Show the differences from branch xxx to this working tree:"
1274
1303
msgstr ""
1275
1304
1276
#: bzrlib/builtins.py:2114
1305
#: bzrlib/builtins.py:2118
1277
1306
msgid " bzr diff --old xxx"
1278
1307
msgstr ""
1279
1308
1280
#: bzrlib/builtins.py:2116
1309
#: bzrlib/builtins.py:2120
1281
1310
msgid " Show the differences between two branches for file NEWS::"
1282
1311
msgstr ""
1283
1312
1284
#: bzrlib/builtins.py:2118
1313
#: bzrlib/builtins.py:2122
1285
1314
msgid " bzr diff --old xxx --new yyy NEWS"
1286
1315
msgstr ""
1287
1316
1288
#: bzrlib/builtins.py:2120
1317
#: bzrlib/builtins.py:2124
1289
1318
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1290
1319
msgstr ""
1291
1320
1292
#: bzrlib/builtins.py:2122
1321
#: bzrlib/builtins.py:2126
1293
1322
msgid ""
1294
1323
" bzr diff --prefix old/:new/\n"
1295
1324
" \n"
1299
1328
msgstr ""
1300
1329
1301
1330
# help of 'diff-options' option of 'diff' command
1302
#: bzrlib/builtins.py:2132
1331
#: bzrlib/builtins.py:2136
1303
1332
msgid "Pass these options to the external diff program."
1304
1333
msgstr ""
1305
1334
1306
1335
# help of 'prefix' option of 'diff' command
1307
#: bzrlib/builtins.py:2135
1336
#: bzrlib/builtins.py:2139
1308
1337
msgid ""
1309
1338
"Set prefixes added to old and new filenames, as two values separated by a "
1310
1339
"colon. (eg \"old/:new/\")."
1311
1340
msgstr ""
1312
1341
1313
1342
# help of 'old' option of 'diff' command
1314
#: bzrlib/builtins.py:2138
1343
#: bzrlib/builtins.py:2142
1315
1344
msgid "Branch/tree to compare from."
1316
1345
msgstr ""
1317
1346
1318
1347
# help of 'new' option of 'diff' command
1319
#: bzrlib/builtins.py:2142
1348
#: bzrlib/builtins.py:2146
1320
1349
msgid "Branch/tree to compare to."
1321
1350
msgstr ""
1322
1351
1323
1352
# help of 'using' option of 'diff' command
1324
#: bzrlib/builtins.py:2148
1353
#: bzrlib/builtins.py:2152
1325
1354
msgid "Use this command to compare files."
1326
1355
msgstr ""
1327
1356
1328
1357
# help of 'format' option of 'diff' command
1329
#: bzrlib/builtins.py:2153
1358
#: bzrlib/builtins.py:2157
1330
1359
msgid "Diff format to use."
1331
1360
msgstr ""
1332
1361
1333
1362
# title of 'format' option of 'diff' command
1334
#: bzrlib/builtins.py:2155
1363
#: bzrlib/builtins.py:2159
1335
1364
msgid "Diff format"
1336
1365
msgstr ""
1337
1366
1338
#: bzrlib/builtins.py:2177
1367
#: bzrlib/builtins.py:2181
1339
1368
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1340
1369
msgstr ""
1341
1370
1342
#: bzrlib/builtins.py:2181
1371
#: bzrlib/builtins.py:2185
1343
1372
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1344
1373
msgstr ""
1345
1374
1346
#: bzrlib/builtins.py:2186 bzrlib/builtins.py:2584 bzrlib/builtins.py:2597
1347
#: bzrlib/builtins.py:2605 bzrlib/builtins.py:4745
1375
#: bzrlib/builtins.py:2190 bzrlib/builtins.py:2588 bzrlib/builtins.py:2601
1376
#: bzrlib/builtins.py:2609 bzrlib/builtins.py:4760
1348
1377
msgid "{0} and {1} are mutually exclusive"
1349
1378
msgstr ""
1350
1379
1351
#: bzrlib/builtins.py:2206
1380
#: bzrlib/builtins.py:2210
1352
1381
msgid ""
1353
1382
"List files deleted in the working tree.\n"
1354
1383
" "
1355
1384
msgstr ""
1356
1385
1357
#: bzrlib/builtins.py:2284
1386
#: bzrlib/builtins.py:2288
1358
1387
msgid "Show the tree root directory."
1359
1388
msgstr ""
1360
1389
1361
#: bzrlib/builtins.py:2286
1390
#: bzrlib/builtins.py:2290
1362
1391
msgid ""
1363
1392
"The root is the nearest enclosing directory with a .bzr control\n"
1364
1393
"directory."
1365
1394
msgstr ""
1366
1395
1367
#: bzrlib/builtins.py:2301
1396
#: bzrlib/builtins.py:2305
1368
1397
msgid "The limit argument must be an integer."
1369
1398
msgstr ""
1370
1399
1371
#: bzrlib/builtins.py:2309
1400
#: bzrlib/builtins.py:2313
1372
1401
msgid "The levels argument must be an integer."
1373
1402
msgstr ""
1374
1403
1375
#: bzrlib/builtins.py:2314
1404
#: bzrlib/builtins.py:2318
1376
1405
msgid "Show historical log for a branch or subset of a branch."
1377
1406
msgstr ""
1378
1407
1379
#: bzrlib/builtins.py:2316
1408
#: bzrlib/builtins.py:2320
1380
1409
msgid ""
1381
1410
"log is bzr's default tool for exploring the history of a branch.\n"
1382
1411
"The branch to use is taken from the first parameter. If no parameters\n"
1384
1413
"Here are some simple examples::"
1385
1414
msgstr ""
1386
1415
1387
#: bzrlib/builtins.py:2321
1416
#: bzrlib/builtins.py:2325
1388
1417
msgid ""
1389
1418
" bzr log log the current branch\n"
1390
1419
" bzr log foo.py log a file in its branch\n"
1391
1420
" bzr log http://server/branch log a branch on a server"
1392
1421
msgstr ""
1393
1422
1394
#: bzrlib/builtins.py:2325
1423
#: bzrlib/builtins.py:2329
1395
1424
msgid ""
1396
1425
"The filtering, ordering and information shown for each revision can\n"
1397
1426
"be controlled as explained below. By default, all revisions are\n"
1401
1430
"were merged."
1402
1431
msgstr ""
1403
1432
1404
#: bzrlib/builtins.py:2332
1433
#: bzrlib/builtins.py:2336
1405
1434
msgid ":Output control:"
1406
1435
msgstr ""
1407
1436
1408
#: bzrlib/builtins.py:2334
1437
#: bzrlib/builtins.py:2338
1409
1438
msgid ""
1410
1439
" The log format controls how information about each revision is\n"
1411
1440
" displayed. The standard log formats are called ``long``, ``short``\n"
1413
1442
" for more details on log formats."
1414
1443
msgstr ""
1415
1444
1416
#: bzrlib/builtins.py:2339
1445
#: bzrlib/builtins.py:2343
1417
1446
msgid ""
1418
1447
" The following options can be used to control what information is\n"
1419
1448
" displayed::"
1420
1449
msgstr ""
1421
1450
1422
#: bzrlib/builtins.py:2342
1451
#: bzrlib/builtins.py:2346
1423
1452
msgid ""
1424
1453
" -l N display a maximum of N revisions\n"
1425
1454
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1428
1457
" --show-ids display revision-ids (and file-ids), not just revnos"
1429
1458
msgstr ""
1430
1459
1431
#: bzrlib/builtins.py:2348
1460
#: bzrlib/builtins.py:2352
1432
1461
msgid ""
1433
1462
" Note that the default number of levels to display is a function of the\n"
1434
1463
" log format. If the -n option is not used, the standard log formats show\n"
1435
1464
" just the top level (mainline)."
1436
1465
msgstr ""
1437
1466
1438
#: bzrlib/builtins.py:2352
1467
#: bzrlib/builtins.py:2356
1439
1468
msgid ""
1440
1469
" Status summaries are shown using status flags like A, M, etc. To see\n"
1441
1470
" the changes explained using words like ``added`` and ``modified``\n"
1442
1471
" instead, use the -vv option."
1443
1472
msgstr ""
1444
1473
1445
#: bzrlib/builtins.py:2356
1474
#: bzrlib/builtins.py:2360
1446
1475
msgid ":Ordering control:"
1447
1476
msgstr ""
1448
1477
1449
#: bzrlib/builtins.py:2358
1478
#: bzrlib/builtins.py:2362
1450
1479
msgid ""
1451
1480
" To display revisions from oldest to newest, use the --forward option.\n"
1452
1481
" In most cases, using this option will have little impact on the total\n"
1454
1483
" display revisions like --reverse does when it can."
1455
1484
msgstr ""
1456
1485
1457
#: bzrlib/builtins.py:2363
1486
#: bzrlib/builtins.py:2367
1458
1487
msgid ":Revision filtering:"
1459
1488
msgstr ""
1460
1489
1461
#: bzrlib/builtins.py:2365
1490
#: bzrlib/builtins.py:2369
1462
1491
msgid ""
1463
1492
" The -r option can be used to specify what revision or range of revisions\n"
1464
1493
" to filter against. The various forms are shown below::"
1465
1494
msgstr ""
1466
1495
1467
#: bzrlib/builtins.py:2368
1496
#: bzrlib/builtins.py:2372
1468
1497
msgid ""
1469
1498
" -rX display revision X\n"
1470
1499
" -rX.. display revision X and later\n"
1472
1501
" -rX..Y display from X to Y inclusive"
1473
1502
msgstr ""
1474
1503
1475
#: bzrlib/builtins.py:2373
1504
#: bzrlib/builtins.py:2377
1476
1505
msgid ""
1477
1506
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1478
1507
" Some common examples are given below::"
1479
1508
msgstr ""
1480
1509
1481
#: bzrlib/builtins.py:2376
1510
#: bzrlib/builtins.py:2380
1482
1511
msgid ""
1483
1512
" -r-1 show just the tip\n"
1484
1513
" -r-10.. show the last 10 mainline revisions\n"
1488
1517
" -rdate:yesterday.. show changes since yesterday"
1489
1518
msgstr ""
1490
1519
1491
#: bzrlib/builtins.py:2383
1520
#: bzrlib/builtins.py:2387
1492
1521
msgid ""
1493
1522
" When logging a range of revisions using -rX..Y, log starts at\n"
1494
1523
" revision Y and searches back in history through the primary\n"
1498
1527
" a nested merge revision and the log will be truncated accordingly."
1499
1528
msgstr ""
1500
1529
1501
#: bzrlib/builtins.py:2390
1530
#: bzrlib/builtins.py:2394
1502
1531
msgid ":Path filtering:"
1503
1532
msgstr ""
1504
1533
1505
#: bzrlib/builtins.py:2392
1534
#: bzrlib/builtins.py:2396
1506
1535
msgid ""
1507
1536
" If parameters are given and the first one is not a branch, the log\n"
1508
1537
" will be filtered to show only those revisions that changed the\n"
1509
1538
" nominated files or directories."
1510
1539
msgstr ""
1511
1540
1512
#: bzrlib/builtins.py:2396
1541
#: bzrlib/builtins.py:2400
1513
1542
msgid ""
1514
1543
" Filenames are interpreted within their historical context. To log a\n"
1515
1544
" deleted file, specify a revision range so that the file existed at\n"
1516
1545
" the end or start of the range."
1517
1546
msgstr ""
1518
1547
1519
#: bzrlib/builtins.py:2400
1548
#: bzrlib/builtins.py:2404
1520
1549
msgid ""
1521
1550
" Historical context is also important when interpreting pathnames of\n"
1522
1551
" renamed files/directories. Consider the following example:"
1523
1552
msgstr ""
1524
1553
1525
#: bzrlib/builtins.py:2403
1554
#: bzrlib/builtins.py:2407
1526
1555
msgid ""
1527
1556
" * revision 1: add tutorial.txt\n"
1528
1557
" * revision 2: modify tutorial.txt\n"
1529
1558
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1530
1559
msgstr ""
1531
1560
1532
#: bzrlib/builtins.py:2407
1561
#: bzrlib/builtins.py:2411
1533
1562
msgid " In this case:"
1534
1563
msgstr ""
1535
1564
1536
#: bzrlib/builtins.py:2409
1565
#: bzrlib/builtins.py:2413
1537
1566
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1538
1567
msgstr ""
1539
1568
1540
#: bzrlib/builtins.py:2411
1569
#: bzrlib/builtins.py:2415
1541
1570
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1542
1571
msgstr ""
1543
1572
1544
#: bzrlib/builtins.py:2413
1573
#: bzrlib/builtins.py:2417
1545
1574
msgid ""
1546
1575
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1547
1576
" the original file in revision 2."
1548
1577
msgstr ""
1549
1578
1550
#: bzrlib/builtins.py:2416
1579
#: bzrlib/builtins.py:2420
1551
1580
msgid ""
1552
1581
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1553
1582
" was no file called guide.txt in revision 2."
1554
1583
msgstr ""
1555
1584
1556
#: bzrlib/builtins.py:2419
1585
#: bzrlib/builtins.py:2423
1557
1586
msgid ""
1558
1587
" Renames are always followed by log. By design, there is no need to\n"
1559
1588
" explicitly ask for this (and no way to stop logging a file back\n"
1560
1589
" until it was last renamed)."
1561
1590
msgstr ""
1562
1591
1563
#: bzrlib/builtins.py:2423
1592
#: bzrlib/builtins.py:2427
1564
1593
msgid ":Other filtering:"
1565
1594
msgstr ""
1566
1595
1567
#: bzrlib/builtins.py:2425
1596
#: bzrlib/builtins.py:2429
1568
1597
msgid ""
1569
1598
" The --match option can be used for finding revisions that match a\n"
1570
1599
" regular expression in a commit message, committer, author or bug.\n"
1573
1602
" --match-message can be used to only match a specific field."
1574
1603
msgstr ""
1575
1604
1576
#: bzrlib/builtins.py:2431
1605
#: bzrlib/builtins.py:2435
1577
1606
msgid ":Tips & tricks:"
1578
1607
msgstr ""
1579
1608
1580
#: bzrlib/builtins.py:2433
1609
#: bzrlib/builtins.py:2437
1581
1610
msgid ""
1582
1611
" GUI tools and IDEs are often better at exploring history than command\n"
1583
1612
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1586
1615
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1587
1616
msgstr ""
1588
1617
1589
#: bzrlib/builtins.py:2439
1618
#: bzrlib/builtins.py:2443
1590
1619
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1591
1620
msgstr ""
1592
1621
1593
#: bzrlib/builtins.py:2441
1622
#: bzrlib/builtins.py:2445
1594
1623
msgid ""
1595
1624
" [ALIASES]\n"
1596
1625
" tip = log -r-1\n"
1598
1627
" show = log -v -p"
1599
1628
msgstr ""
1600
1629
1601
#: bzrlib/builtins.py:2446
1630
#: bzrlib/builtins.py:2450
1602
1631
msgid ""
1603
1632
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1604
1633
" will show the last 10 mainline revisions. To see the details of a\n"
1605
1634
" particular revision X, ``bzr show -rX``."
1606
1635
msgstr ""
1607
1636
1608
#: bzrlib/builtins.py:2450
1637
#: bzrlib/builtins.py:2454
1609
1638
msgid ""
1610
1639
" If you are interested in looking deeper into a particular merge X,\n"
1611
1640
" use ``bzr log -n0 -rX``."
1612
1641
msgstr ""
1613
1642
1614
#: bzrlib/builtins.py:2453
1643
#: bzrlib/builtins.py:2457
1615
1644
msgid ""
1616
1645
" ``bzr log -v`` on a branch with lots of history is currently\n"
1617
1646
" very slow. A fix for this issue is currently under development.\n"
1619
1648
" be given when using the -v option."
1620
1649
msgstr ""
1621
1650
1622
#: bzrlib/builtins.py:2458
1651
#: bzrlib/builtins.py:2462
1623
1652
msgid ""
1624
1653
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1625
1654
" used to find revisions matching user names, commit messages, etc.\n"
1627
1656
" a list of words but not others."
1628
1657
msgstr ""
1629
1658
1630
#: bzrlib/builtins.py:2463
1659
#: bzrlib/builtins.py:2467
1631
1660
msgid ""
1632
1661
" When exploring non-mainline history on large projects with deep\n"
1633
1662
" history, the performance of log can be greatly improved by installing\n"
1636
1665
msgstr ""
1637
1666
1638
1667
# help of 'forward' option of 'log' command
1639
#: bzrlib/builtins.py:2472
1668
#: bzrlib/builtins.py:2476
1640
1669
msgid "Show from oldest to newest."
1641
1670
msgstr ""
1642
1671
1643
1672
# help of 'verbose' option of 'log' command
1644
#: bzrlib/builtins.py:2475
1673
#: bzrlib/builtins.py:2479
1645
1674
msgid "Show files changed in each revision."
1646
1675
msgstr ""
1647
1676
1648
1677
# help of 'change' option of 'log' command
1649
#: bzrlib/builtins.py:2481
1678
#: bzrlib/builtins.py:2485
1650
1679
msgid "Show just the specified revision. See also \"help revisionspec\"."
1651
1680
msgstr ""
1652
1681
1653
1682
# help of 'authors' option of 'log' command
1654
#: bzrlib/builtins.py:2485
1683
#: bzrlib/builtins.py:2489
1655
1684
msgid "What names to list as authors - first, all or committer."
1656
1685
msgstr ""
1657
1686
1658
1687
# title of 'authors' option of 'log' command
1659
#: bzrlib/builtins.py:2486
1688
#: bzrlib/builtins.py:2490
1660
1689
msgid "Authors"
1661
1690
msgstr ""
1662
1691
1663
1692
# help of 'levels' option of 'log' command
1664
#: bzrlib/builtins.py:2491
1693
#: bzrlib/builtins.py:2495
1665
1694
msgid "Number of levels to display - 0 for all, 1 for flat."
1666
1695
msgstr ""
1667
1696
1668
1697
# help of 'limit' option of 'log' command
1669
#: bzrlib/builtins.py:2501
1698
#: bzrlib/builtins.py:2505
1670
1699
msgid "Limit the output to the first N revisions."
1671
1700
msgstr ""
1672
1701
1673
1702
# help of 'show-diff' option of 'log' command
1674
#: bzrlib/builtins.py:2506
1703
#: bzrlib/builtins.py:2510
1675
1704
msgid "Show changes made in each revision as a patch."
1676
1705
msgstr ""
1677
1706
1678
1707
# help of 'include-merged' option of 'log' command
1679
#: bzrlib/builtins.py:2508
1708
#: bzrlib/builtins.py:2512
1680
1709
msgid "Show merged revisions like --levels 0 does."
1681
1710
msgstr ""
1682
1711
1683
1712
# help of 'omit-merges' option of 'log' command
1684
#: bzrlib/builtins.py:2512
1713
#: bzrlib/builtins.py:2516
1685
1714
msgid "Do not report commits with more than one parent."
1686
1715
msgstr ""
1687
1716
1688
1717
# help of 'exclude-common-ancestry' option of 'log' command
1689
#: bzrlib/builtins.py:2514
1718
#: bzrlib/builtins.py:2518
1690
1719
msgid ""
1691
1720
"Display only the revisions that are not part of both ancestries (require -"
1692
"rX..Y)"
1721
"rX..Y)."
1693
1722
msgstr ""
1694
1723
1695
1724
# help of 'signatures' option of 'log' command
1696
#: bzrlib/builtins.py:2518
1697
msgid "Show digital signature validity"
1725
#: bzrlib/builtins.py:2522
1726
msgid "Show digital signature validity."
1698
1727
msgstr ""
1699
1728
1700
1729
# help of 'match' option of 'log' command
1701
#: bzrlib/builtins.py:2521
1730
#: bzrlib/builtins.py:2525
1702
1731
msgid "Show revisions whose properties match this expression."
1703
1732
msgstr ""
1704
1733
1705
1734
# help of 'match-message' option of 'log' command
1706
#: bzrlib/builtins.py:2525
1735
#: bzrlib/builtins.py:2529
1707
1736
msgid "Show revisions whose message matches this expression."
1708
1737
msgstr ""
1709
1738
1710
1739
# help of 'match-committer' option of 'log' command
1711
#: bzrlib/builtins.py:2529
1740
#: bzrlib/builtins.py:2533
1712
1741
msgid "Show revisions whose committer matches this expression."
1713
1742
msgstr ""
1714
1743
1715
1744
# help of 'match-author' option of 'log' command
1716
#: bzrlib/builtins.py:2533
1745
#: bzrlib/builtins.py:2537
1717
1746
msgid "Show revisions whose authors match this expression."
1718
1747
msgstr ""
1719
1748
1720
1749
# help of 'match-bugs' option of 'log' command
1721
#: bzrlib/builtins.py:2537
1750
#: bzrlib/builtins.py:2541
1722
1751
msgid "Show revisions whose bugs match this expression."
1723
1752
msgstr ""
1724
1753
1725
#: bzrlib/builtins.py:2591
1754
#: bzrlib/builtins.py:2595
1726
1755
msgid "--exclude-common-ancestry requires -r with two revisions"
1727
1756
msgstr ""
1728
1757
1729
#: bzrlib/builtins.py:2619
1758
#: bzrlib/builtins.py:2623
1730
1759
#, python-format
1731
1760
msgid "Path unknown at end or start of revision range: %s"
1732
1761
msgstr ""
1733
1762
1734
#: bzrlib/builtins.py:2736
1763
#: bzrlib/builtins.py:2740
1735
1764
#, python-format
1736
1765
msgid "bzr %s doesn't accept two revisions in different branches."
1737
1766
msgstr ""
1738
1767
1739
#: bzrlib/builtins.py:2752
1768
#: bzrlib/builtins.py:2756
1740
1769
#, python-format
1741
1770
msgid "bzr %s --revision takes one or two values."
1742
1771
msgstr ""
1743
1772
1744
#: bzrlib/builtins.py:2797
1773
#: bzrlib/builtins.py:2801
1745
1774
msgid ""
1746
1775
"List files in a tree.\n"
1747
1776
" "
1748
1777
msgstr ""
1749
1778
1750
1779
# help of 'recursive' option of 'ls' command
1751
#: bzrlib/builtins.py:2806
1780
#: bzrlib/builtins.py:2810
1752
1781
msgid "Recurse into subdirectories."
1753
1782
msgstr ""
1754
1783
1755
1784
# help of 'from-root' option of 'ls' command
1756
#: bzrlib/builtins.py:2808
1785
#: bzrlib/builtins.py:2812
1757
1786
msgid "Print paths relative to the root of the branch."
1758
1787
msgstr ""
1759
1788
1760
1789
# help of 'unknown' option of 'ls' command
1761
#: bzrlib/builtins.py:2810
1790
#: bzrlib/builtins.py:2814
1762
1791
msgid "Print unknown files."
1763
1792
msgstr ""
1764
1793
1765
1794
# help of 'versioned' option of 'ls' command
1766
#: bzrlib/builtins.py:2811
1795
#: bzrlib/builtins.py:2815
1767
1796
msgid "Print versioned files."
1768
1797
msgstr ""
1769
1798
1770
1799
# help of 'ignored' option of 'ls' command
1771
#: bzrlib/builtins.py:2814
1800
#: bzrlib/builtins.py:2818
1772
1801
msgid "Print ignored files."
1773
1802
msgstr ""
1774
1803
1775
1804
# help of 'kind' option of 'ls' command
1776
#: bzrlib/builtins.py:2816
1805
#: bzrlib/builtins.py:2820
1777
1806
msgid "List entries of a particular kind: file, directory, symlink."
1778
1807
msgstr ""
1779
1808
1780
#: bzrlib/builtins.py:2829
1809
#: bzrlib/builtins.py:2833
1781
1810
msgid "invalid kind specified"
1782
1811
msgstr ""
1783
1812
1784
#: bzrlib/builtins.py:2832
1813
#: bzrlib/builtins.py:2836
1785
1814
msgid "Cannot set both --verbose and --null"
1786
1815
msgstr ""
1787
1816
1788
#: bzrlib/builtins.py:2841
1817
#: bzrlib/builtins.py:2845
1789
1818
msgid "cannot specify both --from-root and PATH"
1790
1819
msgstr ""
1791
1820
1792
#: bzrlib/builtins.py:2928
1821
#: bzrlib/builtins.py:2932
1793
1822
msgid "Ignore specified files or patterns."
1794
1823
msgstr ""
1795
1824
1796
#: bzrlib/builtins.py:2930
1825
#: bzrlib/builtins.py:2934
1797
1826
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1798
1827
msgstr ""
1799
1828
1800
#: bzrlib/builtins.py:2932
1829
#: bzrlib/builtins.py:2936
1801
1830
msgid ""
1802
1831
"If a .bzrignore file does not exist, the ignore command\n"
1803
1832
"will create one and add the specified files or patterns to the newly\n"
1806
1835
"the use of the ignore command will require an explicit add command."
1807
1836
msgstr ""
1808
1837
1809
#: bzrlib/builtins.py:2938
1838
#: bzrlib/builtins.py:2942
1810
1839
msgid ""
1811
1840
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1812
1841
"After adding, editing or deleting that file either indirectly by\n"
1814
1843
"it."
1815
1844
msgstr ""
1816
1845
1817
#: bzrlib/builtins.py:2943
1846
#: bzrlib/builtins.py:2947
1818
1847
msgid ""
1819
1848
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1820
1849
"the global ignore file can be found in the application data directory as\n"
1823
1852
"can be edited directly using an editor."
1824
1853
msgstr ""
1825
1854
1826
#: bzrlib/builtins.py:2949
1855
#: bzrlib/builtins.py:2953
1827
1856
msgid ""
1828
1857
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1829
1858
"precedence over regular ignores. Such exceptions are used to specify\n"
1830
1859
"files that should be versioned which would otherwise be ignored."
1831
1860
msgstr ""
1832
1861
1833
#: bzrlib/builtins.py:2953
1862
#: bzrlib/builtins.py:2957
1834
1863
msgid ""
1835
1864
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1836
1865
"precedence over the '!' exception patterns."
1837
1866
msgstr ""
1838
1867
1839
#: bzrlib/builtins.py:2956
1868
#: bzrlib/builtins.py:2960
1840
1869
msgid ""
1841
1870
":Notes: \n"
1842
1871
" \n"
1844
1873
" the shell on Unix."
1845
1874
msgstr ""
1846
1875
1847
#: bzrlib/builtins.py:2961
1876
#: bzrlib/builtins.py:2965
1848
1877
msgid ""
1849
1878
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1850
1879
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1851
1880
msgstr ""
1852
1881
1853
#: bzrlib/builtins.py:2964
1882
#: bzrlib/builtins.py:2968
1854
1883
msgid ""
1855
1884
":Examples:\n"
1856
1885
" Ignore the top level Makefile::"
1857
1886
msgstr ""
1858
1887
1859
#: bzrlib/builtins.py:2967
1888
#: bzrlib/builtins.py:2971
1860
1889
msgid " bzr ignore ./Makefile"
1861
1890
msgstr ""
1862
1891
1863
#: bzrlib/builtins.py:2969
1892
#: bzrlib/builtins.py:2973
1864
1893
msgid " Ignore .class files in all directories...::"
1865
1894
msgstr ""
1866
1895
1867
#: bzrlib/builtins.py:2971
1896
#: bzrlib/builtins.py:2975
1868
1897
msgid " bzr ignore \"*.class\""
1869
1898
msgstr ""
1870
1899
1871
#: bzrlib/builtins.py:2973
1900
#: bzrlib/builtins.py:2977
1872
1901
msgid " ...but do not ignore \"special.class\"::"
1873
1902
msgstr ""
1874
1903
1875
#: bzrlib/builtins.py:2975
1904
#: bzrlib/builtins.py:2979
1876
1905
msgid " bzr ignore \"!special.class\""
1877
1906
msgstr ""
1878
1907
1879
#: bzrlib/builtins.py:2977
1908
#: bzrlib/builtins.py:2981
1880
1909
msgid " Ignore files whose name begins with the \"#\" character::"
1881
1910
msgstr ""
1882
1911
1883
#: bzrlib/builtins.py:2979
1912
#: bzrlib/builtins.py:2983
1884
1913
msgid " bzr ignore \"RE:^#\""
1885
1914
msgstr ""
1886
1915
1887
#: bzrlib/builtins.py:2981
1916
#: bzrlib/builtins.py:2985
1888
1917
msgid " Ignore .o files under the lib directory::"
1889
1918
msgstr ""
1890
1919
1891
#: bzrlib/builtins.py:2983
1920
#: bzrlib/builtins.py:2987
1892
1921
msgid " bzr ignore \"lib/**/*.o\""
1893
1922
msgstr ""
1894
1923
1895
#: bzrlib/builtins.py:2987
1924
#: bzrlib/builtins.py:2991
1896
1925
msgid " bzr ignore \"RE:lib/.*\\.o\""
1897
1926
msgstr ""
1898
1927
1899
#: bzrlib/builtins.py:2989
1928
#: bzrlib/builtins.py:2993
1900
1929
msgid " Ignore everything but the \"debian\" toplevel directory::"
1901
1930
msgstr ""
1902
1931
1903
#: bzrlib/builtins.py:2991
1932
#: bzrlib/builtins.py:2995
1904
1933
msgid ""
1905
1934
" bzr ignore \"RE:(?!debian/).*\"\n"
1906
1935
" \n"
1913
1942
msgstr ""
1914
1943
1915
1944
# help of 'default-rules' option of 'ignore' command
1916
#: bzrlib/builtins.py:3005
1945
#: bzrlib/builtins.py:3009
1917
1946
msgid "Display the default ignore rules that bzr uses."
1918
1947
msgstr ""
1919
1948
1920
#: bzrlib/builtins.py:3017
1949
#: bzrlib/builtins.py:3021
1921
1950
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1922
1951
msgstr ""
1923
1952
1924
#: bzrlib/builtins.py:3028
1953
#: bzrlib/builtins.py:3032
1925
1954
#, python-format
1926
1955
msgid "Invalid ignore pattern found. %s"
1927
1956
msgid_plural "Invalid ignore patterns found. %s"
1928
1957
msgstr[0] ""
1929
1958
msgstr[1] ""
1930
1959
1931
#: bzrlib/builtins.py:3037
1960
#: bzrlib/builtins.py:3041
1932
1961
msgid "NAME_PATTERN should not be an absolute path"
1933
1962
msgstr ""
1934
1963
1935
#: bzrlib/builtins.py:3050
1964
#: bzrlib/builtins.py:3054
1936
1965
#, python-format
1937
1966
msgid ""
1938
1967
"Warning: the following files are version controlled and match your ignore "
1942
1971
"them.\n"
1943
1972
msgstr ""
1944
1973
1945
#: bzrlib/builtins.py:3057
1974
#: bzrlib/builtins.py:3061
1946
1975
msgid "List ignored files and the patterns that matched them."
1947
1976
msgstr ""
1948
1977
1949
#: bzrlib/builtins.py:3059
1978
#: bzrlib/builtins.py:3063
1950
1979
msgid ""
1951
1980
"List all the ignored files and the ignore pattern that caused the file to\n"
1952
1981
"be ignored."
1953
1982
msgstr ""
1954
1983
1955
#: bzrlib/builtins.py:3062
1984
#: bzrlib/builtins.py:3066
1956
1985
msgid "Alternatively, to list just the files::"
1957
1986
msgstr ""
1958
1987
1959
#: bzrlib/builtins.py:3064
1988
#: bzrlib/builtins.py:3068
1960
1989
msgid " bzr ls --ignored"
1961
1990
msgstr ""
1962
1991
1963
#: bzrlib/builtins.py:3098
1992
#: bzrlib/builtins.py:3102
1964
1993
#, python-format
1965
1994
msgid "not a valid revision-number: %r"
1966
1995
msgstr ""
1967
1996
1968
#: bzrlib/builtins.py:3105
1997
#: bzrlib/builtins.py:3109
1969
1998
msgid "Export current or past revision to a destination directory or archive."
1970
1999
msgstr ""
1971
2000
1972
#: bzrlib/builtins.py:3107
2001
#: bzrlib/builtins.py:3111
1973
2002
msgid "If no revision is specified this exports the last committed revision."
1974
2003
msgstr ""
1975
2004
1976
#: bzrlib/builtins.py:3109
2005
#: bzrlib/builtins.py:3113
1977
2006
msgid ""
1978
2007
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1979
2008
"given, try to find the format with the extension. If no extension\n"
1980
2009
"is found exports to a directory (equivalent to --format=dir)."
1981
2010
msgstr ""
1982
2011
1983
#: bzrlib/builtins.py:3113
2012
#: bzrlib/builtins.py:3117
1984
2013
msgid ""
1985
2014
"If root is supplied, it will be used as the root directory inside\n"
1986
2015
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1987
2016
"to the exported filename. The root option has no effect for 'dir' format."
1988
2017
msgstr ""
1989
2018
1990
#: bzrlib/builtins.py:3117
2019
#: bzrlib/builtins.py:3121
1991
2020
msgid ""
1992
2021
"If branch is omitted then the branch containing the current working\n"
1993
2022
"directory will be used."
1994
2023
msgstr ""
1995
2024
1996
#: bzrlib/builtins.py:3120
2025
#: bzrlib/builtins.py:3124
1997
2026
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1998
2027
msgstr ""
1999
2028
2000
#: bzrlib/builtins.py:3122
2029
#: bzrlib/builtins.py:3126
2001
2030
msgid ""
2002
2031
" ================= =========================\n"
2003
2032
" Supported formats Autodetected by extension\n"
2011
2040
msgstr ""
2012
2041
2013
2042
# help of 'format' option of 'export' command
2014
#: bzrlib/builtins.py:3136
2043
#: bzrlib/builtins.py:3140
2015
2044
msgid "Type of file to export to."
2016
2045
msgstr ""
2017
2046
2018
2047
# help of 'filters' option of 'export' command
2019
#: bzrlib/builtins.py:3139
2048
#: bzrlib/builtins.py:3143
2020
2049
msgid "Apply content filters to export the convenient form."
2021
2050
msgstr ""
2022
2051
2023
2052
# help of 'root' option of 'export' command
2024
#: bzrlib/builtins.py:3143
2053
#: bzrlib/builtins.py:3147
2025
2054
msgid "Name of the root directory inside the exported file."
2026
2055
msgstr ""
2027
2056
2028
2057
# help of 'per-file-timestamps' option of 'export' command
2029
#: bzrlib/builtins.py:3145
2058
#: bzrlib/builtins.py:3149
2030
2059
msgid ""
2031
2060
"Set modification time of files to that of the last revision in which it was "
2032
2061
"changed."
2033
2062
msgstr ""
2034
2063
2035
#: bzrlib/builtins.py:3165
2064
# help of 'uncommitted' option of 'export' command
2065
#: bzrlib/builtins.py:3152
2066
msgid "Export the working tree contents rather than that of the last revision."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3171
2070
msgid "--uncommitted requires a working tree"
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3180
2036
2074
#, python-format
2037
2075
msgid "Unsupported export format: %s"
2038
2076
msgstr ""
2039
2077
2040
#: bzrlib/builtins.py:3169
2078
#: bzrlib/builtins.py:3184
2041
2079
msgid "Write the contents of a file as of a given revision to standard output."
2042
2080
msgstr ""
2043
2081
2044
#: bzrlib/builtins.py:3171
2082
#: bzrlib/builtins.py:3186
2045
2083
msgid "If no revision is nominated, the last revision is used."
2046
2084
msgstr ""
2047
2085
2048
#: bzrlib/builtins.py:3173
2086
#: bzrlib/builtins.py:3188
2049
2087
msgid ""
2050
2088
"Note: Take care to redirect standard output when using this command on a\n"
2051
2089
"binary file."
2052
2090
msgstr ""
2053
2091
2092
# help of 'name-from-revision' option of 'cat' command
2093
#: bzrlib/builtins.py:3194
2094
msgid "The path name in the old tree."
2095
msgstr ""
2096
2054
2097
# help of 'filters' option of 'cat' command
2055
#: bzrlib/builtins.py:3180
2098
#: bzrlib/builtins.py:3195
2056
2099
msgid "Apply content filters to display the convenience form."
2057
2100
msgstr ""
2058
2101
2059
#: bzrlib/builtins.py:3191
2102
#: bzrlib/builtins.py:3206
2060
2103
msgid "bzr cat --revision takes exactly one revision specifier"
2061
2104
msgstr ""
2062
2105
2063
#: bzrlib/builtins.py:3216 bzrlib/builtins.py:3228
2106
#: bzrlib/builtins.py:3231 bzrlib/builtins.py:3243
2064
2107
msgid "{0!r} is not present in revision {1}"
2065
2108
msgstr ""
2066
2109
2067
#: bzrlib/builtins.py:3251
2110
#: bzrlib/builtins.py:3266
2068
2111
msgid "Commit changes into a new revision."
2069
2112
msgstr ""
2070
2113
2071
#: bzrlib/builtins.py:3253
2114
#: bzrlib/builtins.py:3268
2072
2115
msgid ""
2073
2116
"An explanatory message needs to be given for each commit. This is\n"
2074
2117
"often done by using the --message option (getting the message from the\n"
2078
2121
"boilerplate text loaded into the editor, use the --show-diff option."
2079
2122
msgstr ""
2080
2123
2081
#: bzrlib/builtins.py:3260
2124
#: bzrlib/builtins.py:3275
2082
2125
msgid ""
2083
2126
"By default, the entire tree is committed and the person doing the\n"
2084
2127
"commit is assumed to be the author. These defaults can be overridden\n"
2085
2128
"as explained below."
2086
2129
msgstr ""
2087
2130
2088
#: bzrlib/builtins.py:3264
2131
#: bzrlib/builtins.py:3279
2089
2132
msgid ":Selective commits:"
2090
2133
msgstr ""
2091
2134
2092
#: bzrlib/builtins.py:3266
2135
#: bzrlib/builtins.py:3281
2093
2136
msgid ""
2094
2137
" If selected files are specified, only changes to those files are\n"
2095
2138
" committed. If a directory is specified then the directory and\n"
2096
2139
" everything within it is committed."
2097
2140
msgstr ""
2098
2141
2099
#: bzrlib/builtins.py:3270
2142
#: bzrlib/builtins.py:3285
2100
2143
msgid ""
2101
2144
" When excludes are given, they take precedence over selected files.\n"
2102
2145
" For example, to commit only changes within foo, but not changes\n"
2103
2146
" within foo/bar::"
2104
2147
msgstr ""
2105
2148
2106
#: bzrlib/builtins.py:3274
2149
#: bzrlib/builtins.py:3289
2107
2150
msgid " bzr commit foo -x foo/bar"
2108
2151
msgstr ""
2109
2152
2110
#: bzrlib/builtins.py:3276
2153
#: bzrlib/builtins.py:3291
2111
2154
msgid " A selective commit after a merge is not yet supported."
2112
2155
msgstr ""
2113
2156
2114
#: bzrlib/builtins.py:3278
2157
#: bzrlib/builtins.py:3293
2115
2158
msgid ":Custom authors:"
2116
2159
msgstr ""
2117
2160
2118
#: bzrlib/builtins.py:3280
2161
#: bzrlib/builtins.py:3295
2119
2162
msgid ""
2120
2163
" If the author of the change is not the same person as the committer,\n"
2121
2164
" you can specify the author's name using the --author option. The\n"
2125
2168
" author."
2126
2169
msgstr ""
2127
2170
2128
#: bzrlib/builtins.py:3287
2171
#: bzrlib/builtins.py:3302
2129
2172
msgid ":Checks:"
2130
2173
msgstr ""
2131
2174
2132
#: bzrlib/builtins.py:3289
2175
#: bzrlib/builtins.py:3304
2133
2176
msgid ""
2134
2177
" A common mistake is to forget to add a new file or directory before\n"
2135
2178
" running the commit command. The --strict option checks for unknown\n"
2138
2181
" for details."
2139
2182
msgstr ""
2140
2183
2141
#: bzrlib/builtins.py:3295
2184
#: bzrlib/builtins.py:3310
2142
2185
msgid ":Things to note:"
2143
2186
msgstr ""
2144
2187
2145
#: bzrlib/builtins.py:3297
2188
#: bzrlib/builtins.py:3312
2146
2189
msgid ""
2147
2190
" If you accidentially commit the wrong changes or make a spelling\n"
2148
2191
" mistake in the commit message say, you can use the uncommit command\n"
2149
2192
" to undo it. See ``bzr help uncommit`` for details."
2150
2193
msgstr ""
2151
2194
2152
#: bzrlib/builtins.py:3301
2195
#: bzrlib/builtins.py:3316
2153
2196
msgid ""
2154
2197
" Hooks can also be configured to run after a commit. This allows you\n"
2155
2198
" to trigger updates to external systems like bug trackers. The --fixes\n"
2158
2201
msgstr ""
2159
2202
2160
2203
# help of 'exclude' option of 'commit' command
2161
#: bzrlib/builtins.py:3311
2204
#: bzrlib/builtins.py:3326
2162
2205
msgid "Do not consider changes made to a given path."
2163
2206
msgstr ""
2164
2207
2165
2208
# help of 'message' option of 'commit' command
2166
#: bzrlib/builtins.py:3314
2209
#: bzrlib/builtins.py:3329
2167
2210
msgid "Description of the new revision."
2168
2211
msgstr ""
2169
2212
2170
2213
# help of 'unchanged' option of 'commit' command
2171
#: bzrlib/builtins.py:3317
2214
#: bzrlib/builtins.py:3332
2172
2215
msgid "Commit even if nothing has changed."
2173
2216
msgstr ""
2174
2217
2175
2218
# help of 'file' option of 'commit' command
2176
#: bzrlib/builtins.py:3321
2219
#: bzrlib/builtins.py:3336
2177
2220
msgid "Take commit message from this file."
2178
2221
msgstr ""
2179
2222
2180
2223
# help of 'strict' option of 'commit' command
2181
#: bzrlib/builtins.py:3323
2224
#: bzrlib/builtins.py:3338
2182
2225
msgid "Refuse to commit if there are unknown files in the working tree."
2183
2226
msgstr ""
2184
2227
2185
2228
# help of 'commit-time' option of 'commit' command
2186
#: bzrlib/builtins.py:3326
2229
#: bzrlib/builtins.py:3341
2187
2230
msgid ""
2188
2231
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2189
2232
"08:00:00 +0100'."
2190
2233
msgstr ""
2191
2234
2192
2235
# help of 'fixes' option of 'commit' command
2193
#: bzrlib/builtins.py:3329
2236
#: bzrlib/builtins.py:3344
2194
2237
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2195
2238
msgstr ""
2196
2239
2197
2240
# help of 'author' option of 'commit' command
2198
#: bzrlib/builtins.py:3332
2241
#: bzrlib/builtins.py:3347
2199
2242
msgid "Set the author's name, if it's different from the committer."
2200
2243
msgstr ""
2201
2244
2202
2245
# help of 'local' option of 'commit' command
2203
#: bzrlib/builtins.py:3335
2246
#: bzrlib/builtins.py:3350
2204
2247
msgid ""
2205
2248
"Perform a local commit in a bound branch. Local commits are not pushed to "
2206
2249
"the master branch until a normal commit is performed."
2207
2250
msgstr ""
2208
2251
2209
2252
# help of 'show-diff' option of 'commit' command
2210
#: bzrlib/builtins.py:3341
2253
#: bzrlib/builtins.py:3356
2211
2254
msgid ""
2212
2255
"When no message is supplied, show the diff along with the status summary in "
2213
2256
"the message editor."
2214
2257
msgstr ""
2215
2258
2216
2259
# help of 'lossy' option of 'commit' command
2217
#: bzrlib/builtins.py:3344
2260
#: bzrlib/builtins.py:3359
2218
2261
msgid ""
2219
2262
"When committing to a foreign version control system do not push data that "
2220
2263
"can not be natively represented."
2221
2264
msgstr ""
2222
2265
2223
#: bzrlib/builtins.py:3362
2266
#: bzrlib/builtins.py:3377
2224
2267
#, python-format
2225
2268
msgid ""
2226
2269
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2228
2271
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2229
2272
msgstr ""
2230
2273
2231
#: bzrlib/builtins.py:3371
2274
#: bzrlib/builtins.py:3386
2232
2275
#, python-format
2233
2276
msgid ""
2234
2277
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2236
2279
"Commit refused."
2237
2280
msgstr ""
2238
2281
2239
#: bzrlib/builtins.py:3380
2282
#: bzrlib/builtins.py:3395
2240
2283
#, python-format
2241
2284
msgid "Unrecognized bug %s. Commit refused."
2242
2285
msgstr ""
2243
2286
2244
#: bzrlib/builtins.py:3383
2287
#: bzrlib/builtins.py:3398
2245
2288
#, python-format
2246
2289
msgid ""
2247
2290
"%s\n"
2248
2291
"Commit refused."
2249
2292
msgstr ""
2250
2293
2251
#: bzrlib/builtins.py:3407
2294
#: bzrlib/builtins.py:3422
2252
2295
msgid "Could not parse --commit-time: "
2253
2296
msgstr ""
2254
2297
2255
#: bzrlib/builtins.py:3447
2298
#: bzrlib/builtins.py:3462
2256
2299
msgid "please specify either --message or --file"
2257
2300
msgstr ""
2258
2301
2259
#: bzrlib/builtins.py:3476
2302
#: bzrlib/builtins.py:3491
2260
2303
msgid "please specify a commit message with either --message or --file"
2261
2304
msgstr ""
2262
2305
2263
#: bzrlib/builtins.py:3479
2306
#: bzrlib/builtins.py:3494
2264
2307
msgid ""
2265
2308
"Empty commit message specified. Please specify a commit message with either "
2266
2309
"--message or --file or leave a blank message with --message \"\"."
2267
2310
msgstr ""
2268
2311
2269
#: bzrlib/builtins.py:3499
2312
#: bzrlib/builtins.py:3514
2270
2313
msgid ""
2271
2314
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2272
2315
"--unchanged to force an empty commit."
2273
2316
msgstr ""
2274
2317
2275
#: bzrlib/builtins.py:3503
2318
#: bzrlib/builtins.py:3518
2276
2319
msgid ""
2277
2320
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2278
2321
"resolve FILE\" to resolve."
2279
2322
msgstr ""
2280
2323
2281
#: bzrlib/builtins.py:3507
2324
#: bzrlib/builtins.py:3522
2282
2325
msgid "Commit refused because there are unknown files in the working tree."
2283
2326
msgstr ""
2284
2327
2285
#: bzrlib/builtins.py:3510
2328
#: bzrlib/builtins.py:3525
2286
2329
msgid ""
2287
2330
"\n"
2288
2331
"To commit to master branch, run update and then commit.\n"
2289
2332
"You can also pass --local to commit to continue working disconnected."
2290
2333
msgstr ""
2291
2334
2292
#: bzrlib/builtins.py:3518
2335
#: bzrlib/builtins.py:3533
2293
2336
msgid ""
2294
2337
"Validate working tree structure, branch consistency and repository history."
2295
2338
msgstr ""
2296
2339
2297
#: bzrlib/builtins.py:3520
2340
#: bzrlib/builtins.py:3535
2298
2341
msgid ""
2299
2342
"This command checks various invariants about branch and repository storage\n"
2300
2343
"to detect data corruption or bzr bugs."
2301
2344
msgstr ""
2302
2345
2303
#: bzrlib/builtins.py:3523
2346
#: bzrlib/builtins.py:3538
2304
2347
msgid ""
2305
2348
"The working tree and branch checks will only give output if a problem is\n"
2306
2349
"detected. The output fields of the repository check are:"
2307
2350
msgstr ""
2308
2351
2309
#: bzrlib/builtins.py:3526
2352
#: bzrlib/builtins.py:3541
2310
2353
msgid ""
2311
2354
"revisions\n"
2312
2355
" This is just the number of revisions checked. It doesn't\n"
2313
2356
" indicate a problem."
2314
2357
msgstr ""
2315
2358
2316
#: bzrlib/builtins.py:3530
2359
#: bzrlib/builtins.py:3545
2317
2360
msgid ""
2318
2361
"versionedfiles\n"
2319
2362
" This is just the number of versionedfiles checked. It\n"
2320
2363
" doesn't indicate a problem."
2321
2364
msgstr ""
2322
2365
2323
#: bzrlib/builtins.py:3534
2366
#: bzrlib/builtins.py:3549
2324
2367
msgid ""
2325
2368
"unreferenced ancestors\n"
2326
2369
" Texts that are ancestors of other texts, but\n"
2328
2371
" subtle problem that Bazaar can work around."
2329
2372
msgstr ""
2330
2373
2331
#: bzrlib/builtins.py:3539
2374
#: bzrlib/builtins.py:3554
2332
2375
msgid ""
2333
2376
"unique file texts\n"
2334
2377
" This is the total number of unique file contents\n"
2335
2378
" seen in the checked revisions. It does not indicate a problem."
2336
2379
msgstr ""
2337
2380
2338
#: bzrlib/builtins.py:3543
2381
#: bzrlib/builtins.py:3558
2339
2382
msgid ""
2340
2383
"repeated file texts\n"
2341
2384
" This is the total number of repeated texts seen\n"
2344
2387
" indicate a problem."
2345
2388
msgstr ""
2346
2389
2347
#: bzrlib/builtins.py:3549
2390
#: bzrlib/builtins.py:3564
2348
2391
msgid ""
2349
2392
"If no restrictions are specified, all Bazaar data that is found at the "
2350
2393
"given\n"
2351
2394
"location will be checked."
2352
2395
msgstr ""
2353
2396
2354
#: bzrlib/builtins.py:3552
2397
#: bzrlib/builtins.py:3567
2355
2398
msgid ":Examples:"
2356
2399
msgstr ""
2357
2400
2358
#: bzrlib/builtins.py:3554
2401
#: bzrlib/builtins.py:3569
2359
2402
msgid " Check the tree and branch at 'foo'::"
2360
2403
msgstr ""
2361
2404
2362
#: bzrlib/builtins.py:3556
2405
#: bzrlib/builtins.py:3571
2363
2406
msgid " bzr check --tree --branch foo"
2364
2407
msgstr ""
2365
2408
2366
#: bzrlib/builtins.py:3558
2409
#: bzrlib/builtins.py:3573
2367
2410
msgid " Check only the repository at 'bar'::"
2368
2411
msgstr ""
2369
2412
2370
#: bzrlib/builtins.py:3560
2413
#: bzrlib/builtins.py:3575
2371
2414
msgid " bzr check --repo bar"
2372
2415
msgstr ""
2373
2416
2374
#: bzrlib/builtins.py:3562
2417
#: bzrlib/builtins.py:3577
2375
2418
msgid " Check everything at 'baz'::"
2376
2419
msgstr ""
2377
2420
2378
#: bzrlib/builtins.py:3564
2421
#: bzrlib/builtins.py:3579
2379
2422
msgid " bzr check baz"
2380
2423
msgstr ""
2381
2424
2382
2425
# help of 'branch' option of 'check' command
2383
#: bzrlib/builtins.py:3570
2426
#: bzrlib/builtins.py:3585
2384
2427
msgid "Check the branch related to the current directory."
2385
2428
msgstr ""
2386
2429
2387
2430
# help of 'repo' option of 'check' command
2388
#: bzrlib/builtins.py:3572
2431
#: bzrlib/builtins.py:3587
2389
2432
msgid "Check the repository related to the current directory."
2390
2433
msgstr ""
2391
2434
2392
2435
# help of 'tree' option of 'check' command
2393
#: bzrlib/builtins.py:3574
2436
#: bzrlib/builtins.py:3589
2394
2437
msgid "Check the working tree related to the current directory."
2395
2438
msgstr ""
2396
2439
2397
#: bzrlib/builtins.py:3588
2440
#: bzrlib/builtins.py:3603
2398
2441
msgid "Upgrade a repository, branch or working tree to a newer format."
2399
2442
msgstr ""
2400
2443
2401
#: bzrlib/builtins.py:3590
2444
#: bzrlib/builtins.py:3605
2402
2445
msgid ""
2403
2446
"When the default format has changed after a major new release of\n"
2404
2447
"Bazaar, you may be informed during certain operations that you\n"
2407
2450
"with older repositories or with older versions of Bazaar."
2408
2451
msgstr ""
2409
2452
2410
#: bzrlib/builtins.py:3596
2453
#: bzrlib/builtins.py:3611
2411
2454
msgid ""
2412
2455
"If you wish to upgrade to a particular format rather than the\n"
2413
2456
"current default, that can be specified using the --format option.\n"
2417
2460
"2.x default) so downgrading is not always possible."
2418
2461
msgstr ""
2419
2462
2420
#: bzrlib/builtins.py:3603
2463
#: bzrlib/builtins.py:3618
2421
2464
msgid ""
2422
2465
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2423
2466
"process (where # is a number). By default, this is left there on\n"
2428
2471
"afterwards."
2429
2472
msgstr ""
2430
2473
2431
#: bzrlib/builtins.py:3611
2474
#: bzrlib/builtins.py:3626
2432
2475
msgid ""
2433
2476
"If the location given is a shared repository, dependent branches\n"
2434
2477
"are also converted provided the repository converts successfully.\n"
2436
2479
"tried."
2437
2480
msgstr ""
2438
2481
2439
#: bzrlib/builtins.py:3616
2482
#: bzrlib/builtins.py:3631
2440
2483
msgid ""
2441
2484
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2442
2485
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2443
2486
msgstr ""
2444
2487
2445
2488
# help of 'format' option of 'upgrade' command
2446
#: bzrlib/builtins.py:3624
2489
#: bzrlib/builtins.py:3639
2447
2490
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2448
2491
msgstr ""
2449
2492
2450
2493
# title of 'format' option of 'init' command
2451
#: bzrlib/builtins.py:3628
2494
#: bzrlib/builtins.py:3643
2452
2495
msgid "Branch format"
2453
2496
msgstr ""
2454
2497
2455
2498
# help of 'clean' option of 'upgrade' command
2456
#: bzrlib/builtins.py:3630
2499
#: bzrlib/builtins.py:3645
2457
2500
msgid "Remove the backup.bzr directory if successful."
2458
2501
msgstr ""
2459
2502
2503
# help of 'dry-run' option of 'add' command
2460
2504
#: bzrlib/builtins.py:3647
2505
msgid "Show what would be done, but don't actually do anything."
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3662
2461
2509
msgid "Show or set bzr user id."
2462
2510
msgstr ""
2463
2511
2464
#: bzrlib/builtins.py:3649
2512
#: bzrlib/builtins.py:3664
2465
2513
msgid ""
2466
2514
":Examples:\n"
2467
2515
" Show the email of the current user::"
2468
2516
msgstr ""
2469
2517
2470
#: bzrlib/builtins.py:3652
2518
#: bzrlib/builtins.py:3667
2471
2519
msgid " bzr whoami --email"
2472
2520
msgstr ""
2473
2521
2474
#: bzrlib/builtins.py:3654
2522
#: bzrlib/builtins.py:3669
2475
2523
msgid " Set the current user::"
2476
2524
msgstr ""
2477
2525
2478
#: bzrlib/builtins.py:3656
2526
#: bzrlib/builtins.py:3671
2479
2527
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2480
2528
msgstr ""
2481
2529
2482
2530
# help of 'email' option of 'whoami' command
2483
#: bzrlib/builtins.py:3660
2531
#: bzrlib/builtins.py:3675
2484
2532
msgid "Display email address only."
2485
2533
msgstr ""
2486
2534
2487
2535
# help of 'branch' option of 'whoami' command
2488
#: bzrlib/builtins.py:3662
2536
#: bzrlib/builtins.py:3677
2489
2537
msgid "Set identity for the current branch instead of globally."
2490
2538
msgstr ""
2491
2539
2492
#: bzrlib/builtins.py:3686
2540
#: bzrlib/builtins.py:3701
2493
2541
msgid "--email can only be used to display existing identity"
2494
2542
msgstr ""
2495
2543
2496
#: bzrlib/builtins.py:3708
2544
#: bzrlib/builtins.py:3723
2497
2545
msgid "Print or set the branch nickname."
2498
2546
msgstr ""
2499
2547
2500
#: bzrlib/builtins.py:3710
2548
#: bzrlib/builtins.py:3725
2501
2549
msgid ""
2502
2550
"If unset, the tree root directory name is used as the nickname.\n"
2503
2551
"To print the current nickname, execute with no argument."
2504
2552
msgstr ""
2505
2553
2506
#: bzrlib/builtins.py:3713
2554
#: bzrlib/builtins.py:3728
2507
2555
msgid ""
2508
2556
"Bound branches use the nickname of its master branch unless it is set\n"
2509
2557
"locally."
2510
2558
msgstr ""
2511
2559
2512
#: bzrlib/builtins.py:3733
2560
#: bzrlib/builtins.py:3748
2513
2561
msgid "Set/unset and display aliases."
2514
2562
msgstr ""
2515
2563
2516
#: bzrlib/builtins.py:3735
2564
#: bzrlib/builtins.py:3750
2517
2565
msgid ""
2518
2566
":Examples:\n"
2519
2567
" Show the current aliases::"
2520
2568
msgstr ""
2521
2569
2522
#: bzrlib/builtins.py:3738
2570
#: bzrlib/builtins.py:3753
2523
2571
msgid " bzr alias"
2524
2572
msgstr ""
2525
2573
2526
#: bzrlib/builtins.py:3740
2574
#: bzrlib/builtins.py:3755
2527
2575
msgid " Show the alias specified for 'll'::"
2528
2576
msgstr ""
2529
2577
2530
#: bzrlib/builtins.py:3742
2578
#: bzrlib/builtins.py:3757
2531
2579
msgid " bzr alias ll"
2532
2580
msgstr ""
2533
2581
2534
#: bzrlib/builtins.py:3744
2582
#: bzrlib/builtins.py:3759
2535
2583
msgid " Set an alias for 'll'::"
2536
2584
msgstr ""
2537
2585
2538
#: bzrlib/builtins.py:3746
2586
#: bzrlib/builtins.py:3761
2539
2587
msgid " bzr alias ll=\"log --line -r-10..-1\""
2540
2588
msgstr ""
2541
2589
2542
#: bzrlib/builtins.py:3748
2590
#: bzrlib/builtins.py:3763
2543
2591
msgid " To remove an alias for 'll'::"
2544
2592
msgstr ""
2545
2593
2546
#: bzrlib/builtins.py:3750
2594
#: bzrlib/builtins.py:3765
2547
2595
msgid " bzr alias --remove ll"
2548
2596
msgstr ""
2549
2597
2550
2598
# help of 'remove' option of 'alias' command
2551
#: bzrlib/builtins.py:3755
2599
#: bzrlib/builtins.py:3770
2552
2600
msgid "Remove the alias."
2553
2601
msgstr ""
2554
2602
2555
#: bzrlib/builtins.py:3773
2603
#: bzrlib/builtins.py:3788
2556
2604
msgid "bzr alias --remove expects an alias to remove."
2557
2605
msgstr ""
2558
2606
2559
#: bzrlib/builtins.py:3945
2607
#: bzrlib/builtins.py:3960
2560
2608
msgid "subunit not available. subunit needs to be installed to use --subunit."
2561
2609
msgstr ""
2562
2610
2563
#: bzrlib/builtins.py:3962
2611
#: bzrlib/builtins.py:3977
2564
2612
msgid ""
2565
2613
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2566
2614
msgstr ""
2567
2615
2568
#: bzrlib/builtins.py:4009
2616
#: bzrlib/builtins.py:4024
2569
2617
msgid "Show version of bzr."
2570
2618
msgstr ""
2571
2619
2572
2620
# help of 'short' option of 'version' command
2573
#: bzrlib/builtins.py:4013
2621
#: bzrlib/builtins.py:4028
2574
2622
msgid "Print just the version number."
2575
2623
msgstr ""
2576
2624
2577
#: bzrlib/builtins.py:4032
2625
#: bzrlib/builtins.py:4047
2578
2626
msgid "It sure does!\n"
2579
2627
msgstr ""
2580
2628
2581
#: bzrlib/builtins.py:4056
2629
#: bzrlib/builtins.py:4071
2582
2630
#, python-format
2583
2631
msgid "merge base is revision %s\n"
2584
2632
msgstr ""
2585
2633
2586
#: bzrlib/builtins.py:4060
2634
#: bzrlib/builtins.py:4075
2587
2635
msgid "Perform a three-way merge."
2588
2636
msgstr ""
2589
2637
2590
#: bzrlib/builtins.py:4062
2638
#: bzrlib/builtins.py:4077
2591
2639
msgid ""
2592
2640
"The source of the merge can be specified either in the form of a branch,\n"
2593
2641
"or in the form of a path to a file containing a merge directive generated\n"
2598
2646
"the current working tree."
2599
2647
msgstr ""
2600
2648
2601
#: bzrlib/builtins.py:4070
2649
#: bzrlib/builtins.py:4085
2602
2650
msgid ""
2603
2651
"When merging from a branch, by default bzr will try to merge in all new\n"
2604
2652
"work from the other branch, automatically determining an appropriate base\n"
2605
2653
"revision. If this fails, you may need to give an explicit base."
2606
2654
msgstr ""
2607
2655
2608
#: bzrlib/builtins.py:4074
2656
#: bzrlib/builtins.py:4089
2609
2657
msgid ""
2610
2658
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2611
2659
"try to merge in all new work up to and including revision OTHER."
2612
2660
msgstr ""
2613
2661
2614
#: bzrlib/builtins.py:4077
2662
#: bzrlib/builtins.py:4092
2615
2663
msgid ""
2616
2664
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2617
2665
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2622
2670
"changes from the other branch is not stored in the commit."
2623
2671
msgstr ""
2624
2672
2625
#: bzrlib/builtins.py:4085
2673
#: bzrlib/builtins.py:4100
2626
2674
msgid "Revision numbers are always relative to the source branch."
2627
2675
msgstr ""
2628
2676
2629
#: bzrlib/builtins.py:4092
2677
#: bzrlib/builtins.py:4107
2630
2678
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2631
2679
msgstr ""
2632
2680
2633
#: bzrlib/builtins.py:4094
2681
#: bzrlib/builtins.py:4109
2634
2682
msgid ""
2635
2683
"If there is no default branch set, the first merge will set it (use\n"
2636
2684
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2638
2686
"only be saved if the remote location can be accessed."
2639
2687
msgstr ""
2640
2688
2641
#: bzrlib/builtins.py:4099
2689
#: bzrlib/builtins.py:4114
2642
2690
msgid ""
2643
2691
"The results of the merge are placed into the destination working\n"
2644
2692
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2645
2693
"committed to record the result of the merge."
2646
2694
msgstr ""
2647
2695
2648
#: bzrlib/builtins.py:4103
2696
#: bzrlib/builtins.py:4118
2649
2697
msgid ""
2650
2698
"merge refuses to run if there are any uncommitted changes, unless\n"
2651
2699
"--force is given. If --force is given, then the changes from the source \n"
2654
2702
"merge revision which has more than two parents."
2655
2703
msgstr ""
2656
2704
2657
#: bzrlib/builtins.py:4109
2705
#: bzrlib/builtins.py:4124
2658
2706
msgid ""
2659
2707
"If one would like to merge changes from the working tree of the other\n"
2660
2708
"branch without merging any committed revisions, the --uncommitted option\n"
2661
2709
"can be given."
2662
2710
msgstr ""
2663
2711
2664
#: bzrlib/builtins.py:4113
2712
#: bzrlib/builtins.py:4128
2665
2713
msgid ""
2666
2714
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2667
2715
"you to apply each diff hunk and file change, similar to \"shelve\"."
2668
2716
msgstr ""
2669
2717
2670
#: bzrlib/builtins.py:4116
2718
#: bzrlib/builtins.py:4131
2671
2719
msgid ""
2672
2720
":Examples:\n"
2673
2721
" To merge all new revisions from bzr.dev::"
2674
2722
msgstr ""
2675
2723
2676
#: bzrlib/builtins.py:4119
2724
#: bzrlib/builtins.py:4134
2677
2725
msgid " bzr merge ../bzr.dev"
2678
2726
msgstr ""
2679
2727
2680
#: bzrlib/builtins.py:4121
2728
#: bzrlib/builtins.py:4136
2681
2729
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2682
2730
msgstr ""
2683
2731
2684
#: bzrlib/builtins.py:4123
2732
#: bzrlib/builtins.py:4138
2685
2733
msgid " bzr merge -r 82 ../bzr.dev"
2686
2734
msgstr ""
2687
2735
2688
#: bzrlib/builtins.py:4125
2736
#: bzrlib/builtins.py:4140
2689
2737
msgid " To merge the changes introduced by 82, without previous changes::"
2690
2738
msgstr ""
2691
2739
2692
#: bzrlib/builtins.py:4127
2740
#: bzrlib/builtins.py:4142
2693
2741
msgid " bzr merge -r 81..82 ../bzr.dev"
2694
2742
msgstr ""
2695
2743
2696
#: bzrlib/builtins.py:4129
2744
#: bzrlib/builtins.py:4144
2697
2745
msgid " To apply a merge directive contained in /tmp/merge::"
2698
2746
msgstr ""
2699
2747
2700
#: bzrlib/builtins.py:4131
2748
#: bzrlib/builtins.py:4146
2701
2749
msgid " bzr merge /tmp/merge"
2702
2750
msgstr ""
2703
2751
2704
#: bzrlib/builtins.py:4133
2752
#: bzrlib/builtins.py:4148
2705
2753
msgid ""
2706
2754
" To create a merge revision with three parents from two branches\n"
2707
2755
" feature1a and feature1b:"
2708
2756
msgstr ""
2709
2757
2710
#: bzrlib/builtins.py:4136
2758
#: bzrlib/builtins.py:4151
2711
2759
msgid ""
2712
2760
" bzr merge ../feature1a\n"
2713
2761
" bzr merge ../feature1b --force\n"
2715
2763
msgstr ""
2716
2764
2717
2765
# help of 'force' option of 'merge' command
2718
#: bzrlib/builtins.py:4148
2766
#: bzrlib/builtins.py:4163
2719
2767
msgid "Merge even if the destination tree has uncommitted changes."
2720
2768
msgstr ""
2721
2769
2722
2770
# help of 'uncommitted' option of 'merge' command
2723
#: bzrlib/builtins.py:4154
2771
#: bzrlib/builtins.py:4169
2724
2772
msgid ""
2725
2773
"Apply uncommitted changes from a working copy, instead of branch changes."
2726
2774
msgstr ""
2727
2775
2728
2776
# help of 'pull' option of 'merge' command
2729
#: bzrlib/builtins.py:4156
2777
#: bzrlib/builtins.py:4171
2730
2778
msgid ""
2731
2779
"If the destination is already completely merged into the source, pull from "
2732
2780
"the source rather than merging. When this happens, you do not need to "
2734
2782
msgstr ""
2735
2783
2736
2784
# help of 'directory' option of 'merge' command
2737
#: bzrlib/builtins.py:4161
2785
#: bzrlib/builtins.py:4176
2738
2786
msgid ""
2739
2787
"Branch to merge into, rather than the one containing the working directory."
2740
2788
msgstr ""
2741
2789
2742
2790
# help of 'preview' option of 'merge' command
2743
#: bzrlib/builtins.py:4163
2791
#: bzrlib/builtins.py:4178
2744
2792
msgid "Instead of merging, show a diff of the merge."
2745
2793
msgstr ""
2746
2794
2747
2795
# help of 'interactive' option of 'merge' command
2748
#: bzrlib/builtins.py:4165
2796
#: bzrlib/builtins.py:4180
2749
2797
msgid "Select changes interactively."
2750
2798
msgstr ""
2751
2799
2752
#: bzrlib/builtins.py:4187
2800
#: bzrlib/builtins.py:4202
2753
2801
msgid ""
2754
2802
"Merging into empty branches not currently supported, https://bugs.launchpad."
2755
2803
"net/bzr/+bug/308562"
2756
2804
msgstr ""
2757
2805
2758
#: bzrlib/builtins.py:4214
2806
#: bzrlib/builtins.py:4229
2759
2807
msgid "Cannot use --uncommitted with bundles or merge directives."
2760
2808
msgstr ""
2761
2809
2762
#: bzrlib/builtins.py:4225
2810
#: bzrlib/builtins.py:4240
2763
2811
msgid "Cannot use --uncommitted and --revision at the same time."
2764
2812
msgstr ""
2765
2813
2766
#: bzrlib/builtins.py:4245
2814
#: bzrlib/builtins.py:4260
2767
2815
msgid "merger: "
2768
2816
msgstr ""
2769
2817
2770
#: bzrlib/builtins.py:4247 bzrlib/bundle/apply_bundle.py:68
2818
#: bzrlib/builtins.py:4262 bzrlib/bundle/apply_bundle.py:68
2771
2819
msgid "Nothing to do."
2772
2820
msgstr ""
2773
2821
2774
#: bzrlib/builtins.py:4251
2822
#: bzrlib/builtins.py:4266
2775
2823
msgid "Cannot pull individual files"
2776
2824
msgstr ""
2777
2825
2778
#: bzrlib/builtins.py:4259
2826
#: bzrlib/builtins.py:4274
2779
2827
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2780
2828
msgstr ""
2781
2829
2782
#: bzrlib/builtins.py:4317
2830
#: bzrlib/builtins.py:4332
2783
2831
#, python-format
2784
2832
msgid "Show-base is not supported for this merge type. %s"
2785
2833
msgstr ""
2786
2834
2787
#: bzrlib/builtins.py:4326
2835
#: bzrlib/builtins.py:4341
2788
2836
#, python-format
2789
2837
msgid "Conflict reduction is not supported for merge type %s."
2790
2838
msgstr ""
2791
2839
2792
#: bzrlib/builtins.py:4330
2840
#: bzrlib/builtins.py:4345
2793
2841
msgid "Cannot do conflict reduction and show base."
2794
2842
msgstr ""
2795
2843
2796
#: bzrlib/builtins.py:4441
2844
#: bzrlib/builtins.py:4456
2797
2845
msgid "No location specified or remembered"
2798
2846
msgstr ""
2799
2847
2800
#: bzrlib/builtins.py:4443
2848
#: bzrlib/builtins.py:4458
2801
2849
msgid "{0} remembered {1} location {2}"
2802
2850
msgstr ""
2803
2851
2804
#: bzrlib/builtins.py:4449
2852
#: bzrlib/builtins.py:4464
2805
2853
msgid "Redo a merge."
2806
2854
msgstr ""
2807
2855
2808
#: bzrlib/builtins.py:4451
2856
#: bzrlib/builtins.py:4466
2809
2857
msgid ""
2810
2858
"Use this if you want to try a different merge technique while resolving\n"
2811
2859
"conflicts. Some merge techniques are better than others, and remerge\n"
2812
2860
"lets you try different ones on different files."
2813
2861
msgstr ""
2814
2862
2815
#: bzrlib/builtins.py:4455
2863
#: bzrlib/builtins.py:4470
2816
2864
msgid ""
2817
2865
"The options for remerge have the same meaning and defaults as the ones for\n"
2818
2866
"merge. The difference is that remerge can (only) be run when there is a\n"
2819
2867
"pending merge, and it lets you specify particular files."
2820
2868
msgstr ""
2821
2869
2822
#: bzrlib/builtins.py:4459
2870
#: bzrlib/builtins.py:4474
2823
2871
msgid ""
2824
2872
":Examples:\n"
2825
2873
" Re-do the merge of all conflicted files, and show the base text in\n"
2826
2874
" conflict regions, in addition to the usual THIS and OTHER texts::"
2827
2875
msgstr ""
2828
2876
2829
#: bzrlib/builtins.py:4463
2877
#: bzrlib/builtins.py:4478
2830
2878
msgid " bzr remerge --show-base"
2831
2879
msgstr ""
2832
2880
2833
#: bzrlib/builtins.py:4465
2881
#: bzrlib/builtins.py:4480
2834
2882
msgid ""
2835
2883
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2836
2884
" additional processing to reduce the size of conflict regions::"
2837
2885
msgstr ""
2838
2886
2839
#: bzrlib/builtins.py:4468
2887
#: bzrlib/builtins.py:4483
2840
2888
msgid " bzr remerge --merge-type weave --reprocess foobar"
2841
2889
msgstr ""
2842
2890
2843
2891
# help of 'show-base' option of 'merge' command
2844
#: bzrlib/builtins.py:4475
2892
#: bzrlib/builtins.py:4490
2845
2893
msgid "Show base revision text in conflicts."
2846
2894
msgstr ""
2847
2895
2848
#: bzrlib/builtins.py:4487
2896
#: bzrlib/builtins.py:4502
2849
2897
msgid ""
2850
2898
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2851
2899
"merges."
2852
2900
msgstr ""
2853
2901
2854
#: bzrlib/builtins.py:4543
2902
#: bzrlib/builtins.py:4558
2855
2903
msgid "Revert files to a previous revision."
2856
2904
msgstr ""
2857
2905
2858
#: bzrlib/builtins.py:4545
2906
#: bzrlib/builtins.py:4560
2859
2907
msgid ""
2860
2908
"Giving a list of files will revert only those files. Otherwise, all files\n"
2861
2909
"will be reverted. If the revision is not specified with '--revision', the\n"
2862
2910
"last committed revision is used."
2863
2911
msgstr ""
2864
2912
2865
#: bzrlib/builtins.py:4549
2913
#: bzrlib/builtins.py:4564
2866
2914
msgid ""
2867
2915
"To remove only some changes, without reverting to a prior version, use\n"
2868
2916
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2871
2919
"certain changes on a hunk-by-hunk basis, see the shelve command."
2872
2920
msgstr ""
2873
2921
2874
#: bzrlib/builtins.py:4555
2922
#: bzrlib/builtins.py:4570
2875
2923
msgid ""
2876
2924
"By default, any files that have been manually changed will be backed up\n"
2877
2925
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2878
2926
"'.~#~' appended to their name, where # is a number."
2879
2927
msgstr ""
2880
2928
2881
#: bzrlib/builtins.py:4559
2929
#: bzrlib/builtins.py:4574
2882
2930
msgid ""
2883
2931
"When you provide files, you can use their current pathname or the pathname\n"
2884
2932
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2886
2934
"reverted."
2887
2935
msgstr ""
2888
2936
2889
#: bzrlib/builtins.py:4564
2937
#: bzrlib/builtins.py:4579
2890
2938
msgid ""
2891
2939
"If you have newly added files since the target revision, they will be\n"
2892
2940
"removed. If the files to be removed have been changed, backups will be\n"
2894
2942
"deleted."
2895
2943
msgstr ""
2896
2944
2897
#: bzrlib/builtins.py:4569
2945
#: bzrlib/builtins.py:4584
2898
2946
msgid ""
2899
2947
"The working tree contains a list of revisions that have been merged but\n"
2900
2948
"not yet committed. These revisions will be included as additional parents\n"
2906
2954
"reverting any files."
2907
2955
msgstr ""
2908
2956
2909
#: bzrlib/builtins.py:4578
2957
#: bzrlib/builtins.py:4593
2910
2958
msgid ""
2911
2959
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2912
2960
"changes from a branch in a single revision. To do this, perform the merge\n"
2921
2969
msgstr ""
2922
2970
2923
2971
# help of 'no-backup' option of 'revert' command
2924
#: bzrlib/builtins.py:4592
2972
#: bzrlib/builtins.py:4607
2925
2973
msgid "Do not save backups of reverted files."
2926
2974
msgstr ""
2927
2975
2928
2976
# help of 'forget-merges' option of 'revert' command
2929
#: bzrlib/builtins.py:4594
2977
#: bzrlib/builtins.py:4609
2930
2978
msgid "Remove pending merge marker, without changing any files."
2931
2979
msgstr ""
2932
2980
2933
#: bzrlib/builtins.py:4625
2981
#: bzrlib/builtins.py:4640
2934
2982
msgid ""
2935
2983
"Show help on a command or other topic.\n"
2936
2984
" "
2937
2985
msgstr ""
2938
2986
2939
2987
# help of 'long' option of 'help' command
2940
#: bzrlib/builtins.py:4630
2988
#: bzrlib/builtins.py:4645
2941
2989
msgid "Show help on all commands."
2942
2990
msgstr ""
2943
2991
2944
#: bzrlib/builtins.py:4659
2992
#: bzrlib/builtins.py:4674
2945
2993
msgid "Show unmerged/unpulled revisions between two branches."
2946
2994
msgstr ""
2947
2995
2948
#: bzrlib/builtins.py:4661
2996
#: bzrlib/builtins.py:4676
2949
2997
msgid "OTHER_BRANCH may be local or remote."
2950
2998
msgstr ""
2951
2999
2952
#: bzrlib/builtins.py:4663
3000
#: bzrlib/builtins.py:4678
2953
3001
msgid ""
2954
3002
"To filter on a range of revisions, you can use the command -r begin..end\n"
2955
3003
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2960
3008
" 0 - no missing revisions"
2961
3009
msgstr ""
2962
3010
2963
#: bzrlib/builtins.py:4673
3011
#: bzrlib/builtins.py:4688
2964
3012
msgid ""
2965
3013
" Determine the missing revisions between this and the branch at the\n"
2966
3014
" remembered pull location::"
2967
3015
msgstr ""
2968
3016
2969
#: bzrlib/builtins.py:4676
3017
#: bzrlib/builtins.py:4691
2970
3018
msgid " bzr missing"
2971
3019
msgstr ""
2972
3020
2973
#: bzrlib/builtins.py:4678
3021
#: bzrlib/builtins.py:4693
2974
3022
msgid " Determine the missing revisions between this and another branch::"
2975
3023
msgstr ""
2976
3024
2977
#: bzrlib/builtins.py:4680
3025
#: bzrlib/builtins.py:4695
2978
3026
msgid " bzr missing http://server/branch"
2979
3027
msgstr ""
2980
3028
2981
#: bzrlib/builtins.py:4682
3029
#: bzrlib/builtins.py:4697
2982
3030
msgid ""
2983
3031
" Determine the missing revisions up to a specific revision on the other\n"
2984
3032
" branch::"
2985
3033
msgstr ""
2986
3034
2987
#: bzrlib/builtins.py:4685
3035
#: bzrlib/builtins.py:4700
2988
3036
msgid " bzr missing -r ..-10"
2989
3037
msgstr ""
2990
3038
2991
#: bzrlib/builtins.py:4687
3039
#: bzrlib/builtins.py:4702
2992
3040
msgid ""
2993
3041
" Determine the missing revisions up to a specific revision on this\n"
2994
3042
" branch::"
2995
3043
msgstr ""
2996
3044
2997
#: bzrlib/builtins.py:4690
3045
#: bzrlib/builtins.py:4705
2998
3046
msgid " bzr missing --my-revision ..-10"
2999
3047
msgstr ""
3000
3048
3001
3049
# help of 'reverse' option of 'missing' command
3002
#: bzrlib/builtins.py:4697
3050
#: bzrlib/builtins.py:4712
3003
3051
msgid "Reverse the order of revisions."
3004
3052
msgstr ""
3005
3053
3006
3054
# help of 'mine-only' option of 'missing' command
3007
#: bzrlib/builtins.py:4699
3055
#: bzrlib/builtins.py:4714
3008
3056
msgid "Display changes in the local branch only."
3009
3057
msgstr ""
3010
3058
3011
3059
# help of 'this' option of 'missing' command
3012
#: bzrlib/builtins.py:4700
3060
#: bzrlib/builtins.py:4715
3013
3061
msgid "Same as --mine-only."
3014
3062
msgstr ""
3015
3063
3016
3064
# help of 'theirs-only' option of 'missing' command
3017
#: bzrlib/builtins.py:4702
3065
#: bzrlib/builtins.py:4717
3018
3066
msgid "Display changes in the remote branch only."
3019
3067
msgstr ""
3020
3068
3021
3069
# help of 'other' option of 'missing' command
3022
#: bzrlib/builtins.py:4703
3070
#: bzrlib/builtins.py:4718
3023
3071
msgid "Same as --theirs-only."
3024
3072
msgstr ""
3025
3073
3026
3074
# help of 'revision' option of 'missing' command
3027
#: bzrlib/builtins.py:4708
3075
#: bzrlib/builtins.py:4723
3028
3076
msgid ""
3029
3077
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3030
3078
"details."
3031
3079
msgstr ""
3032
3080
3033
3081
# help of 'my-revision' option of 'missing' command
3034
#: bzrlib/builtins.py:4712
3082
#: bzrlib/builtins.py:4727
3035
3083
msgid ""
3036
3084
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3037
3085
"details."
3038
3086
msgstr ""
3039
3087
3040
3088
# help of 'include-merged' option of 'missing' command
3041
#: bzrlib/builtins.py:4715
3089
#: bzrlib/builtins.py:4730
3042
3090
msgid "Show all revisions in addition to the mainline ones."
3043
3091
msgstr ""
3044
3092
3045
#: bzrlib/builtins.py:4769
3093
#: bzrlib/builtins.py:4784
3046
3094
msgid "No peer location known or specified."
3047
3095
msgstr ""
3048
3096
3049
#: bzrlib/builtins.py:4773
3097
#: bzrlib/builtins.py:4788
3050
3098
msgid "Using saved parent location: {0}\n"
3051
3099
msgstr ""
3052
3100
3053
#: bzrlib/builtins.py:4806
3101
#: bzrlib/builtins.py:4821
3054
3102
#, python-format
3055
3103
msgid "You have %d extra revision:\n"
3056
3104
msgid_plural "You have %d extra revisions:\n"
3057
3105
msgstr[0] ""
3058
3106
msgstr[1] ""
3059
3107
3060
#: bzrlib/builtins.py:4822
3108
#: bzrlib/builtins.py:4837
3061
3109
#, python-format
3062
3110
msgid "You are missing %d revision:\n"
3063
3111
msgid_plural "You are missing %d revisions:\n"
3064
3112
msgstr[0] ""
3065
3113
msgstr[1] ""
3066
3114
3067
#: bzrlib/builtins.py:4834
3115
#: bzrlib/builtins.py:4849
3068
3116
msgid "This branch has no new revisions.\n"
3069
3117
msgstr ""
3070
3118
3071
#: bzrlib/builtins.py:4837
3119
#: bzrlib/builtins.py:4852
3072
3120
msgid "Other branch has no new revisions.\n"
3073
3121
msgstr ""
3074
3122
3075
#: bzrlib/builtins.py:4842
3123
#: bzrlib/builtins.py:4857
3076
3124
msgid "Branches are up to date.\n"
3077
3125
msgstr ""
3078
3126
3079
#: bzrlib/builtins.py:4853
3127
#: bzrlib/builtins.py:4868
3080
3128
msgid "Compress the data within a repository."
3081
3129
msgstr ""
3082
3130
3083
#: bzrlib/builtins.py:4855
3131
#: bzrlib/builtins.py:4870
3084
3132
msgid ""
3085
3133
"This operation compresses the data within a bazaar repository. As\n"
3086
3134
"bazaar supports automatic packing of repository, this operation is\n"
3087
3135
"normally not required to be done manually."
3088
3136
msgstr ""
3089
3137
3090
#: bzrlib/builtins.py:4859
3138
#: bzrlib/builtins.py:4874
3091
3139
msgid ""
3092
3140
"During the pack operation, bazaar takes a backup of existing repository\n"
3093
3141
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3096
3144
"used."
3097
3145
msgstr ""
3098
3146
3099
#: bzrlib/builtins.py:4865
3147
#: bzrlib/builtins.py:4880
3100
3148
msgid ""
3101
3149
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3102
3150
"during or immediately after repacking, you may be left with a state\n"
3105
3153
msgstr ""
3106
3154
3107
3155
# help of 'clean-obsolete-packs' option of 'pack' command
3108
#: bzrlib/builtins.py:4874
3156
#: bzrlib/builtins.py:4889
3109
3157
msgid "Delete obsolete packs to save disk space."
3110
3158
msgstr ""
3111
3159
3112
#: bzrlib/builtins.py:4888
3160
#: bzrlib/builtins.py:4903
3113
3161
msgid "List the installed plugins."
3114
3162
msgstr ""
3115
3163
3116
#: bzrlib/builtins.py:4890
3164
#: bzrlib/builtins.py:4905
3117
3165
msgid ""
3118
3166
"This command displays the list of installed plugins including\n"
3119
3167
"version of plugin and a short description of each."
3120
3168
msgstr ""
3121
3169
3122
#: bzrlib/builtins.py:4893
3170
#: bzrlib/builtins.py:4908
3123
3171
msgid "--verbose shows the path where each plugin is located."
3124
3172
msgstr ""
3125
3173
3126
#: bzrlib/builtins.py:4895
3174
#: bzrlib/builtins.py:4910
3127
3175
msgid ""
3128
3176
"A plugin is an external component for Bazaar that extends the\n"
3129
3177
"revision control system, by adding or replacing code in Bazaar.\n"
3132
3180
"customizing log output."
3133
3181
msgstr ""
3134
3182
3135
#: bzrlib/builtins.py:4901
3183
#: bzrlib/builtins.py:4916
3136
3184
msgid ""
3137
3185
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3138
3186
"for further information on plugins including where to find them and how to\n"
3140
3188
"plugins using the Python programming language."
3141
3189
msgstr ""
3142
3190
3143
#: bzrlib/builtins.py:4917
3191
#: bzrlib/builtins.py:4932
3144
3192
msgid "Show testament (signing-form) of a revision."
3145
3193
msgstr ""
3146
3194
3147
3195
# help of 'long' option of 'testament' command
3148
#: bzrlib/builtins.py:4920
3196
#: bzrlib/builtins.py:4935
3149
3197
msgid "Produce long-format testament."
3150
3198
msgstr ""
3151
3199
3152
3200
# help of 'strict' option of 'testament' command
3153
#: bzrlib/builtins.py:4922
3201
#: bzrlib/builtins.py:4937
3154
3202
msgid "Produce a strict-format testament."
3155
3203
msgstr ""
3156
3204
3157
#: bzrlib/builtins.py:4948
3205
#: bzrlib/builtins.py:4963
3158
3206
msgid "Show the origin of each line in a file."
3159
3207
msgstr ""
3160
3208
3161
#: bzrlib/builtins.py:4950
3209
#: bzrlib/builtins.py:4965
3162
3210
msgid ""
3163
3211
"This prints out the given file with an annotation on the left side\n"
3164
3212
"indicating which revision, author and date introduced the change."
3165
3213
msgstr ""
3166
3214
3167
#: bzrlib/builtins.py:4953
3215
#: bzrlib/builtins.py:4968
3168
3216
msgid ""
3169
3217
"If the origin is the same for a run of consecutive lines, it is\n"
3170
3218
"shown only at the top, unless the --all option is given."
3171
3219
msgstr ""
3172
3220
3173
3221
# help of 'all' option of 'annotate' command
3174
#: bzrlib/builtins.py:4961
3222
#: bzrlib/builtins.py:4976
3175
3223
msgid "Show annotations on all lines."
3176
3224
msgstr ""
3177
3225
3178
3226
# help of 'long' option of 'annotate' command
3179
#: bzrlib/builtins.py:4962
3227
#: bzrlib/builtins.py:4977
3180
3228
msgid "Show commit date in annotations."
3181
3229
msgstr ""
3182
3230
3183
#: bzrlib/builtins.py:5049
3231
#: bzrlib/builtins.py:5064
3184
3232
msgid "Cannot sign a range of non-revision-history revisions"
3185
3233
msgstr ""
3186
3234
3187
#: bzrlib/builtins.py:5061
3235
#: bzrlib/builtins.py:5076
3188
3236
msgid "Please supply either one revision, or a range."
3189
3237
msgstr ""
3190
3238
3191
#: bzrlib/builtins.py:5065
3239
#: bzrlib/builtins.py:5080
3192
3240
msgid ""
3193
3241
"Convert the current branch into a checkout of the supplied branch.\n"
3194
3242
"If no branch is supplied, rebind to the last bound location."
3195
3243
msgstr ""
3196
3244
3197
#: bzrlib/builtins.py:5068
3245
#: bzrlib/builtins.py:5083
3198
3246
msgid ""
3199
3247
"Once converted into a checkout, commits must succeed on the master branch\n"
3200
3248
"before they will be applied to the local branch."
3201
3249
msgstr ""
3202
3250
3203
#: bzrlib/builtins.py:5071
3251
#: bzrlib/builtins.py:5086
3204
3252
msgid ""
3205
3253
"Bound branches use the nickname of its master branch unless it is set\n"
3206
3254
"locally, in which case binding will update the local nickname to be\n"
3207
3255
"that of the master."
3208
3256
msgstr ""
3209
3257
3210
#: bzrlib/builtins.py:5086
3258
#: bzrlib/builtins.py:5101
3211
3259
msgid "No location supplied. This format does not remember old locations."
3212
3260
msgstr ""
3213
3261
3214
#: bzrlib/builtins.py:5091
3262
#: bzrlib/builtins.py:5106
3215
3263
msgid "Branch is already bound"
3216
3264
msgstr ""
3217
3265
3218
#: bzrlib/builtins.py:5093
3266
#: bzrlib/builtins.py:5108
3219
3267
msgid "No location supplied and no previous location known"
3220
3268
msgstr ""
3221
3269
3222
#: bzrlib/builtins.py:5099
3270
#: bzrlib/builtins.py:5114
3223
3271
msgid "These branches have diverged. Try merging, and then bind again."
3224
3272
msgstr ""
3225
3273
3226
#: bzrlib/builtins.py:5106
3274
#: bzrlib/builtins.py:5121
3227
3275
msgid "Convert the current checkout into a regular branch."
3228
3276
msgstr ""
3229
3277
3230
#: bzrlib/builtins.py:5108
3278
#: bzrlib/builtins.py:5123
3231
3279
msgid ""
3232
3280
"After unbinding, the local branch is considered independent and subsequent\n"
3233
3281
"commits will be local only."
3234
3282
msgstr ""
3235
3283
3236
#: bzrlib/builtins.py:5119
3284
#: bzrlib/builtins.py:5134
3237
3285
msgid "Local branch is not bound"
3238
3286
msgstr ""
3239
3287
3240
#: bzrlib/builtins.py:5123
3288
#: bzrlib/builtins.py:5138
3241
3289
msgid "Remove the last committed revision."
3242
3290
msgstr ""
3243
3291
3244
#: bzrlib/builtins.py:5125
3292
#: bzrlib/builtins.py:5140
3245
3293
msgid ""
3246
3294
"--verbose will print out what is being removed.\n"
3247
3295
"--dry-run will go through all the motions, but not actually\n"
3248
3296
"remove anything."
3249
3297
msgstr ""
3250
3298
3251
#: bzrlib/builtins.py:5129
3299
#: bzrlib/builtins.py:5144
3252
3300
msgid ""
3253
3301
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3254
3302
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3255
3303
"branch at revision 15."
3256
3304
msgstr ""
3257
3305
3258
#: bzrlib/builtins.py:5133
3306
#: bzrlib/builtins.py:5148
3259
3307
msgid ""
3260
3308
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3261
3309
"it may make is to restore any pending merges that were present before\n"
3263
3311
msgstr ""
3264
3312
3265
3313
# help of 'dry-run' option of 'uncommit' command
3266
#: bzrlib/builtins.py:5144
3314
#: bzrlib/builtins.py:5159
3267
3315
msgid "Don't actually make changes."
3268
3316
msgstr ""
3269
3317
3270
3318
# help of 'force' option of 'uncommit' command
3271
#: bzrlib/builtins.py:5145
3319
#: bzrlib/builtins.py:5160
3272
3320
msgid "Say yes to all questions."
3273
3321
msgstr ""
3274
3322
3275
3323
# help of 'keep-tags' option of 'uncommit' command
3276
#: bzrlib/builtins.py:5147
3324
#: bzrlib/builtins.py:5162
3277
3325
msgid "Keep tags that point to removed revisions."
3278
3326
msgstr ""
3279
3327
3280
3328
# help of 'local' option of 'uncommit' command
3281
#: bzrlib/builtins.py:5149
3329
#: bzrlib/builtins.py:5164
3282
3330
msgid "Only remove the commits from the local branch when in a checkout."
3283
3331
msgstr ""
3284
3332
3285
#: bzrlib/builtins.py:5198
3333
#: bzrlib/builtins.py:5213
3286
3334
msgid "No revisions to uncommit.\n"
3287
3335
msgstr ""
3288
3336
3289
#: bzrlib/builtins.py:5213
3337
#: bzrlib/builtins.py:5228
3290
3338
msgid "Dry-run, pretending to remove the above revisions.\n"
3291
3339
msgstr ""
3292
3340
3293
#: bzrlib/builtins.py:5216
3341
#: bzrlib/builtins.py:5231
3294
3342
msgid "The above revision(s) will be removed.\n"
3295
3343
msgstr ""
3296
3344
3297
#: bzrlib/builtins.py:5220
3345
#: bzrlib/builtins.py:5235
3298
3346
msgid "Uncommit these revisions"
3299
3347
msgstr ""
3300
3348
3301
#: bzrlib/builtins.py:5223
3349
#: bzrlib/builtins.py:5238
3302
3350
msgid "Canceled\n"
3303
3351
msgstr ""
3304
3352
3305
#: bzrlib/builtins.py:5230
3353
#: bzrlib/builtins.py:5245
3306
3354
#, python-format
3307
3355
msgid ""
3308
3356
"You can restore the old tip by running:\n"
3309
3357
" bzr pull . -r revid:%s\n"
3310
3358
msgstr ""
3311
3359
3312
#: bzrlib/builtins.py:5235
3360
#: bzrlib/builtins.py:5250
3313
3361
msgid "Break a dead lock."
3314
3362
msgstr ""
3315
3363
3316
#: bzrlib/builtins.py:5237
3364
#: bzrlib/builtins.py:5252
3317
3365
msgid ""
3318
3366
"This command breaks a lock on a repository, branch, working directory or\n"
3319
3367
"config file."
3320
3368
msgstr ""
3321
3369
3322
#: bzrlib/builtins.py:5240
3370
#: bzrlib/builtins.py:5255
3323
3371
msgid ""
3324
3372
"CAUTION: Locks should only be broken when you are sure that the process\n"
3325
3373
"holding the lock has been stopped."
3326
3374
msgstr ""
3327
3375
3328
#: bzrlib/builtins.py:5243
3376
#: bzrlib/builtins.py:5258
3329
3377
msgid ""
3330
3378
"You can get information on what locks are open via the 'bzr info\n"
3331
3379
"[location]' command."
3332
3380
msgstr ""
3333
3381
3334
#: bzrlib/builtins.py:5246
3382
#: bzrlib/builtins.py:5261
3335
3383
msgid ""
3336
3384
":Examples:\n"
3337
3385
" bzr break-lock\n"
3340
3388
msgstr ""
3341
3389
3342
3390
# help of 'config' option of 'break-lock' command
3343
#: bzrlib/builtins.py:5255
3391
#: bzrlib/builtins.py:5270
3344
3392
msgid "LOCATION is the directory where the config lock is."
3345
3393
msgstr ""
3346
3394
3347
3395
# help of 'force' option of 'break-lock' command
3348
#: bzrlib/builtins.py:5257
3396
#: bzrlib/builtins.py:5272
3349
3397
msgid "Do not ask for confirmation before breaking the lock."
3350
3398
msgstr ""
3351
3399
3352
#: bzrlib/builtins.py:5293
3400
# help of 'protocol=bzr' option of 'serve' command
3401
#: bzrlib/builtins.py:5307
3402
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5308
3353
3406
msgid "Run the bzr server."
3354
3407
msgstr ""
3355
3408
3356
3409
# help of 'inet' option of 'serve' command
3357
#: bzrlib/builtins.py:5299
3410
#: bzrlib/builtins.py:5314
3358
3411
msgid "Serve on stdin/out for use from inetd or sshd."
3359
3412
msgstr ""
3360
3413
3361
3414
# title of 'protocol' option of 'serve' command
3362
#: bzrlib/builtins.py:5300
3415
#: bzrlib/builtins.py:5315
3363
3416
msgid "protocol"
3364
3417
msgstr ""
3365
3418
3366
3419
# help of 'protocol' option of 'serve' command
3367
#: bzrlib/builtins.py:5301
3420
#: bzrlib/builtins.py:5316
3368
3421
msgid "Protocol to serve."
3369
3422
msgstr ""
3370
3423
3371
3424
# help of 'port' option of 'serve' command
3372
#: bzrlib/builtins.py:5305
3425
#: bzrlib/builtins.py:5320
3373
3426
msgid ""
3374
3427
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3375
3428
"Passing 0 as the port number will result in a dynamically allocated port. "
3377
3430
msgstr ""
3378
3431
3379
3432
# help of 'directory' option of 'serve' command
3380
#: bzrlib/builtins.py:5311
3433
#: bzrlib/builtins.py:5326
3381
3434
msgid "Serve contents of this directory."
3382
3435
msgstr ""
3383
3436
3384
3437
# help of 'allow-writes' option of 'serve' command
3385
#: bzrlib/builtins.py:5313
3438
#: bzrlib/builtins.py:5328
3386
3439
msgid ""
3387
3440
"By default the server is a readonly server. Supplying --allow-writes "
3388
3441
"enables write access to the contents of the served directory and below. "
3392
3445
msgstr ""
3393
3446
3394
3447
# help of 'client-timeout' option of 'serve' command
3395
#: bzrlib/builtins.py:5322
3448
#: bzrlib/builtins.py:5337
3396
3449
msgid "Override the default idle client timeout (5min)."
3397
3450
msgstr ""
3398
3451
3399
#: bzrlib/builtins.py:5372
3452
#: bzrlib/builtins.py:5387
3400
3453
msgid "Combine a tree into its containing tree."
3401
3454
msgstr ""
3402
3455
3403
#: bzrlib/builtins.py:5374
3456
#: bzrlib/builtins.py:5389
3404
3457
msgid "This command requires the target tree to be in a rich-root format."
3405
3458
msgstr ""
3406
3459
3407
#: bzrlib/builtins.py:5376
3460
#: bzrlib/builtins.py:5391
3408
3461
msgid ""
3409
3462
"The TREE argument should be an independent tree, inside another tree, but\n"
3410
3463
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3411
3464
"running \"bzr branch\" with the target inside a tree.)"
3412
3465
msgstr ""
3413
3466
3414
#: bzrlib/builtins.py:5380
3467
#: bzrlib/builtins.py:5395
3415
3468
msgid ""
3416
3469
"The result is a combined tree, with the subtree no longer an independent\n"
3417
3470
"part. This is marked as a merge of the subtree into the containing tree,\n"
3418
3471
"and all history is preserved."
3419
3472
msgstr ""
3420
3473
3421
#: bzrlib/builtins.py:5398
3474
#: bzrlib/builtins.py:5413
3422
3475
#, python-format
3423
3476
msgid ""
3424
3477
"Can't join trees because %s doesn't support rich root data.\n"
3425
3478
"You can use bzr upgrade on the repository."
3426
3479
msgstr ""
3427
3480
3428
#: bzrlib/builtins.py:5408 bzrlib/builtins.py:5414
3481
#: bzrlib/builtins.py:5423 bzrlib/builtins.py:5429
3429
3482
msgid "Cannot join {0}. {1}"
3430
3483
msgstr ""
3431
3484
3432
#: bzrlib/builtins.py:5418
3485
#: bzrlib/builtins.py:5433
3433
3486
msgid "Split a subdirectory of a tree into a separate tree."
3434
3487
msgstr ""
3435
3488
3436
#: bzrlib/builtins.py:5420
3489
#: bzrlib/builtins.py:5435
3437
3490
msgid ""
3438
3491
"This command will produce a target tree in a format that supports\n"
3439
3492
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3440
3493
"converted into earlier formats like 'dirstate-tags'."
3441
3494
msgstr ""
3442
3495
3443
#: bzrlib/builtins.py:5424
3496
#: bzrlib/builtins.py:5439
3444
3497
msgid ""
3445
3498
"The TREE argument should be a subdirectory of a working tree. That\n"
3446
3499
"subdirectory will be converted into an independent tree, with its own\n"
3447
3500
"branch. Commits in the top-level tree will not apply to the new subtree."
3448
3501
msgstr ""
3449
3502
3450
#: bzrlib/builtins.py:5504
3503
#: bzrlib/builtins.py:5519
3451
3504
msgid "No submit branch specified or known"
3452
3505
msgstr ""
3453
3506
3454
#: bzrlib/builtins.py:5512 bzrlib/send.py:106
3507
#: bzrlib/builtins.py:5527 bzrlib/send.py:106
3455
3508
msgid "No public branch specified or known"
3456
3509
msgstr ""
3457
3510
3458
#: bzrlib/builtins.py:5517
3511
#: bzrlib/builtins.py:5532
3459
3512
msgid "bzr merge-directive takes at most two one revision identifiers"
3460
3513
msgstr ""
3461
3514
3462
#: bzrlib/builtins.py:5526
3515
#: bzrlib/builtins.py:5541
3463
3516
msgid "No revisions to bundle."
3464
3517
msgstr ""
3465
3518
3466
#: bzrlib/builtins.py:5545
3519
#: bzrlib/builtins.py:5560
3467
3520
msgid "Mail or create a merge-directive for submitting changes."
3468
3521
msgstr ""
3469
3522
3470
#: bzrlib/builtins.py:5547
3523
#: bzrlib/builtins.py:5562
3471
3524
msgid "A merge directive provides many things needed for requesting merges:"
3472
3525
msgstr ""
3473
3526
3474
#: bzrlib/builtins.py:5549
3527
#: bzrlib/builtins.py:5564
3475
3528
msgid "* A machine-readable description of the merge to perform"
3476
3529
msgstr ""
3477
3530
3478
#: bzrlib/builtins.py:5551
3531
#: bzrlib/builtins.py:5566
3479
3532
msgid "* An optional patch that is a preview of the changes requested"
3480
3533
msgstr ""
3481
3534
3482
#: bzrlib/builtins.py:5553
3535
#: bzrlib/builtins.py:5568
3483
3536
msgid ""
3484
3537
"* An optional bundle of revision data, so that the changes can be applied\n"
3485
3538
" directly from the merge directive, without retrieving data from a\n"
3486
3539
" branch."
3487
3540
msgstr ""
3488
3541
3489
#: bzrlib/builtins.py:5557
3542
#: bzrlib/builtins.py:5572
3490
3543
msgid ""
3491
3544
"`bzr send` creates a compact data set that, when applied using bzr\n"
3492
3545
"merge, has the same effect as merging from the source branch. "
3493
3546
msgstr ""
3494
3547
3495
#: bzrlib/builtins.py:5560
3548
#: bzrlib/builtins.py:5575
3496
3549
msgid ""
3497
3550
"By default the merge directive is self-contained and can be applied to any\n"
3498
3551
"branch containing submit_branch in its ancestory without needing access to\n"
3499
3552
"the source branch."
3500
3553
msgstr ""
3501
3554
3502
#: bzrlib/builtins.py:5564
3555
#: bzrlib/builtins.py:5579
3503
3556
msgid ""
3504
3557
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3505
3558
"revisions, but only a structured request to merge from the\n"
3508
3561
"included if known, so that people can check it later."
3509
3562
msgstr ""
3510
3563
3511
#: bzrlib/builtins.py:5570
3564
#: bzrlib/builtins.py:5585
3512
3565
msgid ""
3513
3566
"The submit branch defaults to the parent of the source branch, but can be\n"
3514
3567
"overridden. Both submit branch and public branch will be remembered in\n"
3517
3570
"be changed using --from."
3518
3571
msgstr ""
3519
3572
3520
#: bzrlib/builtins.py:5576
3573
#: bzrlib/builtins.py:5591
3521
3574
msgid ""
3522
3575
"Both the submit branch and the public branch follow the usual behavior with\n"
3523
3576
"respect to --remember: If there is no default location set, the first send\n"
3526
3579
"--remember. The value will only be saved if the location can be accessed."
3527
3580
msgstr ""
3528
3581
3529
#: bzrlib/builtins.py:5582
3582
#: bzrlib/builtins.py:5597
3530
3583
msgid ""
3531
3584
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3532
3585
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3534
3587
"in the merge directive."
3535
3588
msgstr ""
3536
3589
3537
#: bzrlib/builtins.py:5587
3590
#: bzrlib/builtins.py:5602
3538
3591
msgid ""
3539
3592
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3540
3593
"given, in which case it is sent to a file."
3541
3594
msgstr ""
3542
3595
3543
#: bzrlib/builtins.py:5590
3596
#: bzrlib/builtins.py:5605
3544
3597
msgid ""
3545
3598
"Mail is sent using your preferred mail program. This should be transparent\n"
3546
3599
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3547
3600
"If the preferred client can't be found (or used), your editor will be used."
3548
3601
msgstr ""
3549
3602
3550
#: bzrlib/builtins.py:5594
3603
#: bzrlib/builtins.py:5609
3551
3604
msgid ""
3552
3605
"To use a specific mail program, set the mail_client configuration option.\n"
3553
3606
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3559
3612
"supported clients."
3560
3613
msgstr ""
3561
3614
3562
#: bzrlib/builtins.py:5601
3615
#: bzrlib/builtins.py:5616
3563
3616
msgid ""
3564
3617
"If mail is being sent, a to address is required. This can be supplied\n"
3565
3618
"either on the commandline, by setting the submit_to configuration\n"
3567
3620
"in the submit branch."
3568
3621
msgstr ""
3569
3622
3570
#: bzrlib/builtins.py:5606
3623
#: bzrlib/builtins.py:5621
3571
3624
msgid ""
3572
3625
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3573
3626
"and\n"
3577
3630
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3578
3631
msgstr ""
3579
3632
3580
#: bzrlib/builtins.py:5612
3633
#: bzrlib/builtins.py:5627
3581
3634
msgid ""
3582
3635
"The merge directives created by bzr send may be applied using bzr merge or\n"
3583
3636
"bzr pull by specifying a file containing a merge directive as the location."
3584
3637
msgstr ""
3585
3638
3586
#: bzrlib/builtins.py:5615
3639
#: bzrlib/builtins.py:5630
3587
3640
msgid ""
3588
3641
"bzr send makes extensive use of public locations to map local locations "
3589
3642
"into\n"
3592
3645
msgstr ""
3593
3646
3594
3647
# help of 'output' option of 'send' command
3595
#: bzrlib/builtins.py:5639
3648
#: bzrlib/builtins.py:5654
3596
3649
msgid "Write merge directive to this file or directory; use - for stdout."
3597
3650
msgstr ""
3598
3651
3599
3652
# help of 'strict' option of 'send' command
3600
#: bzrlib/builtins.py:5643
3653
#: bzrlib/builtins.py:5658
3601
3654
msgid ""
3602
3655
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3603
3656
"strict disables the check."
3604
3657
msgstr ""
3605
3658
3606
3659
# help of 'mail-to' option of 'send' command
3607
#: bzrlib/builtins.py:5645
3660
#: bzrlib/builtins.py:5660
3608
3661
msgid "Mail the request to this address."
3609
3662
msgstr ""
3610
3663
3611
3664
# help of 'body' option of 'send' command
3612
#: bzrlib/builtins.py:5649
3665
#: bzrlib/builtins.py:5664
3613
3666
msgid "Body for the email."
3614
3667
msgstr ""
3615
3668
3616
3669
# help of 'no-bundle' option of 'send' command
3617
#: bzrlib/builtins.py:5702
3670
#: bzrlib/builtins.py:5717
3618
3671
msgid "Do not include a bundle in the merge directive."
3619
3672
msgstr ""
3620
3673
3621
3674
# help of 'no-patch' option of 'send' command
3622
#: bzrlib/builtins.py:5703
3675
#: bzrlib/builtins.py:5718
3623
3676
msgid "Do not include a preview patch in the merge directive."
3624
3677
msgstr ""
3625
3678
3626
3679
# help of 'remember' option of 'send' command
3627
#: bzrlib/builtins.py:5706
3680
#: bzrlib/builtins.py:5721
3628
3681
msgid "Remember submit and public branch."
3629
3682
msgstr ""
3630
3683
3631
3684
# help of 'from' option of 'send' command
3632
#: bzrlib/builtins.py:5708
3685
#: bzrlib/builtins.py:5723
3633
3686
msgid ""
3634
3687
"Branch to generate the submission from, rather than the one containing the "
3635
3688
"working directory."
3636
3689
msgstr ""
3637
3690
3638
3691
# title of 'format' option of 'send' command
3639
#: bzrlib/builtins.py:5718
3692
#: bzrlib/builtins.py:5733
3640
3693
msgid "format"
3641
3694
msgstr ""
3642
3695
3643
3696
# help of 'format' option of 'send' command
3644
#: bzrlib/builtins.py:5719
3697
#: bzrlib/builtins.py:5734
3645
3698
msgid "Use the specified output format."
3646
3699
msgstr ""
3647
3700
3648
#: bzrlib/builtins.py:5741
3701
#: bzrlib/builtins.py:5756
3649
3702
msgid "Create, remove or modify a tag naming a revision."
3650
3703
msgstr ""
3651
3704
3652
#: bzrlib/builtins.py:5743
3705
#: bzrlib/builtins.py:5758
3653
3706
msgid ""
3654
3707
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3655
3708
"(--revision) option can be given -rtag:X, where X is any previously\n"
3656
3709
"created tag."
3657
3710
msgstr ""
3658
3711
3659
#: bzrlib/builtins.py:5747
3712
#: bzrlib/builtins.py:5762
3660
3713
msgid ""
3661
3714
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3662
3715
"along when you branch, push, pull or merge."
3663
3716
msgstr ""
3664
3717
3665
#: bzrlib/builtins.py:5750
3718
#: bzrlib/builtins.py:5765
3666
3719
msgid ""
3667
3720
"It is an error to give a tag name that already exists unless you pass\n"
3668
3721
"--force, in which case the tag is moved to point to the new revision."
3669
3722
msgstr ""
3670
3723
3671
#: bzrlib/builtins.py:5753
3724
#: bzrlib/builtins.py:5768
3672
3725
msgid ""
3673
3726
"To rename a tag (change the name but keep it on the same revsion), run "
3674
3727
"``bzr\n"
3675
3728
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3676
3729
msgstr ""
3677
3730
3678
#: bzrlib/builtins.py:5756
3731
#: bzrlib/builtins.py:5771
3679
3732
msgid ""
3680
3733
"If no tag name is specified it will be determined through the \n"
3681
3734
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3684
3737
msgstr ""
3685
3738
3686
3739
# help of 'delete' option of 'tag' command
3687
#: bzrlib/builtins.py:5766
3740
#: bzrlib/builtins.py:5781
3688
3741
msgid "Delete this tag rather than placing it."
3689
3742
msgstr ""
3690
3743
3691
3744
# help of 'directory' option of 'tag' command
3692
#: bzrlib/builtins.py:5769
3745
#: bzrlib/builtins.py:5784
3693
3746
msgid "Branch in which to place the tag."
3694
3747
msgstr ""
3695
3748
3696
3749
# help of 'force' option of 'tag' command
3697
#: bzrlib/builtins.py:5771
3750
#: bzrlib/builtins.py:5786
3698
3751
msgid "Replace existing tags."
3699
3752
msgstr ""
3700
3753
3701
#: bzrlib/builtins.py:5786
3754
#: bzrlib/builtins.py:5801
3702
3755
msgid "No tag specified to delete."
3703
3756
msgstr ""
3704
3757
3705
#: bzrlib/builtins.py:5788
3758
#: bzrlib/builtins.py:5803
3706
3759
#, python-format
3707
3760
msgid "Deleted tag %s."
3708
3761
msgstr ""
3709
3762
3710
#: bzrlib/builtins.py:5802
3763
#: bzrlib/builtins.py:5817
3711
3764
msgid "Please specify a tag name."
3712
3765
msgstr ""
3713
3766
3714
#: bzrlib/builtins.py:5810
3767
#: bzrlib/builtins.py:5825
3715
3768
#, python-format
3716
3769
msgid "Tag %s already exists for that revision."
3717
3770
msgstr ""
3718
3771
3719
#: bzrlib/builtins.py:5814
3772
#: bzrlib/builtins.py:5829
3720
3773
#, python-format
3721
3774
msgid "Created tag %s."
3722
3775
msgstr ""
3723
3776
3724
#: bzrlib/builtins.py:5816
3777
#: bzrlib/builtins.py:5831
3725
3778
#, python-format
3726
3779
msgid "Updated tag %s."
3727
3780
msgstr ""
3728
3781
3729
#: bzrlib/builtins.py:5820
3782
#: bzrlib/builtins.py:5835
3730
3783
msgid "List tags."
3731
3784
msgstr ""
3732
3785
3733
#: bzrlib/builtins.py:5822
3786
#: bzrlib/builtins.py:5837
3734
3787
msgid ""
3735
3788
"This command shows a table of tag names and the revisions they reference."
3736
3789
msgstr ""
3737
3790
3738
3791
# help of 'directory' option of 'tags' command
3739
#: bzrlib/builtins.py:5828
3792
#: bzrlib/builtins.py:5843
3740
3793
msgid "Branch whose tags should be displayed."
3741
3794
msgstr ""
3742
3795
3743
3796
# help of 'sort' option of 'tags' command
3744
#: bzrlib/builtins.py:5830
3797
#: bzrlib/builtins.py:5845
3745
3798
msgid "Sort tags by different criteria."
3746
3799
msgstr ""
3747
3800
3748
3801
# title of 'sort' option of 'tags' command
3749
#: bzrlib/builtins.py:5830
3802
#: bzrlib/builtins.py:5845
3750
3803
msgid "Sorting"
3751
3804
msgstr ""
3752
3805
3753
#: bzrlib/builtins.py:5899
3806
#: bzrlib/builtins.py:5914
3754
3807
msgid "Reconfigure the type of a bzr directory."
3755
3808
msgstr ""
3756
3809
3757
#: bzrlib/builtins.py:5901
3810
#: bzrlib/builtins.py:5916
3758
3811
msgid "A target configuration must be specified."
3759
3812
msgstr ""
3760
3813
3761
#: bzrlib/builtins.py:5903
3814
#: bzrlib/builtins.py:5918
3762
3815
msgid ""
3763
3816
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3764
3817
"The order of preference is\n"
3770
3823
msgstr ""
3771
3824
3772
3825
# title of 'tree_type' option of 'reconfigure' command
3773
#: bzrlib/builtins.py:5917
3826
#: bzrlib/builtins.py:5932
3774
3827
msgid "Tree type"
3775
3828
msgstr ""
3776
3829
3777
3830
# help of 'tree_type' option of 'reconfigure' command
3778
#: bzrlib/builtins.py:5918
3831
#: bzrlib/builtins.py:5933
3779
3832
msgid "The relation between branch and tree."
3780
3833
msgstr ""
3781
3834
3835
# help of 'tree_type=branch' option of 'reconfigure' command
3836
#: bzrlib/builtins.py:5935
3837
msgid "Reconfigure to be an unbound branch with no working tree."
3838
msgstr ""
3839
3840
# help of 'tree_type=tree' option of 'reconfigure' command
3841
#: bzrlib/builtins.py:5936
3842
msgid "Reconfigure to be an unbound branch with a working tree."
3843
msgstr ""
3844
3845
# help of 'tree_type=checkout' option of 'reconfigure' command
3846
#: bzrlib/builtins.py:5937
3847
msgid "Reconfigure to be a bound branch with a working tree."
3848
msgstr ""
3849
3850
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3851
#: bzrlib/builtins.py:5938
3852
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3853
msgstr ""
3854
3782
3855
# title of 'repository_type' option of 'reconfigure' command
3783
#: bzrlib/builtins.py:5928
3856
#: bzrlib/builtins.py:5943
3784
3857
msgid "Repository type"
3785
3858
msgstr ""
3786
3859
3787
3860
# help of 'repository_type' option of 'reconfigure' command
3788
#: bzrlib/builtins.py:5929
3861
#: bzrlib/builtins.py:5944
3789
3862
msgid "Location fo the repository."
3790
3863
msgstr ""
3791
3864
3865
# help of 'repository_type=standalone' option of 'reconfigure' command
3866
#: bzrlib/builtins.py:5946
3867
msgid ""
3868
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3869
msgstr ""
3870
3871
# help of 'repository_type=use-shared' option of 'reconfigure' command
3872
#: bzrlib/builtins.py:5948
3873
msgid "Reconfigure to use a shared repository."
3874
msgstr ""
3875
3792
3876
# title of 'repository_trees' option of 'reconfigure' command
3793
#: bzrlib/builtins.py:5937
3877
#: bzrlib/builtins.py:5952
3794
3878
msgid "Trees in Repository"
3795
3879
msgstr ""
3796
3880
3797
3881
# help of 'repository_trees' option of 'reconfigure' command
3798
#: bzrlib/builtins.py:5938
3882
#: bzrlib/builtins.py:5953
3799
3883
msgid "Whether new branches in the repository have trees."
3800
3884
msgstr ""
3801
3885
3886
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3887
#: bzrlib/builtins.py:5955
3888
msgid "Reconfigure repository to create working trees on branches by default."
3889
msgstr ""
3890
3891
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3892
#: bzrlib/builtins.py:5957
3893
msgid ""
3894
"Reconfigure repository to not create working trees on branches by default."
3895
msgstr ""
3896
3802
3897
# help of 'bind-to' option of 'reconfigure' command
3803
#: bzrlib/builtins.py:5945
3898
#: bzrlib/builtins.py:5960
3804
3899
msgid "Branch to bind checkout to."
3805
3900
msgstr ""
3806
3901
3807
3902
# help of 'force' option of 'reconfigure' command
3808
#: bzrlib/builtins.py:5947
3903
#: bzrlib/builtins.py:5962
3809
3904
msgid "Perform reconfiguration even if local changes will be lost."
3810
3905
msgstr ""
3811
3906
3812
3907
# help of 'stacked-on' option of 'reconfigure' command
3813
#: bzrlib/builtins.py:5950
3908
#: bzrlib/builtins.py:5965
3814
3909
msgid "Reconfigure a branch to be stacked on another branch."
3815
3910
msgstr ""
3816
3911
3817
3912
# help of 'unstacked' option of 'reconfigure' command
3818
#: bzrlib/builtins.py:5954
3913
#: bzrlib/builtins.py:5969
3819
3914
msgid ""
3820
3915
"Reconfigure a branch to be unstacked. This may require copying substantial "
3821
3916
"data into it."
3822
3917
msgstr ""
3823
3918
3824
#: bzrlib/builtins.py:5964
3919
#: bzrlib/builtins.py:5979
3825
3920
msgid "Can't use both --stacked-on and --unstacked"
3826
3921
msgstr ""
3827
3922
3828
#: bzrlib/builtins.py:5978
3923
#: bzrlib/builtins.py:5993
3829
3924
msgid "No target configuration specified"
3830
3925
msgstr ""
3831
3926
3832
#: bzrlib/builtins.py:6013
3927
#: bzrlib/builtins.py:6028
3833
3928
msgid "Set the branch of a checkout and update."
3834
3929
msgstr ""
3835
3930
3836
#: bzrlib/builtins.py:6015
3931
#: bzrlib/builtins.py:6030
3837
3932
msgid ""
3838
3933
"For lightweight checkouts, this changes the branch being referenced.\n"
3839
3934
"For heavyweight checkouts, this checks that there are no local commits\n"
3841
3936
"of the new location and binds to it."
3842
3937
msgstr ""
3843
3938
3844
#: bzrlib/builtins.py:6020
3939
#: bzrlib/builtins.py:6035
3845
3940
msgid ""
3846
3941
"In both cases, the working tree is updated and uncommitted changes\n"
3847
3942
"are merged. The user can commit or revert these as they desire."
3848
3943
msgstr ""
3849
3944
3850
#: bzrlib/builtins.py:6023
3945
#: bzrlib/builtins.py:6038
3851
3946
msgid "Pending merges need to be committed or reverted before using switch."
3852
3947
msgstr ""
3853
3948
3854
#: bzrlib/builtins.py:6025
3949
#: bzrlib/builtins.py:6040
3855
3950
msgid ""
3856
3951
"The path to the branch to switch to can be specified relative to the parent\n"
3857
3952
"directory of the current branch. For example, if you are currently in a\n"
3859
3954
"/path/to/newbranch."
3860
3955
msgstr ""
3861
3956
3862
#: bzrlib/builtins.py:6030
3957
#: bzrlib/builtins.py:6045
3863
3958
msgid ""
3864
3959
"Bound branches use the nickname of its master branch unless it is set\n"
3865
3960
"locally, in which case switching will update the local nickname to be\n"
3867
3962
msgstr ""
3868
3963
3869
3964
# help of 'force' option of 'switch' command
3870
#: bzrlib/builtins.py:6038
3965
#: bzrlib/builtins.py:6053
3871
3966
msgid "Switch even if local commits will be lost."
3872
3967
msgstr ""
3873
3968
3874
3969
# help of 'create-branch' option of 'switch' command
3875
#: bzrlib/builtins.py:6041
3970
#: bzrlib/builtins.py:6056
3876
3971
msgid "Create the target branch from this one before switching to it."
3877
3972
msgstr ""
3878
3973
3879
#: bzrlib/builtins.py:6053
3974
#: bzrlib/builtins.py:6068
3880
3975
msgid "You must supply either a revision or a location"
3881
3976
msgstr ""
3882
3977
3883
#: bzrlib/builtins.py:6064
3978
#: bzrlib/builtins.py:6079
3884
3979
msgid "cannot create branch without source branch"
3885
3980
msgstr ""
3886
3981
3887
#: bzrlib/builtins.py:6110
3982
#: bzrlib/builtins.py:6143
3888
3983
msgid "Manage filtered views."
3889
3984
msgstr ""
3890
3985
3891
#: bzrlib/builtins.py:6112
3986
#: bzrlib/builtins.py:6145
3892
3987
msgid ""
3893
3988
"Views provide a mask over the tree so that users can focus on\n"
3894
3989
"a subset of a tree when doing their work. After creating a view,\n"
3898
3993
"must be within the current view."
3899
3994
msgstr ""
3900
3995
3901
#: bzrlib/builtins.py:6119
3996
#: bzrlib/builtins.py:6152
3902
3997
msgid ""
3903
3998
"In most cases, a view has a short life-span: it is created to make\n"
3904
3999
"a selected change and is deleted once that change is committed.\n"
3906
4001
"and switch between them."
3907
4002
msgstr ""
3908
4003
3909
#: bzrlib/builtins.py:6124
4004
#: bzrlib/builtins.py:6157
3910
4005
msgid ""
3911
4006
"To disable the current view without deleting it, you can switch to\n"
3912
4007
"the pseudo view called ``off``. This can be useful when you need\n"
3914
4009
"want to switch back to your view after that."
3915
4010
msgstr ""
3916
4011
3917
#: bzrlib/builtins.py:6129
4012
#: bzrlib/builtins.py:6162
3918
4013
msgid ""
3919
4014
":Examples:\n"
3920
4015
" To define the current view::"
3921
4016
msgstr ""
3922
4017
3923
#: bzrlib/builtins.py:6132
4018
#: bzrlib/builtins.py:6165
3924
4019
msgid " bzr view file1 dir1 ..."
3925
4020
msgstr ""
3926
4021
3927
#: bzrlib/builtins.py:6134
4022
#: bzrlib/builtins.py:6167
3928
4023
msgid " To list the current view::"
3929
4024
msgstr ""
3930
4025
3931
#: bzrlib/builtins.py:6136
4026
#: bzrlib/builtins.py:6169
3932
4027
msgid " bzr view"
3933
4028
msgstr ""
3934
4029
3935
#: bzrlib/builtins.py:6138
4030
#: bzrlib/builtins.py:6171
3936
4031
msgid " To delete the current view::"
3937
4032
msgstr ""
3938
4033
3939
#: bzrlib/builtins.py:6140
4034
#: bzrlib/builtins.py:6173
3940
4035
msgid " bzr view --delete"
3941
4036
msgstr ""
3942
4037
3943
#: bzrlib/builtins.py:6142
4038
#: bzrlib/builtins.py:6175
3944
4039
msgid " To disable the current view without deleting it::"
3945
4040
msgstr ""
3946
4041
3947
#: bzrlib/builtins.py:6144
4042
#: bzrlib/builtins.py:6177
3948
4043
msgid " bzr view --switch off"
3949
4044
msgstr ""
3950
4045
3951
#: bzrlib/builtins.py:6146
4046
#: bzrlib/builtins.py:6179
3952
4047
msgid " To define a named view and switch to it::"
3953
4048
msgstr ""
3954
4049
3955
#: bzrlib/builtins.py:6148
4050
#: bzrlib/builtins.py:6181
3956
4051
msgid " bzr view --name view-name file1 dir1 ..."
3957
4052
msgstr ""
3958
4053
3959
#: bzrlib/builtins.py:6150
4054
#: bzrlib/builtins.py:6183
3960
4055
msgid " To list a named view::"
3961
4056
msgstr ""
3962
4057
3963
#: bzrlib/builtins.py:6152
4058
#: bzrlib/builtins.py:6185
3964
4059
msgid " bzr view --name view-name"
3965
4060
msgstr ""
3966
4061
3967
#: bzrlib/builtins.py:6154
4062
#: bzrlib/builtins.py:6187
3968
4063
msgid " To delete a named view::"
3969
4064
msgstr ""
3970
4065
3971
#: bzrlib/builtins.py:6156
4066
#: bzrlib/builtins.py:6189
3972
4067
msgid " bzr view --name view-name --delete"
3973
4068
msgstr ""
3974
4069
3975
#: bzrlib/builtins.py:6158
4070
#: bzrlib/builtins.py:6191
3976
4071
msgid " To switch to a named view::"
3977
4072
msgstr ""
3978
4073
3979
#: bzrlib/builtins.py:6160
4074
#: bzrlib/builtins.py:6193
3980
4075
msgid " bzr view --switch view-name"
3981
4076
msgstr ""
3982
4077
3983
#: bzrlib/builtins.py:6162
4078
#: bzrlib/builtins.py:6195
3984
4079
msgid " To list all views defined::"
3985
4080
msgstr ""
3986
4081
3987
#: bzrlib/builtins.py:6164
4082
#: bzrlib/builtins.py:6197
3988
4083
msgid " bzr view --all"
3989
4084
msgstr ""
3990
4085
3991
#: bzrlib/builtins.py:6166
4086
#: bzrlib/builtins.py:6199
3992
4087
msgid " To delete all views::"
3993
4088
msgstr ""
3994
4089
3995
#: bzrlib/builtins.py:6168
4090
#: bzrlib/builtins.py:6201
3996
4091
msgid " bzr view --delete --all"
3997
4092
msgstr ""
3998
4093
3999
4094
# help of 'all' option of 'view' command
4000
#: bzrlib/builtins.py:6175
4095
#: bzrlib/builtins.py:6208
4001
4096
msgid "Apply list or delete action to all views."
4002
4097
msgstr ""
4003
4098
4004
4099
# help of 'delete' option of 'view' command
4005
#: bzrlib/builtins.py:6178
4100
#: bzrlib/builtins.py:6211
4006
4101
msgid "Delete the view."
4007
4102
msgstr ""
4008
4103
4009
4104
# help of 'name' option of 'view' command
4010
#: bzrlib/builtins.py:6181
4105
#: bzrlib/builtins.py:6214
4011
4106
msgid "Name of the view to define, list or delete."
4012
4107
msgstr ""
4013
4108
4014
4109
# help of 'switch' option of 'view' command
4015
#: bzrlib/builtins.py:6185
4110
#: bzrlib/builtins.py:6218
4016
4111
msgid "Name of the view to switch to."
4017
4112
msgstr ""
4018
4113
4019
#: bzrlib/builtins.py:6204
4114
#: bzrlib/builtins.py:6237
4020
4115
msgid "Both --delete and a file list specified"
4021
4116
msgstr ""
4022
4117
4023
#: bzrlib/builtins.py:6207
4118
#: bzrlib/builtins.py:6240
4024
4119
msgid "Both --delete and --switch specified"
4025
4120
msgstr ""
4026
4121
4027
#: bzrlib/builtins.py:6210
4122
#: bzrlib/builtins.py:6243
4028
4123
msgid "Deleted all views.\n"
4029
4124
msgstr ""
4030
4125
4031
#: bzrlib/builtins.py:6212
4126
#: bzrlib/builtins.py:6245
4032
4127
msgid "No current view to delete"
4033
4128
msgstr ""
4034
4129
4035
#: bzrlib/builtins.py:6215
4130
#: bzrlib/builtins.py:6248
4036
4131
#, python-format
4037
4132
msgid "Deleted '%s' view.\n"
4038
4133
msgstr ""
4039
4134
4040
#: bzrlib/builtins.py:6219
4135
#: bzrlib/builtins.py:6252
4041
4136
msgid "Both --switch and a file list specified"
4042
4137
msgstr ""
4043
4138
4044
#: bzrlib/builtins.py:6222
4139
#: bzrlib/builtins.py:6255
4045
4140
msgid "Both --switch and --all specified"
4046
4141
msgstr ""
4047
4142
4048
#: bzrlib/builtins.py:6225
4143
#: bzrlib/builtins.py:6258
4049
4144
msgid "No current view to disable"
4050
4145
msgstr ""
4051
4146
4052
#: bzrlib/builtins.py:6227
4147
#: bzrlib/builtins.py:6260
4053
4148
#, python-format
4054
4149
msgid "Disabled '%s' view.\n"
4055
4150
msgstr ""
4056
4151
4057
#: bzrlib/builtins.py:6231 bzrlib/builtins.py:6253
4152
#: bzrlib/builtins.py:6264 bzrlib/builtins.py:6286
4058
4153
msgid "Using '{0}' view: {1}\n"
4059
4154
msgstr ""
4060
4155
4061
#: bzrlib/builtins.py:6234
4156
#: bzrlib/builtins.py:6267
4062
4157
msgid "Views defined:\n"
4063
4158
msgstr ""
4064
4159
4065
#: bzrlib/builtins.py:6243
4160
#: bzrlib/builtins.py:6276
4066
4161
msgid "No views defined.\n"
4067
4162
msgstr ""
4068
4163
4069
#: bzrlib/builtins.py:6250
4164
#: bzrlib/builtins.py:6283
4070
4165
msgid "Cannot change the 'off' pseudo view"
4071
4166
msgstr ""
4072
4167
4073
#: bzrlib/builtins.py:6258
4168
#: bzrlib/builtins.py:6291
4074
4169
msgid "No current view.\n"
4075
4170
msgstr ""
4076
4171
4077
#: bzrlib/builtins.py:6261
4172
#: bzrlib/builtins.py:6294
4078
4173
msgid "'{0}' view is: {1}\n"
4079
4174
msgstr ""
4080
4175
4081
#: bzrlib/builtins.py:6281
4176
#: bzrlib/builtins.py:6314
4082
4177
msgid " <no hooks installed>\n"
4083
4178
msgstr ""
4084
4179
4085
#: bzrlib/builtins.py:6285
4180
#: bzrlib/builtins.py:6318
4086
4181
msgid "Remove a branch."
4087
4182
msgstr ""
4088
4183
4089
#: bzrlib/builtins.py:6287
4184
#: bzrlib/builtins.py:6320
4090
4185
msgid ""
4091
4186
"This will remove the branch from the specified location but \n"
4092
4187
"will keep any working tree or repository in place."
4093
4188
msgstr ""
4094
4189
4095
#: bzrlib/builtins.py:6292
4190
#: bzrlib/builtins.py:6325
4096
4191
msgid " Remove the branch at repo/trunk::"
4097
4192
msgstr ""
4098
4193
4099
#: bzrlib/builtins.py:6294
4194
#: bzrlib/builtins.py:6327
4100
4195
msgid " bzr remove-branch repo/trunk"
4101
4196
msgstr ""
4102
4197
4103
#: bzrlib/builtins.py:6310
4198
# help of 'writer=plain' option of 'shelve' command
4199
#: bzrlib/builtins.py:6342
4200
msgid "Plaintext diff output."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6343
4104
4204
msgid "Temporarily set aside some changes from the current tree."
4105
4205
msgstr ""
4106
4206
4107
#: bzrlib/builtins.py:6312
4207
#: bzrlib/builtins.py:6345
4108
4208
msgid ""
4109
4209
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4110
4210
"ie. out of the way, until a later time when you can bring them back from\n"
4113
4213
"will they survive its deletion."
4114
4214
msgstr ""
4115
4215
4116
#: bzrlib/builtins.py:6318
4216
#: bzrlib/builtins.py:6351
4117
4217
msgid "If shelve --list is specified, previously-shelved changes are listed."
4118
4218
msgstr ""
4119
4219
4120
#: bzrlib/builtins.py:6320
4220
#: bzrlib/builtins.py:6353
4121
4221
msgid ""
4122
4222
"Shelve is intended to help separate several sets of changes that have\n"
4123
4223
"been inappropriately mingled. If you just want to get rid of all changes\n"
4125
4225
"shelve all text changes at once, use shelve --all."
4126
4226
msgstr ""
4127
4227
4128
#: bzrlib/builtins.py:6325
4228
#: bzrlib/builtins.py:6358
4129
4229
msgid ""
4130
4230
"If filenames are specified, only the changes to those files will be\n"
4131
4231
"shelved. Other files will be left untouched."
4132
4232
msgstr ""
4133
4233
4134
#: bzrlib/builtins.py:6328
4234
#: bzrlib/builtins.py:6361
4135
4235
msgid ""
4136
4236
"If a revision is specified, changes since that revision will be shelved."
4137
4237
msgstr ""
4138
4238
4139
#: bzrlib/builtins.py:6330
4239
#: bzrlib/builtins.py:6363
4140
4240
msgid ""
4141
4241
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4142
4242
"restore the most recently shelved changes."
4143
4243
msgstr ""
4144
4244
4145
#: bzrlib/builtins.py:6333
4245
#: bzrlib/builtins.py:6366
4146
4246
msgid ""
4147
4247
"For complicated changes, it is possible to edit the changes in a separate\n"
4148
4248
"editor program to decide what the file remaining in the working copy\n"
4149
4249
"should look like. To do this, add the configuration option"
4150
4250
msgstr ""
4151
4251
4152
#: bzrlib/builtins.py:6337
4252
#: bzrlib/builtins.py:6370
4153
4253
msgid " change_editor = PROGRAM @new_path @old_path"
4154
4254
msgstr ""
4155
4255
4156
#: bzrlib/builtins.py:6339
4256
#: bzrlib/builtins.py:6372
4157
4257
msgid ""
4158
4258
"where @new_path is replaced with the path of the new version of the \n"
4159
4259
"file and @old_path is replaced with the path of the old version of \n"
4163
4263
msgstr ""
4164
4264
4165
4265
# help of 'all' option of 'shelve' command
4166
#: bzrlib/builtins.py:6351
4266
#: bzrlib/builtins.py:6384
4167
4267
msgid "Shelve all changes."
4168
4268
msgstr ""
4169
4269
4170
4270
# help of 'writer' option of 'shelve' command
4171
#: bzrlib/builtins.py:6353
4271
#: bzrlib/builtins.py:6386
4172
4272
msgid "Method to use for writing diffs."
4173
4273
msgstr ""
4174
4274
4175
4275
# title of 'writer' option of 'shelve' command
4176
#: bzrlib/builtins.py:6353
4276
#: bzrlib/builtins.py:6386
4177
4277
msgid "writer"
4178
4278
msgstr ""
4179
4279
4180
4280
# help of 'list' option of 'shelve' command
4181
#: bzrlib/builtins.py:6357
4281
#: bzrlib/builtins.py:6390
4182
4282
msgid "List shelved changes."
4183
4283
msgstr ""
4184
4284
4185
4285
# help of 'destroy' option of 'shelve' command
4186
#: bzrlib/builtins.py:6359
4286
#: bzrlib/builtins.py:6392
4187
4287
msgid "Destroy removed changes instead of shelving them."
4188
4288
msgstr ""
4189
4289
4190
#: bzrlib/builtins.py:6388
4290
#: bzrlib/builtins.py:6421
4191
4291
msgid "No shelved changes."
4192
4292
msgstr ""
4193
4293
4194
#: bzrlib/builtins.py:6399
4294
#: bzrlib/builtins.py:6432
4195
4295
msgid "Restore shelved changes."
4196
4296
msgstr ""
4197
4297
4198
#: bzrlib/builtins.py:6401
4298
#: bzrlib/builtins.py:6434
4199
4299
msgid ""
4200
4300
"By default, the most recently shelved changes are restored. However if you\n"
4201
4301
"specify a shelf by id those changes will be restored instead. This works\n"
4203
4303
msgstr ""
4204
4304
4205
4305
# help of 'action' option of 'unshelve' command
4206
#: bzrlib/builtins.py:6410
4306
#: bzrlib/builtins.py:6443
4207
4307
msgid "The action to perform."
4208
4308
msgstr ""
4209
4309
4210
#: bzrlib/builtins.py:6432
4310
# help of 'action=apply' option of 'unshelve' command
4311
#: bzrlib/builtins.py:6445
4312
msgid "Apply changes and remove from the shelf."
4313
msgstr ""
4314
4315
# help of 'action=dry-run' option of 'unshelve' command
4316
#: bzrlib/builtins.py:6446
4317
msgid "Show changes, but do not apply or remove them."
4318
msgstr ""
4319
4320
# help of 'action=preview' option of 'unshelve' command
4321
#: bzrlib/builtins.py:6447
4322
msgid ""
4323
"Instead of unshelving the changes, show the diff that would result from "
4324
"unshelving."
4325
msgstr ""
4326
4327
# help of 'action=delete-only' option of 'unshelve' command
4328
#: bzrlib/builtins.py:6449
4329
msgid "Delete changes without applying them."
4330
msgstr ""
4331
4332
# help of 'action=keep' option of 'unshelve' command
4333
#: bzrlib/builtins.py:6450
4334
msgid "Apply changes but don't delete them."
4335
msgstr ""
4336
4337
#: bzrlib/builtins.py:6465
4211
4338
msgid "Remove unwanted files from working tree."
4212
4339
msgstr ""
4213
4340
4214
#: bzrlib/builtins.py:6434
4341
#: bzrlib/builtins.py:6467
4215
4342
msgid ""
4216
4343
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4217
4344
"files are never deleted."
4218
4345
msgstr ""
4219
4346
4220
#: bzrlib/builtins.py:6437
4347
#: bzrlib/builtins.py:6470
4221
4348
msgid ""
4222
4349
"Another class is 'detritus', which includes files emitted by bzr during\n"
4223
4350
"normal operations and selftests. (The value of these files decreases with\n"
4224
4351
"time.)"
4225
4352
msgstr ""
4226
4353
4227
#: bzrlib/builtins.py:6441
4354
#: bzrlib/builtins.py:6474
4228
4355
msgid ""
4229
4356
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4230
4357
"flags are respected, and may be combined."
4231
4358
msgstr ""
4232
4359
4233
#: bzrlib/builtins.py:6444
4360
#: bzrlib/builtins.py:6477
4234
4361
msgid "To check what clean-tree will do, use --dry-run."
4235
4362
msgstr ""
4236
4363
4237
4364
# help of 'ignored' option of 'clean-tree' command
4238
#: bzrlib/builtins.py:6447
4365
#: bzrlib/builtins.py:6480
4239
4366
msgid "Delete all ignored files."
4240
4367
msgstr ""
4241
4368
4242
4369
# help of 'detritus' option of 'clean-tree' command
4243
#: bzrlib/builtins.py:6448
4370
#: bzrlib/builtins.py:6481
4244
4371
msgid ""
4245
4372
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4246
4373
msgstr ""
4247
4374
4248
4375
# help of 'unknown' option of 'clean-tree' command
4249
#: bzrlib/builtins.py:6451
4376
#: bzrlib/builtins.py:6484
4250
4377
msgid "Delete files unknown to bzr (default)."
4251
4378
msgstr ""
4252
4379
4253
4380
# help of 'dry-run' option of 'clean-tree' command
4254
#: bzrlib/builtins.py:6452
4381
#: bzrlib/builtins.py:6485
4255
4382
msgid "Show files to delete instead of deleting them."
4256
4383
msgstr ""
4257
4384
4258
4385
# help of 'force' option of 'clean-tree' command
4259
#: bzrlib/builtins.py:6454
4386
#: bzrlib/builtins.py:6487
4260
4387
msgid "Do not prompt before deleting."
4261
4388
msgstr ""
4262
4389
4316
4443
msgstr[0] ""
4317
4444
msgstr[1] ""
4318
4445
4319
#: bzrlib/bzrdir.py:477
4446
#: bzrlib/bzrdir.py:487
4320
4447
msgid ""
4321
4448
"making backup of {0}\n"
4322
4449
" to {1}"
4323
4450
msgstr ""
4324
4451
4325
#: bzrlib/bzrdir.py:500
4452
#: bzrlib/bzrdir.py:510
4326
4453
msgid "renamed {0} to {1}"
4327
4454
msgstr ""
4328
4455
4329
#: bzrlib/bzrdir.py:1490
4456
#: bzrlib/bzrdir.py:1512
4330
4457
#, python-format
4331
4458
msgid ""
4332
4459
"Source repository format does not support stacking, using format:\n"
4333
4460
" %s"
4334
4461
msgstr ""
4335
4462
4336
#: bzrlib/bzrdir.py:1510
4463
#: bzrlib/bzrdir.py:1532
4337
4464
#, python-format
4338
4465
msgid ""
4339
4466
"Source branch format does not support stacking, using format:\n"
4340
4467
" %s"
4341
4468
msgstr ""
4342
4469
4343
#: bzrlib/bzrdir.py:1655
4470
#: bzrlib/bzrdir.py:1677
4344
4471
msgid "starting repository conversion"
4345
4472
msgstr ""
4346
4473
4347
#: bzrlib/bzrdir.py:1877
4474
#: bzrlib/bzrdir.py:1906
4348
4475
msgid "Using default stacking branch {0} at {1}"
4349
4476
msgstr ""
4350
4477
4504
4631
msgid "No known version info format {0}. Supported types are: {1}"
4505
4632
msgstr ""
4506
4633
4634
# help of 'format=custom' option of 'version-info' command
4635
#: bzrlib/cmd_version_info.py:50
4636
msgid "Version info in Custom template-based format."
4637
msgstr ""
4638
4639
# help of 'format=python' option of 'version-info' command
4640
#: bzrlib/cmd_version_info.py:50
4641
msgid "Version info in Python format."
4642
msgstr ""
4643
4644
# help of 'format=rio' option of 'version-info' command
4645
#: bzrlib/cmd_version_info.py:50
4646
msgid "Version info in RIO (simple text) format (default)."
4647
msgstr ""
4648
4507
4649
#: bzrlib/cmd_version_info.py:51
4508
4650
msgid "Show version information about this tree."
4509
4651
msgstr ""
4759
4901
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4760
4902
msgstr ""
4761
4903
4762
#: bzrlib/config.py:2688
4904
#: bzrlib/config.py:2762
4763
4905
#, python-format
4764
4906
msgid "Invalid '%s', should be of the form 'name=value'"
4765
4907
msgstr ""
4766
4908
4767
#: bzrlib/config.py:3391
4909
#: bzrlib/config.py:3469
4768
4910
msgid "Display, set or remove a configuration option."
4769
4911
msgstr ""
4770
4912
4771
#: bzrlib/config.py:3393
4913
#: bzrlib/config.py:3471
4772
4914
msgid "Display the active value for a given option."
4773
4915
msgstr ""
4774
4916
4775
#: bzrlib/config.py:3395
4917
#: bzrlib/config.py:3473
4776
4918
msgid ""
4777
4919
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4778
4920
"matching options are displayed mentioning their scope. The active value\n"
4779
4921
"that bzr will take into account is the first one displayed for each option."
4780
4922
msgstr ""
4781
4923
4782
#: bzrlib/config.py:3399
4924
#: bzrlib/config.py:3477
4783
4925
msgid "If no NAME is given, --all .* is implied."
4784
4926
msgstr ""
4785
4927
4786
#: bzrlib/config.py:3401
4928
#: bzrlib/config.py:3479
4787
4929
msgid ""
4788
4930
"Setting a value is achieved by using name=value without spaces. The value\n"
4789
4931
"is set in the most relevant scope and can be checked by displaying the\n"
4791
4933
msgstr ""
4792
4934
4793
4935
# help of 'scope' option of 'config' command
4794
#: bzrlib/config.py:3412
4795
msgid "Reduce the scope to the specified configuration file"
4936
#: bzrlib/config.py:3491
4937
msgid "Reduce the scope to the specified configuration file."
4796
4938
msgstr ""
4797
4939
4798
4940
# help of 'all' option of 'config' command
4799
#: bzrlib/config.py:3416
4941
#: bzrlib/config.py:3495
4800
4942
msgid "Display all the defined values for the matching options."
4801
4943
msgstr ""
4802
4944
4803
4945
# help of 'remove' option of 'config' command
4804
#: bzrlib/config.py:3418
4805
msgid "Remove the option from the configuration file"
4946
#: bzrlib/config.py:3497
4947
msgid "Remove the option from the configuration file."
4806
4948
msgstr ""
4807
4949
4808
4950
#: bzrlib/conflicts.py:48
4833
4975
msgid "List paths of files with text conflicts."
4834
4976
msgstr ""
4835
4977
4978
# help of 'action=done' option of 'resolve' command
4979
#: bzrlib/conflicts.py:83
4980
msgid "Marks the conflict as resolved."
4981
msgstr ""
4982
4983
# help of 'action=take-this' option of 'resolve' command
4984
#: bzrlib/conflicts.py:86
4985
msgid "Resolve the conflict preserving the version in the working tree."
4986
msgstr ""
4987
4988
# help of 'action=take-other' option of 'resolve' command
4989
#: bzrlib/conflicts.py:89
4990
msgid "Resolve the conflict taking the merged version into account."
4991
msgstr ""
4992
4836
4993
# help of 'action' option of 'resolve' command
4837
4994
#: bzrlib/conflicts.py:96
4838
4995
msgid "How to resolve the conflict."
4885
5042
msgid "action"
4886
5043
msgstr ""
4887
5044
4888
#: bzrlib/controldir.py:683
5045
#: bzrlib/controldir.py:682
4889
5046
msgid "{0} is{1} redirected to {2}"
4890
5047
msgstr ""
4891
5048
4894
5051
msgid "*** Ignoring files outside view. View is %s"
4895
5052
msgstr ""
4896
5053
4897
#: bzrlib/errors.py:215
5054
#: bzrlib/errors.py:155
4898
5055
msgid "The tree builder is already building a tree."
4899
5056
msgstr ""
4900
5057
4901
#: bzrlib/errors.py:236
5058
#: bzrlib/errors.py:176
4902
5059
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4903
5060
msgstr ""
4904
5061
4905
#: bzrlib/errors.py:255
5062
#: bzrlib/errors.py:195
4906
5063
msgid ""
4907
5064
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4908
5065
"versions \"%(minimum)s\" to \"%(current)s\"."
4909
5066
msgstr ""
4910
5067
4911
#: bzrlib/errors.py:267
5068
#: bzrlib/errors.py:207
4912
5069
msgid "The transport '%(transport)s' is only accessible within this process."
4913
5070
msgstr ""
4914
5071
4915
#: bzrlib/errors.py:285
5072
#: bzrlib/errors.py:225
4916
5073
msgid "Invalid revision number %(revno)s"
4917
5074
msgstr ""
4918
5075
4919
#: bzrlib/errors.py:294
5076
#: bzrlib/errors.py:234
4920
5077
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4921
5078
msgstr ""
4922
5079
4923
#: bzrlib/errors.py:305
5080
#: bzrlib/errors.py:245
4924
5081
msgid "Reserved revision-id {%(revision_id)s}"
4925
5082
msgstr ""
4926
5083
4927
#: bzrlib/errors.py:319
5084
#: bzrlib/errors.py:259
4928
5085
msgid "There is no public branch set for \"%(branch_url)s\"."
4929
5086
msgstr ""
4930
5087
4931
#: bzrlib/errors.py:329
5088
#: bzrlib/errors.py:269
4932
5089
msgid ""
4933
5090
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4934
5091
"obtain a list of topics."
4935
5092
msgstr ""
4936
5093
4937
#: bzrlib/errors.py:338
5094
#: bzrlib/errors.py:278
4938
5095
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4939
5096
msgstr ""
4940
5097
4941
#: bzrlib/errors.py:348
5098
#: bzrlib/errors.py:288
4942
5099
msgid ""
4943
5100
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4944
5101
msgstr ""
4945
5102
4946
#: bzrlib/errors.py:357
5103
#: bzrlib/errors.py:297
4947
5104
msgid "The branch '%(branch)s' is not stacked."
4948
5105
msgstr ""
4949
5106
4950
#: bzrlib/errors.py:371
5107
#: bzrlib/errors.py:311
4951
5108
msgid "No WorkingTree exists for \"%(base)s\"."
4952
5109
msgstr ""
4953
5110
4954
#: bzrlib/errors.py:380
5111
#: bzrlib/errors.py:320
4955
5112
msgid "Not currently building a tree."
4956
5113
msgstr ""
4957
5114
4958
#: bzrlib/errors.py:385
5115
#: bzrlib/errors.py:325
4959
5116
msgid "%(url)s is not a local path."
4960
5117
msgstr ""
4961
5118
4962
#: bzrlib/errors.py:413
5119
#: bzrlib/errors.py:353
4963
5120
msgid "%(not_locked)r is not write locked but needs to be."
4964
5121
msgstr ""
4965
5122
4966
#: bzrlib/errors.py:421
5123
#: bzrlib/errors.py:361
4967
5124
msgid "Error in command line options"
4968
5125
msgstr ""
4969
5126
4970
#: bzrlib/errors.py:426
5127
#: bzrlib/errors.py:366
4971
5128
msgid "%(value)s is not an index of type %(_type)s."
4972
5129
msgstr ""
4973
5130
4974
#: bzrlib/errors.py:436
5131
#: bzrlib/errors.py:376
4975
5132
msgid "Error in data for index %(value)s."
4976
5133
msgstr ""
4977
5134
4978
#: bzrlib/errors.py:445
5135
#: bzrlib/errors.py:385
4979
5136
msgid "The key '%(key)s' is already in index '%(index)s'."
4980
5137
msgstr ""
4981
5138
4982
#: bzrlib/errors.py:455
5139
#: bzrlib/errors.py:395
4983
5140
msgid "The key '%(key)s' is not a valid key."
4984
5141
msgstr ""
4985
5142
4986
#: bzrlib/errors.py:464
5143
#: bzrlib/errors.py:404
4987
5144
msgid "Could not parse options for index %(value)s."
4988
5145
msgstr ""
4989
5146
4990
#: bzrlib/errors.py:473
5147
#: bzrlib/errors.py:413
4991
5148
msgid "The value '%(value)s' is not a valid value."
4992
5149
msgstr ""
4993
5150
4994
#: bzrlib/errors.py:501
5151
#: bzrlib/errors.py:441
4995
5152
msgid "Generic path error: %(path)r%(extra)s)"
4996
5153
msgstr ""
4997
5154
4998
#: bzrlib/errors.py:514
5155
#: bzrlib/errors.py:454
4999
5156
msgid "No such file: %(path)r%(extra)s"
5000
5157
msgstr ""
5001
5158
5002
#: bzrlib/errors.py:519
5159
#: bzrlib/errors.py:459
5003
5160
msgid "File exists: %(path)r%(extra)s"
5004
5161
msgstr ""
5005
5162
5006
#: bzrlib/errors.py:525
5163
#: bzrlib/errors.py:465
5007
5164
msgid ""
5008
5165
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5009
5166
"after to tell bzr about a rename that has already happened)%(extra)s"
5010
5167
msgstr ""
5011
5168
5012
#: bzrlib/errors.py:541
5169
#: bzrlib/errors.py:481
5013
5170
msgid "\"%(path)s\" is not a directory %(extra)s"
5014
5171
msgstr ""
5015
5172
5016
#: bzrlib/errors.py:546
5173
#: bzrlib/errors.py:486
5017
5174
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5018
5175
msgstr ""
5019
5176
5020
#: bzrlib/errors.py:551
5177
#: bzrlib/errors.py:491
5021
5178
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5022
5179
msgstr ""
5023
5180
5024
#: bzrlib/errors.py:556
5181
#: bzrlib/errors.py:496
5025
5182
msgid "Hard-linking \"%(path)s\" is not supported"
5026
5183
msgstr ""
5027
5184
5028
#: bzrlib/errors.py:571
5185
#: bzrlib/errors.py:511
5029
5186
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5030
5187
msgstr ""
5031
5188
5032
#: bzrlib/errors.py:576
5189
#: bzrlib/errors.py:516
5033
5190
msgid "Permission denied: \"%(path)s\"%(extra)s"
5034
5191
msgstr ""
5035
5192
5036
#: bzrlib/errors.py:581
5193
#: bzrlib/errors.py:521
5037
5194
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5038
5195
msgstr ""
5039
5196
5040
#: bzrlib/errors.py:586
5197
#: bzrlib/errors.py:526
5041
5198
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5042
5199
msgstr ""
5043
5200
5044
#: bzrlib/errors.py:597
5201
#: bzrlib/errors.py:537
5045
5202
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5046
5203
msgstr ""
5047
5204
5048
#: bzrlib/errors.py:619
5205
#: bzrlib/errors.py:559
5049
5206
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5050
5207
msgstr ""
5051
5208
5052
#: bzrlib/errors.py:629
5209
#: bzrlib/errors.py:569
5053
5210
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5054
5211
msgstr ""
5055
5212
5056
#: bzrlib/errors.py:637
5213
#: bzrlib/errors.py:577
5057
5214
msgid ""
5058
5215
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5059
5216
"upgrade the branch to permit branch stacking."
5060
5217
msgstr ""
5061
5218
5062
#: bzrlib/errors.py:648
5219
#: bzrlib/errors.py:588
5063
5220
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5064
5221
msgstr ""
5065
5222
5066
#: bzrlib/errors.py:658
5223
#: bzrlib/errors.py:598
5067
5224
msgid ""
5068
5225
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5069
5226
"need to upgrade the repository to permit branch stacking."
5070
5227
msgstr ""
5071
5228
5072
#: bzrlib/errors.py:669
5229
#: bzrlib/errors.py:609
5073
5230
msgid "Error reading from %(path)r."
5074
5231
msgstr ""
5075
5232
5076
#: bzrlib/errors.py:688
5233
#: bzrlib/errors.py:628
5077
5234
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5078
5235
msgstr ""
5079
5236
5080
#: bzrlib/errors.py:704
5237
#: bzrlib/errors.py:644
5081
5238
msgid "Path \"%(path)s\" is not unicode normalized"
5082
5239
msgstr ""
5083
5240
5084
#: bzrlib/errors.py:712
5241
#: bzrlib/errors.py:652
5085
5242
msgid "Not a branch: \"%(path)s\"%(detail)s."
5086
5243
msgstr ""
5087
5244
5088
#: bzrlib/errors.py:754
5245
#: bzrlib/errors.py:694
5089
5246
msgid "No submit branch available for branch \"%(path)s\""
5090
5247
msgstr ""
5091
5248
5092
#: bzrlib/errors.py:763
5249
#: bzrlib/errors.py:703
5093
5250
msgid "Already a branch: \"%(path)s\"."
5094
5251
msgstr ""
5095
5252
5096
#: bzrlib/errors.py:769
5253
#: bzrlib/errors.py:709
5097
5254
msgid ""
5098
5255
"Directory contains a branch, but no working tree (use bzr checkout if you "
5099
5256
"wish to build a working tree): \"%(path)s\""
5100
5257
msgstr ""
5101
5258
5102
#: bzrlib/errors.py:774
5259
#: bzrlib/errors.py:714
5103
5260
msgid ""
5104
5261
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5105
5262
msgstr ""
5106
5263
5107
#: bzrlib/errors.py:784
5264
#: bzrlib/errors.py:724
5108
5265
msgid ""
5109
5266
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5110
5267
msgstr ""
5111
5268
5112
#: bzrlib/errors.py:794
5269
#: bzrlib/errors.py:734
5113
5270
msgid "No repository present: \"%(path)s\""
5114
5271
msgstr ""
5115
5272
5116
#: bzrlib/errors.py:802
5117
msgid "File \"%(path)s\" is not in branch %(branch_base)s."
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:814
5273
#: bzrlib/errors.py:741
5121
5274
msgid ""
5122
5275
"Unsupported branch format: %(format)s\n"
5123
5276
"Please run 'bzr upgrade'"
5124
5277
msgstr ""
5125
5278
5126
#: bzrlib/errors.py:820
5279
#: bzrlib/errors.py:747
5127
5280
msgid "Unknown %(kind)s format: %(format)r"
5128
5281
msgstr ""
5129
5282
5130
#: bzrlib/errors.py:829
5283
#: bzrlib/errors.py:756
5131
5284
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5132
5285
msgstr ""
5133
5286
5134
#: bzrlib/errors.py:842
5287
#: bzrlib/errors.py:769
5135
5288
msgid ""
5136
5289
"%(target)s\n"
5137
5290
"is not compatible with\n"
5139
5292
"%(details)s"
5140
5293
msgstr ""
5141
5294
5142
#: bzrlib/errors.py:858
5295
#: bzrlib/errors.py:785
5143
5296
msgid "Revision is not compatible with %(repo_format)s"
5144
5297
msgstr ""
5145
5298
5146
#: bzrlib/errors.py:868
5299
#: bzrlib/errors.py:795
5147
5300
msgid "%(context_info)s%(path)s is already versioned."
5148
5301
msgstr ""
5149
5302
5150
#: bzrlib/errors.py:889
5303
#: bzrlib/errors.py:816
5151
5304
msgid "%(context_info)s%(path)s is not versioned."
5152
5305
msgstr ""
5153
5306
5154
#: bzrlib/errors.py:910
5307
#: bzrlib/errors.py:837
5155
5308
msgid "Path(s) are not versioned: %(paths_as_string)s"
5156
5309
msgstr ""
5157
5310
5158
#: bzrlib/errors.py:921
5311
#: bzrlib/errors.py:848
5159
5312
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5160
5313
msgstr ""
5161
5314
5162
#: bzrlib/errors.py:940
5315
#: bzrlib/errors.py:867
5163
5316
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5164
5317
msgstr ""
5165
5318
5166
#: bzrlib/errors.py:948
5319
#: bzrlib/errors.py:875
5167
5320
msgid ""
5168
5321
"Filename %(filename)r is not valid in your current filesystem encoding "
5169
5322
"%(fs_encoding)s"
5170
5323
msgstr ""
5171
5324
5172
#: bzrlib/errors.py:959
5325
#: bzrlib/errors.py:886
5173
5326
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5174
5327
msgstr ""
5175
5328
5176
#: bzrlib/errors.py:977
5329
#: bzrlib/errors.py:904
5177
5330
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5178
5331
msgstr ""
5179
5332
5180
#: bzrlib/errors.py:1016
5333
#: bzrlib/errors.py:943
5181
5334
msgid "Cannot lock %(lock)s: %(why)s"
5182
5335
msgstr ""
5183
5336
5184
#: bzrlib/errors.py:1026
5337
#: bzrlib/errors.py:953
5185
5338
msgid ""
5186
5339
"A transaction related operation was attempted after the transaction finished."
5187
5340
msgstr ""
5188
5341
5189
#: bzrlib/errors.py:1053
5342
#: bzrlib/errors.py:980
5190
5343
msgid "Cannot lock: transport is read only: %(transport)s"
5191
5344
msgstr ""
5192
5345
5193
#: bzrlib/errors.py:1061
5346
#: bzrlib/errors.py:988
5194
5347
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5195
5348
msgstr ""
5196
5349
5197
#: bzrlib/errors.py:1072
5350
#: bzrlib/errors.py:999
5198
5351
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5199
5352
msgstr ""
5200
5353
5201
#: bzrlib/errors.py:1083
5354
#: bzrlib/errors.py:1010
5202
5355
msgid ""
5203
5356
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5204
5357
"%(holder)r, wanted to break %(target)r"
5205
5358
msgstr ""
5206
5359
5207
#: bzrlib/errors.py:1095
5360
#: bzrlib/errors.py:1022
5208
5361
msgid ""
5209
5362
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5210
5363
"Use 'bzr break-lock' to clear it"
5211
5364
msgstr ""
5212
5365
5213
#: bzrlib/errors.py:1108
5366
#: bzrlib/errors.py:1035
5214
5367
msgid "Lock not held: %(lock)s"
5215
5368
msgstr ""
5216
5369
5217
#: bzrlib/errors.py:1137
5370
#: bzrlib/errors.py:1064
5218
5371
msgid "No changes to commit"
5219
5372
msgstr ""
5220
5373
5221
#: bzrlib/errors.py:1142
5374
#: bzrlib/errors.py:1069
5222
5375
msgid ""
5223
5376
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5224
5377
msgstr ""
5225
5378
5226
#: bzrlib/errors.py:1152
5379
#: bzrlib/errors.py:1079
5227
5380
msgid ""
5228
5381
"Excluding paths during commit is not supported by repository at %(repository)"
5229
5382
"r."
5230
5383
msgstr ""
5231
5384
5232
#: bzrlib/errors.py:1161
5385
#: bzrlib/errors.py:1088
5233
5386
msgid ""
5234
5387
"The specified commit message contains characters unsupported by the current "
5235
5388
"encoding."
5236
5389
msgstr ""
5237
5390
5238
#: bzrlib/errors.py:1167
5391
#: bzrlib/errors.py:1094
5239
5392
msgid "Upgrade URL cannot work with readonly URLs."
5240
5393
msgstr ""
5241
5394
5242
#: bzrlib/errors.py:1172
5395
#: bzrlib/errors.py:1099
5243
5396
msgid "The branch format %(format)s is already at the most recent format."
5244
5397
msgstr ""
5245
5398
5246
#: bzrlib/errors.py:1195
5399
#: bzrlib/errors.py:1122
5247
5400
msgid "Option --change does not accept revision ranges"
5248
5401
msgstr ""
5249
5402
5250
#: bzrlib/errors.py:1200
5403
#: bzrlib/errors.py:1127
5251
5404
msgid "No namespace registered for string: %(spec)r"
5252
5405
msgstr ""
5253
5406
5254
#: bzrlib/errors.py:1219
5407
#: bzrlib/errors.py:1146
5255
5408
msgid ""
5256
5409
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5257
5410
"%(extra)s"
5258
5411
msgstr ""
5259
5412
5260
#: bzrlib/errors.py:1233
5261
msgid "%(branch)s is missing %(object_type)s {%(object_id)s}"
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:1238
5413
#: bzrlib/errors.py:1160
5265
5414
msgid ""
5266
5415
"Operation denied because it would change the main history, which is not "
5267
5416
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5268
5417
msgstr ""
5269
5418
5270
#: bzrlib/errors.py:1249
5419
#: bzrlib/errors.py:1171
5271
5420
msgid ""
5272
5421
"These branches have diverged. Use the missing command to see how.\n"
5273
5422
"Use the merge command to reconcile them."
5274
5423
msgstr ""
5275
5424
5276
#: bzrlib/errors.py:1269
5425
#: bzrlib/errors.py:1191
5277
5426
msgid ""
5278
5427
"Branches have no common ancestor, and no merge base revision was specified."
5279
5428
msgstr ""
5280
5429
5281
#: bzrlib/errors.py:1275
5430
#: bzrlib/errors.py:1197
5282
5431
msgid ""
5283
5432
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5284
5433
msgstr ""
5285
5434
5286
#: bzrlib/errors.py:1281
5435
#: bzrlib/errors.py:1203
5287
5436
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5288
5437
msgstr ""
5289
5438
5290
#: bzrlib/errors.py:1290
5439
#: bzrlib/errors.py:1212
5291
5440
msgid ""
5292
5441
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5293
5442
msgstr ""
5294
5443
5295
#: bzrlib/errors.py:1299
5444
#: bzrlib/errors.py:1221
5296
5445
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5297
5446
msgstr ""
5298
5447
5299
#: bzrlib/errors.py:1319
5448
#: bzrlib/errors.py:1230
5300
5449
msgid "Branch %(branch)s has no commits."
5301
5450
msgstr ""
5302
5451
5303
#: bzrlib/errors.py:1337
5452
#: bzrlib/errors.py:1248
5304
5453
msgid ""
5305
5454
"Bound branch %(branch)s is out of date with master branch %(master)s."
5306
5455
"%(extra_help)s"
5307
5456
msgstr ""
5308
5457
5309
#: bzrlib/errors.py:1349
5458
#: bzrlib/errors.py:1260
5310
5459
msgid ""
5311
5460
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5312
5461
"bound to %(remote)s."
5313
5462
msgstr ""
5314
5463
5315
#: bzrlib/errors.py:1361
5464
#: bzrlib/errors.py:1272
5316
5465
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5317
5466
msgstr ""
5318
5467
5319
#: bzrlib/errors.py:1370
5468
#: bzrlib/errors.py:1281
5320
5469
msgid ""
5321
5470
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5322
5471
"%(error)s"
5323
5472
msgstr ""
5324
5473
5325
#: bzrlib/errors.py:1382
5474
#: bzrlib/errors.py:1293
5326
5475
msgid "Error in processing weave: %(msg)s"
5327
5476
msgstr ""
5328
5477
5329
#: bzrlib/errors.py:1391
5478
#: bzrlib/errors.py:1302
5330
5479
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5331
5480
msgstr ""
5332
5481
5333
#: bzrlib/errors.py:1402
5482
#: bzrlib/errors.py:1313
5334
5483
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5335
5484
msgstr ""
5336
5485
5337
#: bzrlib/errors.py:1412
5486
#: bzrlib/errors.py:1323
5338
5487
msgid "Weave invariant violated: %(what)s"
5339
5488
msgstr ""
5340
5489
5341
#: bzrlib/errors.py:1421
5490
#: bzrlib/errors.py:1332
5342
5491
msgid "Parents are mismatched between two revisions. %(msg)s"
5343
5492
msgstr ""
5344
5493
5345
#: bzrlib/errors.py:1443
5494
#: bzrlib/errors.py:1354
5346
5495
msgid ""
5347
5496
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5348
5497
"%(weave_b)s"
5349
5498
msgstr ""
5350
5499
5351
#: bzrlib/errors.py:1455
5500
#: bzrlib/errors.py:1366
5352
5501
msgid "Versioned file error"
5353
5502
msgstr ""
5354
5503
5355
#: bzrlib/errors.py:1460
5504
#: bzrlib/errors.py:1371
5356
5505
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5357
5506
msgstr ""
5358
5507
5359
#: bzrlib/errors.py:1470
5508
#: bzrlib/errors.py:1381
5360
5509
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5361
5510
msgstr ""
5362
5511
5363
#: bzrlib/errors.py:1480
5512
#: bzrlib/errors.py:1391
5364
5513
msgid "Text did not match its checksum: %(msg)s"
5365
5514
msgstr ""
5366
5515
5367
#: bzrlib/errors.py:1605
5516
#: bzrlib/errors.py:1517
5368
5517
msgid "Export format %(format)r not supported"
5369
5518
msgstr ""
5370
5519
5371
#: bzrlib/errors.py:1614
5520
#: bzrlib/errors.py:1526
5372
5521
msgid "Transport error: %(msg)s %(orig_error)s"
5373
5522
msgstr ""
5374
5523
5375
#: bzrlib/errors.py:1640
5524
#: bzrlib/errors.py:1552
5376
5525
msgid "Generic bzr smart protocol error: %(details)s"
5377
5526
msgstr ""
5378
5527
5379
#: bzrlib/errors.py:1648
5528
#: bzrlib/errors.py:1560
5380
5529
msgid "Received bad protocol version marker: %(marker)r"
5381
5530
msgstr ""
5382
5531
5383
#: bzrlib/errors.py:1680
5532
#: bzrlib/errors.py:1592
5384
5533
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5385
5534
msgstr ""
5386
5535
5387
#: bzrlib/errors.py:1685
5536
#: bzrlib/errors.py:1597
5388
5537
msgid "Connection error: %(msg)s %(orig_error)s"
5389
5538
msgstr ""
5390
5539
5391
#: bzrlib/errors.py:1690
5540
#: bzrlib/errors.py:1602
5392
5541
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5393
5542
msgstr ""
5394
5543
5395
#: bzrlib/errors.py:1711
5544
#: bzrlib/errors.py:1623
5396
5545
msgid "Connection closed: %(msg)s %(orig_error)s"
5397
5546
msgstr ""
5398
5547
5399
#: bzrlib/errors.py:1716
5548
#: bzrlib/errors.py:1628
5400
5549
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5401
5550
msgstr ""
5402
5551
5403
#: bzrlib/errors.py:1721
5552
#: bzrlib/errors.py:1633
5404
5553
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5405
5554
msgstr ""
5406
5555
5407
#: bzrlib/errors.py:1731
5556
#: bzrlib/errors.py:1643
5408
5557
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5409
5558
msgstr ""
5410
5559
5411
#: bzrlib/errors.py:1746
5560
#: bzrlib/errors.py:1658
5412
5561
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5413
5562
msgstr ""
5414
5563
5415
#: bzrlib/errors.py:1760
5564
#: bzrlib/errors.py:1672
5416
5565
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5417
5566
msgstr ""
5418
5567
5419
#: bzrlib/errors.py:1768
5568
#: bzrlib/errors.py:1680
5420
5569
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5421
5570
msgstr ""
5422
5571
5423
#: bzrlib/errors.py:1777
5572
#: bzrlib/errors.py:1689
5424
5573
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5425
5574
msgstr ""
5426
5575
5427
#: bzrlib/errors.py:1791
5576
#: bzrlib/errors.py:1703
5428
5577
msgid "Too many redirections"
5429
5578
msgstr ""
5430
5579
5431
#: bzrlib/errors.py:1796
5580
#: bzrlib/errors.py:1708
5432
5581
msgid "Working tree has conflicts."
5433
5582
msgstr ""
5434
5583
5435
#: bzrlib/errors.py:1800
5584
#: bzrlib/errors.py:1712
5436
5585
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5437
5586
msgstr ""
5438
5587
5439
#: bzrlib/errors.py:1809
5588
#: bzrlib/errors.py:1721
5440
5589
msgid ""
5441
5590
"Error(s) parsing config file %(filename)s:\n"
5442
5591
"%(errors)s"
5443
5592
msgstr ""
5444
5593
5445
#: bzrlib/errors.py:1820
5594
#: bzrlib/errors.py:1732
5446
5595
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5447
5596
msgstr ""
5448
5597
5449
#: bzrlib/errors.py:1828
5598
#: bzrlib/errors.py:1740
5450
5599
msgid "%(username)r does not seem to contain a reasonable email address"
5451
5600
msgstr ""
5452
5601
5453
#: bzrlib/errors.py:1837
5602
#: bzrlib/errors.py:1749
5454
5603
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5455
5604
msgstr ""
5456
5605
5457
#: bzrlib/errors.py:1845
5606
#: bzrlib/errors.py:1757
5458
5607
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5459
5608
msgstr ""
5460
5609
5461
#: bzrlib/errors.py:1853
5610
#: bzrlib/errors.py:1765
5462
5611
msgid "Unable to import library \"%(library)s\": %(error)s"
5463
5612
msgstr ""
5464
5613
5465
#: bzrlib/errors.py:1861
5614
#: bzrlib/errors.py:1773
5466
5615
msgid "python-gpgme is not installed, it is needed to verify signatures"
5467
5616
msgstr ""
5468
5617
5469
#: bzrlib/errors.py:1869
5618
#: bzrlib/errors.py:1781
5470
5619
msgid ""
5471
5620
"The working tree for %(basedir)s has changed since the last commit, but "
5472
5621
"weave merge requires that it be unchanged"
5473
5622
msgstr ""
5474
5623
5475
#: bzrlib/errors.py:1879
5624
#: bzrlib/errors.py:1791
5476
5625
msgid ""
5477
5626
"Can't reprocess and show base, because reprocessing obscures the "
5478
5627
"relationship of conflicting lines to the base"
5479
5628
msgstr ""
5480
5629
5481
#: bzrlib/errors.py:1885
5630
#: bzrlib/errors.py:1797
5482
5631
msgid "Cycle in graph %(graph)r"
5483
5632
msgstr ""
5484
5633
5485
#: bzrlib/errors.py:1913
5634
#: bzrlib/errors.py:1825
5486
5635
msgid "File %(filename)s is not conflicted."
5487
5636
msgstr ""
5488
5637
5489
#: bzrlib/errors.py:1935
5638
#: bzrlib/errors.py:1847
5490
5639
msgid "No bundle was found in \"%(filename)s\"."
5491
5640
msgstr ""
5492
5641
5493
#: bzrlib/errors.py:1944
5642
#: bzrlib/errors.py:1856
5494
5643
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5495
5644
msgstr ""
5496
5645
5497
#: bzrlib/errors.py:1954
5646
#: bzrlib/errors.py:1866
5498
5647
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5499
5648
msgstr ""
5500
5649
5501
#: bzrlib/errors.py:1967
5650
#: bzrlib/errors.py:1879
5502
5651
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5503
5652
msgstr ""
5504
5653
5505
#: bzrlib/errors.py:1977
5654
#: bzrlib/errors.py:1889
5506
5655
msgid "Key %(key)s is already present in map"
5507
5656
msgstr ""
5508
5657
5509
#: bzrlib/errors.py:1982
5658
#: bzrlib/errors.py:1894
5510
5659
msgid "The prefix %(prefix)s is in the help search path twice."
5511
5660
msgstr ""
5512
5661
5513
#: bzrlib/errors.py:1992
5662
#: bzrlib/errors.py:1904
5514
5663
msgid ""
5515
5664
"No final name for trans_id %(trans_id)r\n"
5516
5665
"file-id: %(file_id)r\n"
5517
5666
"root trans-id: %(root_trans_id)r\n"
5518
5667
msgstr ""
5519
5668
5520
#: bzrlib/errors.py:2024
5669
#: bzrlib/errors.py:1936
5521
5670
msgid "Attempt to reuse a transform that has already been applied."
5522
5671
msgstr ""
5523
5672
5524
#: bzrlib/errors.py:2029
5673
#: bzrlib/errors.py:1941
5525
5674
msgid "Moving the root directory is not supported at this time"
5526
5675
msgstr ""
5527
5676
5528
#: bzrlib/errors.py:2034
5677
#: bzrlib/errors.py:1946
5529
5678
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5530
5679
msgstr ""
5531
5680
5532
#: bzrlib/errors.py:2045
5681
#: bzrlib/errors.py:1957
5533
5682
msgid ""
5534
5683
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5535
5684
msgstr ""
5536
5685
5537
#: bzrlib/errors.py:2081
5686
#: bzrlib/errors.py:1993
5538
5687
msgid ""
5539
5688
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5540
5689
msgstr ""
5541
5690
5542
#: bzrlib/errors.py:2090
5543
msgid ""
5544
"Can't safely remove modified or unknown files:\n"
5545
"%(changes_as_text)sUse --keep to not delete them, or --force to delete them "
5546
"regardless."
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:2127
5691
#: bzrlib/errors.py:2023
5550
5692
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5551
5693
msgstr ""
5552
5694
5553
#: bzrlib/errors.py:2135
5695
#: bzrlib/errors.py:2031
5554
5696
msgid "Nothing to merge."
5555
5697
msgstr ""
5556
5698
5557
#: bzrlib/errors.py:2140
5699
#: bzrlib/errors.py:2036
5558
5700
msgid "Format %(format)s cannot be initialised by this version of bzr."
5559
5701
msgstr ""
5560
5702
5561
#: bzrlib/errors.py:2149
5703
#: bzrlib/errors.py:2045
5562
5704
msgid ""
5563
5705
"Cannot convert from format %(from_format)s to format %(format)s. "
5564
5706
"%(problem)s"
5565
5707
msgstr ""
5566
5708
5567
#: bzrlib/errors.py:2161
5709
#: bzrlib/errors.py:2057
5568
5710
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5569
5711
msgstr ""
5570
5712
5571
#: bzrlib/errors.py:2169
5713
#: bzrlib/errors.py:2065
5572
5714
msgid "%(exe_name)s could not be found on this machine"
5573
5715
msgstr ""
5574
5716
5575
#: bzrlib/errors.py:2177
5717
#: bzrlib/errors.py:2073
5576
5718
msgid "Diff is not installed on this machine: %(msg)s"
5577
5719
msgstr ""
5578
5720
5579
#: bzrlib/errors.py:2185
5721
#: bzrlib/errors.py:2081
5580
5722
msgid "Diff3 is not installed on this machine."
5581
5723
msgstr ""
5582
5724
5583
#: bzrlib/errors.py:2191
5725
#: bzrlib/errors.py:2087
5584
5726
msgid "The content being inserted is already present."
5585
5727
msgstr ""
5586
5728
5587
#: bzrlib/errors.py:2196
5729
#: bzrlib/errors.py:2092
5588
5730
msgid ""
5589
5731
"This tree contains left-over files from a failed operation.\n"
5590
5732
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5592
5734
" keep, and delete it when you are done."
5593
5735
msgstr ""
5594
5736
5595
#: bzrlib/errors.py:2207
5737
#: bzrlib/errors.py:2103
5596
5738
msgid ""
5597
5739
"This tree contains left-over files from a failed operation.\n"
5598
5740
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5599
5741
" wish to keep, and delete it when you are done."
5600
5742
msgstr ""
5601
5743
5602
#: bzrlib/errors.py:2217
5744
#: bzrlib/errors.py:2113
5603
5745
msgid ""
5604
5746
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5605
5747
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5607
5749
" keep, and delete it when you are done."
5608
5750
msgstr ""
5609
5751
5610
#: bzrlib/errors.py:2228
5752
#: bzrlib/errors.py:2124
5611
5753
msgid ""
5612
5754
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5613
5755
"examine %(pending_deletion)s to see if it contains any files you wish to "
5614
5756
"keep, and delete it when you are done."
5615
5757
msgstr ""
5616
5758
5617
#: bzrlib/errors.py:2238
5759
#: bzrlib/errors.py:2134
5618
5760
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5619
5761
msgstr ""
5620
5762
5621
#: bzrlib/errors.py:2252
5763
#: bzrlib/errors.py:2148
5622
5764
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5623
5765
msgstr ""
5624
5766
5625
#: bzrlib/errors.py:2265
5767
#: bzrlib/errors.py:2161
5626
5768
msgid "Error in merge modified format"
5627
5769
msgstr ""
5628
5770
5629
#: bzrlib/errors.py:2270
5771
#: bzrlib/errors.py:2166
5630
5772
msgid "Format error in conflict listings"
5631
5773
msgstr ""
5632
5774
5633
#: bzrlib/errors.py:2274
5775
#: bzrlib/errors.py:2170
5634
5776
msgid ""
5635
5777
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5636
5778
"Error: %(description)s"
5637
5779
msgstr ""
5638
5780
5639
#: bzrlib/errors.py:2285
5781
#: bzrlib/errors.py:2181
5640
5782
msgid ""
5641
5783
"An error has been detected in the repository %(repo_path)s.\n"
5642
5784
"Please run bzr reconcile on this repository."
5643
5785
msgstr ""
5644
5786
5645
#: bzrlib/errors.py:2296
5787
#: bzrlib/errors.py:2192
5646
5788
msgid ""
5647
5789
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5648
5790
"reason: %(reason)s"
5649
5791
msgstr ""
5650
5792
5651
#: bzrlib/errors.py:2309
5793
#: bzrlib/errors.py:2205
5652
5794
msgid ""
5653
5795
"An inconsistent delta was supplied: %(delta)r\n"
5654
5796
"reason: %(reason)s"
5655
5797
msgstr ""
5656
5798
5657
#: bzrlib/errors.py:2321
5799
#: bzrlib/errors.py:2217
5658
5800
msgid "To use this feature you must upgrade your branch at %(path)s."
5659
5801
msgstr ""
5660
5802
5661
#: bzrlib/errors.py:2330
5803
#: bzrlib/errors.py:2226
5662
5804
msgid "To use this feature you must upgrade your repository at %(path)s."
5663
5805
msgstr ""
5664
5806
5665
#: bzrlib/errors.py:2335
5807
#: bzrlib/errors.py:2231
5666
5808
msgid ""
5667
5809
"To use this feature you must upgrade your branch at %(path)s to a format "
5668
5810
"which supports rich roots."
5669
5811
msgstr ""
5670
5812
5671
#: bzrlib/errors.py:2341
5813
#: bzrlib/errors.py:2237
5672
5814
msgid "Cannot perform local-only commits on unbound branches."
5673
5815
msgstr ""
5674
5816
5675
#: bzrlib/errors.py:2346
5817
#: bzrlib/errors.py:2242
5676
5818
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5677
5819
msgstr ""
5678
5820
5679
#: bzrlib/errors.py:2367
5821
#: bzrlib/errors.py:2263
5680
5822
msgid "Ghost tags not supported by format %(format)r."
5681
5823
msgstr ""
5682
5824
5683
#: bzrlib/errors.py:2375
5825
#: bzrlib/errors.py:2271
5684
5826
msgid "File is binary but should be text."
5685
5827
msgstr ""
5686
5828
5687
#: bzrlib/errors.py:2380
5829
#: bzrlib/errors.py:2276
5688
5830
msgid "The path %(path)s is not permitted on this platform"
5689
5831
msgstr ""
5690
5832
5691
#: bzrlib/errors.py:2389
5833
#: bzrlib/errors.py:2285
5692
5834
msgid ""
5693
5835
"Testament did not match expected value.\n"
5694
5836
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5695
5837
" {%(measured)s}"
5696
5838
msgstr ""
5697
5839
5698
#: bzrlib/errors.py:2401
5840
#: bzrlib/errors.py:2297
5699
5841
msgid "Not a bzr revision-bundle: %(text)r"
5700
5842
msgstr ""
5701
5843
5702
#: bzrlib/errors.py:2410
5844
#: bzrlib/errors.py:2306
5703
5845
msgid "Bad bzr revision-bundle: %(text)r"
5704
5846
msgstr ""
5705
5847
5706
#: bzrlib/errors.py:2419
5848
#: bzrlib/errors.py:2315
5707
5849
msgid "Malformed bzr revision-bundle header: %(text)r"
5708
5850
msgstr ""
5709
5851
5710
#: bzrlib/errors.py:2424
5852
#: bzrlib/errors.py:2320
5711
5853
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5712
5854
msgstr ""
5713
5855
5714
#: bzrlib/errors.py:2429
5856
#: bzrlib/errors.py:2325
5715
5857
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5716
5858
msgstr ""
5717
5859
5718
#: bzrlib/errors.py:2434
5860
#: bzrlib/errors.py:2330
5719
5861
msgid "End of line marker was not \\n in bzr revision-bundle"
5720
5862
msgstr ""
5721
5863
5722
#: bzrlib/errors.py:2444
5864
#: bzrlib/errors.py:2340
5723
5865
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5724
5866
msgstr ""
5725
5867
5726
#: bzrlib/errors.py:2454
5868
#: bzrlib/errors.py:2350
5727
5869
msgid "Root class for inventory serialization errors"
5728
5870
msgstr ""
5729
5871
5730
#: bzrlib/errors.py:2458
5872
#: bzrlib/errors.py:2354
5731
5873
msgid ""
5732
5874
"The inventory was not in the expected format:\n"
5733
5875
" %(msg)s"
5734
5876
msgstr ""
5735
5877
5736
#: bzrlib/errors.py:2467
5878
#: bzrlib/errors.py:2363
5737
5879
msgid "This operation requires rich root data storage"
5738
5880
msgstr ""
5739
5881
5740
#: bzrlib/errors.py:2480
5882
#: bzrlib/errors.py:2376
5741
5883
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5742
5884
msgstr ""
5743
5885
5744
#: bzrlib/errors.py:2489
5886
#: bzrlib/errors.py:2385
5745
5887
msgid ""
5746
5888
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5747
5889
"variable."
5748
5890
msgstr ""
5749
5891
5750
#: bzrlib/errors.py:2496
5892
#: bzrlib/errors.py:2392
5751
5893
msgid ""
5752
5894
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5753
5895
"ghost at {%(ghost_revision_id)s}"
5754
5896
msgstr ""
5755
5897
5756
#: bzrlib/errors.py:2506
5898
#: bzrlib/errors.py:2402
5757
5899
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5758
5900
msgstr ""
5759
5901
5760
#: bzrlib/errors.py:2557
5902
#: bzrlib/errors.py:2453
5761
5903
msgid ""
5762
5904
"A merge directive must provide either a bundle or a public branch location."
5763
5905
msgstr ""
5764
5906
5765
#: bzrlib/errors.py:2564
5907
#: bzrlib/errors.py:2460
5766
5908
msgid "Bad merge directive payload %(start)r"
5767
5909
msgstr ""
5768
5910
5769
#: bzrlib/errors.py:2574
5911
#: bzrlib/errors.py:2470
5770
5912
msgid "Preview patch does not match requested changes."
5771
5913
msgstr ""
5772
5914
5773
#: bzrlib/errors.py:2580
5915
#: bzrlib/errors.py:2476
5774
5916
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5775
5917
msgstr ""
5776
5918
5777
#: bzrlib/errors.py:2590
5919
#: bzrlib/errors.py:2486
5778
5920
msgid ""
5779
5921
"Your branch does not have all of the revisions required in order to merge "
5780
5922
"this merge directive and the target location specified in the merge "
5781
5923
"directive is not a branch: %(location)s."
5782
5924
msgstr ""
5783
5925
5784
#: bzrlib/errors.py:2602
5926
#: bzrlib/errors.py:2498
5785
5927
msgid "Unsupported entry kind %(kind)s"
5786
5928
msgstr ""
5787
5929
5788
#: bzrlib/errors.py:2610
5930
#: bzrlib/errors.py:2506
5789
5931
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5790
5932
msgstr ""
5791
5933
5792
#: bzrlib/errors.py:2620
5934
#: bzrlib/errors.py:2516
5793
5935
msgid "Subsume target %(other_tree)s needs to be upgraded."
5794
5936
msgstr ""
5795
5937
5796
#: bzrlib/errors.py:2639
5938
#: bzrlib/errors.py:2535
5797
5939
msgid "No such tag: %(tag_name)s"
5798
5940
msgstr ""
5799
5941
5800
#: bzrlib/errors.py:2647
5942
#: bzrlib/errors.py:2543
5801
5943
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5802
5944
msgstr ""
5803
5945
5804
#: bzrlib/errors.py:2656
5946
#: bzrlib/errors.py:2552
5805
5947
msgid "Tag %(tag_name)s already exists."
5806
5948
msgstr ""
5807
5949
5808
#: bzrlib/errors.py:2664
5950
#: bzrlib/errors.py:2560
5809
5951
msgid ""
5810
5952
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
5811
5953
"\" for more information on this feature."
5812
5954
msgstr ""
5813
5955
5814
#: bzrlib/errors.py:2674
5956
#: bzrlib/errors.py:2570
5815
5957
msgid ""
5816
5958
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5817
5959
msgstr ""
5818
5960
5819
#: bzrlib/errors.py:2684
5961
#: bzrlib/errors.py:2580
5820
5962
msgid ""
5821
5963
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5822
5964
msgstr ""
5823
5965
5824
#: bzrlib/errors.py:2694
5966
#: bzrlib/errors.py:2590
5825
5967
msgid "Invalid line in bugs property: '%(line)s'"
5826
5968
msgstr ""
5827
5969
5828
#: bzrlib/errors.py:2702
5970
#: bzrlib/errors.py:2598
5829
5971
msgid "Invalid bug status: '%(status)s'"
5830
5972
msgstr ""
5831
5973
5832
#: bzrlib/errors.py:2710
5974
#: bzrlib/errors.py:2606
5833
5975
msgid "Could not understand response from smart server: %(response_tuple)r"
5834
5976
msgstr ""
5835
5977
5836
#: bzrlib/errors.py:2749
5978
#: bzrlib/errors.py:2645
5837
5979
msgid "Server sent an unexpected error: %(error_tuple)r"
5838
5980
msgstr ""
5839
5981
5840
#: bzrlib/errors.py:2768
5982
#: bzrlib/errors.py:2664
5841
5983
msgid "Unrecognised container format: %(container_format)r"
5842
5984
msgstr ""
5843
5985
5844
#: bzrlib/errors.py:2776
5986
#: bzrlib/errors.py:2672
5845
5987
msgid "Unexpected end of container stream"
5846
5988
msgstr ""
5847
5989
5848
#: bzrlib/errors.py:2781
5990
#: bzrlib/errors.py:2677
5849
5991
msgid "Unknown record type: %(record_type)r"
5850
5992
msgstr ""
5851
5993
5852
#: bzrlib/errors.py:2789
5994
#: bzrlib/errors.py:2685
5853
5995
msgid "Invalid record: %(reason)s"
5854
5996
msgstr ""
5855
5997
5856
#: bzrlib/errors.py:2797
5998
#: bzrlib/errors.py:2693
5857
5999
msgid "Container has data after end marker: %(excess)r"
5858
6000
msgstr ""
5859
6001
5860
#: bzrlib/errors.py:2805
6002
#: bzrlib/errors.py:2701
5861
6003
msgid "Container has multiple records with the same name: %(name)s"
5862
6004
msgstr ""
5863
6005
5864
#: bzrlib/errors.py:2818
6006
#: bzrlib/errors.py:2714
5865
6007
msgid "Corrupt or incompatible data stream: %(reason)s"
5866
6008
msgstr ""
5867
6009
5868
#: bzrlib/errors.py:2826
6010
#: bzrlib/errors.py:2722
5869
6011
msgid "SMTP error: %(error)s"
5870
6012
msgstr ""
5871
6013
5872
#: bzrlib/errors.py:2834
6014
#: bzrlib/errors.py:2730
5873
6015
msgid "No message supplied."
5874
6016
msgstr ""
5875
6017
5876
#: bzrlib/errors.py:2839
6018
#: bzrlib/errors.py:2735
5877
6019
msgid "No mail-to address (--mail-to) or output (-o) specified."
5878
6020
msgstr ""
5879
6021
5880
#: bzrlib/errors.py:2844
6022
#: bzrlib/errors.py:2740
5881
6023
msgid "Unknown mail client: %(mail_client)s"
5882
6024
msgstr ""
5883
6025
5884
#: bzrlib/errors.py:2852
6026
#: bzrlib/errors.py:2748
5885
6027
msgid ""
5886
6028
"Unable to find mail client with the following names: "
5887
6029
"%(mail_command_list_string)s"
5888
6030
msgstr ""
5889
6031
5890
#: bzrlib/errors.py:2862
6032
#: bzrlib/errors.py:2758
5891
6033
msgid "SMTP connection to %(host)s refused"
5892
6034
msgstr ""
5893
6035
5894
#: bzrlib/errors.py:2871
6036
#: bzrlib/errors.py:2767
5895
6037
msgid "Please specify smtp_server. No server at default %(host)s."
5896
6038
msgstr ""
5897
6039
5898
#: bzrlib/errors.py:2885
6040
#: bzrlib/errors.py:2781
5899
6041
msgid ""
5900
6042
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5901
6043
"reconfigure."
5902
6044
msgstr ""
5903
6045
5904
#: bzrlib/errors.py:2897
6046
#: bzrlib/errors.py:2793
5905
6047
msgid "'%(display_url)s' is already a branch."
5906
6048
msgstr ""
5907
6049
5908
#: bzrlib/errors.py:2902
6050
#: bzrlib/errors.py:2798
5909
6051
msgid "'%(display_url)s' is already a tree."
5910
6052
msgstr ""
5911
6053
5912
#: bzrlib/errors.py:2907
6054
#: bzrlib/errors.py:2803
5913
6055
msgid "'%(display_url)s' is already a checkout."
5914
6056
msgstr ""
5915
6057
5916
#: bzrlib/errors.py:2912
6058
#: bzrlib/errors.py:2808
5917
6059
msgid "'%(display_url)s' is already a lightweight checkout."
5918
6060
msgstr ""
5919
6061
5920
#: bzrlib/errors.py:2917
6062
#: bzrlib/errors.py:2813
5921
6063
msgid "'%(display_url)s' is already using a shared repository."
5922
6064
msgstr ""
5923
6065
5924
#: bzrlib/errors.py:2922
6066
#: bzrlib/errors.py:2818
5925
6067
msgid "'%(display_url)s' is already standalone."
5926
6068
msgstr ""
5927
6069
5928
#: bzrlib/errors.py:2927
6070
#: bzrlib/errors.py:2823
5929
6071
msgid "Shared repository '%(display_url)s' already creates working trees."
5930
6072
msgstr ""
5931
6073
5932
#: bzrlib/errors.py:2933
6074
#: bzrlib/errors.py:2829
5933
6075
msgid ""
5934
6076
"Shared repository '%(display_url)s' already doesn't create working trees."
5935
6077
msgstr ""
5936
6078
5937
#: bzrlib/errors.py:2939
6079
#: bzrlib/errors.py:2835
5938
6080
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5939
6081
msgstr ""
5940
6082
5941
#: bzrlib/errors.py:2944
6083
#: bzrlib/errors.py:2840
5942
6084
msgid "No location could be found to bind to at %(display_url)s."
5943
6085
msgstr ""
5944
6086
5945
#: bzrlib/errors.py:2949
6087
#: bzrlib/errors.py:2845
5946
6088
msgid ""
5947
6089
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
5948
6090
"%(more)s"
5949
6091
msgstr ""
5950
6092
5951
#: bzrlib/errors.py:2968
6093
#: bzrlib/errors.py:2864
5952
6094
msgid ""
5953
6095
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
5954
6096
"%(more)s"
5955
6097
msgstr ""
5956
6098
5957
#: bzrlib/errors.py:2974
6099
#: bzrlib/errors.py:2870
5958
6100
msgid "Variable {%(name)s} is not available."
5959
6101
msgstr ""
5960
6102
5961
#: bzrlib/errors.py:2982
6103
#: bzrlib/errors.py:2878
5962
6104
msgid "No template specified."
5963
6105
msgstr ""
5964
6106
5965
#: bzrlib/errors.py:2987
6107
#: bzrlib/errors.py:2883
5966
6108
msgid "Unable to create symlink %(path_str)son this platform"
5967
6109
msgstr ""
5968
6110
5969
#: bzrlib/errors.py:3002
6111
#: bzrlib/errors.py:2898
5970
6112
msgid ""
5971
6113
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
5972
6114
"\", \"local\"."
5973
6115
msgstr ""
5974
6116
5975
#: bzrlib/errors.py:3036
6117
#: bzrlib/errors.py:2932
5976
6118
msgid ""
5977
6119
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5978
6120
msgstr ""
5979
6121
5980
#: bzrlib/errors.py:3048
6122
#: bzrlib/errors.py:2944
5981
6123
msgid "The \"%(config_id)s\" configuration does not exist."
5982
6124
msgstr ""
5983
6125
5984
#: bzrlib/errors.py:3056
6126
#: bzrlib/errors.py:2952
5985
6127
msgid "The \"%(option_name)s\" configuration option does not exist."
5986
6128
msgstr ""
5987
6129
5988
#: bzrlib/errors.py:3064
6130
#: bzrlib/errors.py:2960
5989
6131
msgid "The alias \"%(alias_name)s\" does not exist."
5990
6132
msgstr ""
5991
6133
5992
#: bzrlib/errors.py:3078
6134
#: bzrlib/errors.py:2974
5993
6135
msgid "\"%(alias_name)s\" is not a valid location alias."
5994
6136
msgstr ""
5995
6137
5996
#: bzrlib/errors.py:3086
6138
#: bzrlib/errors.py:2982
5997
6139
msgid "No %(alias_name)s location assigned."
5998
6140
msgstr ""
5999
6141
6000
#: bzrlib/errors.py:3094
6142
#: bzrlib/errors.py:2990
6001
6143
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6002
6144
msgstr ""
6003
6145
6004
#: bzrlib/errors.py:3104
6146
#: bzrlib/errors.py:3000
6005
6147
msgid "Unknown rules detected: %(unknowns_str)s."
6006
6148
msgstr ""
6007
6149
6008
#: bzrlib/errors.py:3117
6009
msgid ""
6010
"Hook '%(hook_name)s' during %(hook_stage)s failed:\n"
6011
"%(traceback_text)s%(exc_value)s"
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:3140
6150
#: bzrlib/errors.py:3011
6015
6151
msgid "Tip change rejected: %(msg)s"
6016
6152
msgstr ""
6017
6153
6018
#: bzrlib/errors.py:3148
6154
#: bzrlib/errors.py:3019
6019
6155
msgid "Shelf corrupt."
6020
6156
msgstr ""
6021
6157
6022
#: bzrlib/errors.py:3153
6158
#: bzrlib/errors.py:3024
6023
6159
msgid "Corruption while decompressing repository file%(orig_error)s"
6024
6160
msgstr ""
6025
6161
6026
#: bzrlib/errors.py:3165
6162
#: bzrlib/errors.py:3036
6027
6163
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6028
6164
msgstr ""
6029
6165
6030
#: bzrlib/errors.py:3173
6166
#: bzrlib/errors.py:3044
6031
6167
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6032
6168
msgstr ""
6033
6169
6034
#: bzrlib/errors.py:3181
6170
#: bzrlib/errors.py:3052
6035
6171
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6036
6172
msgstr ""
6037
6173
6038
#: bzrlib/errors.py:3189
6174
#: bzrlib/errors.py:3060
6039
6175
msgid "The user aborted the operation."
6040
6176
msgstr ""
6041
6177
6042
#: bzrlib/errors.py:3194
6178
#: bzrlib/errors.py:3065
6043
6179
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6044
6180
msgstr ""
6045
6181
6046
#: bzrlib/errors.py:3204
6182
#: bzrlib/errors.py:3075
6047
6183
msgid "No such view: %(view_name)s."
6048
6184
msgstr ""
6049
6185
6050
#: bzrlib/errors.py:3214
6186
#: bzrlib/errors.py:3085
6051
6187
msgid ""
6052
6188
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6053
6189
"to a later format."
6054
6190
msgstr ""
6055
6191
6056
#: bzrlib/errors.py:3223
6192
#: bzrlib/errors.py:3094
6057
6193
msgid ""
6058
6194
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6059
6195
msgstr ""
6060
6196
6061
#: bzrlib/errors.py:3290
6197
#: bzrlib/errors.py:3161
6062
6198
msgid "%(bzrdir)r does not support co-located branches."
6063
6199
msgstr ""
6064
6200
6065
#: bzrlib/errors.py:3296
6201
#: bzrlib/errors.py:3167
6066
6202
msgid ""
6067
6203
"Unable to determine your name.\n"
6068
6204
"Please, set your name with the 'whoami' command.\n"
6069
6205
"E.g. bzr whoami \"Your Name <name@example.com>\""
6070
6206
msgstr ""
6071
6207
6072
#: bzrlib/errors.py:3305
6208
#: bzrlib/errors.py:3176
6073
6209
msgid "Invalid pattern(s) found. %(msg)s"
6074
6210
msgstr ""
6075
6211
6076
#: bzrlib/errors.py:3313
6212
#: bzrlib/errors.py:3184
6077
6213
msgid ""
6078
6214
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6079
6215
"unbind` to fix."
6080
6216
msgstr ""
6081
6217
6082
#: bzrlib/errors.py:3324
6218
#: bzrlib/errors.py:3195
6083
6219
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6084
6220
msgstr ""
6085
6221
6086
#: bzrlib/errors.py:3333
6222
#: bzrlib/errors.py:3204
6087
6223
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6088
6224
msgstr ""
6089
6225
6090
#: bzrlib/errors.py:3342
6226
#: bzrlib/errors.py:3213
6091
6227
msgid ""
6092
6228
"No compatible object available for operations from %(source)r to %(target)r."
6093
6229
msgstr ""
6094
6230
6095
#: bzrlib/errors.py:3352
6231
#: bzrlib/errors.py:3223
6096
6232
msgid ""
6097
6233
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6098
6234
"%(arguments)s."
6099
6235
msgstr ""
6100
6236
6101
#: bzrlib/errors.py:3362
6237
#: bzrlib/errors.py:3233
6102
6238
msgid ""
6103
6239
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6104
6240
"format %(format)r"
6105
6241
msgstr ""
6106
6242
6107
#: bzrlib/export_pot.py:123 bzrlib/export_pot.py:129
6108
#, python-format
6109
msgid "%r is not found in bzrlib/option.py"
6110
msgstr ""
6111
6112
#: bzrlib/export_pot.py:188
6243
#: bzrlib/errors.py:3249
6244
msgid "Binary files section encountered."
6245
msgstr ""
6246
6247
#: bzrlib/errors.py:3257
6248
msgid ""
6249
"Malformed patch header. %(desc)s\n"
6250
"%(line)r"
6251
msgstr ""
6252
6253
#: bzrlib/errors.py:3266
6254
msgid ""
6255
"Malformed hunk header. %(desc)s\n"
6256
"%(line)r"
6257
msgstr ""
6258
6259
#: bzrlib/errors.py:3275
6260
msgid ""
6261
"Malformed line. %(desc)s\n"
6262
"%(line)r"
6263
msgstr ""
6264
6265
#: bzrlib/errors.py:3285
6266
msgid ""
6267
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6268
"but patch says it should be \"%(patch_line)s\""
6269
msgstr ""
6270
6271
#: bzrlib/export_pot.py:246
6113
6272
#, python-format
6114
6273
msgid "Exporting messages from builtin command: %s"
6115
6274
msgstr ""
6116
6275
6117
#: bzrlib/export_pot.py:207
6276
#: bzrlib/export_pot.py:265
6118
6277
msgid "Exporting messages from plugin command: {0} in {1}"
6119
6278
msgstr ""
6120
6279
6121
#: bzrlib/export_pot.py:232
6280
#: bzrlib/export_pot.py:286
6122
6281
#, python-format
6123
6282
msgid "Exporting message from error: %s"
6124
6283
msgstr ""
6131
6290
msgid "Fetching revisions"
6132
6291
msgstr ""
6133
6292
6134
#: bzrlib/foreign.py:311
6293
#: bzrlib/foreign.py:261
6294
msgid "Push into a different VCS without any custom bzr metadata."
6295
msgstr ""
6296
6297
#: bzrlib/foreign.py:263
6298
msgid ""
6299
"This will afterwards rebase the local branch on the remote\n"
6300
"branch unless the --no-rebase option is used, in which case \n"
6301
"the two branches will be out of sync after the push. "
6302
msgstr ""
6303
6304
# help of 'directory' option of 'dpush' command
6305
#: bzrlib/foreign.py:271
6306
msgid ""
6307
"Branch to push from, rather than the one containing the working directory."
6308
msgstr ""
6309
6310
# help of 'no-rebase' option of 'dpush' command
6311
#: bzrlib/foreign.py:276
6312
msgid "Do not rebase after push."
6313
msgstr ""
6314
6315
# help of 'strict' option of 'dpush' command
6316
#: bzrlib/foreign.py:278
6317
msgid ""
6318
"Refuse to push if there are uncommitted changes in the working tree, --no-"
6319
"strict disables the check."
6320
msgstr ""
6321
6322
#: bzrlib/foreign.py:310
6135
6323
#, python-format
6136
6324
msgid "Using saved location: %s\n"
6137
6325
msgstr ""
6138
6326
6139
#: bzrlib/foreign.py:321
6327
#: bzrlib/foreign.py:320
6140
6328
msgid ""
6141
6329
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6142
6330
"regular push."
6198
6386
msgstr[0] ""
6199
6387
msgstr[1] ""
6200
6388
6201
#: bzrlib/groupcompress.py:1758
6389
#: bzrlib/groupcompress.py:1737
6202
6390
#, python-format
6203
6391
msgid "Insert claimed random_id=True, but then inserted %r two times"
6204
6392
msgstr ""
6205
6393
6206
#: bzrlib/hooks.py:314
6394
#: bzrlib/hooks.py:329
6207
6395
#, python-format
6208
6396
msgid "Introduced in: %s"
6209
6397
msgstr ""
6210
6398
6211
#: bzrlib/hooks.py:317
6399
#: bzrlib/hooks.py:332
6212
6400
#, python-format
6213
6401
msgid "Deprecated in: %s"
6214
6402
msgstr ""
6293
6481
msgstr[0] ""
6294
6482
msgstr[1] ""
6295
6483
6296
#: bzrlib/merge.py:717
6484
#: bzrlib/merge.py:718
6297
6485
msgid "All changes applied successfully."
6298
6486
msgstr ""
6299
6487
6300
#: bzrlib/merge.py:719
6488
#: bzrlib/merge.py:720
6301
6489
#, python-format
6302
6490
msgid "%d conflicts encountered."
6303
6491
msgstr ""
6304
6492
6305
#: bzrlib/merge.py:864 bzrlib/merge.py:1951
6493
#: bzrlib/merge.py:868 bzrlib/merge.py:1956
6306
6494
msgid "Preparing file merge"
6307
6495
msgstr ""
6308
6496
6311
6499
msgstr ""
6312
6500
6313
6501
# help of 'help' option
6314
#: bzrlib/option.py:539
6502
#: bzrlib/option.py:524
6315
6503
msgid "Show help message."
6316
6504
msgstr ""
6317
6505
6318
6506
# help of 'quiet' option
6319
#: bzrlib/option.py:541
6507
#: bzrlib/option.py:526
6320
6508
msgid "Only display errors and warnings."
6321
6509
msgstr ""
6322
6510
6323
6511
# help of 'usage' option
6324
#: bzrlib/option.py:544
6512
#: bzrlib/option.py:529
6325
6513
msgid "Show usage message and options."
6326
6514
msgstr ""
6327
6515
6328
6516
# help of 'verbose' option
6329
#: bzrlib/option.py:546
6517
#: bzrlib/option.py:531
6330
6518
msgid "Display more information."
6331
6519
msgstr ""
6332
6520
6333
6521
# help of 'change' option
6334
#: bzrlib/option.py:557
6522
#: bzrlib/option.py:539
6335
6523
msgid ""
6336
6524
"Select changes introduced by the specified revision. See also \"help "
6337
6525
"revisionspec\"."
6338
6526
msgstr ""
6339
6527
6340
6528
# help of 'directory' option
6341
#: bzrlib/option.py:560
6342
msgid "Branch to operate on, instead of working directory"
6343
msgstr ""
6344
6345
# help of 'dry-run' option
6346
#: bzrlib/option.py:562
6347
msgid "Show what would be done, but don't actually do anything."
6348
msgstr ""
6349
6350
# help of 'line' option
6351
#: bzrlib/option.py:569
6352
msgid "Use log format with one line per revision. Same as --log-format line"
6529
#: bzrlib/option.py:541
6530
msgid "Branch to operate on, instead of working directory."
6531
msgstr ""
6532
6533
# help of 'log-format=long' option
6534
#: bzrlib/option.py:543
6535
msgid "Detailed log format."
6536
msgstr ""
6537
6538
# help of 'log-format=gnu-changelog' option
6539
#: bzrlib/option.py:543
6540
msgid "Format used by GNU ChangeLog files."
6541
msgstr ""
6542
6543
# help of 'log-format=line' option
6544
#: bzrlib/option.py:543
6545
msgid "Log format with one line per revision."
6546
msgstr ""
6547
6548
# help of 'log-format=short' option
6549
#: bzrlib/option.py:543
6550
msgid "Moderately short log format."
6353
6551
msgstr ""
6354
6552
6355
6553
# help of 'log-format' option
6356
#: bzrlib/option.py:571
6554
#: bzrlib/option.py:543
6357
6555
msgid "Use specified log format."
6358
6556
msgstr ""
6359
6557
6360
6558
# title of 'log-format' option
6361
#: bzrlib/option.py:573
6559
#: bzrlib/option.py:545
6362
6560
msgid "Log format"
6363
6561
msgstr ""
6364
6562
6365
# help of 'long' option
6366
#: bzrlib/option.py:575
6367
msgid "Use detailed log format. Same as --log-format long"
6563
# help of 'merge-type=lca' option
6564
#: bzrlib/option.py:547
6565
msgid "LCA-newness merge."
6566
msgstr ""
6567
6568
# help of 'merge-type=diff3' option
6569
#: bzrlib/option.py:547
6570
msgid "Merge using external diff3."
6571
msgstr ""
6572
6573
# help of 'merge-type=merge3' option
6574
#: bzrlib/option.py:547
6575
msgid "Native diff3-style merge."
6368
6576
msgstr ""
6369
6577
6370
6578
# help of 'merge-type' option
6371
#: bzrlib/option.py:578
6579
#: bzrlib/option.py:547
6372
6580
msgid "Select a particular merge algorithm."
6373
6581
msgstr ""
6374
6582
6583
# help of 'merge-type=weave' option
6584
#: bzrlib/option.py:547
6585
msgid "Weave-based merge."
6586
msgstr ""
6587
6375
6588
# title of 'merge-type' option
6376
#: bzrlib/option.py:580
6589
#: bzrlib/option.py:549
6377
6590
msgid "Merge algorithm"
6378
6591
msgstr ""
6379
6592
6380
6593
# help of 'message' option
6381
#: bzrlib/option.py:583
6594
#: bzrlib/option.py:552
6382
6595
msgid "Message string."
6383
6596
msgstr ""
6384
6597
6385
# help of 'name-from-revision' option
6386
#: bzrlib/option.py:584
6387
msgid "The path name in the old tree."
6388
msgstr ""
6389
6390
6598
# help of 'null' option
6391
#: bzrlib/option.py:588
6599
#: bzrlib/option.py:554
6392
6600
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6393
6601
msgstr ""
6394
6602
6395
6603
# help of 'overwrite' option
6396
#: bzrlib/option.py:590
6604
#: bzrlib/option.py:556
6397
6605
msgid "Ignore differences between branches and overwrite unconditionally."
6398
6606
msgstr ""
6399
6607
6400
# help of 'profile' option
6401
#: bzrlib/option.py:594
6402
msgid "Show performance profiling information."
6608
# help of 'remember' option
6609
#: bzrlib/option.py:558
6610
msgid "Remember the specified location as a default."
6403
6611
msgstr ""
6404
6612
6405
6613
# help of 'reprocess' option
6406
#: bzrlib/option.py:595
6614
#: bzrlib/option.py:560
6407
6615
msgid "Reprocess to reduce spurious conflicts."
6408
6616
msgstr ""
6409
6617
6410
# help of 'remember' option
6411
#: bzrlib/option.py:596
6412
msgid "Remember the specified location as a default."
6413
msgstr ""
6414
6415
6618
# help of 'revision' option
6416
#: bzrlib/option.py:601
6619
#: bzrlib/option.py:564
6417
6620
msgid "See \"help revisionspec\" for details."
6418
6621
msgstr ""
6419
6622
6420
# help of 'short' option
6421
#: bzrlib/option.py:602
6422
msgid "Use moderately short log format. Same as --log-format short"
6423
msgstr ""
6424
6425
6623
# help of 'show-ids' option
6426
#: bzrlib/option.py:605
6624
#: bzrlib/option.py:566
6427
6625
msgid "Show internal object ids."
6428
6626
msgstr ""
6429
6627
6430
6628
# help of 'timezone' option
6431
#: bzrlib/option.py:608
6629
#: bzrlib/option.py:569
6432
6630
msgid "Display timezone as local, original, or utc."
6433
6631
msgstr ""
6434
6632
6435
#: bzrlib/osutils.py:93
6633
#: bzrlib/osutils.py:94
6436
6634
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6437
6635
msgstr ""
6438
6636
6439
#: bzrlib/osutils.py:194
6637
#: bzrlib/osutils.py:214
6440
6638
msgid "lstat/stat of ({0!r}): {1!r}"
6441
6639
msgstr ""
6442
6640
6443
#: bzrlib/osutils.py:944 bzrlib/osutils.py:955
6641
#: bzrlib/osutils.py:964 bzrlib/osutils.py:975
6444
6642
#, python-format
6445
6643
msgid "sorry, %r not allowed in path"
6446
6644
msgstr ""
6447
6645
6448
#: bzrlib/osutils.py:1173
6646
#: bzrlib/osutils.py:1193
6449
6647
#, python-format
6450
6648
msgid "%r is too short to calculate a relative path"
6451
6649
msgstr ""
6456
6654
msgstr ""
6457
6655
6458
6656
# help of 'plugin' option of 'bash-completion' command
6459
#: bzrlib/plugins/bash_completion/bashcomp.py:407
6657
#: bzrlib/plugins/bash_completion/bashcomp.py:408
6460
6658
msgid "Enable completions for the selected plugin (default: all plugins)"
6461
6659
msgstr ""
6462
6660
6792
6990
" remote: {2}"
6793
6991
msgstr ""
6794
6992
6795
#: bzrlib/plugins/launchpad/lp_propose.py:146
6993
#: bzrlib/plugins/launchpad/lp_propose.py:147
6796
6994
#, python-format
6797
6995
msgid "There is already a branch merge proposal: %s"
6798
6996
msgstr ""
7032
7230
msgid "%s is now not stacked\n"
7033
7231
msgstr ""
7034
7232
7035
#: bzrlib/remote.py:1886
7233
#: bzrlib/remote.py:1134 bzrlib/repository.py:287
7234
#, python-format
7235
msgid "bzr: ERROR (ignored): %s"
7236
msgstr ""
7237
7238
#: bzrlib/remote.py:2217
7036
7239
msgid "Copying repository content as tarball..."
7037
7240
msgstr ""
7038
7241
7048
7251
msgid "{0} => {1}"
7049
7252
msgstr ""
7050
7253
7051
#: bzrlib/repository.py:287
7052
#, python-format
7053
msgid "bzr: ERROR (ignored): %s"
7054
msgstr ""
7055
7056
#: bzrlib/repository.py:1800
7254
#: bzrlib/repository.py:1781
7057
7255
msgid "Moving repository to repository.backup"
7058
7256
msgstr ""
7059
7257
7060
#: bzrlib/repository.py:1807
7258
#: bzrlib/repository.py:1788
7061
7259
msgid "Creating new repository"
7062
7260
msgstr ""
7063
7261
7064
#: bzrlib/repository.py:1812
7262
#: bzrlib/repository.py:1793
7065
7263
msgid "Copying content"
7066
7264
msgstr ""
7067
7265
7068
#: bzrlib/repository.py:1816
7266
#: bzrlib/repository.py:1797
7069
7267
msgid "Deleting old repository content"
7070
7268
msgstr ""
7071
7269
7072
#: bzrlib/repository.py:1818
7270
#: bzrlib/repository.py:1799
7073
7271
msgid "repository converted"
7074
7272
msgstr ""
7075
7273
7076
#: bzrlib/revisionspec.py:922
7274
#: bzrlib/revisionspec.py:904
7077
7275
msgid "Using {0} {1}"
7078
7276
msgstr ""
7079
7277
7116
7314
msgid "Format 0.9 does not permit bundle with no patch"
7117
7315
msgstr ""
7118
7316
7317
#: bzrlib/shelf_ui.py:45
7318
#, python-format
7319
msgid "Shelve adding file \"%(path)s\"?"
7320
msgstr ""
7321
7119
7322
#: bzrlib/shelf_ui.py:46
7120
#, python-format
7121
msgid "Shelve adding file \"%(path)s\"?"
7323
msgid "Shelve binary changes?"
7122
7324
msgstr ""
7123
7325
7124
7326
#: bzrlib/shelf_ui.py:47
7125
msgid "Shelve binary changes?"
7126
msgstr ""
7127
7128
#: bzrlib/shelf_ui.py:48
7129
7327
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7130
7328
msgstr ""
7131
7329
7330
#: bzrlib/shelf_ui.py:49
7331
#, python-format
7332
msgid "Shelve removing file \"%(path)s\"?"
7333
msgstr ""
7334
7132
7335
#: bzrlib/shelf_ui.py:50
7133
7336
#, python-format
7134
msgid "Shelve removing file \"%(path)s\"?"
7337
msgid "Shelve %d change(s)?"
7135
7338
msgstr ""
7136
7339
7137
7340
#: bzrlib/shelf_ui.py:51
7138
#, python-format
7139
msgid "Shelve %d change(s)?"
7341
msgid "Shelve?"
7140
7342
msgstr ""
7141
7343
7142
7344
#: bzrlib/shelf_ui.py:52
7143
msgid "Shelve?"
7144
msgstr ""
7145
7146
#: bzrlib/shelf_ui.py:53
7147
7345
#, python-format
7148
7346
msgid ""
7149
7347
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7150
7348
msgstr ""
7151
7349
7152
#: bzrlib/shelf_ui.py:55
7350
#: bzrlib/shelf_ui.py:54
7153
7351
#, python-format
7154
7352
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7155
7353
msgstr ""
7156
7354
7157
#: bzrlib/shelf_ui.py:70
7355
#: bzrlib/shelf_ui.py:69
7158
7356
#, python-format
7159
7357
msgid "Changes shelved with id \"%d\"."
7160
7358
msgstr ""
7161
7359
7162
#: bzrlib/shelf_ui.py:74
7360
#: bzrlib/shelf_ui.py:73
7163
7361
msgid "Selected changes destroyed."
7164
7362
msgstr ""
7165
7363
7166
#: bzrlib/shelf_ui.py:78
7364
#: bzrlib/shelf_ui.py:77
7167
7365
msgid "Selected changes:"
7168
7366
msgstr ""
7169
7367
7368
#: bzrlib/shelf_ui.py:97
7369
#, python-format
7370
msgid "Delete file \"%(path)s\"?"
7371
msgstr ""
7372
7170
7373
#: bzrlib/shelf_ui.py:98
7171
#, python-format
7172
msgid "Delete file \"%(path)s\"?"
7374
msgid "Apply binary changes?"
7173
7375
msgstr ""
7174
7376
7175
7377
#: bzrlib/shelf_ui.py:99
7176
msgid "Apply binary changes?"
7177
msgstr ""
7178
7179
#: bzrlib/shelf_ui.py:100
7180
7378
#, python-format
7181
7379
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7182
7380
msgstr ""
7183
7381
7382
#: bzrlib/shelf_ui.py:101
7383
#, python-format
7384
msgid "Add file \"%(path)s\"?"
7385
msgstr ""
7386
7184
7387
#: bzrlib/shelf_ui.py:102
7185
7388
#, python-format
7186
msgid "Add file \"%(path)s\"?"
7389
msgid "Apply %d change(s)?"
7187
7390
msgstr ""
7188
7391
7189
7392
#: bzrlib/shelf_ui.py:103
7190
#, python-format
7191
msgid "Apply %d change(s)?"
7393
msgid "Apply change?"
7192
7394
msgstr ""
7193
7395
7194
7396
#: bzrlib/shelf_ui.py:104
7195
msgid "Apply change?"
7196
msgstr ""
7197
7198
#: bzrlib/shelf_ui.py:105
7199
7397
#, python-format
7200
7398
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7201
7399
msgstr ""
7202
7400
7203
#: bzrlib/shelf_ui.py:107
7401
#: bzrlib/shelf_ui.py:106
7204
7402
#, python-format
7205
7403
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7206
7404
msgstr ""
7207
7405
7208
#: bzrlib/shelf_ui.py:402
7406
#: bzrlib/shelf_ui.py:401
7209
7407
msgid "No changes are shelved."
7210
7408
msgstr ""
7211
7409
7212
#: bzrlib/shelf_ui.py:460
7410
#: bzrlib/shelf_ui.py:459
7213
7411
#, python-format
7214
7412
msgid "Using changes with id \"%d\"."
7215
7413
msgstr ""
7216
7414
7217
#: bzrlib/shelf_ui.py:464
7415
#: bzrlib/shelf_ui.py:463
7218
7416
#, python-format
7219
7417
msgid "Message: %s"
7220
7418
msgstr ""
7221
7419
7222
#: bzrlib/shelf_ui.py:476
7420
#: bzrlib/shelf_ui.py:475
7223
7421
#, python-format
7224
7422
msgid "Deleted changes with id \"%d\"."
7225
7423
msgstr ""
7283
7481
msgid "Updated to revision %d."
7284
7482
msgstr ""
7285
7483
7286
#: bzrlib/transform.py:1727 bzrlib/transform.py:1738 bzrlib/transform.py:1740
7484
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7287
7485
msgid "Apply phase"
7288
7486
msgstr ""
7289
7487
7290
#: bzrlib/transform.py:1766 bzrlib/transform.py:1834
7488
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7291
7489
msgid "removing file"
7292
7490
msgstr ""
7293
7491
7294
#: bzrlib/transform.py:1784 bzrlib/transform.py:1869
7492
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7295
7493
msgid "adding file"
7296
7494
msgstr ""
7297
7495
7298
#: bzrlib/transform.py:2584
7496
#: bzrlib/transform.py:2580
7299
7497
msgid "Building tree"
7300
7498
msgstr ""
7301
7499
7302
#: bzrlib/transform.py:2674 bzrlib/transform.py:2701
7500
#: bzrlib/transform.py:2670 bzrlib/transform.py:2697
7303
7501
msgid "Adding file contents"
7304
7502
msgstr ""
7305
7503
7306
#: bzrlib/transform.py:3021
7504
#: bzrlib/transform.py:3017
7307
7505
msgid "Resolution pass"
7308
7506
msgstr ""
7309
7507
7312
7510
msgid "Authenticated as %s"
7313
7511
msgstr ""
7314
7512
7315
#: bzrlib/tree.py:635
7513
#: bzrlib/tree.py:632
7316
7514
msgid "*** {0} content-filter: {1} => {2!r}"
7317
7515
msgstr ""
7318
7516
7371
7569
msgid "failed to clean-up {0}: {1}"
7372
7570
msgstr ""
7373
7571
7374
#: bzrlib/vf_repository.py:1092
7572
#: bzrlib/vf_repository.py:1093
7375
7573
msgid "inventories"
7376
7574
msgstr ""
7377
7575
7378
#: bzrlib/vf_repository.py:1118
7576
#: bzrlib/vf_repository.py:1119
7379
7577
msgid "texts"
7380
7578
msgstr ""
7381
7579
7382
#: bzrlib/vf_repository.py:1575 bzrlib/vf_repository.py:1584
7580
#: bzrlib/vf_repository.py:1624 bzrlib/vf_repository.py:1633
7383
7581
msgid "Calculating text parents"
7384
7582
msgstr ""
7385
7583
7386
#: bzrlib/vf_repository.py:1660
7584
#: bzrlib/vf_repository.py:1709
7387
7585
msgid "Fetch texts"
7388
7586
msgstr ""
7389
7587
7390
#: bzrlib/vf_repository.py:2471
7588
#: bzrlib/vf_repository.py:2538
7391
7589
msgid "loading text store"
7392
7590
msgstr ""
7393
7591
7394
#: bzrlib/vf_repository.py:2477
7592
#: bzrlib/vf_repository.py:2544
7395
7593
msgid "checking text graph"
7396
7594
msgstr ""
7397
7595
7398
#: bzrlib/vf_repository.py:2927 bzrlib/vf_repository.py:2941
7399
#: bzrlib/vf_repository.py:3056
7596
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7597
#: bzrlib/vf_repository.py:3127
7400
7598
msgid "Transferring revisions"
7401
7599
msgstr ""
7402
7600
7403
#: bzrlib/win32utils.py:132
7601
#: bzrlib/win32utils.py:137
7404
7602
msgid "Failed to GetProcessMemoryInfo()"
7405
7603
msgstr ""
7406
7604
7407
#: bzrlib/win32utils.py:153
7605
#: bzrlib/win32utils.py:158
7408
7606
msgid "Cannot debug memory on win32 without ctypes or win32process"
7409
7607
msgstr ""
7410
7608
7411
#: bzrlib/win32utils.py:158
7609
#: bzrlib/win32utils.py:163
7412
7610
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7413
7611
msgstr ""
7414
7612
7415
#: bzrlib/win32utils.py:166
7613
#: bzrlib/win32utils.py:171
7416
7614
#, python-format
7417
7615
msgid "WorkingSize %8d KiB"
7418
7616
msgstr ""
7419
7617
7420
#: bzrlib/win32utils.py:167
7618
#: bzrlib/win32utils.py:172
7421
7619
#, python-format
7422
7620
msgid "PeakWorking %8d KiB"
7423
7621
msgstr ""
7424
7622
7425
#: bzrlib/win32utils.py:168
7623
#: bzrlib/win32utils.py:173
7426
7624
#, python-format
7427
7625
msgid "PagefileUsage %8d KiB"
7428
7626
msgstr ""
7429
7627
7430
#: bzrlib/win32utils.py:169
7628
#: bzrlib/win32utils.py:174
7431
7629
#, python-format
7432
7630
msgid "PeakPagefileUsage %8d KiB"
7433
7631
msgstr ""
7434
7632
7435
#: bzrlib/win32utils.py:171
7633
#: bzrlib/win32utils.py:176
7436
7634
#, python-format
7437
7635
msgid "PrivateUsage %8d KiB"
7438
7636
msgstr ""
7439
7637
7440
#: bzrlib/win32utils.py:172
7638
#: bzrlib/win32utils.py:177
7441
7639
#, python-format
7442
7640
msgid "PageFaultCount %8d"
7443
7641
msgstr ""
7444
7642
7445
#: bzrlib/workingtree.py:1509
7643
#: bzrlib/workingtree.py:1467
7446
7644
msgid "Rerun update after fixing the conflicts."
7447
7645
msgstr ""
7448
7646
7452
7650
7453
7651
#: dummy/help_topics/basic/detail.txt:1
7454
7652
msgid ""
7455
"Bazaar 2.5b3 -- a free distributed version-control tool\n"
7653
"Bazaar 2.5b4 -- a free distributed version-control tool\n"
7456
7654
"http://bazaar.canonical.com/"
7457
7655
msgstr ""
7458
7656
9005
9203
"diff Show differences in the working tree, between revisions "
9006
9204
"or\n"
9007
9205
" branches.\n"
9206
"dpush Push into a different VCS without any custom bzr "
9207
"metadata.\n"
9008
9208
"export Export current or past revision to a destination directory "
9009
9209
"or\n"
9010
9210
" archive.\n"
9675
9875
msgstr ""
9676
9876
9677
9877
#: en/help_topics/configuration.txt:321
9878
msgid "Another such option is ``basename`` which can be used like this::"
9879
msgstr ""
9880
9881
#: en/help_topics/configuration.txt:323
9882
msgid ""
9883
" [/home/vila/src/bzr]\n"
9884
" mypush = lp:~vila/bzr/{basename}"
9885
msgstr ""
9886
9887
#: en/help_topics/configuration.txt:326
9888
msgid ""
9889
"When used in a directory like\n"
9890
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9891
msgstr ""
9892
9893
#: en/help_topics/configuration.txt:332
9894
msgid ""
9895
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9896
"itself is defined as the relative path between the section name and the\n"
9897
"location it matches."
9898
msgstr ""
9899
9900
#: en/help_topics/configuration.txt:336
9678
9901
msgid ""
9679
9902
"When an option is local to a Section, it cannot be referred to from option\n"
9680
9903
"values in any other section from the same ``Store`` nor from any other\n"
9681
9904
"``Store``."
9682
9905
msgstr ""
9683
9906
9684
#: en/help_topics/configuration.txt:325
9907
#: en/help_topics/configuration.txt:340
9685
9908
msgid ""
9686
9909
"\n"
9687
9910
"The main configuration file, bazaar.conf\n"
9688
9911
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9689
9912
msgstr ""
9690
9913
9691
#: en/help_topics/configuration.txt:329
9914
#: en/help_topics/configuration.txt:344
9692
9915
msgid ""
9693
9916
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9694
9917
"The default section contains the default\n"
9696
9919
"overriden by providing a branch-specific section in ``locations.conf``."
9697
9920
msgstr ""
9698
9921
9699
#: en/help_topics/configuration.txt:334
9922
#: en/help_topics/configuration.txt:349
9700
9923
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9701
9924
msgstr ""
9702
9925
9703
#: en/help_topics/configuration.txt:336
9926
#: en/help_topics/configuration.txt:351
9704
9927
msgid ""
9705
9928
" [DEFAULT]\n"
9706
9929
" email = John Doe <jdoe@isp.com>\n"
9708
9931
" create_signatures = when-required"
9709
9932
msgstr ""
9710
9933
9711
#: en/help_topics/configuration.txt:341
9934
#: en/help_topics/configuration.txt:356
9712
9935
msgid ""
9713
9936
"\n"
9714
9937
"The branch location configuration file, locations.conf\n"
9715
9938
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9716
9939
msgstr ""
9717
9940
9718
#: en/help_topics/configuration.txt:345
9941
#: en/help_topics/configuration.txt:360
9719
9942
msgid ""
9720
9943
"``locations.conf`` allows one to specify overriding settings for\n"
9721
9944
"a specific branch. The format is almost identical to the default section in\n"
9725
9948
"for. The '?' and '*' wildcards are supported::"
9726
9949
msgstr ""
9727
9950
9728
#: en/help_topics/configuration.txt:351
9951
#: en/help_topics/configuration.txt:366
9729
9952
msgid ""
9730
9953
" [/home/jdoe/branches/nethack]\n"
9731
9954
" email = Nethack Admin <nethack@nethack.com>"
9732
9955
msgstr ""
9733
9956
9734
#: en/help_topics/configuration.txt:354
9957
#: en/help_topics/configuration.txt:369
9735
9958
msgid ""
9736
9959
" [http://hypothetical.site.com/branches/devel-branch]\n"
9737
9960
" create_signatures = always"
9738
9961
msgstr ""
9739
9962
9740
#: en/help_topics/configuration.txt:357
9963
#: en/help_topics/configuration.txt:372
9741
9964
msgid ""
9742
9965
"The authentication configuration file, authentication.conf\n"
9743
9966
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9744
9967
msgstr ""
9745
9968
9746
#: en/help_topics/configuration.txt:360
9969
#: en/help_topics/configuration.txt:375
9747
9970
msgid ""
9748
9971
"``authentication.conf`` allows one to specify credentials for\n"
9749
9972
"remote servers. This can be used for all the supported transports and any "
9751
9974
"of bzr that requires authentication (smtp for example)."
9752
9975
msgstr ""
9753
9976
9754
#: en/help_topics/configuration.txt:364
9977
#: en/help_topics/configuration.txt:379
9755
9978
msgid ""
9756
9979
"The syntax of the file obeys the same rules as the others except for the\n"
9757
9980
"option policies which don't apply."
9758
9981
msgstr ""
9759
9982
9760
#: en/help_topics/configuration.txt:367
9983
#: en/help_topics/configuration.txt:382
9761
9984
msgid ""
9762
9985
"For more information on the possible uses of the authentication "
9763
9986
"configuration\n"
9764
9987
"file see :doc:`authentication-help`."
9765
9988
msgstr ""
9766
9989
9767
#: en/help_topics/configuration.txt:370
9990
#: en/help_topics/configuration.txt:385
9768
9991
msgid ""
9769
9992
"\n"
9770
9993
"Common options\n"
9771
9994
"--------------"
9772
9995
msgstr ""
9773
9996
9774
#: en/help_topics/configuration.txt:374
9997
#: en/help_topics/configuration.txt:389
9775
9998
msgid ""
9776
9999
"debug_flags\n"
9777
10000
"~~~~~~~~~~~"
9778
10001
msgstr ""
9779
10002
9780
#: en/help_topics/configuration.txt:377
10003
#: en/help_topics/configuration.txt:392
9781
10004
msgid ""
9782
10005
"A comma-separated list of debugging options to turn on. The same values\n"
9783
10006
"can be used as with the -D command-line option (see `help global-options`).\n"
9784
10007
"For example::"
9785
10008
msgstr ""
9786
10009
9787
#: en/help_topics/configuration.txt:381
10010
#: en/help_topics/configuration.txt:396
9788
10011
msgid " debug_flags = hpss"
9789
10012
msgstr ""
9790
10013
9791
#: en/help_topics/configuration.txt:385
10014
#: en/help_topics/configuration.txt:400
9792
10015
msgid " debug_flags = hpss,evil"
9793
10016
msgstr ""
9794
10017
9795
#: en/help_topics/configuration.txt:387
10018
#: en/help_topics/configuration.txt:402
9796
10019
msgid ""
9797
10020
"email\n"
9798
10021
"~~~~~"
9799
10022
msgstr ""
9800
10023
9801
#: en/help_topics/configuration.txt:390
10024
#: en/help_topics/configuration.txt:405
9802
10025
msgid ""
9803
10026
"The email address to use when committing a branch. Typically takes the form\n"
9804
10027
"of::"
9805
10028
msgstr ""
9806
10029
9807
#: en/help_topics/configuration.txt:393
10030
#: en/help_topics/configuration.txt:408
9808
10031
msgid " email = Full Name <account@hostname.tld>"
9809
10032
msgstr ""
9810
10033
9811
#: en/help_topics/configuration.txt:395
10034
#: en/help_topics/configuration.txt:410
9812
10035
msgid ""
9813
10036
"editor\n"
9814
10037
"~~~~~~"
9815
10038
msgstr ""
9816
10039
9817
#: en/help_topics/configuration.txt:398
10040
#: en/help_topics/configuration.txt:413
9818
10041
msgid ""
9819
10042
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9820
10043
"a commit message. This setting is trumped by the environment variable\n"
9822
10045
"variables."
9823
10046
msgstr ""
9824
10047
9825
#: en/help_topics/configuration.txt:403
10048
#: en/help_topics/configuration.txt:418
9826
10049
msgid ""
9827
10050
"log_format\n"
9828
10051
"~~~~~~~~~~"
9829
10052
msgstr ""
9830
10053
9831
#: en/help_topics/configuration.txt:406
10054
#: en/help_topics/configuration.txt:421
9832
10055
msgid ""
9833
10056
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9834
10057
"and ``line``. Additional formats may be provided by plugins. The default\n"
9835
10058
"value is ``long``."
9836
10059
msgstr ""
9837
10060
9838
#: en/help_topics/configuration.txt:410
10061
#: en/help_topics/configuration.txt:425
9839
10062
msgid ""
9840
10063
"check_signatures\n"
9841
10064
"~~~~~~~~~~~~~~~~"
9842
10065
msgstr ""
9843
10066
9844
#: en/help_topics/configuration.txt:413
10067
#: en/help_topics/configuration.txt:428
9845
10068
msgid ""
9846
10069
"Reserved for future use. These options will allow a policy for branches to\n"
9847
10070
"require signatures."
9848
10071
msgstr ""
9849
10072
9850
#: en/help_topics/configuration.txt:416
10073
#: en/help_topics/configuration.txt:431
9851
10074
msgid ""
9852
10075
"require\n"
9853
10076
" The gnupg signature for revisions must be present and must be valid."
9854
10077
msgstr ""
9855
10078
9856
#: en/help_topics/configuration.txt:419
10079
#: en/help_topics/configuration.txt:434
9857
10080
msgid ""
9858
10081
"ignore\n"
9859
10082
" Do not check gnupg signatures of revisions."
9860
10083
msgstr ""
9861
10084
9862
#: en/help_topics/configuration.txt:422
10085
#: en/help_topics/configuration.txt:437
9863
10086
msgid ""
9864
10087
"check-available\n"
9865
10088
" (default) If gnupg signatures for revisions are present, check them.\n"
9867
10090
" no signature is present."
9868
10091
msgstr ""
9869
10092
9870
#: en/help_topics/configuration.txt:427
10093
#: en/help_topics/configuration.txt:442
9871
10094
msgid ""
9872
10095
"create_signatures\n"
9873
10096
"~~~~~~~~~~~~~~~~~"
9874
10097
msgstr ""
9875
10098
9876
#: en/help_topics/configuration.txt:430
10099
#: en/help_topics/configuration.txt:445
9877
10100
msgid ""
9878
10101
"Defines the behaviour of signing revisions on commits. By default bzr will "
9879
10102
"not\n"
9880
10103
"sign new commits."
9881
10104
msgstr ""
9882
10105
9883
#: en/help_topics/configuration.txt:433
10106
#: en/help_topics/configuration.txt:448
9884
10107
msgid ""
9885
10108
"always\n"
9886
10109
" Sign every new revision that is committed. If the signing fails then "
9888
10111
" commit will not be made."
9889
10112
msgstr ""
9890
10113
9891
#: en/help_topics/configuration.txt:437
10114
#: en/help_topics/configuration.txt:452
9892
10115
msgid ""
9893
10116
"when-required\n"
9894
10117
" Reserved for future use."
9895
10118
msgstr ""
9896
10119
9897
#: en/help_topics/configuration.txt:440
10120
#: en/help_topics/configuration.txt:455
9898
10121
msgid ""
9899
10122
"never\n"
9900
10123
" Reserved for future use."
9901
10124
msgstr ""
9902
10125
9903
#: en/help_topics/configuration.txt:443
10126
#: en/help_topics/configuration.txt:458
9904
10127
msgid ""
9905
10128
"In future it is planned that ``when-required`` will sign newly\n"
9906
10129
"committed revisions only when the branch requires them. ``never`` will "
9908
10131
"to sign newly committed revisions, even if the branch requires signatures."
9909
10132
msgstr ""
9910
10133
9911
#: en/help_topics/configuration.txt:447
10134
#: en/help_topics/configuration.txt:462
9912
10135
msgid ""
9913
10136
"dirstate.fdatasync\n"
9914
10137
"~~~~~~~~~~~~~~~~~~"
9915
10138
msgstr ""
9916
10139
9917
#: en/help_topics/configuration.txt:450
10140
#: en/help_topics/configuration.txt:465
9918
10141
msgid ""
9919
10142
"If true (default), working tree metadata changes are flushed through the\n"
9920
10143
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9921
10144
"should not be lost if the machine crashes. See also repository.fdatasync."
9922
10145
msgstr ""
9923
10146
9924
#: en/help_topics/configuration.txt:454
10147
#: en/help_topics/configuration.txt:469
9925
10148
msgid ""
9926
10149
"gpg_signing_key\n"
9927
10150
"~~~~~~~~~~~~~~~"
9928
10151
msgstr ""
9929
10152
9930
#: en/help_topics/configuration.txt:457
10153
#: en/help_topics/configuration.txt:472
9931
10154
msgid ""
9932
10155
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9933
10156
"address, key fingerprint or full key ID. When unset or when set to\n"
9934
10157
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9935
10158
msgstr ""
9936
10159
9937
#: en/help_topics/configuration.txt:461
10160
#: en/help_topics/configuration.txt:476
9938
10161
msgid ""
9939
10162
"recurse\n"
9940
10163
"~~~~~~~"
9941
10164
msgstr ""
9942
10165
9943
#: en/help_topics/configuration.txt:464
10166
#: en/help_topics/configuration.txt:479
9944
10167
msgid ""
9945
10168
"Only useful in ``locations.conf``. Defines whether or not the\n"
9946
10169
"configuration for this section applies to subdirectories:"
9947
10170
msgstr ""
9948
10171
9949
#: en/help_topics/configuration.txt:467
10172
#: en/help_topics/configuration.txt:482
9950
10173
msgid ""
9951
10174
"true\n"
9952
10175
" (default) This section applies to subdirectories as well."
9953
10176
msgstr ""
9954
10177
9955
#: en/help_topics/configuration.txt:470
10178
#: en/help_topics/configuration.txt:485
9956
10179
msgid ""
9957
10180
"false\n"
9958
10181
" This section only applies to the branch at this directory and not\n"
9959
10182
" branches below it."
9960
10183
msgstr ""
9961
10184
9962
#: en/help_topics/configuration.txt:474
10185
#: en/help_topics/configuration.txt:489
9963
10186
msgid ""
9964
10187
"gpg_signing_command\n"
9965
10188
"~~~~~~~~~~~~~~~~~~~"
9966
10189
msgstr ""
9967
10190
9968
#: en/help_topics/configuration.txt:477
10191
#: en/help_topics/configuration.txt:492
9969
10192
msgid ""
9970
10193
"(Default: \"gpg\"). Which program should be used to sign and check "
9971
10194
"revisions.\n"
9972
10195
"For example::"
9973
10196
msgstr ""
9974
10197
9975
#: en/help_topics/configuration.txt:480
10198
#: en/help_topics/configuration.txt:495
9976
10199
msgid " gpg_signing_command = /usr/bin/gnpg"
9977
10200
msgstr ""
9978
10201
9979
#: en/help_topics/configuration.txt:482
10202
#: en/help_topics/configuration.txt:497
9980
10203
msgid ""
9981
10204
"The specified command must accept the options \"--clearsign\" and \"-u "
9982
10205
"<email>\"."
9983
10206
msgstr ""
9984
10207
9985
#: en/help_topics/configuration.txt:484
10208
#: en/help_topics/configuration.txt:499
9986
10209
msgid ""
9987
10210
"bzr_remote_path\n"
9988
10211
"~~~~~~~~~~~~~~~"
9989
10212
msgstr ""
9990
10213
9991
#: en/help_topics/configuration.txt:487
10214
#: en/help_topics/configuration.txt:502
9992
10215
msgid ""
9993
10216
"(Default: \"bzr\"). The path to the command that should be used to run the "
9994
10217
"smart\n"
9995
10218
"server for bzr. This value may only be specified in locations.conf, because:"
9996
10219
msgstr ""
9997
10220
9998
#: en/help_topics/configuration.txt:490
10221
#: en/help_topics/configuration.txt:505
9999
10222
msgid ""
10000
10223
"- it's needed before branch.conf is accessible\n"
10001
10224
"- allowing remote branch.conf files to specify commands would be a security\n"
10002
10225
" risk"
10003
10226
msgstr ""
10004
10227
10005
#: en/help_topics/configuration.txt:494
10228
#: en/help_topics/configuration.txt:509
10006
10229
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10007
10230
msgstr ""
10008
10231
10009
#: en/help_topics/configuration.txt:496
10232
#: en/help_topics/configuration.txt:511
10010
10233
msgid ""
10011
10234
"smtp_server\n"
10012
10235
"~~~~~~~~~~~"
10013
10236
msgstr ""
10014
10237
10015
#: en/help_topics/configuration.txt:499
10238
#: en/help_topics/configuration.txt:514
10016
10239
msgid ""
10017
10240
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10018
10241
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10019
10242
msgstr ""
10020
10243
10021
#: en/help_topics/configuration.txt:502
10244
#: en/help_topics/configuration.txt:517
10022
10245
msgid ""
10023
10246
"smtp_username, smtp_password\n"
10024
10247
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10025
10248
msgstr ""
10026
10249
10027
#: en/help_topics/configuration.txt:505
10250
#: en/help_topics/configuration.txt:520
10028
10251
msgid ""
10029
10252
"User and password to authenticate to the SMTP server. If smtp_username\n"
10030
10253
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10032
10255
"to send mail."
10033
10256
msgstr ""
10034
10257
10035
#: en/help_topics/configuration.txt:510
10258
#: en/help_topics/configuration.txt:525
10036
10259
msgid ""
10037
10260
"locks.steal_dead\n"
10038
10261
"~~~~~~~~~~~~~~~~"
10039
10262
msgstr ""
10040
10263
10041
#: en/help_topics/configuration.txt:513
10264
#: en/help_topics/configuration.txt:528
10042
10265
msgid ""
10043
10266
"If set to true, bzr will automatically break locks held by processes from\n"
10044
10267
"the same machine and user that are no longer alive. Otherwise, it will\n"
10046
10269
"the object is no longer in use."
10047
10270
msgstr ""
10048
10271
10049
#: en/help_topics/configuration.txt:518
10272
#: en/help_topics/configuration.txt:533
10050
10273
msgid ""
10051
10274
"mail_client\n"
10052
10275
"~~~~~~~~~~~"
10053
10276
msgstr ""
10054
10277
10055
#: en/help_topics/configuration.txt:521
10278
#: en/help_topics/configuration.txt:536
10056
10279
msgid ""
10057
10280
"A mail client to use for sending merge requests.\n"
10058
10281
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10061
10284
"``editor``."
10062
10285
msgstr ""
10063
10286
10064
#: en/help_topics/configuration.txt:526
10287
#: en/help_topics/configuration.txt:541
10065
10288
msgid "Supported values for specific clients:"
10066
10289
msgstr ""
10067
10290
10068
#: en/help_topics/configuration.txt:528
10291
#: en/help_topics/configuration.txt:543
10069
10292
msgid ""
10070
10293
":claws: Use Claws. This skips a dialog for attaching files.\n"
10071
10294
":evolution: Use Evolution.\n"
10076
10299
" this works around some bugs that xdg-email doesn't handle."
10077
10300
msgstr ""
10078
10301
10079
#: en/help_topics/configuration.txt:535
10302
#: en/help_topics/configuration.txt:550
10080
10303
msgid "Supported generic values are:"
10081
10304
msgstr ""
10082
10305
10083
#: en/help_topics/configuration.txt:537
10306
#: en/help_topics/configuration.txt:552
10084
10307
msgid ""
10085
10308
":default: See above.\n"
10086
10309
":editor: Use your editor to compose the merge request. This also uses\n"
10090
10313
":xdg-email: Use xdg-email to run your preferred mail program"
10091
10314
msgstr ""
10092
10315
10093
#: en/help_topics/configuration.txt:544
10316
#: en/help_topics/configuration.txt:559
10094
10317
msgid ""
10095
10318
"repository.fdatasync\n"
10096
10319
"~~~~~~~~~~~~~~~~~~~~"
10097
10320
msgstr ""
10098
10321
10099
#: en/help_topics/configuration.txt:547
10322
#: en/help_topics/configuration.txt:562
10100
10323
msgid ""
10101
10324
"If true (default), repository changes are flushed through the OS buffers\n"
10102
10325
"to physical disk. This is somewhat slower, but means data should not be\n"
10103
10326
"lost if the machine crashes. See also dirstate.fdatasync."
10104
10327
msgstr ""
10105
10328
10106
#: en/help_topics/configuration.txt:551
10329
#: en/help_topics/configuration.txt:566
10107
10330
msgid ""
10108
10331
"submit_branch\n"
10109
10332
"~~~~~~~~~~~~~"
10110
10333
msgstr ""
10111
10334
10112
#: en/help_topics/configuration.txt:554
10335
#: en/help_topics/configuration.txt:569
10113
10336
msgid ""
10114
10337
"The branch you intend to submit your current work to. This is "
10115
10338
"automatically\n"
10118
10341
"should usually be set on a per-branch or per-location basis."
10119
10342
msgstr ""
10120
10343
10121
#: en/help_topics/configuration.txt:558
10344
#: en/help_topics/configuration.txt:573
10122
10345
msgid ""
10123
10346
"public_branch\n"
10124
10347
"~~~~~~~~~~~~~"
10125
10348
msgstr ""
10126
10349
10127
#: en/help_topics/configuration.txt:561
10350
#: en/help_topics/configuration.txt:576
10128
10351
msgid ""
10129
10352
"A publically-accessible version of this branch (implying that this version "
10130
10353
"is\n"
10131
10354
"not publically-accessible). Used (and set) by ``bzr send``."
10132
10355
msgstr ""
10133
10356
10134
#: en/help_topics/configuration.txt:564
10357
#: en/help_topics/configuration.txt:579
10135
10358
msgid ""
10136
10359
"suppress_warnings\n"
10137
10360
"~~~~~~~~~~~~~~~~~"
10138
10361
msgstr ""
10139
10362
10140
#: en/help_topics/configuration.txt:567
10363
#: en/help_topics/configuration.txt:582
10141
10364
msgid ""
10142
10365
"A list of strings, each string represent a warning that can be emitted by\n"
10143
10366
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10144
10367
msgstr ""
10145
10368
10146
#: en/help_topics/configuration.txt:570
10369
#: en/help_topics/configuration.txt:585
10147
10370
msgid "Valid values:"
10148
10371
msgstr ""
10149
10372
10150
#: en/help_topics/configuration.txt:572
10373
#: en/help_topics/configuration.txt:587
10151
10374
msgid ""
10152
10375
"* ``format_deprecation``:\n"
10153
10376
" whether the format deprecation warning is shown on repositories that "
10155
10378
" using deprecated formats."
10156
10379
msgstr ""
10157
10380
10158
#: en/help_topics/configuration.txt:576
10381
#: en/help_topics/configuration.txt:591
10159
10382
msgid ""
10160
10383
"default_format\n"
10161
10384
"~~~~~~~~~~~~~~"
10162
10385
msgstr ""
10163
10386
10164
#: en/help_topics/configuration.txt:579
10387
#: en/help_topics/configuration.txt:594
10165
10388
msgid ""
10166
10389
"A format name for the default format used when creating branches. See "
10167
10390
"``bzr\n"
10168
10391
"help formats`` for possible values."
10169
10392
msgstr ""
10170
10393
10171
#: en/help_topics/configuration.txt:582
10394
#: en/help_topics/configuration.txt:597
10172
10395
msgid ""
10173
10396
"\n"
10174
10397
"Unicode options\n"
10175
10398
"---------------"
10176
10399
msgstr ""
10177
10400
10178
#: en/help_topics/configuration.txt:586
10401
#: en/help_topics/configuration.txt:601
10179
10402
msgid ""
10180
10403
"output_encoding\n"
10181
10404
"~~~~~~~~~~~~~~~"
10182
10405
msgstr ""
10183
10406
10184
#: en/help_topics/configuration.txt:589
10407
#: en/help_topics/configuration.txt:604
10185
10408
msgid ""
10186
10409
"A Python unicode encoding name for text output from bzr, such as log\n"
10187
10410
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10188
10411
"is the terminal encoding prefered by the operating system."
10189
10412
msgstr ""
10190
10413
10191
#: en/help_topics/configuration.txt:593
10414
#: en/help_topics/configuration.txt:608
10192
10415
msgid ""
10193
10416
"\n"
10194
10417
"Branch type specific options\n"
10195
10418
"----------------------------"
10196
10419
msgstr ""
10197
10420
10198
#: en/help_topics/configuration.txt:597
10421
#: en/help_topics/configuration.txt:612
10199
10422
msgid ""
10200
10423
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10201
10424
"later format. They\n"
10203
10426
"manually set in ``locations.conf`` or ``bazaar.conf``."
10204
10427
msgstr ""
10205
10428
10206
#: en/help_topics/configuration.txt:602
10429
#: en/help_topics/configuration.txt:617
10207
10430
msgid ""
10208
10431
"append_revisions_only\n"
10209
10432
"~~~~~~~~~~~~~~~~~~~~~"
10210
10433
msgstr ""
10211
10434
10212
#: en/help_topics/configuration.txt:605
10435
#: en/help_topics/configuration.txt:620
10213
10436
msgid ""
10214
10437
"If set to \"True\" then revisions can only be appended to the log, not\n"
10215
10438
"removed. A branch with this setting enabled can only pull from another\n"
10219
10442
"compatibility with previous bzr versions (older than 2.2)."
10220
10443
msgstr ""
10221
10444
10222
#: en/help_topics/configuration.txt:612
10445
#: en/help_topics/configuration.txt:627
10223
10446
msgid ""
10224
10447
"parent_location\n"
10225
10448
"~~~~~~~~~~~~~~~"
10226
10449
msgstr ""
10227
10450
10228
#: en/help_topics/configuration.txt:615
10451
#: en/help_topics/configuration.txt:630
10229
10452
msgid ""
10230
10453
"If present, the location of the default branch for pull or merge. This "
10231
10454
"option\n"
10233
10456
"--remember``."
10234
10457
msgstr ""
10235
10458
10236
#: en/help_topics/configuration.txt:619
10459
#: en/help_topics/configuration.txt:634
10237
10460
msgid ""
10238
10461
"push_location\n"
10239
10462
"~~~~~~~~~~~~~"
10240
10463
msgstr ""
10241
10464
10242
#: en/help_topics/configuration.txt:622
10465
#: en/help_topics/configuration.txt:637
10243
10466
msgid ""
10244
10467
"If present, the location of the default branch for push. This option\n"
10245
10468
"is normally set by the first ``push`` or ``push --remember``."
10246
10469
msgstr ""
10247
10470
10248
#: en/help_topics/configuration.txt:625
10471
#: en/help_topics/configuration.txt:640
10249
10472
msgid ""
10250
10473
"push_strict\n"
10251
10474
"~~~~~~~~~~~"
10252
10475
msgstr ""
10253
10476
10254
#: en/help_topics/configuration.txt:628
10477
#: en/help_topics/configuration.txt:643
10255
10478
msgid ""
10256
10479
"If present, defines the ``--strict`` option default value for checking\n"
10257
10480
"uncommitted changes before pushing."
10258
10481
msgstr ""
10259
10482
10260
#: en/help_topics/configuration.txt:631
10483
#: en/help_topics/configuration.txt:646
10261
10484
msgid ""
10262
10485
"dpush_strict\n"
10263
10486
"~~~~~~~~~~~~"
10264
10487
msgstr ""
10265
10488
10266
#: en/help_topics/configuration.txt:634
10489
#: en/help_topics/configuration.txt:649
10267
10490
msgid ""
10268
10491
"If present, defines the ``--strict`` option default value for checking\n"
10269
10492
"uncommitted changes before pushing into a different VCS without any\n"
10270
10493
"custom bzr metadata."
10271
10494
msgstr ""
10272
10495
10273
#: en/help_topics/configuration.txt:638
10496
#: en/help_topics/configuration.txt:653
10274
10497
msgid ""
10275
10498
"bound_location\n"
10276
10499
"~~~~~~~~~~~~~~"
10277
10500
msgstr ""
10278
10501
10279
#: en/help_topics/configuration.txt:641
10502
#: en/help_topics/configuration.txt:656
10280
10503
msgid ""
10281
10504
"The location that commits should go to when acting as a checkout.\n"
10282
10505
"This option is normally set by ``bind``."
10283
10506
msgstr ""
10284
10507
10285
#: en/help_topics/configuration.txt:644
10508
#: en/help_topics/configuration.txt:659
10286
10509
msgid ""
10287
10510
"bound\n"
10288
10511
"~~~~~"
10289
10512
msgstr ""
10290
10513
10291
#: en/help_topics/configuration.txt:647
10514
#: en/help_topics/configuration.txt:662
10292
10515
msgid ""
10293
10516
"If set to \"True\", the branch should act as a checkout, and push each "
10294
10517
"commit to\n"
10295
10518
"the bound_location. This option is normally set by ``bind``/``unbind``."
10296
10519
msgstr ""
10297
10520
10298
#: en/help_topics/configuration.txt:650
10521
#: en/help_topics/configuration.txt:665
10299
10522
msgid ""
10300
10523
"send_strict\n"
10301
10524
"~~~~~~~~~~~"
10302
10525
msgstr ""
10303
10526
10304
#: en/help_topics/configuration.txt:653
10527
#: en/help_topics/configuration.txt:668
10305
10528
msgid ""
10306
10529
"If present, defines the ``--strict`` option default value for checking\n"
10307
10530
"uncommitted changes before sending a merge directive."
10308
10531
msgstr ""
10309
10532
10310
#: en/help_topics/configuration.txt:656
10533
#: en/help_topics/configuration.txt:671
10311
10534
msgid ""
10312
10535
"add.maximum_file_size\n"
10313
10536
"~~~~~~~~~~~~~~~~~~~~~"
10314
10537
msgstr ""
10315
10538
10316
#: en/help_topics/configuration.txt:659
10539
#: en/help_topics/configuration.txt:674
10317
10540
msgid ""
10318
10541
"Defines the maximum file size the command line \"add\" operation will allow\n"
10319
10542
"in recursive mode, with files larger than this value being skipped. You "
10325
10548
"will disable skipping."
10326
10549
msgstr ""
10327
10550
10328
#: en/help_topics/configuration.txt:665
10551
#: en/help_topics/configuration.txt:680
10329
10552
msgid ""
10330
10553
"External Merge Tools\n"
10331
10554
"--------------------"
10332
10555
msgstr ""
10333
10556
10334
#: en/help_topics/configuration.txt:668
10557
#: en/help_topics/configuration.txt:683
10335
10558
msgid ""
10336
10559
"bzr.mergetool.<name>\n"
10337
10560
"~~~~~~~~~~~~~~~~~~~~"
10338
10561
msgstr ""
10339
10562
10340
#: en/help_topics/configuration.txt:671
10563
#: en/help_topics/configuration.txt:686
10341
10564
msgid ""
10342
10565
"Defines an external merge tool called <name> with the given command-line.\n"
10343
10566
"Arguments containing spaces should be quoted using single or double quotes. "
10345
10568
"executable may omit its path if it can be found on the PATH."
10346
10569
msgstr ""
10347
10570
10348
#: en/help_topics/configuration.txt:675
10571
#: en/help_topics/configuration.txt:690
10349
10572
msgid ""
10350
10573
"The following markers can be used in the command-line to substitute "
10351
10574
"filenames\n"
10352
10575
"involved in the merge conflict::"
10353
10576
msgstr ""
10354
10577
10355
#: en/help_topics/configuration.txt:678
10578
#: en/help_topics/configuration.txt:693
10356
10579
msgid ""
10357
10580
" {base} file.BASE\n"
10358
10581
" {this} file.THIS\n"
10363
10586
" succeeds."
10364
10587
msgstr ""
10365
10588
10366
#: en/help_topics/configuration.txt:687
10589
#: en/help_topics/configuration.txt:702
10367
10590
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10368
10591
msgstr ""
10369
10592
10370
#: en/help_topics/configuration.txt:689
10593
#: en/help_topics/configuration.txt:704
10371
10594
msgid ""
10372
10595
"bzr.default_mergetool\n"
10373
10596
"~~~~~~~~~~~~~~~~~~~~~"
10374
10597
msgstr ""
10375
10598
10376
#: en/help_topics/configuration.txt:692
10599
#: en/help_topics/configuration.txt:707
10377
10600
msgid ""
10378
10601
"Specifies which external merge tool (as defined above) should be selected "
10379
10602
"by\n"
10380
10603
"default in tools such as ``bzr qconflicts``."
10381
10604
msgstr ""
10382
10605
10383
#: en/help_topics/configuration.txt:697
10606
#: en/help_topics/configuration.txt:712
10384
10607
msgid " bzr.default_mergetool = kdiff3\n"
10385
10608
msgstr ""
10386
10609
11173
11396
#: en/help_topics/current-formats.txt:3
11174
11397
msgid ""
11175
11398
":2a:\n"
11176
" (native) (default) First format for bzr 2.0 series. Uses group-\n"
11399
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11177
11400
" compress storage. Provides rich roots which are a one-way\n"
11178
11401
" transition."
11179
11402
msgstr ""
11180
11403
11181
11404
#: en/help_topics/current-formats.txt:8
11182
11405
msgid ""
11183
":pack-0.92:\n"
11184
" (native) New in 0.92: Pack-based format with data compatible with\n"
11185
" dirstate-tags format repositories. Interoperates with bzr\n"
11186
" repositories before 0.92 but cannot be read by bzr < 0.92."
11187
msgstr ""
11188
11189
#: en/help_topics/current-formats.txt:13
11190
msgid ""
11191
":1.14:\n"
11192
" (native) A working-tree format that supports content filtering."
11193
msgstr ""
11194
11195
#: en/help_topics/current-formats.txt:16
11196
msgid ""
11197
":1.14-rich-root:\n"
11198
" (native) A variant of 1.14 that supports rich-root data (needed\n"
11199
" for bzr-svn and bzr-git)."
11200
msgstr ""
11201
11202
#: en/help_topics/current-formats.txt:20
11203
msgid ""
11204
":development-colo:\n"
11205
" (native) The 2a format with experimental support for colocated\n"
11206
" branches."
11207
msgstr ""
11208
11209
#: en/help_topics/current-formats.txt:24
11210
msgid ""
11211
11406
"\n"
11212
11407
"See :doc:`formats-help` for more about storage formats."
11213
11408
msgstr ""
11249
11444
"-Dindex Trace major index operations.\n"
11250
11445
"-Dknit Trace knit operations.\n"
11251
11446
"-Dlock Trace when lockdir locks are taken or released.\n"
11447
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11448
" retrying the request.\n"
11252
11449
"-Dprogress Trace progress bar operations.\n"
11253
11450
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11254
11451
"-Dmerge Emit information for debugging merges.\n"
11546
11743
"bundle-info Output interesting stats about a bundle\n"
11547
11744
"bundle-revisions Create a merge-directive for submitting changes.\n"
11548
11745
"cat-revision Write out metadata for a revision.\n"
11549
"dpush Push into a different VCS without any custom bzr "
11550
"metadata.\n"
11551
11746
"dump-btree Dump the contents of a btree index file to stdout.\n"
11552
11747
"export-pot Export command helps and error messages in po format.\n"
11553
11748
"file-id Print file_id of a particular file or directory.\n"
12378
12573
12379
12574
#: en/help_topics/location-alias.txt:9
12380
12575
msgid ""
12381
" :parent the parent of this branch\n"
12382
" :submit the submit branch for this branch\n"
12383
" :public the public location of this branch\n"
12384
" :bound the branch this branch is bound to, for bound branches\n"
12385
" :push the saved location used for `bzr push` with no arguments\n"
12386
" :this this branch"
12576
" :bound The branch this branch is bound to, for bound branches.\n"
12577
" :parent The parent of this branch.\n"
12578
" :public The public location of this branch.\n"
12579
" :push The saved location used for `bzr push` with no arguments.\n"
12580
" :submit The submit branch for this branch.\n"
12581
" :this This branch."
12387
12582
msgstr ""
12388
12583
12389
12584
#: en/help_topics/location-alias.txt:16
12391
12586
msgstr ""
12392
12587
12393
12588
#: en/help_topics/location-alias.txt:18
12394
msgid " bzr push :parent"
12589
msgid " bzr push :parent\n"
12395
12590
msgstr ""
12396
12591
12397
12592
#: en/help_topics/log-formats.txt:1
12455
12650
msgstr ""
12456
12651
12457
12652
#: en/help_topics/other-formats.txt:3
12458
msgid "No experimental formats are available."
12653
msgid "Experimental formats are shown below."
12459
12654
msgstr ""
12460
12655
12461
12656
#: en/help_topics/other-formats.txt:5
12462
12657
msgid ""
12658
":development-colo:\n"
12659
" (native) The 2a format with experimental support for colocated\n"
12660
" branches."
12661
msgstr ""
12662
12663
#: en/help_topics/other-formats.txt:9
12664
msgid ""
12463
12665
"\n"
12464
"No deprecated formats are available."
12666
"Deprecated formats are shown below."
12667
msgstr ""
12668
12669
#: en/help_topics/other-formats.txt:12
12670
msgid ""
12671
":pack-0.92:\n"
12672
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12673
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12674
" by bzr < 0.92."
12465
12675
msgstr ""
12466
12676
12467
12677
#: en/help_topics/patterns.txt:1
Loggerhead is a web-based interface for Breezy
Version: 2.0.1