« back to all changes in this revision
Viewing changes to po/en_AU.po
- browse files at revision 6093.4.155
- compare with another revision
- download diff
- download tarball
- view history from revision 6093.4.155
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-07-21 04:30:31 UTC
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20120721043031-pjhomz88j0qw381z
Launchpad automatic translations update.
- files modified:
- po/en_AU.po
added
removed
po/en_AU.po
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2011-09-17 01:19+0000\n"
12
"Last-Translator: Joel Pickett <jlkpcktt@gmail.com>\n"
11
"PO-Revision-Date: 2012-07-20 14:35+0000\n"
12
"Last-Translator: Rafael Neri <Unknown>\n"
13
13
"Language-Team: English (Australia) <en_AU@li.org>\n"
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:34+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
18
"X-Launchpad-Export-Date: 2012-07-21 04:30+0000\n"
19
"X-Generator: Launchpad (build 15654)\n"
20
20
21
21
#: bzrlib/add.py:93
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
38
msgstr[0] "%d tag updated."
39
msgstr[1] "%d tags updated."
40
40
41
41
#: bzrlib/branch.py:2960
42
42
msgid "No new revisions or tags to push."
48
48
49
49
#: bzrlib/branch.py:2982
50
50
msgid "checked branch {0} format {1}"
51
msgstr ""
51
msgstr "checked branch {0} format {1}"
52
52
53
53
#: bzrlib/branch.py:2985
54
54
#, python-format
308
308
309
309
#: bzrlib/builtins.py:671
310
310
msgid "--tree and --revision can not be used together"
311
msgstr ""
311
msgstr "--tree and --revision can not be used together"
312
312
313
313
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
314
314
msgid "Tags can only be placed on a single revision, not on a range"
315
msgstr ""
315
msgstr "Tags can only be placed on a single revision, not on a range"
316
316
317
317
#: bzrlib/builtins.py:712
318
318
msgid "Show revno of working tree."
319
msgstr ""
319
msgstr "Show revno of working tree."
320
320
321
321
#: bzrlib/builtins.py:760
322
322
msgid "Add specified files or directories."
355
355
"A warning will be printed when nested trees are encountered,\n"
356
356
"unless they are explicitly ignored."
357
357
msgstr ""
358
"A warning will be printed when nested trees are encountered,\n"
359
"unless they are explicitly ignored."
358
360
359
361
#: bzrlib/builtins.py:777
360
362
msgid ""
516
518
517
519
#: bzrlib/builtins.py:1017
518
520
msgid "can not move root of branch"
519
msgstr ""
521
msgstr "can not move root of branch"
520
522
521
523
#: bzrlib/builtins.py:1023
522
524
msgid "Only one path may be specified to --auto."
584
586
"configuration option. You can use a different format by overriding it with\n"
585
587
"-Olog_format=<other_format>."
586
588
msgstr ""
589
"The --verbose option will display the revisions pulled using the log_format\n"
590
"configuration option. You can use a different format by overriding it with\n"
591
"-Olog_format=<other_format>."
587
592
588
593
#: bzrlib/builtins.py:1138
589
594
msgid ""
696
701
"configuration option. You can use a different format by overriding it with\n"
697
702
"-Olog_format=<other_format>."
698
703
msgstr ""
704
"The --verbose option will display the revisions pushed using the log_format\n"
705
"configuration option. You can use a different format by overriding it with\n"
706
"-Olog_format=<other_format>."
699
707
700
708
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
701
709
msgid ""
725
733
"history. Only the work not present in the referenced branch is included in "
726
734
"the branch created."
727
735
msgstr ""
736
"Create a stacked branch that refers to another branch for the commit "
737
"history. Only the work not present in the referenced branch is included in "
738
"the branch created."
728
739
729
740
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
730
741
msgid ""
731
742
"Refuse to push if there are uncommitted changes in the working tree, --no-"
732
743
"strict disables the check."
733
744
msgstr ""
745
"Refuse to push if there are uncommitted changes in the working tree, --no-"
746
"strict disables the check."
734
747
735
748
#: bzrlib/builtins.py:1315
736
749
msgid "Don't populate the working tree, even for protocols that support it."
737
msgstr ""
750
msgstr "Don't populate the working tree, even for protocols that support it."
738
751
739
752
#: bzrlib/builtins.py:1318
740
753
msgid "Overwrite tags only."
741
msgstr ""
754
msgstr "Overwrite tags only."
742
755
743
756
#: bzrlib/builtins.py:1369
744
757
msgid "Could not determine branch to refer to."
745
msgstr ""
758
msgstr "Could not determine branch to refer to."
746
759
747
760
#: bzrlib/builtins.py:1378
748
761
#, python-format
755
768
756
769
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
757
770
msgid "No push location known or specified."
758
msgstr ""
771
msgstr "No push location known or specified."
759
772
760
773
#: bzrlib/builtins.py:1388
761
774
#, python-format
762
775
msgid "Using saved push location: %s"
763
msgstr ""
776
msgstr "Using saved push location: %s"
764
777
765
778
#: bzrlib/builtins.py:1398
766
779
msgid "Create a new branch that is a copy of an existing branch."
767
msgstr ""
780
msgstr "Create a new branch that is a copy of an existing branch."
768
781
769
782
#: bzrlib/builtins.py:1400
770
783
msgid ""
776
789
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
777
790
"create ./foo-bar."
778
791
msgstr ""
792
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
793
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
794
"./bar.\n"
795
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
796
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
797
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
798
"create ./foo-bar."
779
799
780
800
#: bzrlib/builtins.py:1407
781
801
msgid ""
782
802
"To retrieve the branch as of a particular revision, supply the --revision\n"
783
803
"parameter, as in \"branch foo/bar -r 5\"."
784
804
msgstr ""
805
"To retrieve the branch as of a particular revision, supply the --revision\n"
806
"parameter, as in \"branch foo/bar -r 5\"."
785
807
786
808
#: bzrlib/builtins.py:1410
787
809
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
788
msgstr ""
810
msgstr "The synonyms 'clone' and 'get' for this command are deprecated."
789
811
790
812
#: bzrlib/builtins.py:1420
791
813
msgid "Create a branch without a working-tree."
792
msgstr ""
814
msgstr "Create a branch without a working-tree."
793
815
794
816
#: bzrlib/builtins.py:1422
795
817
msgid "Switch the checkout in the current directory to the new branch."
796
msgstr ""
818
msgstr "Switch the checkout in the current directory to the new branch."
797
819
798
820
#: bzrlib/builtins.py:1425
799
821
msgid ""
800
822
"Create a stacked branch referring to the source branch. The new branch will "
801
823
"depend on the availability of the source branch for all operations."
802
824
msgstr ""
825
"Create a stacked branch referring to the source branch. The new branch will "
826
"depend on the availability of the source branch for all operations."
803
827
804
828
#: bzrlib/builtins.py:1429
805
829
msgid "Do not use a shared repository, even if available."
806
msgstr ""
830
msgstr "Do not use a shared repository, even if available."
807
831
808
832
#: bzrlib/builtins.py:1431
809
833
msgid ""
810
834
"By default branch will fail if the target directory exists, but does not "
811
835
"already have a control directory. This flag will allow branch to proceed."
812
836
msgstr ""
837
"By default branch will fail if the target directory exists, but does not "
838
"already have a control directory. This flag will allow branch to proceed."
813
839
814
840
#: bzrlib/builtins.py:1436
815
841
msgid "Bind new branch to from location."
816
msgstr ""
842
msgstr "Bind new branch to from location."
817
843
818
844
#: bzrlib/builtins.py:1483
819
845
#, python-format
820
846
msgid "Target directory \"%s\" already exists."
821
msgstr ""
847
msgstr "Target directory \"%s\" already exists."
822
848
823
849
#: bzrlib/builtins.py:1495
824
850
#, python-format
825
851
msgid "Parent of \"%s\" does not exist."
826
msgstr ""
852
msgstr "Parent of \"%s\" does not exist."
827
853
828
854
#: bzrlib/builtins.py:1514
829
855
msgid "The branch {0} has no revision {1}."
830
msgstr ""
856
msgstr "The branch {0} has no revision {1}."
831
857
832
858
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
833
859
#, python-format
834
860
msgid "Created new stacked branch referring to %s."
835
msgstr ""
861
msgstr "Created new stacked branch referring to %s."
836
862
837
863
#: bzrlib/builtins.py:1533
838
864
#, python-format
839
865
msgid "Branched %d revision."
840
866
msgid_plural "Branched %d revisions."
841
msgstr[0] ""
842
msgstr[1] ""
867
msgstr[0] "Branched %d revision."
868
msgstr[1] "Branched %d revisions."
843
869
844
870
#: bzrlib/builtins.py:1538
845
871
#, python-format
846
872
msgid "New branch bound to %s"
847
msgstr ""
873
msgstr "New branch bound to %s"
848
874
849
875
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
850
876
#, python-format
851
877
msgid "Switched to branch: %s"
852
msgstr ""
878
msgstr "Switched to branch: %s"
853
879
854
880
#: bzrlib/builtins.py:1548
855
881
msgid "List the branches available at the current location."
856
msgstr ""
882
msgstr "List the branches available at the current location."
857
883
858
884
#: bzrlib/builtins.py:1550
859
885
msgid ""
860
886
"This command will print the names of all the branches at the current\n"
861
887
"location."
862
888
msgstr ""
889
"This command will print the names of all the branches at the current\n"
890
"location."
863
891
864
892
#: bzrlib/builtins.py:1557
865
893
msgid ""
866
894
"Recursively scan for branches rather than just looking in the specified "
867
895
"location."
868
896
msgstr ""
897
"Recursively scan for branches rather than just looking in the specified "
898
"location."
869
899
870
900
#: bzrlib/builtins.py:1586
871
901
msgid "(default)"
873
903
874
904
#: bzrlib/builtins.py:1598
875
905
msgid "Create a new checkout of an existing branch."
876
msgstr ""
906
msgstr "Create a new checkout of an existing branch."
877
907
878
908
#: bzrlib/builtins.py:1600
879
909
msgid ""
884
914
"or if it was never created - i.e. if you pushed the branch to its current\n"
885
915
"location using SFTP."
886
916
msgstr ""
917
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
918
"for\n"
919
"the branch found in '.'. This is useful if you have removed the working "
920
"tree\n"
921
"or if it was never created - i.e. if you pushed the branch to its current\n"
922
"location using SFTP."
887
923
888
924
#: bzrlib/builtins.py:1605
889
925
msgid ""
896
932
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
897
933
"create ./foo-bar."
898
934
msgstr ""
935
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
936
"will\n"
937
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
938
"./bar.\n"
939
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
940
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
941
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
942
"create ./foo-bar."
899
943
900
944
#: bzrlib/builtins.py:1612
901
945
msgid ""
906
950
"old\n"
907
951
"code.)"
908
952
msgstr ""
953
"To retrieve the branch as of a particular revision, supply the --revision\n"
954
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
955
"immediately\n"
956
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
957
"old\n"
958
"code.)"
909
959
910
960
#: bzrlib/builtins.py:1622
911
961
msgid ""
914
964
"operations like diff and status without such access, and also support local "
915
965
"commits."
916
966
msgstr ""
967
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
968
"the branch for every operation. Normal checkouts can perform common "
969
"operations like diff and status without such access, and also support local "
970
"commits."
917
971
918
972
#: bzrlib/builtins.py:1629
919
973
msgid "Get file contents from this tree."
920
msgstr ""
974
msgstr "Get file contents from this tree."
921
975
922
976
#: bzrlib/builtins.py:1631
923
977
msgid "Hard-link working tree files where possible."
924
msgstr ""
978
msgstr "Hard-link working tree files where possible."
925
979
926
980
#: bzrlib/builtins.py:1672
927
981
msgid ""
928
982
"Show list of renamed files.\n"
929
983
" "
930
984
msgstr ""
985
"Show list of renamed files.\n"
986
" "
931
987
932
988
#: bzrlib/builtins.py:1700
933
989
msgid "Update a working tree to a new revision."
934
msgstr ""
990
msgstr "Update a working tree to a new revision."
935
991
936
992
#: bzrlib/builtins.py:1702
937
993
msgid ""
939
995
"branch, or the specified revision) into the working tree, and then make\n"
940
996
"that revision the basis revision for the working tree. "
941
997
msgstr ""
998
"This will perform a merge of the destination revision (the tip of the\n"
999
"branch, or the specified revision) into the working tree, and then make\n"
1000
"that revision the basis revision for the working tree. "
942
1001
943
1002
#: bzrlib/builtins.py:1706
944
1003
msgid ""
945
1004
"You can use this to visit an older revision, or to update a working tree\n"
946
1005
"that is out of date from its branch."
947
1006
msgstr ""
1007
"You can use this to visit an older revision, or to update a working tree\n"
1008
"that is out of date from its branch."
948
1009
949
1010
#: bzrlib/builtins.py:1709
950
1011
msgid ""
953
1014
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
954
1015
"with the changes brought in by the change in basis revision."
955
1016
msgstr ""
1017
"If there are any uncommitted changes in the tree, they will be carried\n"
1018
"across and remain as uncommitted changes after the update. To discard\n"
1019
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1020
"with the changes brought in by the change in basis revision."
956
1021
957
1022
#: bzrlib/builtins.py:1714
958
1023
msgid ""
959
1024
"If the tree's branch is bound to a master branch, bzr will also update\n"
960
1025
"the branch from the master."
961
1026
msgstr ""
1027
"If the tree's branch is bound to a master branch, bzr will also update\n"
1028
"the branch from the master."
962
1029
963
1030
#: bzrlib/builtins.py:1717
964
1031
msgid ""
969
1036
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
970
1037
"out the old content of that file to a new location."
971
1038
msgstr ""
1039
"You cannot update just a single file or directory, because each Bazaar\n"
1040
"working tree has just a single basis revision. If you want to restore a\n"
1041
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1042
"update'. If you want to restore a file to its state in a previous\n"
1043
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1044
"out the old content of that file to a new location."
972
1045
973
1046
#: bzrlib/builtins.py:1724
974
1047
msgid ""
976
1049
"working tree to update. By default, the working tree that contains the \n"
977
1050
"current working directory is used."
978
1051
msgstr ""
1052
"The 'dir' argument, if given, must be the location of the root of a\n"
1053
"working tree to update. By default, the working tree that contains the \n"
1054
"current working directory is used."
979
1055
980
1056
#: bzrlib/builtins.py:1740
981
1057
msgid "bzr update --revision takes exactly one revision"
982
msgstr ""
1058
msgstr "bzr update --revision takes exactly one revision"
983
1059
984
1060
#: bzrlib/builtins.py:1748
985
1061
msgid "bzr update can only update a whole tree, not a file or subdirectory"
986
msgstr ""
1062
msgstr "bzr update can only update a whole tree, not a file or subdirectory"
987
1063
988
1064
#: bzrlib/builtins.py:1779
989
1065
msgid "Tree is up to date at revision {0} of branch {1}"
990
msgstr ""
1066
msgstr "Tree is up to date at revision {0} of branch {1}"
991
1067
992
1068
#: bzrlib/builtins.py:1795
993
1069
#, python-format
995
1071
"branch has no revision %s\n"
996
1072
"bzr update --revision only works for a revision in the branch history"
997
1073
msgstr ""
1074
"branch has no revision %s\n"
1075
"bzr update --revision only works for a revision in the branch history"
998
1076
999
1077
#: bzrlib/builtins.py:1801
1000
1078
msgid "Updated to revision {0} of branch {1}"
1001
msgstr ""
1079
msgstr "Updated to revision {0} of branch {1}"
1002
1080
1003
1081
#: bzrlib/builtins.py:1805
1004
1082
msgid ""
1005
1083
"Your local commits will now show as pending merges with 'bzr status', and "
1006
1084
"can be committed with 'bzr commit'."
1007
1085
msgstr ""
1086
"Your local commits will now show as pending merges with 'bzr status', and "
1087
"can be committed with 'bzr commit'."
1008
1088
1009
1089
#: bzrlib/builtins.py:1814
1010
1090
msgid "Show information about a working tree, branch or repository."
1011
msgstr ""
1091
msgstr "Show information about a working tree, branch or repository."
1012
1092
1013
1093
#: bzrlib/builtins.py:1816
1014
1094
msgid ""
1015
1095
"This command will show all known locations and formats associated to the\n"
1016
1096
"tree, branch or repository."
1017
1097
msgstr ""
1098
"This command will show all known locations and formats associated to the\n"
1099
"tree, branch or repository."
1018
1100
1019
1101
#: bzrlib/builtins.py:1819
1020
1102
msgid ""
1022
1104
"To see extended statistic information, use a verbosity level of 2 or\n"
1023
1105
"higher by specifying the verbose option multiple times, e.g. -vv."
1024
1106
msgstr ""
1107
"In verbose mode, statistical information is included with each report.\n"
1108
"To see extended statistic information, use a verbosity level of 2 or\n"
1109
"higher by specifying the verbose option multiple times, e.g. -vv."
1025
1110
1026
1111
#: bzrlib/builtins.py:1823
1027
1112
msgid "Branches and working trees will also report any missing revisions."
1028
msgstr ""
1113
msgstr "Branches and working trees will also report any missing revisions."
1029
1114
1030
1115
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1031
1116
#: bzrlib/builtins.py:6466
1032
1117
msgid ":Examples:"
1033
msgstr ""
1118
msgstr ":Examples:"
1034
1119
1035
1120
#: bzrlib/builtins.py:1827
1036
1121
msgid " Display information on the format and related locations:"
1037
msgstr ""
1122
msgstr " Display information on the format and related locations:"
1038
1123
1039
1124
#: bzrlib/builtins.py:1829
1040
1125
msgid " bzr info"
1041
msgstr ""
1126
msgstr " bzr info"
1042
1127
1043
1128
#: bzrlib/builtins.py:1831
1044
1129
msgid ""
1046
1131
" basic statistics (like the number of files in the working tree and\n"
1047
1132
" number of revisions in the branch and repository):"
1048
1133
msgstr ""
1134
" Display the above together with extended format information and\n"
1135
" basic statistics (like the number of files in the working tree and\n"
1136
" number of revisions in the branch and repository):"
1049
1137
1050
1138
#: bzrlib/builtins.py:1835
1051
1139
msgid " bzr info -v"
1052
msgstr ""
1140
msgstr " bzr info -v"
1053
1141
1054
1142
#: bzrlib/builtins.py:1837
1055
1143
msgid " Display the above together with number of committers to the branch:"
1056
1144
msgstr ""
1145
" Display the above together with number of committers to the branch:"
1057
1146
1058
1147
#: bzrlib/builtins.py:1839
1059
1148
msgid " bzr info -vv"
1060
msgstr ""
1149
msgstr " bzr info -vv"
1061
1150
1062
1151
#: bzrlib/builtins.py:1858
1063
1152
msgid "Remove files or directories."
1064
msgstr ""
1153
msgstr "Remove files or directories."
1065
1154
1066
1155
#: bzrlib/builtins.py:1860
1067
1156
msgid ""
1071
1160
"parameters are given Bazaar will scan for files that are being tracked by\n"
1072
1161
"Bazaar but missing in your tree and stop tracking them for you."
1073
1162
msgstr ""
1163
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1164
"delete them if they can easily be recovered using revert otherwise they\n"
1165
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1166
"parameters are given Bazaar will scan for files that are being tracked by\n"
1167
"Bazaar but missing in your tree and stop tracking them for you."
1074
1168
1075
1169
#: bzrlib/builtins.py:1868
1076
1170
msgid "Only remove files that have never been committed."
1077
msgstr ""
1171
msgstr "Only remove files that have never been committed."
1078
1172
1079
1173
#: bzrlib/builtins.py:1870
1080
1174
msgid "The file deletion mode to be used."
1081
msgstr ""
1175
msgstr "The file deletion mode to be used."
1082
1176
1083
1177
#: bzrlib/builtins.py:1871
1084
1178
msgid "Deletion Strategy"
1085
msgstr ""
1179
msgstr "Deletion Strategy"
1086
1180
1087
1181
#: bzrlib/builtins.py:1872
1088
1182
msgid "Backup changed files (default)."
1089
msgstr ""
1183
msgstr "Backup changed files (default)."
1090
1184
1091
1185
#: bzrlib/builtins.py:1873
1092
1186
msgid "Delete from bzr but leave the working copy."
1093
msgstr ""
1187
msgstr "Delete from bzr but leave the working copy."
1094
1188
1095
1189
#: bzrlib/builtins.py:1874
1096
1190
msgid "Don't backup changed files."
1097
msgstr ""
1191
msgstr "Don't backup changed files."
1098
1192
1099
1193
#: bzrlib/builtins.py:1875
1100
1194
msgid ""
1101
1195
"Delete all the specified files, even if they can not be recovered and even "
1102
1196
"if they are non-empty directories. (deprecated, use no-backup)"
1103
1197
msgstr ""
1198
"Delete all the specified files, even if they can not be recovered and even "
1199
"if they are non-empty directories. (deprecated, use no-backup)"
1104
1200
1105
1201
#: bzrlib/builtins.py:1884
1106
1202
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1107
1203
msgstr ""
1204
"(The --force option is deprecated, rather use --no-backup in future.)"
1108
1205
1109
1206
#: bzrlib/builtins.py:1901
1110
1207
msgid "No matching files."
1111
msgstr ""
1208
msgstr "No matching files."
1112
1209
1113
1210
#: bzrlib/builtins.py:1962
1114
1211
msgid "Reconcile bzr metadata in a branch."
1115
msgstr ""
1212
msgstr "Reconcile bzr metadata in a branch."
1116
1213
1117
1214
#: bzrlib/builtins.py:1964
1118
1215
msgid ""
1121
1218
"need to run this command if 'bzr check' or a bzr developer\n"
1122
1219
"advises you to run it."
1123
1220
msgstr ""
1221
"This can correct data mismatches that may have been caused by\n"
1222
"previous ghost operations or bzr upgrades. You should only\n"
1223
"need to run this command if 'bzr check' or a bzr developer\n"
1224
"advises you to run it."
1124
1225
1125
1226
#: bzrlib/builtins.py:1969
1126
1227
msgid ""
1129
1230
"id which was not present in very early bzr versions is represented\n"
1130
1231
"correctly in both branches."
1131
1232
msgstr ""
1233
"If a second branch is provided, cross-branch reconciliation is\n"
1234
"also attempted, which will check that data like the tree root\n"
1235
"id which was not present in very early bzr versions is represented\n"
1236
"correctly in both branches."
1132
1237
1133
1238
#: bzrlib/builtins.py:1974
1134
1239
msgid ""
1135
1240
"At the same time it is run it may recompress data resulting in\n"
1136
1241
"a potential saving in disk space or performance gain."
1137
1242
msgstr ""
1243
"At the same time it is run it may recompress data resulting in\n"
1244
"a potential saving in disk space or performance gain."
1138
1245
1139
1246
#: bzrlib/builtins.py:1977
1140
1247
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1141
1248
msgstr ""
1142
1143
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1144
msgid ""
1145
"Format for the bzr 2.0 series.\n"
1146
"Uses group-compress storage.\n"
1147
"Provides rich roots which are a one-way transition.\n"
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1151
msgid ""
1152
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1153
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1154
msgstr ""
1249
"The branch *MUST* be on a listable system such as local disk or sftp."
1250
1251
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1252
msgid ""
1253
"Format for the bzr 2.0 series.\n"
1254
"Uses group-compress storage.\n"
1255
"Provides rich roots which are a one-way transition.\n"
1256
msgstr ""
1257
"Format for the bzr 2.0 series.\n"
1258
"Uses group-compress storage.\n"
1259
"Provides rich roots which are a one-way transition.\n"
1260
1261
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1262
msgid ""
1263
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1264
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1265
msgstr ""
1266
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1267
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1155
1268
1156
1269
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1157
1270
msgid "The 2a format with experimental support for colocated branches.\n"
1158
msgstr ""
1271
msgstr "The 2a format with experimental support for collocated branches.\n"
1159
1272
1160
1273
#: bzrlib/builtins.py:2045
1161
1274
msgid "Make a directory into a versioned branch."
1162
msgstr ""
1275
msgstr "Make a directory into a versioned branch."
1163
1276
1164
1277
#: bzrlib/builtins.py:2047
1165
1278
msgid ""
1166
1279
"Use this to create an empty branch, or before importing an\n"
1167
1280
"existing project."
1168
1281
msgstr ""
1282
"Use this to create an empty branch, or before importing an\n"
1283
"existing project."
1169
1284
1170
1285
#: bzrlib/builtins.py:2050
1171
1286
msgid ""
1174
1289
"init creates a standalone branch which carries its own history\n"
1175
1290
"in the .bzr directory."
1176
1291
msgstr ""
1292
"If there is a repository in a parent directory of the location, then\n"
1293
"the history of the branch will be stored in the repository. Otherwise\n"
1294
"init creates a standalone branch which carries its own history\n"
1295
"in the .bzr directory."
1177
1296
1178
1297
#: bzrlib/builtins.py:2055
1179
1298
msgid ""
1180
1299
"If there is already a branch at the location but it has no working tree,\n"
1181
1300
"the tree can be populated with 'bzr checkout'."
1182
1301
msgstr ""
1302
"If there is already a branch at the location but it has no working tree,\n"
1303
"the tree can be populated with 'bzr checkout'."
1183
1304
1184
1305
#: bzrlib/builtins.py:2058
1185
1306
msgid "Recipe for importing a tree of files::"
1186
msgstr ""
1307
msgstr "Recipe for importing a tree of files::"
1187
1308
1188
1309
#: bzrlib/builtins.py:2060
1189
1310
msgid ""
1193
1314
" bzr status\n"
1194
1315
" bzr commit -m \"imported project\""
1195
1316
msgstr ""
1317
" cd ~/project\n"
1318
" bzr init\n"
1319
" bzr add .\n"
1320
" bzr status\n"
1321
" bzr commit -m \"imported project\""
1196
1322
1197
1323
#: bzrlib/builtins.py:2071
1198
1324
msgid ""
1199
1325
"Create the path leading up to the branch if it does not already exist."
1200
1326
msgstr ""
1327
"Create the path leading up to the branch if it does not already exist."
1201
1328
1202
1329
#: bzrlib/builtins.py:2074
1203
1330
msgid "Specify a format for this branch. See \"help formats\"."
1204
msgstr ""
1331
msgstr "Specify a format for this branch. See \"help formats\"."
1205
1332
1206
1333
#: bzrlib/builtins.py:2082
1207
1334
msgid ""
1208
1335
"Never change revnos or the existing log. Append revisions to it only."
1209
1336
msgstr ""
1337
"Never change revnos or the existing log. Append revisions to it only."
1210
1338
1211
1339
#: bzrlib/builtins.py:2085
1212
1340
msgid "Create a branch without a working tree."
1213
msgstr ""
1341
msgstr "Create a branch without a working tree."
1214
1342
1215
1343
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1216
1344
#, python-format
1218
1346
"Parent directory of %s does not exist.\n"
1219
1347
"You may supply --create-prefix to create all leading parent directories."
1220
1348
msgstr ""
1349
"Parent directory of %s does not exist.\n"
1350
"You may supply --create-prefix to create all leading parent directories."
1221
1351
1222
1352
#: bzrlib/builtins.py:2139
1223
1353
msgid ""
1224
1354
"This branch format cannot be set to append-revisions-only. Try --default."
1225
1355
msgstr ""
1356
"This branch format cannot be set to append-revisions-only. Try --default."
1226
1357
1227
1358
#: bzrlib/builtins.py:2150
1228
1359
msgid "Created a {0} (format: {1})\n"
1229
msgstr ""
1360
msgstr "Created a {0} (format: {1})\n"
1230
1361
1231
1362
#: bzrlib/builtins.py:2159
1232
1363
#, python-format
1233
1364
msgid "Using shared repository: %s\n"
1234
msgstr ""
1365
msgstr "Using shared repository: %s\n"
1235
1366
1236
1367
#: bzrlib/builtins.py:2163
1237
1368
msgid "Create a shared repository for branches to share storage space."
1238
msgstr ""
1369
msgstr "Create a shared repository for branches to share storage space."
1239
1370
1240
1371
#: bzrlib/builtins.py:2165
1241
1372
msgid ""
1244
1375
"with shared history, this reduces the amount of storage needed and \n"
1245
1376
"speeds up the creation of new branches."
1246
1377
msgstr ""
1378
"New branches created under the repository directory will store their\n"
1379
"revisions in the repository, not in the branch directory. For branches\n"
1380
"with shared history, this reduces the amount of storage needed and \n"
1381
"speeds up the creation of new branches."
1247
1382
1248
1383
#: bzrlib/builtins.py:2170
1249
1384
msgid ""
1254
1389
"store branches which are interacted with through checkouts or remote\n"
1255
1390
"branches, such as on a server."
1256
1391
msgstr ""
1392
"If the --no-trees option is given then the branches in the repository\n"
1393
"will not have working trees by default. They will still exist as \n"
1394
"directories on disk, but they will not have separate copies of the \n"
1395
"files at a certain revision. This can be useful for repositories that\n"
1396
"store branches which are interacted with through checkouts or remote\n"
1397
"branches, such as on a server."
1257
1398
1258
1399
#: bzrlib/builtins.py:2177
1259
1400
msgid ""
1260
1401
":Examples:\n"
1261
1402
" Create a shared repository holding just branches::"
1262
1403
msgstr ""
1404
":Examples:\n"
1405
" Create a shared repository holding just branches::"
1263
1406
1264
1407
#: bzrlib/builtins.py:2180
1265
1408
msgid ""
1266
1409
" bzr init-repo --no-trees repo\n"
1267
1410
" bzr init repo/trunk"
1268
1411
msgstr ""
1412
" bzr init-repo --no-trees repo\n"
1413
" bzr init repo/trunk"
1269
1414
1270
1415
#: bzrlib/builtins.py:2183
1271
1416
msgid " Make a lightweight checkout elsewhere::"
1272
msgstr ""
1417
msgstr " Make a lightweight checkout elsewhere::"
1273
1418
1274
1419
#: bzrlib/builtins.py:2185
1275
1420
msgid ""
1277
1422
" cd trunk-checkout\n"
1278
1423
" (add files here)"
1279
1424
msgstr ""
1425
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1426
" cd trunk-checkout\n"
1427
" (add files here)"
1280
1428
1281
1429
#: bzrlib/builtins.py:2193
1282
1430
msgid ""
1283
1431
"Specify a format for this repository. See \"bzr help formats\" for details."
1284
1432
msgstr ""
1433
"Specify a format for this repository. See \"bzr help formats\" for details."
1285
1434
1286
1435
#: bzrlib/builtins.py:2197
1287
1436
msgid "Repository format"
1288
msgstr ""
1437
msgstr "Repository format"
1289
1438
1290
1439
#: bzrlib/builtins.py:2199
1291
1440
msgid "Branches in the repository will default to not having a working tree."
1292
1441
msgstr ""
1442
"Branches in the repository will default to not having a working tree."
1293
1443
1294
1444
#: bzrlib/builtins.py:2225
1295
1445
msgid "Show differences in the working tree, between revisions or branches."
1296
msgstr ""
1446
msgstr "Show differences in the working tree, between revisions or branches."
1297
1447
1298
1448
#: bzrlib/builtins.py:2227
1299
1449
msgid ""
1304
1454
"the first argument, if any, or the current tree if no arguments are\n"
1305
1455
"given."
1306
1456
msgstr ""
1457
"If no arguments are given, all changes for the current tree are listed.\n"
1458
"If files are given, only the changes in those files are listed.\n"
1459
"Remote and multiple branches can be compared by using the --old and\n"
1460
"--new options. If not provided, the default for both is derived from\n"
1461
"the first argument, if any, or the current tree if no arguments are\n"
1462
"given."
1307
1463
1308
1464
#: bzrlib/builtins.py:2234
1309
1465
msgid ""
1310
1466
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1311
1467
"produces patches suitable for \"patch -p1\"."
1312
1468
msgstr ""
1469
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1470
"produces patches suitable for \"patch -p1\"."
1313
1471
1314
1472
#: bzrlib/builtins.py:2237
1315
1473
msgid ""
1320
1478
"revision ranges used by \"bzr log\" which includes the first revision\n"
1321
1479
"in the range."
1322
1480
msgstr ""
1481
"Note that when using the -r argument with a range of revisions, the\n"
1482
"differences are computed between the two specified revisions. That\n"
1483
"is, the command does not show the changes introduced by the first \n"
1484
"revision in the range. This differs from the interpretation of \n"
1485
"revision ranges used by \"bzr log\" which includes the first revision\n"
1486
"in the range."
1323
1487
1324
1488
#: bzrlib/builtins.py:2244
1325
1489
msgid ""
1329
1493
" 3 - error\n"
1330
1494
" 0 - no change"
1331
1495
msgstr ""
1496
":Exit values:\n"
1497
" 1 - changed\n"
1498
" 2 - unrepresentable changes\n"
1499
" 3 - error\n"
1500
" 0 - no change"
1332
1501
1333
1502
#: bzrlib/builtins.py:2250
1334
1503
msgid ""
1335
1504
":Examples:\n"
1336
1505
" Shows the difference in the working tree versus the last commit::"
1337
1506
msgstr ""
1507
":Examples:\n"
1508
" Shows the difference in the working tree versus the last commit::"
1338
1509
1339
1510
#: bzrlib/builtins.py:2253
1340
1511
msgid " bzr diff"
1341
msgstr ""
1512
msgstr " bzr diff"
1342
1513
1343
1514
#: bzrlib/builtins.py:2255
1344
1515
msgid " Difference between the working tree and revision 1::"
1345
msgstr ""
1516
msgstr " Difference between the working tree and revision 1::"
1346
1517
1347
1518
#: bzrlib/builtins.py:2257
1348
1519
msgid " bzr diff -r1"
1349
msgstr ""
1520
msgstr " bzr diff -r1"
1350
1521
1351
1522
#: bzrlib/builtins.py:2259
1352
1523
msgid " Difference between revision 3 and revision 1::"
1353
msgstr ""
1524
msgstr " Difference between revision 3 and revision 1::"
1354
1525
1355
1526
#: bzrlib/builtins.py:2261
1356
1527
msgid " bzr diff -r1..3"
1357
msgstr ""
1528
msgstr " bzr diff -r1..3"
1358
1529
1359
1530
#: bzrlib/builtins.py:2263
1360
1531
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1361
msgstr ""
1532
msgstr " Difference between revision 3 and revision 1 for branch xxx::"
1362
1533
1363
1534
#: bzrlib/builtins.py:2265
1364
1535
msgid " bzr diff -r1..3 xxx"
1365
msgstr ""
1536
msgstr " bzr diff -r1..3 xxx"
1366
1537
1367
1538
#: bzrlib/builtins.py:2267
1368
1539
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1369
msgstr ""
1540
msgstr " The changes introduced by revision 2 (equivalent to -r1..2)::"
1370
1541
1371
1542
#: bzrlib/builtins.py:2269
1372
1543
msgid " bzr diff -c2"
1373
msgstr ""
1544
msgstr " bzr diff -c2"
1374
1545
1375
1546
#: bzrlib/builtins.py:2271
1376
1547
msgid ""
1378
1549
" \n"
1379
1550
" bzr diff -cX"
1380
1551
msgstr ""
1552
" To see the changes introduced by revision X::\n"
1553
" \n"
1554
" bzr diff -cX"
1381
1555
1382
1556
#: bzrlib/builtins.py:2275
1383
1557
msgid ""
1385
1559
" compared to the left hand parent. To see the changes against\n"
1386
1560
" another parent, use::"
1387
1561
msgstr ""
1562
" Note that in the case of a merge, the -c option shows the changes\n"
1563
" compared to the left hand parent. To see the changes against\n"
1564
" another parent, use::"
1388
1565
1389
1566
#: bzrlib/builtins.py:2279
1390
1567
msgid " bzr diff -r<chosen_parent>..X"
1391
msgstr ""
1568
msgstr " bzr diff -r<chosen_parent>..X"
1392
1569
1393
1570
#: bzrlib/builtins.py:2281
1394
1571
msgid ""
1395
1572
" The changes between the current revision and the previous revision\n"
1396
1573
" (equivalent to -c-1 and -r-2..-1)"
1397
1574
msgstr ""
1575
" The changes between the current revision and the previous revision\n"
1576
" (equivalent to -c-1 and -r-2..-1)"
1398
1577
1399
1578
#: bzrlib/builtins.py:2284
1400
1579
msgid " bzr diff -r-2.."
1401
msgstr ""
1580
msgstr " bzr diff -r-2.."
1402
1581
1403
1582
#: bzrlib/builtins.py:2286
1404
1583
msgid " Show just the differences for file NEWS::"
1405
msgstr ""
1584
msgstr " Show just the differences for file NEWS::"
1406
1585
1407
1586
#: bzrlib/builtins.py:2288
1408
1587
msgid " bzr diff NEWS"
1409
msgstr ""
1588
msgstr " bzr diff NEWS"
1410
1589
1411
1590
#: bzrlib/builtins.py:2290
1412
1591
msgid " Show the differences in working tree xxx for file NEWS::"
1413
msgstr ""
1592
msgstr " Show the differences in working tree xxx for file NEWS::"
1414
1593
1415
1594
#: bzrlib/builtins.py:2292
1416
1595
msgid " bzr diff xxx/NEWS"
1417
msgstr ""
1596
msgstr " bzr diff xxx/NEWS"
1418
1597
1419
1598
#: bzrlib/builtins.py:2294
1420
1599
msgid " Show the differences from branch xxx to this working tree:"
1421
msgstr ""
1600
msgstr " Show the differences from branch xxx to this working tree:"
1422
1601
1423
1602
#: bzrlib/builtins.py:2296
1424
1603
msgid " bzr diff --old xxx"
1425
msgstr ""
1604
msgstr " bzr diff --old xxx"
1426
1605
1427
1606
#: bzrlib/builtins.py:2298
1428
1607
msgid " Show the differences between two branches for file NEWS::"
1429
msgstr ""
1608
msgstr " Show the differences between two branches for file NEWS::"
1430
1609
1431
1610
#: bzrlib/builtins.py:2300
1432
1611
msgid " bzr diff --old xxx --new yyy NEWS"
1433
msgstr ""
1612
msgstr " bzr diff --old xxx --new yyy NEWS"
1434
1613
1435
1614
#: bzrlib/builtins.py:2302
1436
1615
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1437
msgstr ""
1616
msgstr " Same as 'bzr diff' but prefix paths with old/ and new/::"
1438
1617
1439
1618
#: bzrlib/builtins.py:2304
1440
1619
msgid ""
1444
1623
" \n"
1445
1624
" bzr diff --using /usr/bin/diff --diff-options -wu"
1446
1625
msgstr ""
1626
" bzr diff --prefix old/:new/\n"
1627
" \n"
1628
" Show the differences using a custom diff program with options::\n"
1629
" \n"
1630
" bzr diff --using /usr/bin/diff --diff-options -wu"
1447
1631
1448
1632
#: bzrlib/builtins.py:2314
1449
1633
msgid "Pass these options to the external diff program."
1450
msgstr ""
1634
msgstr "Pass these options to the external diff program."
1451
1635
1452
1636
#: bzrlib/builtins.py:2317
1453
1637
msgid ""
1454
1638
"Set prefixes added to old and new filenames, as two values separated by a "
1455
1639
"colon. (eg \"old/:new/\")."
1456
1640
msgstr ""
1641
"Set prefixes added to old and new filenames, as two values separated by a "
1642
"colon. (eg \"old/:new/\")."
1457
1643
1458
1644
#: bzrlib/builtins.py:2320
1459
1645
msgid "Branch/tree to compare from."
1460
msgstr ""
1646
msgstr "Branch/tree to compare from."
1461
1647
1462
1648
#: bzrlib/builtins.py:2324
1463
1649
msgid "Branch/tree to compare to."
1464
msgstr ""
1650
msgstr "Branch/tree to compare to."
1465
1651
1466
1652
#: bzrlib/builtins.py:2330
1467
1653
msgid "Use this command to compare files."
1468
msgstr ""
1654
msgstr "Use this command to compare files."
1469
1655
1470
1656
#: bzrlib/builtins.py:2335
1471
1657
msgid "Diff format to use."
1472
msgstr ""
1658
msgstr "Diff format to use."
1473
1659
1474
1660
#: bzrlib/builtins.py:2337
1475
1661
msgid "Diff format"
1476
msgstr ""
1662
msgstr "Diff format"
1477
1663
1478
1664
#: bzrlib/builtins.py:2359
1479
1665
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1480
msgstr ""
1666
msgstr "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1481
1667
1482
1668
#: bzrlib/builtins.py:2363
1483
1669
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1484
msgstr ""
1670
msgstr "bzr diff --revision takes exactly one or two revision specifiers"
1485
1671
1486
1672
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1487
1673
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1488
1674
msgid "{0} and {1} are mutually exclusive"
1489
msgstr ""
1675
msgstr "{0} and {1} are mutually exclusive"
1490
1676
1491
1677
#: bzrlib/builtins.py:2388
1492
1678
msgid ""
1493
1679
"List files deleted in the working tree.\n"
1494
1680
" "
1495
1681
msgstr ""
1682
"List files deleted in the working tree.\n"
1683
" "
1496
1684
1497
1685
#: bzrlib/builtins.py:2465
1498
1686
msgid "Show the tree root directory."
1499
msgstr ""
1687
msgstr "Show the tree root directory."
1500
1688
1501
1689
#: bzrlib/builtins.py:2467
1502
1690
msgid ""
1503
1691
"The root is the nearest enclosing directory with a .bzr control\n"
1504
1692
"directory."
1505
1693
msgstr ""
1694
"The root is the nearest enclosing directory with a .bzr control\n"
1695
"directory."
1506
1696
1507
1697
#: bzrlib/builtins.py:2482
1508
1698
msgid "The limit argument must be an integer."
1509
msgstr ""
1699
msgstr "The limit argument must be an integer."
1510
1700
1511
1701
#: bzrlib/builtins.py:2490
1512
1702
msgid "The levels argument must be an integer."
1513
msgstr ""
1703
msgstr "The levels argument must be an integer."
1514
1704
1515
1705
#: bzrlib/builtins.py:2495
1516
1706
msgid "Show historical log for a branch or subset of a branch."
1517
msgstr ""
1707
msgstr "Show historical log for a branch or subset of a branch."
1518
1708
1519
1709
#: bzrlib/builtins.py:2497
1520
1710
msgid ""
1523
1713
"are given, the branch containing the working directory is logged.\n"
1524
1714
"Here are some simple examples::"
1525
1715
msgstr ""
1716
"log is bzr's default tool for exploring the history of a branch.\n"
1717
"The branch to use is taken from the first parameter. If no parameters\n"
1718
"are given, the branch containing the working directory is logged.\n"
1719
"Here are some simple examples::"
1526
1720
1527
1721
#: bzrlib/builtins.py:2502
1528
1722
msgid ""
1530
1724
" bzr log foo.py log a file in its branch\n"
1531
1725
" bzr log http://server/branch log a branch on a server"
1532
1726
msgstr ""
1727
" bzr log log the current branch\n"
1728
" bzr log foo.py log a file in its branch\n"
1729
" bzr log http://server/branch log a branch on a server"
1533
1730
1534
1731
#: bzrlib/builtins.py:2506
1535
1732
msgid ""
1540
1737
"merged revisions are shown indented under the revision in which they\n"
1541
1738
"were merged."
1542
1739
msgstr ""
1740
"The filtering, ordering and information shown for each revision can\n"
1741
"be controlled as explained below. By default, all revisions are\n"
1742
"shown sorted (topologically) so that newer revisions appear before\n"
1743
"older ones and descendants always appear before ancestors. If displayed,\n"
1744
"merged revisions are shown indented under the revision in which they\n"
1745
"were merged."
1543
1746
1544
1747
#: bzrlib/builtins.py:2513
1545
1748
msgid ":Output control:"
1546
msgstr ""
1749
msgstr ":Output control:"
1547
1750
1548
1751
#: bzrlib/builtins.py:2515
1549
1752
msgid ""
1552
1755
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1553
1756
" for more details on log formats."
1554
1757
msgstr ""
1758
" The log format controls how information about each revision is\n"
1759
" displayed. The standard log formats are called ``long``, ``short``\n"
1760
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1761
" for more details on log formats."
1555
1762
1556
1763
#: bzrlib/builtins.py:2520
1557
1764
msgid ""
1558
1765
" The following options can be used to control what information is\n"
1559
1766
" displayed::"
1560
1767
msgstr ""
1768
" The following options can be used to control what information is\n"
1769
" displayed::"
1561
1770
1562
1771
#: bzrlib/builtins.py:2523
1563
1772
msgid ""
1567
1776
" -p display a diff (patch) for each revision\n"
1568
1777
" --show-ids display revision-ids (and file-ids), not just revnos"
1569
1778
msgstr ""
1779
" -l N display a maximum of N revisions\n"
1780
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1781
" -v display a status summary (delta) for each revision\n"
1782
" -p display a diff (patch) for each revision\n"
1783
" --show-ids display revision-ids (and file-ids), not just revnos"
1570
1784
1571
1785
#: bzrlib/builtins.py:2529
1572
1786
msgid ""
1574
1788
" log format. If the -n option is not used, the standard log formats show\n"
1575
1789
" just the top level (mainline)."
1576
1790
msgstr ""
1791
" Note that the default number of levels to display is a function of the\n"
1792
" log format. If the -n option is not used, the standard log formats show\n"
1793
" just the top level (mainline)."
1577
1794
1578
1795
#: bzrlib/builtins.py:2533
1579
1796
msgid ""
1581
1798
" the changes explained using words like ``added`` and ``modified``\n"
1582
1799
" instead, use the -vv option."
1583
1800
msgstr ""
1801
" Status summaries are shown using status flags like A, M, etc. To see\n"
1802
" the changes explained using words like ``added`` and ``modified``\n"
1803
" instead, use the -vv option."
1584
1804
1585
1805
#: bzrlib/builtins.py:2537
1586
1806
msgid ":Ordering control:"
1587
msgstr ""
1807
msgstr ":Ordering control:"
1588
1808
1589
1809
#: bzrlib/builtins.py:2539
1590
1810
msgid ""
1593
1813
" time taken to produce a log, though --forward does not incrementally\n"
1594
1814
" display revisions like --reverse does when it can."
1595
1815
msgstr ""
1816
" To display revisions from oldest to newest, use the --forward option.\n"
1817
" In most cases, using this option will have little impact on the total\n"
1818
" time taken to produce a log, though --forward does not incrementally\n"
1819
" display revisions like --reverse does when it can."
1596
1820
1597
1821
#: bzrlib/builtins.py:2544
1598
1822
msgid ":Revision filtering:"
1599
msgstr ""
1823
msgstr ":Revision filtering:"
1600
1824
1601
1825
#: bzrlib/builtins.py:2546
1602
1826
msgid ""
1603
1827
" The -r option can be used to specify what revision or range of revisions\n"
1604
1828
" to filter against. The various forms are shown below::"
1605
1829
msgstr ""
1830
" The -r option can be used to specify what revision or range of revisions\n"
1831
" to filter against. The various forms are shown below::"
1606
1832
1607
1833
#: bzrlib/builtins.py:2549
1608
1834
msgid ""
1611
1837
" -r..Y display up to and including revision Y\n"
1612
1838
" -rX..Y display from X to Y inclusive"
1613
1839
msgstr ""
1840
" -rX display revision X\n"
1841
" -rX.. display revision X and later\n"
1842
" -r..Y display up to and including revision Y\n"
1843
" -rX..Y display from X to Y inclusive"
1614
1844
1615
1845
#: bzrlib/builtins.py:2554
1616
1846
msgid ""
1617
1847
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1618
1848
" Some common examples are given below::"
1619
1849
msgstr ""
1850
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1851
" Some common examples are given below::"
1620
1852
1621
1853
#: bzrlib/builtins.py:2557
1622
1854
msgid ""
1627
1859
" branch and the one at location path\n"
1628
1860
" -rdate:yesterday.. show changes since yesterday"
1629
1861
msgstr ""
1862
" -r-1 show just the tip\n"
1863
" -r-10.. show the last 10 mainline revisions\n"
1864
" -rsubmit:.. show what's new on this branch\n"
1865
" -rancestor:path.. show changes since the common ancestor of this\n"
1866
" branch and the one at location path\n"
1867
" -rdate:yesterday.. show changes since yesterday"
1630
1868
1631
1869
#: bzrlib/builtins.py:2564
1632
1870
msgid ""
1637
1875
" along the way. If multi-level logging is used (-n0), X may be\n"
1638
1876
" a nested merge revision and the log will be truncated accordingly."
1639
1877
msgstr ""
1878
" When logging a range of revisions using -rX..Y, log starts at\n"
1879
" revision Y and searches back in history through the primary\n"
1880
" (\"left-hand\") parents until it finds X. When logging just the\n"
1881
" top level (using -n1), an error is reported if X is not found\n"
1882
" along the way. If multi-level logging is used (-n0), X may be\n"
1883
" a nested merge revision and the log will be truncated accordingly."
1640
1884
1641
1885
#: bzrlib/builtins.py:2571
1642
1886
msgid ":Path filtering:"
1643
msgstr ""
1887
msgstr ":Path filtering:"
1644
1888
1645
1889
#: bzrlib/builtins.py:2573
1646
1890
msgid ""
1648
1892
" will be filtered to show only those revisions that changed the\n"
1649
1893
" nominated files or directories."
1650
1894
msgstr ""
1895
" If parameters are given and the first one is not a branch, the log\n"
1896
" will be filtered to show only those revisions that changed the\n"
1897
" nominated files or directories."
1651
1898
1652
1899
#: bzrlib/builtins.py:2577
1653
1900
msgid ""
1655
1902
" deleted file, specify a revision range so that the file existed at\n"
1656
1903
" the end or start of the range."
1657
1904
msgstr ""
1905
" Filenames are interpreted within their historical context. To log a\n"
1906
" deleted file, specify a revision range so that the file existed at\n"
1907
" the end or start of the range."
1658
1908
1659
1909
#: bzrlib/builtins.py:2581
1660
1910
msgid ""
1661
1911
" Historical context is also important when interpreting pathnames of\n"
1662
1912
" renamed files/directories. Consider the following example:"
1663
1913
msgstr ""
1914
" Historical context is also important when interpreting pathnames of\n"
1915
" renamed files/directories. Consider the following example:"
1664
1916
1665
1917
#: bzrlib/builtins.py:2584
1666
1918
msgid ""
1668
1920
" * revision 2: modify tutorial.txt\n"
1669
1921
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1670
1922
msgstr ""
1923
" * revision 1: add tutorial.txt\n"
1924
" * revision 2: modify tutorial.txt\n"
1925
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1671
1926
1672
1927
#: bzrlib/builtins.py:2588
1673
1928
msgid " In this case:"
1674
msgstr ""
1929
msgstr " In this case:"
1675
1930
1676
1931
#: bzrlib/builtins.py:2590
1677
1932
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1678
msgstr ""
1933
msgstr " * ``bzr log guide.txt`` will log the file added in revision 1"
1679
1934
1680
1935
#: bzrlib/builtins.py:2592
1681
1936
msgid ""
1682
1937
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1683
1938
msgstr ""
1939
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1684
1940
1685
1941
#: bzrlib/builtins.py:2594
1686
1942
msgid ""
1687
1943
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1688
1944
" the original file in revision 2."
1689
1945
msgstr ""
1946
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1947
" the original file in revision 2."
1690
1948
1691
1949
#: bzrlib/builtins.py:2597
1692
1950
msgid ""
1693
1951
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1694
1952
" was no file called guide.txt in revision 2."
1695
1953
msgstr ""
1954
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1955
" was no file called guide.txt in revision 2."
1696
1956
1697
1957
#: bzrlib/builtins.py:2600
1698
1958
msgid ""
1700
1960
" explicitly ask for this (and no way to stop logging a file back\n"
1701
1961
" until it was last renamed)."
1702
1962
msgstr ""
1963
" Renames are always followed by log. By design, there is no need to\n"
1964
" explicitly ask for this (and no way to stop logging a file back\n"
1965
" until it was last renamed)."
1703
1966
1704
1967
#: bzrlib/builtins.py:2604
1705
1968
msgid ":Other filtering:"
1706
msgstr ""
1969
msgstr ":Other filtering:"
1707
1970
1708
1971
#: bzrlib/builtins.py:2606
1709
1972
msgid ""
1713
1976
" expressions. --match-author, --match-bugs, --match-committer and\n"
1714
1977
" --match-message can be used to only match a specific field."
1715
1978
msgstr ""
1979
" The --match option can be used for finding revisions that match a\n"
1980
" regular expression in a commit message, committer, author or bug.\n"
1981
" Specifying the option several times will match any of the supplied\n"
1982
" expressions. --match-author, --match-bugs, --match-committer and\n"
1983
" --match-message can be used to only match a specific field."
1716
1984
1717
1985
#: bzrlib/builtins.py:2612
1718
1986
msgid ":Tips & tricks:"
1719
msgstr ""
1987
msgstr ":Tips & tricks:"
1720
1988
1721
1989
#: bzrlib/builtins.py:2614
1722
1990
msgid ""
1726
1994
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1727
1995
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1728
1996
msgstr ""
1997
" GUI tools and IDEs are often better at exploring history than command\n"
1998
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1999
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
2000
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
2001
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1729
2002
1730
2003
#: bzrlib/builtins.py:2620
1731
2004
msgid ""
1732
2005
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1733
2006
msgstr ""
2007
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1734
2008
1735
2009
#: bzrlib/builtins.py:2622
1736
2010
msgid ""
1739
2013
" top = log -l10 --line\n"
1740
2014
" show = log -v -p"
1741
2015
msgstr ""
2016
" [ALIASES]\n"
2017
" tip = log -r-1\n"
2018
" top = log -l10 --line\n"
2019
" show = log -v -p"
1742
2020
1743
2021
#: bzrlib/builtins.py:2627
1744
2022
msgid ""
1746
2024
" will show the last 10 mainline revisions. To see the details of a\n"
1747
2025
" particular revision X, ``bzr show -rX``."
1748
2026
msgstr ""
2027
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2028
" will show the last 10 mainline revisions. To see the details of a\n"
2029
" particular revision X, ``bzr show -rX``."
1749
2030
1750
2031
#: bzrlib/builtins.py:2631
1751
2032
msgid ""
1752
2033
" If you are interested in looking deeper into a particular merge X,\n"
1753
2034
" use ``bzr log -n0 -rX``."
1754
2035
msgstr ""
2036
" If you are interested in looking deeper into a particular merge X,\n"
2037
" use ``bzr log -n0 -rX``."
1755
2038
1756
2039
#: bzrlib/builtins.py:2634
1757
2040
msgid ""
1760
2043
" With or without that fix, it is recommended that a revision range\n"
1761
2044
" be given when using the -v option."
1762
2045
msgstr ""
2046
" ``bzr log -v`` on a branch with lots of history is currently\n"
2047
" very slow. A fix for this issue is currently under development.\n"
2048
" With or without that fix, it is recommended that a revision range\n"
2049
" be given when using the -v option."
1763
2050
1764
2051
#: bzrlib/builtins.py:2639
1765
2052
msgid ""
1768
2055
" Among other features, this plugin can find all revisions containing\n"
1769
2056
" a list of words but not others."
1770
2057
msgstr ""
2058
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2059
" used to find revisions matching user names, commit messages, etc.\n"
2060
" Among other features, this plugin can find all revisions containing\n"
2061
" a list of words but not others."
1771
2062
1772
2063
#: bzrlib/builtins.py:2644
1773
2064
msgid ""
1776
2067
" the historycache plugin. This plugin buffers historical information\n"
1777
2068
" trading disk space for faster speed."
1778
2069
msgstr ""
2070
" When exploring non-mainline history on large projects with deep\n"
2071
" history, the performance of log can be greatly improved by installing\n"
2072
" the historycache plugin. This plugin buffers historical information\n"
2073
" trading disk space for faster speed."
1779
2074
1780
2075
#: bzrlib/builtins.py:2653
1781
2076
msgid "Show from oldest to newest."
1782
msgstr ""
2077
msgstr "Show from oldest to newest."
1783
2078
1784
2079
#: bzrlib/builtins.py:2656
1785
2080
msgid "Show files changed in each revision."
1786
msgstr ""
2081
msgstr "Show files changed in each revision."
1787
2082
1788
2083
#: bzrlib/builtins.py:2662
1789
2084
msgid "Show just the specified revision. See also \"help revisionspec\"."
1790
msgstr ""
2085
msgstr "Show just the specified revision. See also \"help revisionspec\"."
1791
2086
1792
2087
#: bzrlib/builtins.py:2666
1793
2088
msgid "What names to list as authors - first, all or committer."
1794
msgstr ""
2089
msgstr "What names to list as authors - first, all or committer."
1795
2090
1796
2091
#: bzrlib/builtins.py:2667
1797
2092
msgid "Authors"
1798
msgstr ""
2093
msgstr "Authors"
1799
2094
1800
2095
#: bzrlib/builtins.py:2672
1801
2096
msgid "Number of levels to display - 0 for all, 1 for flat."
1802
msgstr ""
2097
msgstr "Number of levels to display - 0 for all, 1 for flat."
1803
2098
1804
2099
#: bzrlib/builtins.py:2682
1805
2100
msgid "Limit the output to the first N revisions."
1806
msgstr ""
2101
msgstr "Limit the output to the first N revisions."
1807
2102
1808
2103
#: bzrlib/builtins.py:2687
1809
2104
msgid "Show changes made in each revision as a patch."
1810
msgstr ""
2105
msgstr "Show changes made in each revision as a patch."
1811
2106
1812
2107
#: bzrlib/builtins.py:2689
1813
2108
msgid "Show merged revisions like --levels 0 does."
1814
msgstr ""
2109
msgstr "Show merged revisions like --levels 0 does."
1815
2110
1816
2111
#: bzrlib/builtins.py:2693
1817
2112
msgid "Do not report commits with more than one parent."
1818
msgstr ""
2113
msgstr "Do not report commits with more than one parent."
1819
2114
1820
2115
#: bzrlib/builtins.py:2695
1821
2116
msgid ""
1822
2117
"Display only the revisions that are not part of both ancestries (require -"
1823
2118
"rX..Y)."
1824
2119
msgstr ""
2120
"Display only the revisions that are not part of both ancestries (require -"
2121
"rX..Y)."
1825
2122
1826
2123
#: bzrlib/builtins.py:2699
1827
2124
msgid "Show digital signature validity."
1828
msgstr ""
2125
msgstr "Show digital signature validity."
1829
2126
1830
2127
#: bzrlib/builtins.py:2702
1831
2128
msgid "Show revisions whose properties match this expression."
1832
msgstr ""
2129
msgstr "Show revisions whose properties match this expression."
1833
2130
1834
2131
#: bzrlib/builtins.py:2706
1835
2132
msgid "Show revisions whose message matches this expression."
1836
msgstr ""
2133
msgstr "Show revisions whose message matches this expression."
1837
2134
1838
2135
#: bzrlib/builtins.py:2710
1839
2136
msgid "Show revisions whose committer matches this expression."
1840
msgstr ""
2137
msgstr "Show revisions whose committer matches this expression."
1841
2138
1842
2139
#: bzrlib/builtins.py:2714
1843
2140
msgid "Show revisions whose authors match this expression."
1844
msgstr ""
2141
msgstr "Show revisions whose authors match this expression."
1845
2142
1846
2143
#: bzrlib/builtins.py:2718
1847
2144
msgid "Show revisions whose bugs match this expression."
1848
msgstr ""
2145
msgstr "Show revisions whose bugs match this expression."
1849
2146
1850
2147
#: bzrlib/builtins.py:2772
1851
2148
msgid "--exclude-common-ancestry requires -r with two revisions"
1852
msgstr ""
2149
msgstr "--exclude-common-ancestry requires -r with two revisions"
1853
2150
1854
2151
#: bzrlib/builtins.py:2800
1855
2152
#, python-format
1856
2153
msgid "Path unknown at end or start of revision range: %s"
1857
msgstr ""
2154
msgstr "Path unknown at end or start of revision range: %s"
1858
2155
1859
2156
#: bzrlib/builtins.py:2917
1860
2157
#, python-format
1861
2158
msgid "bzr %s doesn't accept two revisions in different branches."
1862
msgstr ""
2159
msgstr "bzr %s doesn't accept two revisions in different branches."
1863
2160
1864
2161
#: bzrlib/builtins.py:2933
1865
2162
#, python-format
1866
2163
msgid "bzr %s --revision takes one or two values."
1867
msgstr ""
2164
msgstr "bzr %s --revision takes one or two values."
1868
2165
1869
2166
#: bzrlib/builtins.py:2978
1870
2167
msgid ""
1871
2168
"List files in a tree.\n"
1872
2169
" "
1873
2170
msgstr ""
2171
"List files in a tree.\n"
2172
" "
1874
2173
1875
2174
#: bzrlib/builtins.py:2987
1876
2175
msgid "Recurse into subdirectories."
1877
msgstr ""
2176
msgstr "Recurse into subdirectories."
1878
2177
1879
2178
#: bzrlib/builtins.py:2989
1880
2179
msgid "Print paths relative to the root of the branch."
1881
msgstr ""
2180
msgstr "Print paths relative to the root of the branch."
1882
2181
1883
2182
#: bzrlib/builtins.py:2991
1884
2183
msgid "Print unknown files."
1885
msgstr ""
2184
msgstr "Print unknown files."
1886
2185
1887
2186
#: bzrlib/builtins.py:2992
1888
2187
msgid "Print versioned files."
1889
msgstr ""
2188
msgstr "Print versioned files."
1890
2189
1891
2190
#: bzrlib/builtins.py:2995
1892
2191
msgid "Print ignored files."
1893
msgstr ""
2192
msgstr "Print ignored files."
1894
2193
1895
2194
#: bzrlib/builtins.py:2997
1896
2195
msgid "List entries of a particular kind: file, directory, symlink."
1897
msgstr ""
2196
msgstr "List entries of a particular kind: file, directory, symlink."
1898
2197
1899
2198
#: bzrlib/builtins.py:3010
1900
2199
msgid "invalid kind specified"
1901
msgstr ""
2200
msgstr "invalid kind specified"
1902
2201
1903
2202
#: bzrlib/builtins.py:3013
1904
2203
msgid "Cannot set both --verbose and --null"
1905
msgstr ""
2204
msgstr "Cannot set both --verbose and --null"
1906
2205
1907
2206
#: bzrlib/builtins.py:3022
1908
2207
msgid "cannot specify both --from-root and PATH"
1909
msgstr ""
2208
msgstr "cannot specify both --from-root and PATH"
1910
2209
1911
2210
#: bzrlib/builtins.py:3109
1912
2211
msgid "Ignore specified files or patterns."
1913
msgstr ""
2212
msgstr "Ignore specified files or patterns."
1914
2213
1915
2214
#: bzrlib/builtins.py:3111
1916
2215
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1917
msgstr ""
2216
msgstr "See ``bzr help patterns`` for details on the syntax of patterns."
1918
2217
1919
2218
#: bzrlib/builtins.py:3113
1920
2219
msgid ""
1924
2223
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1925
2224
"the use of the ignore command will require an explicit add command."
1926
2225
msgstr ""
2226
"If a .bzrignore file does not exist, the ignore command\n"
2227
"will create one and add the specified files or patterns to the newly\n"
2228
"created file. The ignore command will also automatically add the \n"
2229
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2230
"the use of the ignore command will require an explicit add command."
1927
2231
1928
2232
#: bzrlib/builtins.py:3119
1929
2233
msgid ""
1932
2236
"using this command or directly by using an editor, be sure to commit\n"
1933
2237
"it."
1934
2238
msgstr ""
2239
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2240
"After adding, editing or deleting that file either indirectly by\n"
2241
"using this command or directly by using an editor, be sure to commit\n"
2242
"it."
1935
2243
1936
2244
#: bzrlib/builtins.py:3124
1937
2245
msgid ""
1941
2249
"Global ignores are not touched by this command. The global ignore file\n"
1942
2250
"can be edited directly using an editor."
1943
2251
msgstr ""
2252
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2253
"the global ignore file can be found in the application data directory as\n"
2254
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2255
"Global ignores are not touched by this command. The global ignore file\n"
2256
"can be edited directly using an editor."
1944
2257
1945
2258
#: bzrlib/builtins.py:3130
1946
2259
msgid ""
1948
2261
"precedence over regular ignores. Such exceptions are used to specify\n"
1949
2262
"files that should be versioned which would otherwise be ignored."
1950
2263
msgstr ""
2264
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2265
"precedence over regular ignores. Such exceptions are used to specify\n"
2266
"files that should be versioned which would otherwise be ignored."
1951
2267
1952
2268
#: bzrlib/builtins.py:3134
1953
2269
msgid ""
1954
2270
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1955
2271
"precedence over the '!' exception patterns."
1956
2272
msgstr ""
2273
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2274
"precedence over the '!' exception patterns."
1957
2275
1958
2276
#: bzrlib/builtins.py:3137
1959
2277
msgid ""
1962
2280
"* Ignore patterns containing shell wildcards must be quoted from\n"
1963
2281
" the shell on Unix."
1964
2282
msgstr ""
2283
":Notes: \n"
2284
" \n"
2285
"* Ignore patterns containing shell wildcards must be quoted from\n"
2286
" the shell on Unix."
1965
2287
1966
2288
#: bzrlib/builtins.py:3142
1967
2289
msgid ""
1968
2290
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1969
2291
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1970
2292
msgstr ""
2293
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2294
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1971
2295
1972
2296
#: bzrlib/builtins.py:3145
1973
2297
msgid ""
1974
2298
":Examples:\n"
1975
2299
" Ignore the top level Makefile::"
1976
2300
msgstr ""
2301
":Examples:\n"
2302
" Ignore the top level Makefile::"
1977
2303
1978
2304
#: bzrlib/builtins.py:3148
1979
2305
msgid " bzr ignore ./Makefile"
1980
msgstr ""
2306
msgstr " bzr ignore ./Makefile"
1981
2307
1982
2308
#: bzrlib/builtins.py:3150
1983
2309
msgid " Ignore .class files in all directories...::"
1984
msgstr ""
2310
msgstr " Ignore .class files in all directories...::"
1985
2311
1986
2312
#: bzrlib/builtins.py:3152
1987
2313
msgid " bzr ignore \"*.class\""
1988
msgstr ""
2314
msgstr " bzr ignore \"*.class\""
1989
2315
1990
2316
#: bzrlib/builtins.py:3154
1991
2317
msgid " ...but do not ignore \"special.class\"::"
1992
msgstr ""
2318
msgstr " ...but do not ignore \"special.class\"::"
1993
2319
1994
2320
#: bzrlib/builtins.py:3156
1995
2321
msgid " bzr ignore \"!special.class\""
1996
msgstr ""
2322
msgstr " bzr ignore \"!special.class\""
1997
2323
1998
2324
#: bzrlib/builtins.py:3158
1999
2325
msgid " Ignore files whose name begins with the \"#\" character::"
2000
msgstr ""
2326
msgstr " Ignore files whose name begins with the \"#\" character::"
2001
2327
2002
2328
#: bzrlib/builtins.py:3160
2003
2329
msgid " bzr ignore \"RE:^#\""
2004
msgstr ""
2330
msgstr " bzr ignore \"RE:^#\""
2005
2331
2006
2332
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2007
2333
msgid " Ignore .o files under the lib directory::"
2008
msgstr ""
2334
msgstr " Ignore .o files under the lib directory::"
2009
2335
2010
2336
#: bzrlib/builtins.py:3164
2011
2337
msgid " bzr ignore \"lib/**/*.o\""
2012
msgstr ""
2338
msgstr " bzr ignore \"lib/**/*.o\""
2013
2339
2014
2340
#: bzrlib/builtins.py:3168
2015
2341
msgid " bzr ignore \"RE:lib/.*\\.o\""
2016
msgstr ""
2342
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2017
2343
2018
2344
#: bzrlib/builtins.py:3170
2019
2345
msgid " Ignore everything but the \"debian\" toplevel directory::"
2020
msgstr ""
2346
msgstr " Ignore everything but the \"debian\" top-level directory::"
2021
2347
2022
2348
#: bzrlib/builtins.py:3172
2023
2349
msgid ""
2030
2356
" bzr ignore \"!./local\"\n"
2031
2357
" bzr ignore \"!!*~\""
2032
2358
msgstr ""
2359
" bzr ignore \"RE:(?!debian/).*\"\n"
2360
" \n"
2361
" Ignore everything except the \"local\" top-level directory,\n"
2362
" but always ignore autosave files ending in ~, even under local/::\n"
2363
" \n"
2364
" bzr ignore \"*\"\n"
2365
" bzr ignore \"!./local\"\n"
2366
" bzr ignore \"!!*~\""
2033
2367
2034
2368
#: bzrlib/builtins.py:3186
2035
2369
msgid "Display the default ignore rules that bzr uses."
2036
msgstr ""
2370
msgstr "Display the default ignore rules that bzr uses."
2037
2371
2038
2372
#: bzrlib/builtins.py:3198
2039
2373
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2040
msgstr ""
2374
msgstr "ignore requires at least one NAME_PATTERN or --default-rules."
2041
2375
2042
2376
#: bzrlib/builtins.py:3209
2043
2377
#, python-format
2044
2378
msgid "Invalid ignore pattern found. %s"
2045
2379
msgid_plural "Invalid ignore patterns found. %s"
2046
msgstr[0] ""
2047
msgstr[1] ""
2380
msgstr[0] "Invalid ignore pattern found. %s"
2381
msgstr[1] "Invalid ignore patterns found. %s"
2048
2382
2049
2383
#: bzrlib/builtins.py:3218
2050
2384
msgid "NAME_PATTERN should not be an absolute path"
2051
msgstr ""
2385
msgstr "NAME_PATTERN should not be an absolute path"
2052
2386
2053
2387
#: bzrlib/builtins.py:3231
2054
2388
#, python-format
2059
2393
"These files will continue to be version controlled unless you 'bzr remove' "
2060
2394
"them.\n"
2061
2395
msgstr ""
2396
"Warning: the following files are version controlled and match your ignore "
2397
"pattern:\n"
2398
"%s\n"
2399
"These files will continue to be version controlled unless you 'bzr remove' "
2400
"them.\n"
2062
2401
2063
2402
#: bzrlib/builtins.py:3238
2064
2403
msgid "List ignored files and the patterns that matched them."
2065
msgstr ""
2404
msgstr "List ignored files and the patterns that matched them."
2066
2405
2067
2406
#: bzrlib/builtins.py:3240
2068
2407
msgid ""
2069
2408
"List all the ignored files and the ignore pattern that caused the file to\n"
2070
2409
"be ignored."
2071
2410
msgstr ""
2411
"List all the ignored files and the ignore pattern that caused the file to\n"
2412
"be ignored."
2072
2413
2073
2414
#: bzrlib/builtins.py:3243
2074
2415
msgid "Alternatively, to list just the files::"
2075
msgstr ""
2416
msgstr "Alternatively, to list just the files::"
2076
2417
2077
2418
#: bzrlib/builtins.py:3245
2078
2419
msgid " bzr ls --ignored"
2079
msgstr ""
2420
msgstr " bzr ls --ignored"
2080
2421
2081
2422
#: bzrlib/builtins.py:3279
2082
2423
#, python-format
2083
2424
msgid "not a valid revision-number: %r"
2084
msgstr ""
2425
msgstr "not a valid revision-number: %r"
2085
2426
2086
2427
#: bzrlib/builtins.py:3286
2087
2428
msgid ""
2088
2429
"Export current or past revision to a destination directory or archive."
2089
2430
msgstr ""
2431
"Export current or past revision to a destination directory or archive."
2090
2432
2091
2433
#: bzrlib/builtins.py:3288
2092
2434
msgid "If no revision is specified this exports the last committed revision."
2093
2435
msgstr ""
2436
"If no revision is specified this exports the last committed revision."
2094
2437
2095
2438
#: bzrlib/builtins.py:3290
2096
2439
msgid ""
2098
2441
"given, try to find the format with the extension. If no extension\n"
2099
2442
"is found exports to a directory (equivalent to --format=dir)."
2100
2443
msgstr ""
2444
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2445
"given, try to find the format with the extension. If no extension\n"
2446
"is found exports to a directory (equivalent to --format=dir)."
2101
2447
2102
2448
#: bzrlib/builtins.py:3294
2103
2449
msgid ""
2105
2451
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2106
2452
"to the exported filename. The root option has no effect for 'dir' format."
2107
2453
msgstr ""
2454
"If root is supplied, it will be used as the root directory inside\n"
2455
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2456
"to the exported filename. The root option has no effect for 'dir' format."
2108
2457
2109
2458
#: bzrlib/builtins.py:3298
2110
2459
msgid ""
2111
2460
"If branch is omitted then the branch containing the current working\n"
2112
2461
"directory will be used."
2113
2462
msgstr ""
2463
"If branch is omitted then the branch containing the current working\n"
2464
"directory will be used."
2114
2465
2115
2466
#: bzrlib/builtins.py:3301
2116
2467
msgid ""
2117
2468
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2118
2469
msgstr ""
2470
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2119
2471
2120
2472
#: bzrlib/builtins.py:3303
2121
2473
msgid ""
2129
2481
" zip .zip\n"
2130
2482
" ================= ========================="
2131
2483
msgstr ""
2484
" ================= =========================\n"
2485
" Supported formats Autodetected by extension\n"
2486
" ================= =========================\n"
2487
" dir (none)\n"
2488
" tar .tar\n"
2489
" tbz2 .tar.bz2, .tbz2\n"
2490
" tgz .tar.gz, .tgz\n"
2491
" zip .zip\n"
2492
" ================= ========================="
2132
2493
2133
2494
#: bzrlib/builtins.py:3317
2134
2495
msgid "Type of file to export to."
2135
msgstr ""
2496
msgstr "Type of file to export to."
2136
2497
2137
2498
#: bzrlib/builtins.py:3320
2138
2499
msgid "Apply content filters to export the convenient form."
2139
msgstr ""
2500
msgstr "Apply content filters to export the convenient form."
2140
2501
2141
2502
#: bzrlib/builtins.py:3324
2142
2503
msgid "Name of the root directory inside the exported file."
2143
msgstr ""
2504
msgstr "Name of the root directory inside the exported file."
2144
2505
2145
2506
#: bzrlib/builtins.py:3326
2146
2507
msgid ""
2147
2508
"Set modification time of files to that of the last revision in which it was "
2148
2509
"changed."
2149
2510
msgstr ""
2511
"Set modification time of files to that of the last revision in which it was "
2512
"changed."
2150
2513
2151
2514
#: bzrlib/builtins.py:3329
2152
2515
msgid ""
2153
2516
"Export the working tree contents rather than that of the last revision."
2154
2517
msgstr ""
2518
"Export the working tree contents rather than that of the last revision."
2155
2519
2156
2520
#: bzrlib/builtins.py:3348
2157
2521
msgid "--uncommitted requires a working tree"
2158
msgstr ""
2522
msgstr "--uncommitted requires a working tree"
2159
2523
2160
2524
#: bzrlib/builtins.py:3357
2161
2525
#, python-format
2162
2526
msgid "Unsupported export format: %s"
2163
msgstr ""
2527
msgstr "Unsupported export format: %s"
2164
2528
2165
2529
#: bzrlib/builtins.py:3361
2166
2530
msgid ""
2167
2531
"Write the contents of a file as of a given revision to standard output."
2168
2532
msgstr ""
2533
"Write the contents of a file as of a given revision to standard output."
2169
2534
2170
2535
#: bzrlib/builtins.py:3363
2171
2536
msgid "If no revision is nominated, the last revision is used."
2172
msgstr ""
2537
msgstr "If no revision is nominated, the last revision is used."
2173
2538
2174
2539
#: bzrlib/builtins.py:3365
2175
2540
msgid ""
2176
2541
"Note: Take care to redirect standard output when using this command on a\n"
2177
2542
"binary file."
2178
2543
msgstr ""
2544
"Note: Take care to redirect standard output when using this command on a\n"
2545
"binary file."
2179
2546
2180
2547
#: bzrlib/builtins.py:3371
2181
2548
msgid "The path name in the old tree."
2182
msgstr ""
2549
msgstr "The path name in the old tree."
2183
2550
2184
2551
#: bzrlib/builtins.py:3372
2185
2552
msgid "Apply content filters to display the convenience form."
2186
msgstr ""
2553
msgstr "Apply content filters to display the convenience form."
2187
2554
2188
2555
#: bzrlib/builtins.py:3383
2189
2556
msgid "bzr cat --revision takes exactly one revision specifier"
2190
msgstr ""
2557
msgstr "bzr cat --revision takes exactly one revision specifier"
2191
2558
2192
2559
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2193
2560
msgid "{0!r} is not present in revision {1}"
2194
msgstr ""
2561
msgstr "{0!r} is not present in revision {1}"
2195
2562
2196
2563
#: bzrlib/builtins.py:3443
2197
2564
msgid "Commit changes into a new revision."
2198
msgstr ""
2565
msgstr "Commit changes into a new revision."
2199
2566
2200
2567
#: bzrlib/builtins.py:3445
2201
2568
msgid ""
2206
2573
"the user to enter the message. To see the changed files in the\n"
2207
2574
"boilerplate text loaded into the editor, use the --show-diff option."
2208
2575
msgstr ""
2576
"An explanatory message needs to be given for each commit. This is\n"
2577
"often done by using the --message option (getting the message from the\n"
2578
"command line) or by using the --file option (getting the message from\n"
2579
"a file). If neither of these options is given, an editor is opened for\n"
2580
"the user to enter the message. To see the changed files in the\n"
2581
"boilerplate text loaded into the editor, use the --show-diff option."
2209
2582
2210
2583
#: bzrlib/builtins.py:3452
2211
2584
msgid ""
2213
2586
"commit is assumed to be the author. These defaults can be overridden\n"
2214
2587
"as explained below."
2215
2588
msgstr ""
2589
"By default, the entire tree is committed and the person doing the\n"
2590
"commit is assumed to be the author. These defaults can be overridden\n"
2591
"as explained below."
2216
2592
2217
2593
#: bzrlib/builtins.py:3456
2218
2594
msgid ":Selective commits:"
2219
msgstr ""
2595
msgstr ":Selective commits:"
2220
2596
2221
2597
#: bzrlib/builtins.py:3458
2222
2598
msgid ""
2224
2600
" committed. If a directory is specified then the directory and\n"
2225
2601
" everything within it is committed."
2226
2602
msgstr ""
2603
" If selected files are specified, only changes to those files are\n"
2604
" committed. If a directory is specified then the directory and\n"
2605
" everything within it is committed."
2227
2606
2228
2607
#: bzrlib/builtins.py:3462
2229
2608
msgid ""
2231
2610
" For example, to commit only changes within foo, but not changes\n"
2232
2611
" within foo/bar::"
2233
2612
msgstr ""
2613
" When excludes are given, they take precedence over selected files.\n"
2614
" For example, to commit only changes within foo, but not changes\n"
2615
" within foo/bar::"
2234
2616
2235
2617
#: bzrlib/builtins.py:3466
2236
2618
msgid " bzr commit foo -x foo/bar"
2237
msgstr ""
2619
msgstr " bzr commit foo -x foo/bar"
2238
2620
2239
2621
#: bzrlib/builtins.py:3468
2240
2622
msgid " A selective commit after a merge is not yet supported."
2241
msgstr ""
2623
msgstr " A selective commit after a merge is not yet supported."
2242
2624
2243
2625
#: bzrlib/builtins.py:3470
2244
2626
msgid ":Custom authors:"
2245
msgstr ""
2627
msgstr ":Custom authors:"
2246
2628
2247
2629
#: bzrlib/builtins.py:3472
2248
2630
msgid ""
2253
2635
" the change you can specify the option multiple times, once for each\n"
2254
2636
" author."
2255
2637
msgstr ""
2638
" If the author of the change is not the same person as the committer,\n"
2639
" you can specify the author's name using the --author option. The\n"
2640
" name should be in the same format as a committer-id, e.g.\n"
2641
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2642
" the change you can specify the option multiple times, once for each\n"
2643
" author."
2256
2644
2257
2645
#: bzrlib/builtins.py:3479
2258
2646
msgid ":Checks:"
2259
msgstr ""
2647
msgstr ":Checks:"
2260
2648
2261
2649
#: bzrlib/builtins.py:3481
2262
2650
msgid ""
2266
2654
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2267
2655
" for details."
2268
2656
msgstr ""
2657
" A common mistake is to forget to add a new file or directory before\n"
2658
" running the commit command. The --strict option checks for unknown\n"
2659
" files and aborts the commit if any are found. More advanced pre-commit\n"
2660
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2661
" for details."
2269
2662
2270
2663
#: bzrlib/builtins.py:3487
2271
2664
msgid ":Things to note:"
2272
msgstr ""
2665
msgstr ":Things to note:"
2273
2666
2274
2667
#: bzrlib/builtins.py:3489
2275
2668
msgid ""
2277
2670
" mistake in the commit message say, you can use the uncommit command\n"
2278
2671
" to undo it. See ``bzr help uncommit`` for details."
2279
2672
msgstr ""
2673
" If you accidentally commit the wrong changes or make a spelling\n"
2674
" mistake in the commit message say, you can use the uncommit command\n"
2675
" to undo it. See ``bzr help uncommit`` for details."
2280
2676
2281
2677
#: bzrlib/builtins.py:3493
2282
2678
msgid ""
2285
2681
" option can be used to record the association between a revision and\n"
2286
2682
" one or more bugs. See ``bzr help bugs`` for details."
2287
2683
msgstr ""
2684
" Hooks can also be configured to run after a commit. This allows you\n"
2685
" to trigger updates to external systems like bug trackers. The --fixes\n"
2686
" option can be used to record the association between a revision and\n"
2687
" one or more bugs. See ``bzr help bugs`` for details."
2288
2688
2289
2689
#: bzrlib/builtins.py:3503
2290
2690
msgid "Do not consider changes made to a given path."
2291
msgstr ""
2691
msgstr "Do not consider changes made to a given path."
2292
2692
2293
2693
#: bzrlib/builtins.py:3506
2294
2694
msgid "Description of the new revision."
2295
msgstr ""
2695
msgstr "Description of the new revision."
2296
2696
2297
2697
#: bzrlib/builtins.py:3509
2298
2698
msgid "Commit even if nothing has changed."
2299
msgstr ""
2699
msgstr "Commit even if nothing has changed."
2300
2700
2301
2701
#: bzrlib/builtins.py:3513
2302
2702
msgid "Take commit message from this file."
2303
msgstr ""
2703
msgstr "Take commit message from this file."
2304
2704
2305
2705
#: bzrlib/builtins.py:3515
2306
2706
msgid "Refuse to commit if there are unknown files in the working tree."
2307
msgstr ""
2707
msgstr "Refuse to commit if there are unknown files in the working tree."
2308
2708
2309
2709
#: bzrlib/builtins.py:3518
2310
2710
msgid ""
2311
2711
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2312
2712
"08:00:00 +0100'."
2313
2713
msgstr ""
2714
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2715
"08:00:00 +0100'."
2314
2716
2315
2717
#: bzrlib/builtins.py:3521
2316
2718
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2317
msgstr ""
2719
msgstr "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2318
2720
2319
2721
#: bzrlib/builtins.py:3524
2320
2722
msgid "Set the author's name, if it's different from the committer."
2321
msgstr ""
2723
msgstr "Set the author's name, if it's different from the committer."
2322
2724
2323
2725
#: bzrlib/builtins.py:3527
2324
2726
msgid ""
2325
2727
"Perform a local commit in a bound branch. Local commits are not pushed to "
2326
2728
"the master branch until a normal commit is performed."
2327
2729
msgstr ""
2730
"Perform a local commit in a bound branch. Local commits are not pushed to "
2731
"the master branch until a normal commit is performed."
2328
2732
2329
2733
#: bzrlib/builtins.py:3533
2330
2734
msgid ""
2331
2735
"When no message is supplied, show the diff along with the status summary in "
2332
2736
"the message editor."
2333
2737
msgstr ""
2738
"When no message is supplied, show the diff along with the status summary in "
2739
"the message editor."
2334
2740
2335
2741
#: bzrlib/builtins.py:3536
2336
2742
msgid ""
2337
2743
"When committing to a foreign version control system do not push data that "
2338
2744
"can not be natively represented."
2339
2745
msgstr ""
2746
"When committing to a foreign version control system do not push data that "
2747
"can not be natively represented."
2340
2748
2341
2749
#: bzrlib/builtins.py:3554
2342
2750
#, python-format
2345
2753
"default bug tracker using the `bugtracker` option.\n"
2346
2754
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2347
2755
msgstr ""
2756
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2757
"default bug tracker using the `bugtracker` option.\n"
2758
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2348
2759
2349
2760
#: bzrlib/builtins.py:3563
2350
2761
#, python-format
2353
2764
"for more information on this feature.\n"
2354
2765
"Commit refused."
2355
2766
msgstr ""
2767
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2768
"for more information on this feature.\n"
2769
"Commit refused."
2356
2770
2357
2771
#: bzrlib/builtins.py:3572
2358
2772
#, python-format
2359
2773
msgid "Unrecognized bug %s. Commit refused."
2360
msgstr ""
2774
msgstr "Unrecognised bug %s. Commit refused."
2361
2775
2362
2776
#: bzrlib/builtins.py:3575
2363
2777
#, python-format
2365
2779
"%s\n"
2366
2780
"Commit refused."
2367
2781
msgstr ""
2782
"%s\n"
2783
"Commit refused."
2368
2784
2369
2785
#: bzrlib/builtins.py:3599
2370
2786
msgid "Could not parse --commit-time: "
2371
msgstr ""
2787
msgstr "Could not parse --commit-time: "
2372
2788
2373
2789
#: bzrlib/builtins.py:3639
2374
2790
msgid "please specify either --message or --file"
2375
msgstr ""
2791
msgstr "please specify either --message or --file"
2376
2792
2377
2793
#: bzrlib/builtins.py:3668
2378
2794
msgid "please specify a commit message with either --message or --file"
2379
msgstr ""
2795
msgstr "please specify a commit message with either --message or --file"
2380
2796
2381
2797
#: bzrlib/builtins.py:3671
2382
2798
msgid ""
2383
2799
"Empty commit message specified. Please specify a commit message with either -"
2384
2800
"-message or --file or leave a blank message with --message \"\"."
2385
2801
msgstr ""
2802
"Empty commit message specified. Please specify a commit message with either -"
2803
"-message or --file or leave a blank message with --message \"\"."
2386
2804
2387
2805
#: bzrlib/builtins.py:3691
2388
2806
msgid ""
2389
2807
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2390
2808
"-unchanged to force an empty commit."
2391
2809
msgstr ""
2810
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2811
"-unchanged to force an empty commit."
2392
2812
2393
2813
#: bzrlib/builtins.py:3695
2394
2814
msgid ""
2395
2815
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2396
2816
"resolve FILE\" to resolve."
2397
2817
msgstr ""
2818
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2819
"resolve FILE\" to resolve."
2398
2820
2399
2821
#: bzrlib/builtins.py:3699
2400
2822
msgid "Commit refused because there are unknown files in the working tree."
2401
msgstr ""
2823
msgstr "Commit refused because there are unknown files in the working tree."
2402
2824
2403
2825
#: bzrlib/builtins.py:3702
2404
2826
msgid ""
2406
2828
"To commit to master branch, run update and then commit.\n"
2407
2829
"You can also pass --local to commit to continue working disconnected."
2408
2830
msgstr ""
2831
"\n"
2832
"To commit to master branch, run update and then commit.\n"
2833
"You can also pass --local to commit to continue working disconnected."
2409
2834
2410
2835
#: bzrlib/builtins.py:3710
2411
2836
msgid ""
2412
2837
"Validate working tree structure, branch consistency and repository history."
2413
2838
msgstr ""
2839
"Validate working tree structure, branch consistency and repository history."
2414
2840
2415
2841
#: bzrlib/builtins.py:3712
2416
2842
msgid ""
2417
2843
"This command checks various invariants about branch and repository storage\n"
2418
2844
"to detect data corruption or bzr bugs."
2419
2845
msgstr ""
2846
"This command checks various invariants about branch and repository storage\n"
2847
"to detect data corruption or bzr bugs."
2420
2848
2421
2849
#: bzrlib/builtins.py:3715
2422
2850
msgid ""
2423
2851
"The working tree and branch checks will only give output if a problem is\n"
2424
2852
"detected. The output fields of the repository check are:"
2425
2853
msgstr ""
2854
"The working tree and branch checks will only give output if a problem is\n"
2855
"detected. The output fields of the repository check are:"
2426
2856
2427
2857
#: bzrlib/builtins.py:3718
2428
2858
msgid ""
2430
2860
" This is just the number of revisions checked. It doesn't\n"
2431
2861
" indicate a problem."
2432
2862
msgstr ""
2863
"revisions\n"
2864
" This is just the number of revisions checked. It doesn't\n"
2865
" indicate a problem."
2433
2866
2434
2867
#: bzrlib/builtins.py:3722
2435
2868
msgid ""
2437
2870
" This is just the number of versionedfiles checked. It\n"
2438
2871
" doesn't indicate a problem."
2439
2872
msgstr ""
2873
"versionedfiles\n"
2874
" This is just the number of versionedfiles checked. It\n"
2875
" doesn't indicate a problem."
2440
2876
2441
2877
#: bzrlib/builtins.py:3726
2442
2878
msgid ""
2445
2881
" are not properly referenced by the revision ancestry. This is a\n"
2446
2882
" subtle problem that Bazaar can work around."
2447
2883
msgstr ""
2884
"unreferenced ancestors\n"
2885
" Texts that are ancestors of other texts, but\n"
2886
" are not properly referenced by the revision ancestry. This is a\n"
2887
" subtle problem that Bazaar can work around."
2448
2888
2449
2889
#: bzrlib/builtins.py:3731
2450
2890
msgid ""
2452
2892
" This is the total number of unique file contents\n"
2453
2893
" seen in the checked revisions. It does not indicate a problem."
2454
2894
msgstr ""
2895
"unique file texts\n"
2896
" This is the total number of unique file contents\n"
2897
" seen in the checked revisions. It does not indicate a problem."
2455
2898
2456
2899
#: bzrlib/builtins.py:3735
2457
2900
msgid ""
2461
2904
" entries are modified, but the file contents are not. It does not\n"
2462
2905
" indicate a problem."
2463
2906
msgstr ""
2907
"repeated file texts\n"
2908
" This is the total number of repeated texts seen\n"
2909
" in the checked revisions. Texts can be repeated when their file\n"
2910
" entries are modified, but the file contents are not. It does not\n"
2911
" indicate a problem."
2464
2912
2465
2913
#: bzrlib/builtins.py:3741
2466
2914
msgid ""
2468
2916
"given\n"
2469
2917
"location will be checked."
2470
2918
msgstr ""
2919
"If no restrictions are specified, all Bazaar data that is found at the "
2920
"given\n"
2921
"location will be checked."
2471
2922
2472
2923
#: bzrlib/builtins.py:3746
2473
2924
msgid " Check the tree and branch at 'foo'::"
2474
msgstr ""
2925
msgstr " Check the tree and branch at 'foo'::"
2475
2926
2476
2927
#: bzrlib/builtins.py:3748
2477
2928
msgid " bzr check --tree --branch foo"
2478
msgstr ""
2929
msgstr " bzr check --tree --branch foo"
2479
2930
2480
2931
#: bzrlib/builtins.py:3750
2481
2932
msgid " Check only the repository at 'bar'::"
2482
msgstr ""
2933
msgstr " Check only the repository at 'bar'::"
2483
2934
2484
2935
#: bzrlib/builtins.py:3752
2485
2936
msgid " bzr check --repo bar"
2486
msgstr ""
2937
msgstr " bzr check --repo bar"
2487
2938
2488
2939
#: bzrlib/builtins.py:3754
2489
2940
msgid " Check everything at 'baz'::"
2490
msgstr ""
2941
msgstr " Check everything at 'baz'::"
2491
2942
2492
2943
#: bzrlib/builtins.py:3756
2493
2944
msgid " bzr check baz"
2494
msgstr ""
2945
msgstr " bzr check baz"
2495
2946
2496
2947
#: bzrlib/builtins.py:3762
2497
2948
msgid "Check the branch related to the current directory."
2498
msgstr ""
2949
msgstr "Check the branch related to the current directory."
2499
2950
2500
2951
#: bzrlib/builtins.py:3764
2501
2952
msgid "Check the repository related to the current directory."
2502
msgstr ""
2953
msgstr "Check the repository related to the current directory."
2503
2954
2504
2955
#: bzrlib/builtins.py:3766
2505
2956
msgid "Check the working tree related to the current directory."
2506
msgstr ""
2957
msgstr "Check the working tree related to the current directory."
2507
2958
2508
2959
#: bzrlib/builtins.py:3780
2509
2960
msgid "Upgrade a repository, branch or working tree to a newer format."
2510
msgstr ""
2961
msgstr "Upgrade a repository, branch or working tree to a newer format."
2511
2962
2512
2963
#: bzrlib/builtins.py:3782
2513
2964
msgid ""
2517
2968
"or make new features available. It may however limit interoperability\n"
2518
2969
"with older repositories or with older versions of Bazaar."
2519
2970
msgstr ""
2971
"When the default format has changed after a major new release of\n"
2972
"Bazaar, you may be informed during certain operations that you\n"
2973
"should upgrade. Upgrading to a newer format may improve performance\n"
2974
"or make new features available. It may however limit interoperability\n"
2975
"with older repositories or with older versions of Bazaar."
2520
2976
2521
2977
#: bzrlib/builtins.py:3788
2522
2978
msgid ""
2527
2983
"a one way process (e.g. changing from the 1.x default to the\n"
2528
2984
"2.x default) so downgrading is not always possible."
2529
2985
msgstr ""
2986
"If you wish to upgrade to a particular format rather than the\n"
2987
"current default, that can be specified using the --format option.\n"
2988
"As a consequence, you can use the upgrade command this way to\n"
2989
"\"downgrade\" to an earlier format, though some conversions are\n"
2990
"a one way process (e.g. changing from the 1.x default to the\n"
2991
"2.x default) so downgrading is not always possible."
2530
2992
2531
2993
#: bzrlib/builtins.py:3795
2532
2994
msgid ""
2538
3000
"Alternatively, you can delete it by hand if everything looks good\n"
2539
3001
"afterwards."
2540
3002
msgstr ""
3003
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
3004
"process (where # is a number). By default, this is left there on\n"
3005
"completion. If the conversion fails, delete the new .bzr directory\n"
3006
"and rename this one back in its place. Use the --clean option to ask\n"
3007
"for the backup.bzr directory to be removed on successful conversion.\n"
3008
"Alternatively, you can delete it by hand if everything looks good\n"
3009
"afterwards."
2541
3010
2542
3011
#: bzrlib/builtins.py:3803
2543
3012
msgid ""
2546
3015
"If the conversion of a branch fails, remaining branches are still\n"
2547
3016
"tried."
2548
3017
msgstr ""
3018
"If the location given is a shared repository, dependent branches\n"
3019
"are also converted provided the repository converts successfully.\n"
3020
"If the conversion of a branch fails, remaining branches are still\n"
3021
"tried."
2549
3022
2550
3023
#: bzrlib/builtins.py:3808
2551
3024
msgid ""
2552
3025
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2553
3026
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2554
3027
msgstr ""
3028
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
3029
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2555
3030
2556
3031
#: bzrlib/builtins.py:3816
2557
3032
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2558
msgstr ""
3033
msgstr "Upgrade to a specific format. See \"bzr help formats\" for details."
2559
3034
2560
3035
#: bzrlib/builtins.py:3820
2561
3036
msgid "Branch format"
2562
msgstr ""
3037
msgstr "Branch format"
2563
3038
2564
3039
#: bzrlib/builtins.py:3822
2565
3040
msgid "Remove the backup.bzr directory if successful."
2566
msgstr ""
3041
msgstr "Remove the backup.bzr directory if successful."
2567
3042
2568
3043
#: bzrlib/builtins.py:3824
2569
3044
msgid "Show what would be done, but don't actually do anything."
2570
msgstr ""
3045
msgstr "Show what would be done, but don't actually do anything."
2571
3046
2572
3047
#: bzrlib/builtins.py:3839
2573
3048
msgid "Show or set bzr user id."
2574
msgstr ""
3049
msgstr "Show or set bzr user id."
2575
3050
2576
3051
#: bzrlib/builtins.py:3841
2577
3052
msgid ""
2578
3053
":Examples:\n"
2579
3054
" Show the email of the current user::"
2580
3055
msgstr ""
3056
":Examples:\n"
3057
" Show the email of the current user::"
2581
3058
2582
3059
#: bzrlib/builtins.py:3844
2583
3060
msgid " bzr whoami --email"
2584
msgstr ""
3061
msgstr " bzr whoami --email"
2585
3062
2586
3063
#: bzrlib/builtins.py:3846
2587
3064
msgid " Set the current user::"
2588
msgstr ""
3065
msgstr " Set the current user::"
2589
3066
2590
3067
#: bzrlib/builtins.py:3848
2591
3068
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2592
msgstr ""
3069
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2593
3070
2594
3071
#: bzrlib/builtins.py:3852
2595
3072
msgid "Display email address only."
2596
msgstr ""
3073
msgstr "Display email address only."
2597
3074
2598
3075
#: bzrlib/builtins.py:3854
2599
3076
msgid "Set identity for the current branch instead of globally."
2600
msgstr ""
3077
msgstr "Set identity for the current branch instead of globally."
2601
3078
2602
3079
#: bzrlib/builtins.py:3880
2603
3080
msgid "--email can only be used to display existing identity"
2604
msgstr ""
3081
msgstr "--email can only be used to display existing identity"
2605
3082
2606
3083
#: bzrlib/builtins.py:3904
2607
3084
msgid "Print or set the branch nickname."
2608
msgstr ""
3085
msgstr "Print or set the branch nickname."
2609
3086
2610
3087
#: bzrlib/builtins.py:3906
2611
3088
msgid ""
2613
3090
"the branch directory name is used for other branches. To print the\n"
2614
3091
"current nickname, execute with no argument."
2615
3092
msgstr ""
3093
"If unset, the colocated branch name is used for colocated branches, and\n"
3094
"the branch directory name is used for other branches. To print the\n"
3095
"current nickname, execute with no argument."
2616
3096
2617
3097
#: bzrlib/builtins.py:3910
2618
3098
msgid ""
2619
3099
"Bound branches use the nickname of its master branch unless it is set\n"
2620
3100
"locally."
2621
3101
msgstr ""
3102
"Bound branches use the nickname of its master branch unless it is set\n"
3103
"locally."
2622
3104
2623
3105
#: bzrlib/builtins.py:3930
2624
3106
msgid "Set/unset and display aliases."
2625
msgstr ""
3107
msgstr "Set/unset and display aliases."
2626
3108
2627
3109
#: bzrlib/builtins.py:3932
2628
3110
msgid ""
2629
3111
":Examples:\n"
2630
3112
" Show the current aliases::"
2631
3113
msgstr ""
3114
":Examples:\n"
3115
" Show the current aliases::"
2632
3116
2633
3117
#: bzrlib/builtins.py:3935
2634
3118
msgid " bzr alias"
2635
msgstr ""
3119
msgstr " bzr alias"
2636
3120
2637
3121
#: bzrlib/builtins.py:3937
2638
3122
msgid " Show the alias specified for 'll'::"
2639
msgstr ""
3123
msgstr " Show the alias specified for 'll'::"
2640
3124
2641
3125
#: bzrlib/builtins.py:3939
2642
3126
msgid " bzr alias ll"
2643
msgstr ""
3127
msgstr " bzr alias ll"
2644
3128
2645
3129
#: bzrlib/builtins.py:3941
2646
3130
msgid " Set an alias for 'll'::"
2647
msgstr ""
3131
msgstr " Set an alias for 'll'::"
2648
3132
2649
3133
#: bzrlib/builtins.py:3943
2650
3134
msgid " bzr alias ll=\"log --line -r-10..-1\""
2651
msgstr ""
3135
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2652
3136
2653
3137
#: bzrlib/builtins.py:3945
2654
3138
msgid " To remove an alias for 'll'::"
2655
msgstr ""
3139
msgstr " To remove an alias for 'll'::"
2656
3140
2657
3141
#: bzrlib/builtins.py:3947
2658
3142
msgid " bzr alias --remove ll"
2659
msgstr ""
3143
msgstr " bzr alias --remove ll"
2660
3144
2661
3145
#: bzrlib/builtins.py:3952
2662
3146
msgid "Remove the alias."
2663
msgstr ""
3147
msgstr "Remove the alias."
2664
3148
2665
3149
#: bzrlib/builtins.py:3970
2666
3150
msgid "bzr alias --remove expects an alias to remove."
2667
msgstr ""
3151
msgstr "bzr alias --remove expects an alias to remove."
2668
3152
2669
3153
#: bzrlib/builtins.py:4151
2670
3154
msgid ""
2671
3155
"subunit not available. subunit needs to be installed to use --subunit."
2672
3156
msgstr ""
3157
"subunit not available. subunit needs to be installed to use --subunit."
2673
3158
2674
3159
#: bzrlib/builtins.py:4168
2675
3160
msgid ""
2676
3161
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2677
3162
msgstr ""
3163
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2678
3164
2679
3165
#: bzrlib/builtins.py:4215
2680
3166
msgid "Show version of bzr."
2681
msgstr ""
3167
msgstr "Show version of bzr."
2682
3168
2683
3169
#: bzrlib/builtins.py:4219
2684
3170
msgid "Print just the version number."
2685
msgstr ""
3171
msgstr "Print just the version number."
2686
3172
2687
3173
#: bzrlib/builtins.py:4238
2688
3174
msgid "It sure does!\n"
2689
msgstr ""
3175
msgstr "It sure does!\n"
2690
3176
2691
3177
#: bzrlib/builtins.py:4262
2692
3178
#, python-format
2693
3179
msgid "merge base is revision %s\n"
2694
msgstr ""
3180
msgstr "merge base is revision %s\n"
2695
3181
2696
3182
#: bzrlib/builtins.py:4266
2697
3183
msgid "Perform a three-way merge."
2698
msgstr ""
3184
msgstr "Perform a three-way merge."
2699
3185
2700
3186
#: bzrlib/builtins.py:4268
2701
3187
msgid ""
2707
3193
"branch: in this case, only the modifications to that file are merged into\n"
2708
3194
"the current working tree."
2709
3195
msgstr ""
3196
"The source of the merge can be specified either in the form of a branch,\n"
3197
"or in the form of a path to a file containing a merge directive generated\n"
3198
"with bzr send. If neither is specified, the default is the upstream branch\n"
3199
"or the branch most recently merged using --remember. The source of the\n"
3200
"merge may also be specified in the form of a path to a file in another\n"
3201
"branch: in this case, only the modifications to that file are merged into\n"
3202
"the current working tree."
2710
3203
2711
3204
#: bzrlib/builtins.py:4276
2712
3205
msgid ""
2714
3207
"work from the other branch, automatically determining an appropriate base\n"
2715
3208
"revision. If this fails, you may need to give an explicit base."
2716
3209
msgstr ""
3210
"When merging from a branch, by default bzr will try to merge in all new\n"
3211
"work from the other branch, automatically determining an appropriate base\n"
3212
"revision. If this fails, you may need to give an explicit base."
2717
3213
2718
3214
#: bzrlib/builtins.py:4280
2719
3215
msgid ""
2720
3216
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2721
3217
"try to merge in all new work up to and including revision OTHER."
2722
3218
msgstr ""
3219
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3220
"try to merge in all new work up to and including revision OTHER."
2723
3221
2724
3222
#: bzrlib/builtins.py:4283
2725
3223
msgid ""
2731
3229
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2732
3230
"changes from the other branch is not stored in the commit."
2733
3231
msgstr ""
3232
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3233
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3234
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3235
"not already contain revision BASE, such a merge is commonly referred to as\n"
3236
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3237
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3238
"changes from the other branch is not stored in the commit."
2734
3239
2735
3240
#: bzrlib/builtins.py:4291
2736
3241
msgid "Revision numbers are always relative to the source branch."
2737
msgstr ""
3242
msgstr "Revision numbers are always relative to the source branch."
2738
3243
2739
3244
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2740
3245
msgid ""
2752
3257
msgid ""
2753
3258
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2754
3259
msgstr ""
3260
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2755
3261
2756
3262
#: bzrlib/builtins.py:4300
2757
3263
msgid ""
2760
3266
"to use the default. To change the default, use --remember. The value will\n"
2761
3267
"only be saved if the remote location can be accessed."
2762
3268
msgstr ""
3269
"If there is no default branch set, the first merge will set it (use\n"
3270
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3271
"to use the default. To change the default, use --remember. The value will\n"
3272
"only be saved if the remote location can be accessed."
2763
3273
2764
3274
#: bzrlib/builtins.py:4305
2765
3275
msgid ""
2767
3277
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2768
3278
"committed to record the result of the merge."
2769
3279
msgstr ""
3280
"The results of the merge are placed into the destination working\n"
3281
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3282
"committed to record the result of the merge."
2770
3283
2771
3284
#: bzrlib/builtins.py:4309
2772
3285
msgid ""
2776
3289
"changes in the tree. The --force option can also be used to create a\n"
2777
3290
"merge revision which has more than two parents."
2778
3291
msgstr ""
3292
"merge refuses to run if there are any uncommitted changes, unless\n"
3293
"--force is given. If --force is given, then the changes from the source \n"
3294
"will be merged with the current working tree, including any uncommitted\n"
3295
"changes in the tree. The --force option can also be used to create a\n"
3296
"merge revision which has more than two parents."
2779
3297
2780
3298
#: bzrlib/builtins.py:4315
2781
3299
msgid ""
2783
3301
"branch without merging any committed revisions, the --uncommitted option\n"
2784
3302
"can be given."
2785
3303
msgstr ""
3304
"If one would like to merge changes from the working tree of the other\n"
3305
"branch without merging any committed revisions, the --uncommitted option\n"
3306
"can be given."
2786
3307
2787
3308
#: bzrlib/builtins.py:4319
2788
3309
msgid ""
2789
3310
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2790
3311
"you to apply each diff hunk and file change, similar to \"shelve\"."
2791
3312
msgstr ""
3313
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3314
"you to apply each diff hunk and file change, similar to \"shelve\"."
2792
3315
2793
3316
#: bzrlib/builtins.py:4322
2794
3317
msgid ""
2795
3318
":Examples:\n"
2796
3319
" To merge all new revisions from bzr.dev::"
2797
3320
msgstr ""
3321
":Examples:\n"
3322
" To merge all new revisions from bzr.dev::"
2798
3323
2799
3324
#: bzrlib/builtins.py:4325
2800
3325
msgid " bzr merge ../bzr.dev"
2801
msgstr ""
3326
msgstr " bzr merge ../bzr.dev"
2802
3327
2803
3328
#: bzrlib/builtins.py:4327
2804
3329
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2805
msgstr ""
3330
msgstr " To merge changes up to and including revision 82 from bzr.dev::"
2806
3331
2807
3332
#: bzrlib/builtins.py:4329
2808
3333
msgid " bzr merge -r 82 ../bzr.dev"
2809
msgstr ""
3334
msgstr " bzr merge -r 82 ../bzr.dev"
2810
3335
2811
3336
#: bzrlib/builtins.py:4331
2812
3337
msgid " To merge the changes introduced by 82, without previous changes::"
2813
3338
msgstr ""
3339
" To merge the changes introduced by 82, without previous changes::"
2814
3340
2815
3341
#: bzrlib/builtins.py:4333
2816
3342
msgid " bzr merge -r 81..82 ../bzr.dev"
2817
msgstr ""
3343
msgstr " bzr merge -r 81..82 ../bzr.dev"
2818
3344
2819
3345
#: bzrlib/builtins.py:4335
2820
3346
msgid " To apply a merge directive contained in /tmp/merge::"
2821
msgstr ""
3347
msgstr " To apply a merge directive contained in /tmp/merge::"
2822
3348
2823
3349
#: bzrlib/builtins.py:4337
2824
3350
msgid " bzr merge /tmp/merge"
2825
msgstr ""
3351
msgstr " bzr merge /tmp/merge"
2826
3352
2827
3353
#: bzrlib/builtins.py:4339
2828
3354
msgid ""
2829
3355
" To create a merge revision with three parents from two branches\n"
2830
3356
" feature1a and feature1b:"
2831
3357
msgstr ""
3358
" To create a merge revision with three parents from two branches\n"
3359
" feature1a and feature1b:"
2832
3360
2833
3361
#: bzrlib/builtins.py:4342
2834
3362
msgid ""
2836
3364
" bzr merge ../feature1b --force\n"
2837
3365
" bzr commit -m 'revision with three parents'"
2838
3366
msgstr ""
3367
" bzr merge ../feature1a\n"
3368
" bzr merge ../feature1b --force\n"
3369
" bzr commit -m 'revision with three parents'"
2839
3370
2840
3371
#: bzrlib/builtins.py:4354
2841
3372
msgid "Merge even if the destination tree has uncommitted changes."
2842
msgstr ""
3373
msgstr "Merge even if the destination tree has uncommitted changes."
2843
3374
2844
3375
#: bzrlib/builtins.py:4360
2845
3376
msgid ""
2846
3377
"Apply uncommitted changes from a working copy, instead of branch changes."
2847
3378
msgstr ""
3379
"Apply uncommitted changes from a working copy, instead of branch changes."
2848
3380
2849
3381
#: bzrlib/builtins.py:4362
2850
3382
msgid ""
2852
3384
"the source rather than merging. When this happens, you do not need to "
2853
3385
"commit the result."
2854
3386
msgstr ""
3387
"If the destination is already completely merged into the source, pull from "
3388
"the source rather than merging. When this happens, you do not need to "
3389
"commit the result."
2855
3390
2856
3391
#: bzrlib/builtins.py:4367
2857
3392
msgid ""
2858
3393
"Branch to merge into, rather than the one containing the working directory."
2859
3394
msgstr ""
3395
"Branch to merge into, rather than the one containing the working directory."
2860
3396
2861
3397
#: bzrlib/builtins.py:4369
2862
3398
msgid "Instead of merging, show a diff of the merge."
2863
msgstr ""
3399
msgstr "Instead of merging, show a diff of the merge."
2864
3400
2865
3401
#: bzrlib/builtins.py:4371
2866
3402
msgid "Select changes interactively."
2867
msgstr ""
3403
msgstr "Select changes interactively."
2868
3404
2869
3405
#: bzrlib/builtins.py:4393
2870
3406
msgid ""
2871
3407
"Merging into empty branches not currently supported, "
2872
3408
"https://bugs.launchpad.net/bzr/+bug/308562"
2873
3409
msgstr ""
3410
"Merging into empty branches not currently supported, "
3411
"https://bugs.launchpad.net/bzr/+bug/308562"
2874
3412
2875
3413
#: bzrlib/builtins.py:4420
2876
3414
msgid "Cannot use --uncommitted with bundles or merge directives."
2877
msgstr ""
3415
msgstr "Cannot use --uncommitted with bundles or merge directives."
2878
3416
2879
3417
#: bzrlib/builtins.py:4431
2880
3418
msgid "Cannot use --uncommitted and --revision at the same time."
2881
msgstr ""
3419
msgstr "Cannot use --uncommitted and --revision at the same time."
2882
3420
2883
3421
#: bzrlib/builtins.py:4451
2884
3422
msgid "merger: "
2885
msgstr ""
3423
msgstr "merger: "
2886
3424
2887
3425
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2888
3426
msgid "Nothing to do."
2889
msgstr ""
3427
msgstr "Nothing to do."
2890
3428
2891
3429
#: bzrlib/builtins.py:4457
2892
3430
msgid "Cannot pull individual files"
2893
msgstr ""
3431
msgstr "Cannot pull individual files"
2894
3432
2895
3433
#: bzrlib/builtins.py:4465
2896
3434
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2897
msgstr ""
3435
msgstr "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2898
3436
2899
3437
#: bzrlib/builtins.py:4523
2900
3438
#, python-format
2901
3439
msgid "Show-base is not supported for this merge type. %s"
2902
msgstr ""
3440
msgstr "Show-base is not supported for this merge type. %s"
2903
3441
2904
3442
#: bzrlib/builtins.py:4532
2905
3443
#, python-format
2906
3444
msgid "Conflict reduction is not supported for merge type %s."
2907
msgstr ""
3445
msgstr "Conflict reduction is not supported for merge type %s."
2908
3446
2909
3447
#: bzrlib/builtins.py:4536
2910
3448
msgid "Cannot do conflict reduction and show base."
2911
msgstr ""
3449
msgstr "Cannot do conflict reduction and show base."
2912
3450
2913
3451
#: bzrlib/builtins.py:4647
2914
3452
msgid "No location specified or remembered"
2915
msgstr ""
3453
msgstr "No location specified or remembered"
2916
3454
2917
3455
#: bzrlib/builtins.py:4649
2918
3456
msgid "{0} remembered {1} location {2}"
2919
msgstr ""
3457
msgstr "{0} remembered {1} location {2}"
2920
3458
2921
3459
#: bzrlib/builtins.py:4655
2922
3460
msgid "Redo a merge."
2923
msgstr ""
3461
msgstr "Redo a merge."
2924
3462
2925
3463
#: bzrlib/builtins.py:4657
2926
3464
msgid ""
2928
3466
"conflicts. Some merge techniques are better than others, and remerge\n"
2929
3467
"lets you try different ones on different files."
2930
3468
msgstr ""
3469
"Use this if you want to try a different merge technique while resolving\n"
3470
"conflicts. Some merge techniques are better than others, and re-merge\n"
3471
"lets you try different ones on different files."
2931
3472
2932
3473
#: bzrlib/builtins.py:4661
2933
3474
msgid ""
2935
3476
"merge. The difference is that remerge can (only) be run when there is a\n"
2936
3477
"pending merge, and it lets you specify particular files."
2937
3478
msgstr ""
3479
"The options for re-merge have the same meaning and defaults as the ones for\n"
3480
"merge. The difference is that re-merge can (only) be run when there is a\n"
3481
"pending merge, and it lets you specify particular files."
2938
3482
2939
3483
#: bzrlib/builtins.py:4665
2940
3484
msgid ""
2942
3486
" Re-do the merge of all conflicted files, and show the base text in\n"
2943
3487
" conflict regions, in addition to the usual THIS and OTHER texts::"
2944
3488
msgstr ""
3489
":Examples:\n"
3490
" Re-do the merge of all conflicted files, and show the base text in\n"
3491
" conflict regions, in addition to the usual THIS and OTHER texts::"
2945
3492
2946
3493
#: bzrlib/builtins.py:4669
2947
3494
msgid " bzr remerge --show-base"
2948
msgstr ""
3495
msgstr " bzr remerge --show-base"
2949
3496
2950
3497
#: bzrlib/builtins.py:4671
2951
3498
msgid ""
2952
3499
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2953
3500
" additional processing to reduce the size of conflict regions::"
2954
3501
msgstr ""
3502
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3503
" additional processing to reduce the size of conflict regions::"
2955
3504
2956
3505
#: bzrlib/builtins.py:4674
2957
3506
msgid " bzr remerge --merge-type weave --reprocess foobar"
2958
msgstr ""
3507
msgstr " bzr remerge --merge-type weave --reprocess foobar"
2959
3508
2960
3509
#: bzrlib/builtins.py:4681
2961
3510
msgid "Show base revision text in conflicts."
2962
msgstr ""
3511
msgstr "Show base revision text in conflicts."
2963
3512
2964
3513
#: bzrlib/builtins.py:4693
2965
3514
msgid ""
2966
3515
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2967
3516
"merges."
2968
3517
msgstr ""
3518
"Sorry, re-merge only works after normal merges. Not cherrypicking or multi-"
3519
"merges."
2969
3520
2970
3521
#: bzrlib/builtins.py:4751
2971
3522
msgid ""
2972
3523
"Set files in the working tree back to the contents of a previous revision."
2973
3524
msgstr ""
3525
"Set files in the working tree back to the contents of a previous revision."
2974
3526
2975
3527
#: bzrlib/builtins.py:4753
2976
3528
msgid ""
2980
3532
"working tree, not any revision history like the branch and repository or\n"
2981
3533
"the working tree basis revision."
2982
3534
msgstr ""
3535
"Giving a list of files will revert only those files. Otherwise, all files\n"
3536
"will be reverted. If the revision is not specified with '--revision', the\n"
3537
"working tree basis revision is used. A revert operation affects only the\n"
3538
"working tree, not any revision history like the branch and repository or\n"
3539
"the working tree basis revision."
2983
3540
2984
3541
#: bzrlib/builtins.py:4759
2985
3542
msgid ""
2992
3549
"update the working tree accordingly while preserving local changes, see the\n"
2993
3550
"update command."
2994
3551
msgstr ""
3552
"To remove only some changes, without reverting to a prior version, use\n"
3553
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3554
"will remove the changes introduced by the second last commit (-2), without\n"
3555
"affecting the changes introduced by the last commit (-1). To remove\n"
3556
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3557
"To update the branch to a specific revision or the latest revision and\n"
3558
"update the working tree accordingly while preserving local changes, see the\n"
3559
"update command."
2995
3560
2996
3561
#: bzrlib/builtins.py:4768
2997
3562
msgid ""
3000
3565
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3001
3566
"files have '.~#~' appended to their name, where # is a number."
3002
3567
msgstr ""
3568
"Uncommitted changes to files that are reverted will be discarded.\n"
3569
"Howver, by default, any files that have been manually changed will be\n"
3570
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3571
"files have '.~#~' appended to their name, where # is a number."
3003
3572
3004
3573
#: bzrlib/builtins.py:4773
3005
3574
msgid ""
3008
3577
"name. If you name a directory, all the contents of that directory will be\n"
3009
3578
"reverted."
3010
3579
msgstr ""
3580
"When you provide files, you can use their current pathname or the pathname\n"
3581
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3582
"name. If you name a directory, all the contents of that directory will be\n"
3583
"reverted."
3011
3584
3012
3585
#: bzrlib/builtins.py:4778
3013
3586
msgid ""
3016
3589
"created as above. Directories containing unknown files will not be\n"
3017
3590
"deleted."
3018
3591
msgstr ""
3592
"If you have newly added files since the target revision, they will be\n"
3593
"removed. If the files to be removed have been changed, backups will be\n"
3594
"created as above. Directories containing unknown files will not be\n"
3595
"deleted."
3019
3596
3020
3597
#: bzrlib/builtins.py:4783
3021
3598
msgid ""
3028
3605
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3029
3606
"reverting any files."
3030
3607
msgstr ""
3608
"The working tree contains a list of revisions that have been merged but\n"
3609
"not yet committed. These revisions will be included as additional parents\n"
3610
"of the next commit. Normally, using revert clears that list as well as\n"
3611
"reverting the files. If any files are specified, revert leaves the list\n"
3612
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3613
".`` in the tree root to revert all files but keep the recorded merges,\n"
3614
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3615
"reverting any files."
3031
3616
3032
3617
#: bzrlib/builtins.py:4792
3033
3618
msgid ""
3042
3627
"cause additional conflicts on later merges involving the same source and\n"
3043
3628
"target branches."
3044
3629
msgstr ""
3630
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3631
"changes from a branch in a single revision. To do this, perform the merge\n"
3632
"as desired. Then doing revert with the \"--forget-merges\" option will "
3633
"keep\n"
3634
"the content of the tree as it was, but it will clear the list of pending\n"
3635
"merges. The next commit will then contain all of the changes that are\n"
3636
"present in the other branch, but without any other parent revisions.\n"
3637
"Because this technique forgets where these changes originated, it may\n"
3638
"cause additional conflicts on later merges involving the same source and\n"
3639
"target branches."
3045
3640
3046
3641
#: bzrlib/builtins.py:4806
3047
3642
msgid "Do not save backups of reverted files."
3048
msgstr ""
3643
msgstr "Do not save backups of reverted files."
3049
3644
3050
3645
#: bzrlib/builtins.py:4808
3051
3646
msgid "Remove pending merge marker, without changing any files."
3052
msgstr ""
3647
msgstr "Remove pending merge marker, without changing any files."
3053
3648
3054
3649
#: bzrlib/builtins.py:4839
3055
3650
msgid ""
3056
3651
"Show help on a command or other topic.\n"
3057
3652
" "
3058
3653
msgstr ""
3654
"Show help on a command or other topic.\n"
3655
" "
3059
3656
3060
3657
#: bzrlib/builtins.py:4844
3061
3658
msgid "Show help on all commands."
3062
msgstr ""
3659
msgstr "Show help on all commands."
3063
3660
3064
3661
#: bzrlib/builtins.py:4873
3065
3662
msgid "Show unmerged/unpulled revisions between two branches."
3066
msgstr ""
3663
msgstr "Show unmerged/unpulled revisions between two branches."
3067
3664
3068
3665
#: bzrlib/builtins.py:4875
3069
3666
msgid "OTHER_BRANCH may be local or remote."
3070
msgstr ""
3667
msgstr "OTHER_BRANCH may be local or remote."
3071
3668
3072
3669
#: bzrlib/builtins.py:4877
3073
3670
msgid ""
3079
3676
" 1 - some missing revisions\n"
3080
3677
" 0 - no missing revisions"
3081
3678
msgstr ""
3679
"To filter on a range of revisions, you can use the command -r begin..end\n"
3680
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3681
"also valid.\n"
3682
" \n"
3683
":Exit values:\n"
3684
" 1 - some missing revisions\n"
3685
" 0 - no missing revisions"
3082
3686
3083
3687
#: bzrlib/builtins.py:4887
3084
3688
msgid ""
3085
3689
" Determine the missing revisions between this and the branch at the\n"
3086
3690
" remembered pull location::"
3087
3691
msgstr ""
3692
" Determine the missing revisions between this and the branch at the\n"
3693
" remembered pull location::"
3088
3694
3089
3695
#: bzrlib/builtins.py:4890
3090
3696
msgid " bzr missing"
3091
msgstr ""
3697
msgstr " bzr missing"
3092
3698
3093
3699
#: bzrlib/builtins.py:4892
3094
3700
msgid " Determine the missing revisions between this and another branch::"
3095
3701
msgstr ""
3702
" Determine the missing revisions between this and another branch::"
3096
3703
3097
3704
#: bzrlib/builtins.py:4894
3098
3705
msgid " bzr missing http://server/branch"
3099
msgstr ""
3706
msgstr " bzr missing http://server/branch"
3100
3707
3101
3708
#: bzrlib/builtins.py:4896
3102
3709
msgid ""
3103
3710
" Determine the missing revisions up to a specific revision on the other\n"
3104
3711
" branch::"
3105
3712
msgstr ""
3713
" Determine the missing revisions up to a specific revision on the other\n"
3714
" branch::"
3106
3715
3107
3716
#: bzrlib/builtins.py:4899
3108
3717
msgid " bzr missing -r ..-10"
3109
msgstr ""
3718
msgstr " bzr missing -r ..-10"
3110
3719
3111
3720
#: bzrlib/builtins.py:4901
3112
3721
msgid ""
3113
3722
" Determine the missing revisions up to a specific revision on this\n"
3114
3723
" branch::"
3115
3724
msgstr ""
3725
" Determine the missing revisions up to a specific revision on this\n"
3726
" branch::"
3116
3727
3117
3728
#: bzrlib/builtins.py:4904
3118
3729
msgid " bzr missing --my-revision ..-10"
3119
msgstr ""
3730
msgstr " bzr missing --my-revision ..-10"
3120
3731
3121
3732
#: bzrlib/builtins.py:4911
3122
3733
msgid "Reverse the order of revisions."
3123
msgstr ""
3734
msgstr "Reverse the order of revisions."
3124
3735
3125
3736
#: bzrlib/builtins.py:4913
3126
3737
msgid "Display changes in the local branch only."
3127
msgstr ""
3738
msgstr "Display changes in the local branch only."
3128
3739
3129
3740
#: bzrlib/builtins.py:4914
3130
3741
msgid "Same as --mine-only."
3131
msgstr ""
3742
msgstr "Same as --mine-only."
3132
3743
3133
3744
#: bzrlib/builtins.py:4916
3134
3745
msgid "Display changes in the remote branch only."
3135
msgstr ""
3746
msgstr "Display changes in the remote branch only."
3136
3747
3137
3748
#: bzrlib/builtins.py:4917
3138
3749
msgid "Same as --theirs-only."
3139
msgstr ""
3750
msgstr "Same as --theirs-only."
3140
3751
3141
3752
#: bzrlib/builtins.py:4922
3142
3753
msgid ""
3143
3754
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3144
3755
"details."
3145
3756
msgstr ""
3757
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3758
"details."
3146
3759
3147
3760
#: bzrlib/builtins.py:4926
3148
3761
msgid ""
3149
3762
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3150
3763
"details."
3151
3764
msgstr ""
3765
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3766
"details."
3152
3767
3153
3768
#: bzrlib/builtins.py:4929
3154
3769
msgid "Show all revisions in addition to the mainline ones."
3155
msgstr ""
3770
msgstr "Show all revisions in addition to the mainline ones."
3156
3771
3157
3772
#: bzrlib/builtins.py:4983
3158
3773
msgid "No peer location known or specified."
3159
msgstr ""
3774
msgstr "No peer location known or specified."
3160
3775
3161
3776
#: bzrlib/builtins.py:4987
3162
3777
msgid "Using saved parent location: {0}\n"
3163
msgstr ""
3778
msgstr "Using saved parent location: {0}\n"
3164
3779
3165
3780
#: bzrlib/builtins.py:5020
3166
3781
#, python-format
3167
3782
msgid "You have %d extra revision:\n"
3168
3783
msgid_plural "You have %d extra revisions:\n"
3169
msgstr[0] ""
3170
msgstr[1] ""
3784
msgstr[0] "You have %d extra revision:\n"
3785
msgstr[1] "You have %d extra revisions:\n"
3171
3786
3172
3787
#: bzrlib/builtins.py:5040
3173
3788
#, python-format
3174
3789
msgid "You are missing %d revision:\n"
3175
3790
msgid_plural "You are missing %d revisions:\n"
3176
msgstr[0] ""
3177
msgstr[1] ""
3791
msgstr[0] "You are missing %d revision:\n"
3792
msgstr[1] "You are missing %d revisions:\n"
3178
3793
3179
3794
#: bzrlib/builtins.py:5055
3180
3795
msgid "This branch has no new revisions.\n"
3181
msgstr ""
3796
msgstr "This branch has no new revisions.\n"
3182
3797
3183
3798
#: bzrlib/builtins.py:5058
3184
3799
msgid "Other branch has no new revisions.\n"
3185
msgstr ""
3800
msgstr "Other branch has no new revisions.\n"
3186
3801
3187
3802
#: bzrlib/builtins.py:5063
3188
3803
msgid "Branches are up to date.\n"
3189
msgstr ""
3804
msgstr "Branches are up to date.\n"
3190
3805
3191
3806
#: bzrlib/builtins.py:5074
3192
3807
msgid "Compress the data within a repository."
3193
msgstr ""
3808
msgstr "Compress the data within a repository."
3194
3809
3195
3810
#: bzrlib/builtins.py:5076
3196
3811
msgid ""
3198
3813
"bazaar supports automatic packing of repository, this operation is\n"
3199
3814
"normally not required to be done manually."
3200
3815
msgstr ""
3816
"This operation compresses the data within a bazaar repository. As\n"
3817
"bazaar supports automatic packing of repository, this operation is\n"
3818
"normally not required to be done manually."
3201
3819
3202
3820
#: bzrlib/builtins.py:5080
3203
3821
msgid ""
3207
3825
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3208
3826
"used."
3209
3827
msgstr ""
3828
"During the pack operation, bazaar takes a backup of existing repository\n"
3829
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3830
"automatically when it is safe to do so. To save disk space by removing\n"
3831
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3832
"used."
3210
3833
3211
3834
#: bzrlib/builtins.py:5086
3212
3835
msgid ""
3215
3838
"where the deletion has been written to disk but the new packs have not\n"
3216
3839
"been. In this case the repository may be unusable."
3217
3840
msgstr ""
3841
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3842
"during or immediately after repacking, you may be left with a state\n"
3843
"where the deletion has been written to disk but the new packs have not\n"
3844
"been. In this case the repository may be unusable."
3218
3845
3219
3846
#: bzrlib/builtins.py:5095
3220
3847
msgid "Delete obsolete packs to save disk space."
3221
msgstr ""
3848
msgstr "Delete obsolete packs to save disk space."
3222
3849
3223
3850
#: bzrlib/builtins.py:5109
3224
3851
msgid "List the installed plugins."
3225
msgstr ""
3852
msgstr "List the installed plugins."
3226
3853
3227
3854
#: bzrlib/builtins.py:5111
3228
3855
msgid ""
3229
3856
"This command displays the list of installed plugins including\n"
3230
3857
"version of plugin and a short description of each."
3231
3858
msgstr ""
3859
"This command displays the list of installed plugins including\n"
3860
"version of plugin and a short description of each."
3232
3861
3233
3862
#: bzrlib/builtins.py:5114
3234
3863
msgid "--verbose shows the path where each plugin is located."
3235
msgstr ""
3864
msgstr "--verbose shows the path where each plugin is located."
3236
3865
3237
3866
#: bzrlib/builtins.py:5116
3238
3867
msgid ""
3242
3871
"adding new commands, providing additional network transports and\n"
3243
3872
"customizing log output."
3244
3873
msgstr ""
3874
"A plugin is an external component for Bazaar that extends the\n"
3875
"revision control system, by adding or replacing code in Bazaar.\n"
3876
"Plugins can do a variety of things, including overriding commands,\n"
3877
"adding new commands, providing additional network transports and\n"
3878
"customising log output."
3245
3879
3246
3880
#: bzrlib/builtins.py:5122
3247
3881
msgid ""
3250
3884
"install them. Instructions are also provided there on how to write new\n"
3251
3885
"plugins using the Python programming language."
3252
3886
msgstr ""
3887
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3888
"for further information on plugins including where to find them and how to\n"
3889
"install them. Instructions are also provided there on how to write new\n"
3890
"plugins using the Python programming language."
3253
3891
3254
3892
#: bzrlib/builtins.py:5138
3255
3893
msgid "Show testament (signing-form) of a revision."
3256
msgstr ""
3894
msgstr "Show testament (signing-form) of a revision."
3257
3895
3258
3896
#: bzrlib/builtins.py:5141
3259
3897
msgid "Produce long-format testament."
3260
msgstr ""
3898
msgstr "Produce long-format testament."
3261
3899
3262
3900
#: bzrlib/builtins.py:5143
3263
3901
msgid "Produce a strict-format testament."
3264
msgstr ""
3902
msgstr "Produce a strict-format testament."
3265
3903
3266
3904
#: bzrlib/builtins.py:5169
3267
3905
msgid "Show the origin of each line in a file."
3268
msgstr ""
3906
msgstr "Show the origin of each line in a file."
3269
3907
3270
3908
#: bzrlib/builtins.py:5171
3271
3909
msgid ""
3272
3910
"This prints out the given file with an annotation on the left side\n"
3273
3911
"indicating which revision, author and date introduced the change."
3274
3912
msgstr ""
3913
"This prints out the given file with an annotation on the left side\n"
3914
"indicating which revision, author and date introduced the change."
3275
3915
3276
3916
#: bzrlib/builtins.py:5174
3277
3917
msgid ""
3278
3918
"If the origin is the same for a run of consecutive lines, it is\n"
3279
3919
"shown only at the top, unless the --all option is given."
3280
3920
msgstr ""
3921
"If the origin is the same for a run of consecutive lines, it is\n"
3922
"shown only at the top, unless the --all option is given."
3281
3923
3282
3924
#: bzrlib/builtins.py:5182
3283
3925
msgid "Show annotations on all lines."
3284
msgstr ""
3926
msgstr "Show annotations on all lines."
3285
3927
3286
3928
#: bzrlib/builtins.py:5183
3287
3929
msgid "Show commit date in annotations."
3288
msgstr ""
3930
msgstr "Show commit date in annotations."
3289
3931
3290
3932
#: bzrlib/builtins.py:5270
3291
3933
msgid "Cannot sign a range of non-revision-history revisions"
3292
msgstr ""
3934
msgstr "Cannot sign a range of non-revision-history revisions"
3293
3935
3294
3936
#: bzrlib/builtins.py:5282
3295
3937
msgid "Please supply either one revision, or a range."
3296
msgstr ""
3938
msgstr "Please supply either one revision, or a range."
3297
3939
3298
3940
#: bzrlib/builtins.py:5286
3299
3941
msgid ""
3300
3942
"Convert the current branch into a checkout of the supplied branch.\n"
3301
3943
"If no branch is supplied, rebind to the last bound location."
3302
3944
msgstr ""
3945
"Convert the current branch into a checkout of the supplied branch.\n"
3946
"If no branch is supplied, rebind to the last bound location."
3303
3947
3304
3948
#: bzrlib/builtins.py:5289
3305
3949
msgid ""
3306
3950
"Once converted into a checkout, commits must succeed on the master branch\n"
3307
3951
"before they will be applied to the local branch."
3308
3952
msgstr ""
3953
"Once converted into a checkout, commits must succeed on the master branch\n"
3954
"before they will be applied to the local branch."
3309
3955
3310
3956
#: bzrlib/builtins.py:5292
3311
3957
msgid ""
3313
3959
"locally, in which case binding will update the local nickname to be\n"
3314
3960
"that of the master."
3315
3961
msgstr ""
3962
"Bound branches use the nickname of its master branch unless it is set\n"
3963
"locally, in which case binding will update the local nickname to be\n"
3964
"that of the master."
3316
3965
3317
3966
#: bzrlib/builtins.py:5307
3318
3967
msgid "No location supplied. This format does not remember old locations."
3319
msgstr ""
3968
msgstr "No location supplied. This format does not remember old locations."
3320
3969
3321
3970
#: bzrlib/builtins.py:5313
3322
3971
msgid "Branch is already bound"
3323
msgstr ""
3972
msgstr "Branch is already bound"
3324
3973
3325
3974
#: bzrlib/builtins.py:5316
3326
3975
msgid "No location supplied and no previous location known"
3327
msgstr ""
3976
msgstr "No location supplied and no previous location known"
3328
3977
3329
3978
#: bzrlib/builtins.py:5322
3330
3979
msgid "These branches have diverged. Try merging, and then bind again."
3331
msgstr ""
3980
msgstr "These branches have diverged. Try merging, and then bind again."
3332
3981
3333
3982
#: bzrlib/builtins.py:5329
3334
3983
msgid "Convert the current checkout into a regular branch."
3335
msgstr ""
3984
msgstr "Convert the current checkout into a regular branch."
3336
3985
3337
3986
#: bzrlib/builtins.py:5331
3338
3987
msgid ""
3339
3988
"After unbinding, the local branch is considered independent and subsequent\n"
3340
3989
"commits will be local only."
3341
3990
msgstr ""
3991
"After unbinding, the local branch is considered independent and subsequent\n"
3992
"commits will be local only."
3342
3993
3343
3994
#: bzrlib/builtins.py:5342
3344
3995
msgid "Local branch is not bound"
3345
msgstr ""
3996
msgstr "Local branch is not bound"
3346
3997
3347
3998
#: bzrlib/builtins.py:5346
3348
3999
msgid "Remove the last committed revision."
3349
msgstr ""
4000
msgstr "Remove the last committed revision."
3350
4001
3351
4002
#: bzrlib/builtins.py:5348
3352
4003
msgid ""
3354
4005
"--dry-run will go through all the motions, but not actually\n"
3355
4006
"remove anything."
3356
4007
msgstr ""
4008
"--verbose will print out what is being removed.\n"
4009
"--dry-run will go through all the motions, but not actually\n"
4010
"remove anything."
3357
4011
3358
4012
#: bzrlib/builtins.py:5352
3359
4013
msgid ""
3361
4015
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3362
4016
"branch at revision 15."
3363
4017
msgstr ""
4018
"If --revision is specified, uncommit revisions to leave the branch at the\n"
4019
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
4020
"branch at revision 15."
3364
4021
3365
4022
#: bzrlib/builtins.py:5356
3366
4023
msgid ""
3368
4025
"it may make is to restore any pending merges that were present before\n"
3369
4026
"the commit."
3370
4027
msgstr ""
4028
"Uncommit leaves the working tree ready for a new commit. The only change\n"
4029
"it may make is to restore any pending merges that were present before\n"
4030
"the commit."
3371
4031
3372
4032
#: bzrlib/builtins.py:5367
3373
4033
msgid "Don't actually make changes."
3374
msgstr ""
4034
msgstr "Don't actually make changes."
3375
4035
3376
4036
#: bzrlib/builtins.py:5368
3377
4037
msgid "Say yes to all questions."
3378
msgstr ""
4038
msgstr "Say yes to all questions."
3379
4039
3380
4040
#: bzrlib/builtins.py:5370
3381
4041
msgid "Keep tags that point to removed revisions."
3382
msgstr ""
4042
msgstr "Keep tags that point to removed revisions."
3383
4043
3384
4044
#: bzrlib/builtins.py:5372
3385
4045
msgid "Only remove the commits from the local branch when in a checkout."
3386
msgstr ""
4046
msgstr "Only remove the commits from the local branch when in a checkout."
3387
4047
3388
4048
#: bzrlib/builtins.py:5421
3389
4049
msgid "No revisions to uncommit.\n"
3390
msgstr ""
4050
msgstr "No revisions to uncommit.\n"
3391
4051
3392
4052
#: bzrlib/builtins.py:5436
3393
4053
msgid "Dry-run, pretending to remove the above revisions.\n"
3394
msgstr ""
4054
msgstr "Dry-run, pretending to remove the above revisions.\n"
3395
4055
3396
4056
#: bzrlib/builtins.py:5439
3397
4057
msgid "The above revision(s) will be removed.\n"
3398
msgstr ""
4058
msgstr "The above revision(s) will be removed.\n"
3399
4059
3400
4060
#: bzrlib/builtins.py:5443
3401
4061
msgid "Uncommit these revisions"
3402
msgstr ""
4062
msgstr "Uncommit these revisions"
3403
4063
3404
4064
#: bzrlib/builtins.py:5446
3405
4065
msgid "Canceled\n"
3406
msgstr ""
4066
msgstr "Cancelled\n"
3407
4067
3408
4068
#: bzrlib/builtins.py:5453
3409
4069
#, python-format
3411
4071
"You can restore the old tip by running:\n"
3412
4072
" bzr pull . -r revid:%s\n"
3413
4073
msgstr ""
4074
"You can restore the old tip by running:\n"
4075
" bzr pull . -r revid:%s\n"
3414
4076
3415
4077
#: bzrlib/builtins.py:5458
3416
4078
msgid "Break a dead lock."
3417
msgstr ""
4079
msgstr "Break a dead lock."
3418
4080
3419
4081
#: bzrlib/builtins.py:5460
3420
4082
msgid ""
3421
4083
"This command breaks a lock on a repository, branch, working directory or\n"
3422
4084
"config file."
3423
4085
msgstr ""
4086
"This command breaks a lock on a repository, branch, working directory or\n"
4087
"config file."
3424
4088
3425
4089
#: bzrlib/builtins.py:5463
3426
4090
msgid ""
3427
4091
"CAUTION: Locks should only be broken when you are sure that the process\n"
3428
4092
"holding the lock has been stopped."
3429
4093
msgstr ""
4094
"CAUTION: Locks should only be broken when you are sure that the process\n"
4095
"holding the lock has been stopped."
3430
4096
3431
4097
#: bzrlib/builtins.py:5466
3432
4098
msgid ""
3433
4099
"You can get information on what locks are open via the 'bzr info\n"
3434
4100
"[location]' command."
3435
4101
msgstr ""
4102
"You can get information on what locks are open via the 'bzr info\n"
4103
"[location]' command."
3436
4104
3437
4105
#: bzrlib/builtins.py:5469
3438
4106
msgid ""
3441
4109
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3442
4110
" bzr break-lock --conf ~/.bazaar"
3443
4111
msgstr ""
4112
":Examples:\n"
4113
" bzr break-lock\n"
4114
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
4115
" bzr break-lock --conf ~/.bazaar"
3444
4116
3445
4117
#: bzrlib/builtins.py:5478
3446
4118
msgid "LOCATION is the directory where the config lock is."
3447
msgstr ""
4119
msgstr "LOCATION is the directory where the config lock is."
3448
4120
3449
4121
#: bzrlib/builtins.py:5480
3450
4122
msgid "Do not ask for confirmation before breaking the lock."
3451
msgstr ""
4123
msgstr "Do not ask for confirmation before breaking the lock."
3452
4124
3453
4125
#: bzrlib/builtins.py:5515
3454
4126
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3455
msgstr ""
4127
msgstr "The Bazaar smart server protocol over TCP. (default port: 4155)"
3456
4128
3457
4129
#: bzrlib/builtins.py:5516
3458
4130
msgid "Run the bzr server."
3459
msgstr ""
4131
msgstr "Run the bzr server."
3460
4132
3461
4133
#: bzrlib/builtins.py:5522
3462
4134
msgid "Serve on stdin/out for use from inetd or sshd."
3463
msgstr ""
4135
msgstr "Serve on stdin/out for use from inetd or sshd."
3464
4136
3465
4137
#: bzrlib/builtins.py:5523
3466
4138
msgid "protocol"
3467
msgstr ""
4139
msgstr "protocol"
3468
4140
3469
4141
#: bzrlib/builtins.py:5524
3470
4142
msgid "Protocol to serve."
3471
msgstr ""
4143
msgstr "Protocol to serve."
3472
4144
3473
4145
#: bzrlib/builtins.py:5528
3474
4146
msgid "Listen for connections on nominated address."
3475
msgstr ""
4147
msgstr "Listen for connections on nominated address."
3476
4148
3477
4149
#: bzrlib/builtins.py:5530
3478
4150
msgid ""
3480
4152
"result in a dynamically allocated port. The default port depends on the "
3481
4153
"protocol."
3482
4154
msgstr ""
4155
"Listen for connections on nominated port. Passing 0 as the port number will "
4156
"result in a dynamically allocated port. The default port depends on the "
4157
"protocol."
3483
4158
3484
4159
#: bzrlib/builtins.py:5535
3485
4160
msgid "Serve contents of this directory."
3486
msgstr ""
4161
msgstr "Serve contents of this directory."
3487
4162
3488
4163
#: bzrlib/builtins.py:5537
3489
4164
msgid ""
3493
4168
"of external authentication is arranged supplying this option leads to global "
3494
4169
"uncontrolled write access to your file system."
3495
4170
msgstr ""
4171
"By default the server is a read-only server. Supplying --allow-writes "
4172
"enables write access to the contents of the served directory and below. "
4173
"Note that ``bzr serve`` does not perform authentication, so unless some form "
4174
"of external authentication is arranged supplying this option leads to global "
4175
"uncontrolled write access to your file system."
3496
4176
3497
4177
#: bzrlib/builtins.py:5546
3498
4178
msgid "Override the default idle client timeout (5min)."
3499
msgstr ""
4179
msgstr "Override the default idle client timeout (5min)."
3500
4180
3501
4181
#: bzrlib/builtins.py:5564
3502
4182
msgid "Combine a tree into its containing tree."
3503
msgstr ""
4183
msgstr "Combine a tree into its containing tree."
3504
4184
3505
4185
#: bzrlib/builtins.py:5566
3506
4186
msgid "This command requires the target tree to be in a rich-root format."
3507
msgstr ""
4187
msgstr "This command requires the target tree to be in a rich-root format."
3508
4188
3509
4189
#: bzrlib/builtins.py:5568
3510
4190
msgid ""
3512
4192
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3513
4193
"running \"bzr branch\" with the target inside a tree.)"
3514
4194
msgstr ""
4195
"The TREE argument should be an independent tree, inside another tree, but\n"
4196
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
4197
"running \"bzr branch\" with the target inside a tree.)"
3515
4198
3516
4199
#: bzrlib/builtins.py:5572
3517
4200
msgid ""
3519
4202
"part. This is marked as a merge of the subtree into the containing tree,\n"
3520
4203
"and all history is preserved."
3521
4204
msgstr ""
4205
"The result is a combined tree, with the subtree no longer an independent\n"
4206
"part. This is marked as a merge of the subtree into the containing tree,\n"
4207
"and all history is preserved."
3522
4208
3523
4209
#: bzrlib/builtins.py:5590
3524
4210
#, python-format
3526
4212
"Can't join trees because %s doesn't support rich root data.\n"
3527
4213
"You can use bzr upgrade on the repository."
3528
4214
msgstr ""
4215
"Can't join trees because %s doesn't support rich root data.\n"
4216
"You can use bzr upgrade on the repository."
3529
4217
3530
4218
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3531
4219
msgid "Cannot join {0}. {1}"
3532
msgstr ""
4220
msgstr "Cannot join {0}. {1}"
3533
4221
3534
4222
#: bzrlib/builtins.py:5610
3535
4223
msgid "Split a subdirectory of a tree into a separate tree."
3536
msgstr ""
4224
msgstr "Split a subdirectory of a tree into a separate tree."
3537
4225
3538
4226
#: bzrlib/builtins.py:5612
3539
4227
msgid ""
3541
4229
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3542
4230
"converted into earlier formats like 'dirstate-tags'."
3543
4231
msgstr ""
4232
"This command will produce a target tree in a format that supports\n"
4233
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
4234
"converted into earlier formats like 'dirstate-tags'."
3544
4235
3545
4236
#: bzrlib/builtins.py:5616
3546
4237
msgid ""
3548
4239
"subdirectory will be converted into an independent tree, with its own\n"
3549
4240
"branch. Commits in the top-level tree will not apply to the new subtree."
3550
4241
msgstr ""
4242
"The TREE argument should be a subdirectory of a working tree. That\n"
4243
"subdirectory will be converted into an independent tree, with its own\n"
4244
"branch. Commits in the top-level tree will not apply to the new subtree."
3551
4245
3552
4246
#: bzrlib/builtins.py:5696
3553
4247
msgid "No submit branch specified or known"
3554
msgstr ""
4248
msgstr "No submit branch specified or known"
3555
4249
3556
4250
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3557
4251
msgid "No public branch specified or known"
3558
msgstr ""
4252
msgstr "No public branch specified or known"
3559
4253
3560
4254
#: bzrlib/builtins.py:5710
3561
4255
msgid "bzr merge-directive takes at most two one revision identifiers"
3562
msgstr ""
4256
msgstr "bzr merge-directive takes at most two one revision identifiers"
3563
4257
3564
4258
#: bzrlib/builtins.py:5719
3565
4259
msgid "No revisions to bundle."
3566
msgstr ""
4260
msgstr "No revisions to bundle."
3567
4261
3568
4262
#: bzrlib/builtins.py:5738
3569
4263
msgid "Mail or create a merge-directive for submitting changes."
3570
msgstr ""
4264
msgstr "Mail or create a merge-directive for submitting changes."
3571
4265
3572
4266
#: bzrlib/builtins.py:5740
3573
4267
msgid "A merge directive provides many things needed for requesting merges:"
3574
msgstr ""
4268
msgstr "A merge directive provides many things needed for requesting merges:"
3575
4269
3576
4270
#: bzrlib/builtins.py:5742
3577
4271
msgid "* A machine-readable description of the merge to perform"
3578
msgstr ""
4272
msgstr "* A machine-readable description of the merge to perform"
3579
4273
3580
4274
#: bzrlib/builtins.py:5744
3581
4275
msgid "* An optional patch that is a preview of the changes requested"
3582
msgstr ""
4276
msgstr "* An optional patch that is a preview of the changes requested"
3583
4277
3584
4278
#: bzrlib/builtins.py:5746
3585
4279
msgid ""
3587
4281
" directly from the merge directive, without retrieving data from a\n"
3588
4282
" branch."
3589
4283
msgstr ""
4284
"* An optional bundle of revision data, so that the changes can be applied\n"
4285
" directly from the merge directive, without retrieving data from a\n"
4286
" branch."
3590
4287
3591
4288
#: bzrlib/builtins.py:5750
3592
4289
msgid ""
3593
4290
"`bzr send` creates a compact data set that, when applied using bzr\n"
3594
4291
"merge, has the same effect as merging from the source branch. "
3595
4292
msgstr ""
4293
"`bzr send` creates a compact data set that, when applied using bzr\n"
4294
"merge, has the same effect as merging from the source branch. "
3596
4295
3597
4296
#: bzrlib/builtins.py:5753
3598
4297
msgid ""
3600
4299
"branch containing submit_branch in its ancestory without needing access to\n"
3601
4300
"the source branch."
3602
4301
msgstr ""
4302
"By default the merge directive is self-contained and can be applied to any\n"
4303
"branch containing submit_branch in its ancestory without needing access to\n"
4304
"the source branch."
3603
4305
3604
4306
#: bzrlib/builtins.py:5757
3605
4307
msgid ""
3609
4311
"up-to-date and accessible to the recipient. The public_branch is always\n"
3610
4312
"included if known, so that people can check it later."
3611
4313
msgstr ""
4314
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4315
"revisions, but only a structured request to merge from the\n"
4316
"public_location. In that case the public_branch is needed and it must be\n"
4317
"up-to-date and accessible to the recipient. The public_branch is always\n"
4318
"included if known, so that people can check it later."
3612
4319
3613
4320
#: bzrlib/builtins.py:5763
3614
4321
msgid ""
3618
4325
"source branch defaults to that containing the working directory, but can\n"
3619
4326
"be changed using --from."
3620
4327
msgstr ""
4328
"The submit branch defaults to the parent of the source branch, but can be\n"
4329
"overridden. Both submit branch and public branch will be remembered in\n"
4330
"branch.conf the first time they are used for a particular branch. The\n"
4331
"source branch defaults to that containing the working directory, but can\n"
4332
"be changed using --from."
3621
4333
3622
4334
#: bzrlib/builtins.py:5769
3623
4335
msgid ""
3627
4339
"omit the location to use the default. To change the default, use\n"
3628
4340
"--remember. The value will only be saved if the location can be accessed."
3629
4341
msgstr ""
4342
"Both the submit branch and the public branch follow the usual behaviour "
4343
"with\n"
4344
"respect to --remember: If there is no default location set, the first send\n"
4345
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4346
"omit the location to use the default. To change the default, use\n"
4347
"--remember. The value will only be saved if the location can be accessed."
3630
4348
3631
4349
#: bzrlib/builtins.py:5775
3632
4350
msgid ""
3635
4353
"If a public location is known for the submit_branch, that location is used\n"
3636
4354
"in the merge directive."
3637
4355
msgstr ""
4356
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4357
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4358
"If a public location is known for the submit_branch, that location is used\n"
4359
"in the merge directive."
3638
4360
3639
4361
#: bzrlib/builtins.py:5780
3640
4362
msgid ""
3641
4363
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3642
4364
"given, in which case it is sent to a file."
3643
4365
msgstr ""
4366
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4367
"given, in which case it is sent to a file."
3644
4368
3645
4369
#: bzrlib/builtins.py:5783
3646
4370
msgid ""
3648
4372
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3649
4373
"If the preferred client can't be found (or used), your editor will be used."
3650
4374
msgstr ""
4375
"Mail is sent using your preferred mail program. This should be transparent\n"
4376
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4377
"If the preferred client can't be found (or used), your editor will be used."
3651
4378
3652
4379
#: bzrlib/builtins.py:5787
3653
4380
msgid ""
3660
4387
"add\n"
3661
4388
"supported clients."
3662
4389
msgstr ""
4390
"To use a specific mail program, set the mail_client configuration option.\n"
4391
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4392
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4393
"(MacOS X's\n"
4394
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4395
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4396
"add\n"
4397
"supported clients."
3663
4398
3664
4399
#: bzrlib/builtins.py:5794
3665
4400
msgid ""
3668
4403
"option in the branch itself or the child_submit_to configuration option\n"
3669
4404
"in the submit branch."
3670
4405
msgstr ""
4406
"If mail is being sent, a to address is required. This can be supplied\n"
4407
"either on the commandline, by setting the submit_to configuration\n"
4408
"option in the branch itself or the child_submit_to configuration option\n"
4409
"in the submit branch."
3671
4410
3672
4411
#: bzrlib/builtins.py:5799
3673
4412
msgid ""
3678
4417
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3679
4418
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3680
4419
msgstr ""
4420
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4421
"and\n"
4422
"merge directive format 2. It is significantly faster and smaller than\n"
4423
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4424
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4425
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3681
4426
3682
4427
#: bzrlib/builtins.py:5805
3683
4428
msgid ""
3684
4429
"The merge directives created by bzr send may be applied using bzr merge or\n"
3685
4430
"bzr pull by specifying a file containing a merge directive as the location."
3686
4431
msgstr ""
4432
"The merge directives created by bzr send may be applied using bzr merge or\n"
4433
"bzr pull by specifying a file containing a merge directive as the location."
3687
4434
3688
4435
#: bzrlib/builtins.py:5808
3689
4436
msgid ""
3692
4439
"URLs that can be used by other people. See `bzr help configuration` to\n"
3693
4440
"set them, and use `bzr info` to display them."
3694
4441
msgstr ""
4442
"bzr send makes extensive use of public locations to map local locations "
4443
"into\n"
4444
"URLs that can be used by other people. See `bzr help configuration` to\n"
4445
"set them, and use `bzr info` to display them."
3695
4446
3696
4447
#: bzrlib/builtins.py:5832
3697
4448
msgid "Write merge directive to this file or directory; use - for stdout."
3698
msgstr ""
4449
msgstr "Write merge directive to this file or directory; use - for stdout."
3699
4450
3700
4451
#: bzrlib/builtins.py:5836
3701
4452
msgid ""
3702
4453
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3703
4454
"strict disables the check."
3704
4455
msgstr ""
4456
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4457
"strict disables the check."
3705
4458
3706
4459
#: bzrlib/builtins.py:5838
3707
4460
msgid "Mail the request to this address."
3708
msgstr ""
4461
msgstr "Mail the request to this address."
3709
4462
3710
4463
#: bzrlib/builtins.py:5842
3711
4464
msgid "Body for the email."
3712
msgstr ""
4465
msgstr "Body for the email."
3713
4466
3714
4467
#: bzrlib/builtins.py:5895
3715
4468
msgid "Do not include a bundle in the merge directive."
3716
msgstr ""
4469
msgstr "Do not include a bundle in the merge directive."
3717
4470
3718
4471
#: bzrlib/builtins.py:5896
3719
4472
msgid "Do not include a preview patch in the merge directive."
3720
msgstr ""
4473
msgstr "Do not include a preview patch in the merge directive."
3721
4474
3722
4475
#: bzrlib/builtins.py:5899
3723
4476
msgid "Remember submit and public branch."
3724
msgstr ""
4477
msgstr "Remember submit and public branch."
3725
4478
3726
4479
#: bzrlib/builtins.py:5901
3727
4480
msgid ""
3728
4481
"Branch to generate the submission from, rather than the one containing the "
3729
4482
"working directory."
3730
4483
msgstr ""
4484
"Branch to generate the submission from, rather than the one containing the "
4485
"working directory."
3731
4486
3732
4487
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3733
4488
msgid "format"
3734
msgstr ""
4489
msgstr "format"
3735
4490
3736
4491
#: bzrlib/builtins.py:5912
3737
4492
msgid "Use the specified output format."
3738
msgstr ""
4493
msgstr "Use the specified output format."
3739
4494
3740
4495
#: bzrlib/builtins.py:5934
3741
4496
msgid "Create, remove or modify a tag naming a revision."
3742
msgstr ""
4497
msgstr "Create, remove or modify a tag naming a revision."
3743
4498
3744
4499
#: bzrlib/builtins.py:5936
3745
4500
msgid ""
3747
4502
"(--revision) option can be given -rtag:X, where X is any previously\n"
3748
4503
"created tag."
3749
4504
msgstr ""
4505
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4506
"(--revision) option can be given -rtag:X, where X is any previously\n"
4507
"created tag."
3750
4508
3751
4509
#: bzrlib/builtins.py:5940
3752
4510
msgid ""
3753
4511
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3754
4512
"along when you branch, push, pull or merge."
3755
4513
msgstr ""
4514
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4515
"along when you branch, push, pull or merge."
3756
4516
3757
4517
#: bzrlib/builtins.py:5943
3758
4518
msgid ""
3759
4519
"It is an error to give a tag name that already exists unless you pass\n"
3760
4520
"--force, in which case the tag is moved to point to the new revision."
3761
4521
msgstr ""
4522
"It is an error to give a tag name that already exists unless you pass\n"
4523
"--force, in which case the tag is moved to point to the new revision."
3762
4524
3763
4525
#: bzrlib/builtins.py:5946
3764
4526
msgid ""
3766
4528
"``bzr\n"
3767
4529
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3768
4530
msgstr ""
4531
"To rename a tag (change the name but keep it on the same revsion), run "
4532
"``bzr\n"
4533
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3769
4534
3770
4535
#: bzrlib/builtins.py:5949
3771
4536
msgid ""
3774
4539
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3775
4540
"details."
3776
4541
msgstr ""
4542
"If no tag name is specified it will be determined through the \n"
4543
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4544
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4545
"details."
3777
4546
3778
4547
#: bzrlib/builtins.py:5959
3779
4548
msgid "Delete this tag rather than placing it."
3780
msgstr ""
4549
msgstr "Delete this tag rather than placing it."
3781
4550
3782
4551
#: bzrlib/builtins.py:5962
3783
4552
msgid "Branch in which to place the tag."
3784
msgstr ""
4553
msgstr "Branch in which to place the tag."
3785
4554
3786
4555
#: bzrlib/builtins.py:5964
3787
4556
msgid "Replace existing tags."
3788
msgstr ""
4557
msgstr "Replace existing tags."
3789
4558
3790
4559
#: bzrlib/builtins.py:5979
3791
4560
msgid "No tag specified to delete."
3792
msgstr ""
4561
msgstr "No tag specified to delete."
3793
4562
3794
4563
#: bzrlib/builtins.py:5981
3795
4564
#, python-format
3796
4565
msgid "Deleted tag %s."
3797
msgstr ""
4566
msgstr "Deleted tag %s."
3798
4567
3799
4568
#: bzrlib/builtins.py:5995
3800
4569
msgid "Please specify a tag name."
3801
msgstr ""
4570
msgstr "Please specify a tag name."
3802
4571
3803
4572
#: bzrlib/builtins.py:6003
3804
4573
#, python-format
3805
4574
msgid "Tag %s already exists for that revision."
3806
msgstr ""
4575
msgstr "Tag %s already exists for that revision."
3807
4576
3808
4577
#: bzrlib/builtins.py:6007
3809
4578
#, python-format
3810
4579
msgid "Created tag %s."
3811
msgstr ""
4580
msgstr "Created tag %s."
3812
4581
3813
4582
#: bzrlib/builtins.py:6009
3814
4583
#, python-format
3815
4584
msgid "Updated tag %s."
3816
msgstr ""
4585
msgstr "Updated tag %s."
3817
4586
3818
4587
#: bzrlib/builtins.py:6013
3819
4588
msgid "List tags."
3820
msgstr ""
4589
msgstr "List tags."
3821
4590
3822
4591
#: bzrlib/builtins.py:6015
3823
4592
msgid ""
3824
4593
"This command shows a table of tag names and the revisions they reference."
3825
4594
msgstr ""
4595
"This command shows a table of tag names and the revisions they reference."
3826
4596
3827
4597
#: bzrlib/builtins.py:6021
3828
4598
msgid "Branch whose tags should be displayed."
3829
msgstr ""
4599
msgstr "Branch whose tags should be displayed."
3830
4600
3831
4601
#: bzrlib/builtins.py:6023
3832
4602
msgid "Sort tags by different criteria."
3833
msgstr ""
4603
msgstr "Sort tags by different criteria."
3834
4604
3835
4605
#: bzrlib/builtins.py:6023
3836
4606
msgid "Sorting"
3837
msgstr ""
4607
msgstr "Sorting"
3838
4608
3839
4609
#: bzrlib/builtins.py:6092
3840
4610
msgid "Reconfigure the type of a bzr directory."
3841
msgstr ""
4611
msgstr "Reconfigure the type of a bzr directory."
3842
4612
3843
4613
#: bzrlib/builtins.py:6094
3844
4614
msgid "A target configuration must be specified."
3845
msgstr ""
4615
msgstr "A target configuration must be specified."
3846
4616
3847
4617
#: bzrlib/builtins.py:6096
3848
4618
msgid ""
3854
4624
"4. The parent location.\n"
3855
4625
"If none of these is available, --bind-to must be specified."
3856
4626
msgstr ""
4627
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4628
"The order of preference is\n"
4629
"1. For a lightweight checkout, the current bound location.\n"
4630
"2. For branches that used to be checkouts, the previously-bound location.\n"
4631
"3. The push location.\n"
4632
"4. The parent location.\n"
4633
"If none of these is available, --bind-to must be specified."
3857
4634
3858
4635
#: bzrlib/builtins.py:6110
3859
4636
msgid "Tree type"
3860
msgstr ""
4637
msgstr "Tree type"
3861
4638
3862
4639
#: bzrlib/builtins.py:6111
3863
4640
msgid "The relation between branch and tree."
3864
msgstr ""
4641
msgstr "The relation between branch and tree."
3865
4642
3866
4643
#: bzrlib/builtins.py:6113
3867
4644
msgid "Reconfigure to be an unbound branch with no working tree."
3868
msgstr ""
4645
msgstr "Reconfigure to be an unbound branch with no working tree."
3869
4646
3870
4647
#: bzrlib/builtins.py:6114
3871
4648
msgid "Reconfigure to be an unbound branch with a working tree."
3872
msgstr ""
4649
msgstr "Reconfigure to be an unbound branch with a working tree."
3873
4650
3874
4651
#: bzrlib/builtins.py:6115
3875
4652
msgid "Reconfigure to be a bound branch with a working tree."
3876
msgstr ""
4653
msgstr "Reconfigure to be a bound branch with a working tree."
3877
4654
3878
4655
#: bzrlib/builtins.py:6116
3879
4656
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3880
msgstr ""
4657
msgstr "Reconfigure to be a lightweight checkout (with no local history)."
3881
4658
3882
4659
#: bzrlib/builtins.py:6121
3883
4660
msgid "Repository type"
3884
msgstr ""
4661
msgstr "Repository type"
3885
4662
3886
4663
#: bzrlib/builtins.py:6122
3887
4664
msgid "Location fo the repository."
3888
msgstr ""
4665
msgstr "Location fo the repository."
3889
4666
3890
4667
#: bzrlib/builtins.py:6124
3891
4668
msgid ""
3892
4669
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3893
4670
msgstr ""
4671
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3894
4672
3895
4673
#: bzrlib/builtins.py:6126
3896
4674
msgid "Reconfigure to use a shared repository."
3897
msgstr ""
4675
msgstr "Reconfigure to use a shared repository."
3898
4676
3899
4677
#: bzrlib/builtins.py:6130
3900
4678
msgid "Trees in Repository"
3901
msgstr ""
4679
msgstr "Trees in Repository"
3902
4680
3903
4681
#: bzrlib/builtins.py:6131
3904
4682
msgid "Whether new branches in the repository have trees."
3905
msgstr ""
4683
msgstr "Whether new branches in the repository have trees."
3906
4684
3907
4685
#: bzrlib/builtins.py:6133
3908
4686
msgid ""
3909
4687
"Reconfigure repository to create working trees on branches by default."
3910
4688
msgstr ""
4689
"Reconfigure repository to create working trees on branches by default."
3911
4690
3912
4691
#: bzrlib/builtins.py:6135
3913
4692
msgid ""
3914
4693
"Reconfigure repository to not create working trees on branches by default."
3915
4694
msgstr ""
4695
"Reconfigure repository to not create working trees on branches by default."
3916
4696
3917
4697
#: bzrlib/builtins.py:6138
3918
4698
msgid "Branch to bind checkout to."
3919
msgstr ""
4699
msgstr "Branch to bind checkout to."
3920
4700
3921
4701
#: bzrlib/builtins.py:6140
3922
4702
msgid "Perform reconfiguration even if local changes will be lost."
3923
msgstr ""
4703
msgstr "Perform reconfiguration even if local changes will be lost."
3924
4704
3925
4705
#: bzrlib/builtins.py:6143
3926
4706
msgid "Reconfigure a branch to be stacked on another branch."
3927
msgstr ""
4707
msgstr "Reconfigure a branch to be stacked on another branch."
3928
4708
3929
4709
#: bzrlib/builtins.py:6147
3930
4710
msgid ""
3931
4711
"Reconfigure a branch to be unstacked. This may require copying substantial "
3932
4712
"data into it."
3933
4713
msgstr ""
4714
"Reconfigure a branch to be unstacked. This may require copying substantial "
4715
"data into it."
3934
4716
3935
4717
#: bzrlib/builtins.py:6157
3936
4718
msgid "Can't use both --stacked-on and --unstacked"
3937
msgstr ""
4719
msgstr "Can't use both --stacked-on and --unstacked"
3938
4720
3939
4721
#: bzrlib/builtins.py:6171
3940
4722
msgid "No target configuration specified"
3941
msgstr ""
4723
msgstr "No target configuration specified"
3942
4724
3943
4725
#: bzrlib/builtins.py:6206
3944
4726
msgid "Set the branch of a checkout and update."
3945
msgstr ""
4727
msgstr "Set the branch of a checkout and update."
3946
4728
3947
4729
#: bzrlib/builtins.py:6208
3948
4730
msgid ""
3951
4733
"versus the current bound branch, then it makes the local branch a mirror\n"
3952
4734
"of the new location and binds to it."
3953
4735
msgstr ""
4736
"For lightweight checkouts, this changes the branch being referenced.\n"
4737
"For heavyweight checkouts, this checks that there are no local commits\n"
4738
"versus the current bound branch, then it makes the local branch a mirror\n"
4739
"of the new location and binds to it."
3954
4740
3955
4741
#: bzrlib/builtins.py:6213
3956
4742
msgid ""
3957
4743
"In both cases, the working tree is updated and uncommitted changes\n"
3958
4744
"are merged. The user can commit or revert these as they desire."
3959
4745
msgstr ""
4746
"In both cases, the working tree is updated and uncommitted changes\n"
4747
"are merged. The user can commit or revert these as they desire."
3960
4748
3961
4749
#: bzrlib/builtins.py:6216
3962
4750
msgid "Pending merges need to be committed or reverted before using switch."
3963
msgstr ""
4751
msgstr "Pending merges need to be committed or reverted before using switch."
3964
4752
3965
4753
#: bzrlib/builtins.py:6218
3966
4754
msgid ""
3969
4757
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3970
4758
"/path/to/newbranch."
3971
4759
msgstr ""
4760
"The path to the branch to switch to can be specified relative to the parent\n"
4761
"directory of the current branch. For example, if you are currently in a\n"
4762
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4763
"/path/to/newbranch."
3972
4764
3973
4765
#: bzrlib/builtins.py:6223
3974
4766
msgid ""
3976
4768
"locally, in which case switching will update the local nickname to be\n"
3977
4769
"that of the master."
3978
4770
msgstr ""
4771
"Bound branches use the nickname of its master branch unless it is set\n"
4772
"locally, in which case switching will update the local nickname to be\n"
4773
"that of the master."
3979
4774
3980
4775
#: bzrlib/builtins.py:6231
3981
4776
msgid "Switch even if local commits will be lost."
3982
msgstr ""
4777
msgstr "Switch even if local commits will be lost."
3983
4778
3984
4779
#: bzrlib/builtins.py:6234
3985
4780
msgid "Create the target branch from this one before switching to it."
3986
msgstr ""
4781
msgstr "Create the target branch from this one before switching to it."
3987
4782
3988
4783
#: bzrlib/builtins.py:6248
3989
4784
msgid "You must supply either a revision or a location"
3990
msgstr ""
4785
msgstr "You must supply either a revision or a location"
3991
4786
3992
4787
#: bzrlib/builtins.py:6261
3993
4788
msgid "cannot create branch without source branch"
3994
msgstr ""
4789
msgstr "cannot create branch without source branch"
3995
4790
3996
4791
#: bzrlib/builtins.py:6286
3997
4792
msgid "Manage filtered views."
3998
msgstr ""
4793
msgstr "Manage filtered views."
3999
4794
4000
4795
#: bzrlib/builtins.py:6288
4001
4796
msgid ""
4006
4801
"An explicit list of files can still be given but those files\n"
4007
4802
"must be within the current view."
4008
4803
msgstr ""
4804
"Views provide a mask over the tree so that users can focus on\n"
4805
"a subset of a tree when doing their work. After creating a view,\n"
4806
"commands that support a list of files - status, diff, commit, etc -\n"
4807
"effectively have that list of files implicitly given each time.\n"
4808
"An explicit list of files can still be given but those files\n"
4809
"must be within the current view."
4009
4810
4010
4811
#: bzrlib/builtins.py:6295
4011
4812
msgid ""
4014
4815
"At other times, you may wish to create one or more named views\n"
4015
4816
"and switch between them."
4016
4817
msgstr ""
4818
"In most cases, a view has a short life-span: it is created to make\n"
4819
"a selected change and is deleted once that change is committed.\n"
4820
"At other times, you may wish to create one or more named views\n"
4821
"and switch between them."
4017
4822
4018
4823
#: bzrlib/builtins.py:6300
4019
4824
msgid ""
4022
4827
"to see the whole tree for an operation or two (e.g. merge) but\n"
4023
4828
"want to switch back to your view after that."
4024
4829
msgstr ""
4830
"To disable the current view without deleting it, you can switch to\n"
4831
"the pseudo view called ``off``. This can be useful when you need\n"
4832
"to see the whole tree for an operation or two (e.g. merge) but\n"
4833
"want to switch back to your view after that."
4025
4834
4026
4835
#: bzrlib/builtins.py:6305
4027
4836
msgid ""
4028
4837
":Examples:\n"
4029
4838
" To define the current view::"
4030
4839
msgstr ""
4840
":Examples:\n"
4841
" To define the current view::"
4031
4842
4032
4843
#: bzrlib/builtins.py:6308
4033
4844
msgid " bzr view file1 dir1 ..."
4034
msgstr ""
4845
msgstr " bzr view file1 dir1 ..."
4035
4846
4036
4847
#: bzrlib/builtins.py:6310
4037
4848
msgid " To list the current view::"
4038
msgstr ""
4849
msgstr " To list the current view::"
4039
4850
4040
4851
#: bzrlib/builtins.py:6312
4041
4852
msgid " bzr view"
4042
msgstr ""
4853
msgstr " bzr view"
4043
4854
4044
4855
#: bzrlib/builtins.py:6314
4045
4856
msgid " To delete the current view::"
4046
msgstr ""
4857
msgstr " To delete the current view::"
4047
4858
4048
4859
#: bzrlib/builtins.py:6316
4049
4860
msgid " bzr view --delete"
4050
msgstr ""
4861
msgstr " bzr view --delete"
4051
4862
4052
4863
#: bzrlib/builtins.py:6318
4053
4864
msgid " To disable the current view without deleting it::"
4054
msgstr ""
4865
msgstr " To disable the current view without deleting it::"
4055
4866
4056
4867
#: bzrlib/builtins.py:6320
4057
4868
msgid " bzr view --switch off"
4058
msgstr ""
4869
msgstr " bzr view --switch off"
4059
4870
4060
4871
#: bzrlib/builtins.py:6322
4061
4872
msgid " To define a named view and switch to it::"
4062
msgstr ""
4873
msgstr " To define a named view and switch to it::"
4063
4874
4064
4875
#: bzrlib/builtins.py:6324
4065
4876
msgid " bzr view --name view-name file1 dir1 ..."
4066
msgstr ""
4877
msgstr " bzr view --name view-name file1 dir1 ..."
4067
4878
4068
4879
#: bzrlib/builtins.py:6326
4069
4880
msgid " To list a named view::"
4070
msgstr ""
4881
msgstr " To list a named view::"
4071
4882
4072
4883
#: bzrlib/builtins.py:6328
4073
4884
msgid " bzr view --name view-name"
4074
msgstr ""
4885
msgstr " bzr view --name view-name"
4075
4886
4076
4887
#: bzrlib/builtins.py:6330
4077
4888
msgid " To delete a named view::"
4078
msgstr ""
4889
msgstr " To delete a named view::"
4079
4890
4080
4891
#: bzrlib/builtins.py:6332
4081
4892
msgid " bzr view --name view-name --delete"
4082
msgstr ""
4893
msgstr " bzr view --name view-name --delete"
4083
4894
4084
4895
#: bzrlib/builtins.py:6334
4085
4896
msgid " To switch to a named view::"
4086
msgstr ""
4897
msgstr " To switch to a named view::"
4087
4898
4088
4899
#: bzrlib/builtins.py:6336
4089
4900
msgid " bzr view --switch view-name"
4090
msgstr ""
4901
msgstr " bzr view --switch view-name"
4091
4902
4092
4903
#: bzrlib/builtins.py:6338
4093
4904
msgid " To list all views defined::"
4094
msgstr ""
4905
msgstr " To list all views defined::"
4095
4906
4096
4907
#: bzrlib/builtins.py:6340
4097
4908
msgid " bzr view --all"
4098
msgstr ""
4909
msgstr " bzr view --all"
4099
4910
4100
4911
#: bzrlib/builtins.py:6342
4101
4912
msgid " To delete all views::"
4102
msgstr ""
4913
msgstr " To delete all views::"
4103
4914
4104
4915
#: bzrlib/builtins.py:6344
4105
4916
msgid " bzr view --delete --all"
4106
msgstr ""
4917
msgstr " bzr view --delete --all"
4107
4918
4108
4919
#: bzrlib/builtins.py:6351
4109
4920
msgid "Apply list or delete action to all views."
4110
msgstr ""
4921
msgstr "Apply list or delete action to all views."
4111
4922
4112
4923
#: bzrlib/builtins.py:6354
4113
4924
msgid "Delete the view."
4114
msgstr ""
4925
msgstr "Delete the view."
4115
4926
4116
4927
#: bzrlib/builtins.py:6357
4117
4928
msgid "Name of the view to define, list or delete."
4118
msgstr ""
4929
msgstr "Name of the view to define, list or delete."
4119
4930
4120
4931
#: bzrlib/builtins.py:6361
4121
4932
msgid "Name of the view to switch to."
4122
msgstr ""
4933
msgstr "Name of the view to switch to."
4123
4934
4124
4935
#: bzrlib/builtins.py:6380
4125
4936
msgid "Both --delete and a file list specified"
4126
msgstr ""
4937
msgstr "Both --delete and a file list specified"
4127
4938
4128
4939
#: bzrlib/builtins.py:6383
4129
4940
msgid "Both --delete and --switch specified"
4130
msgstr ""
4941
msgstr "Both --delete and --switch specified"
4131
4942
4132
4943
#: bzrlib/builtins.py:6386
4133
4944
msgid "Deleted all views.\n"
4134
msgstr ""
4945
msgstr "Deleted all views.\n"
4135
4946
4136
4947
#: bzrlib/builtins.py:6388
4137
4948
msgid "No current view to delete"
4138
msgstr ""
4949
msgstr "No current view to delete"
4139
4950
4140
4951
#: bzrlib/builtins.py:6391
4141
4952
#, python-format
4142
4953
msgid "Deleted '%s' view.\n"
4143
msgstr ""
4954
msgstr "Deleted '%s' view.\n"
4144
4955
4145
4956
#: bzrlib/builtins.py:6395
4146
4957
msgid "Both --switch and a file list specified"
4147
msgstr ""
4958
msgstr "Both --switch and a file list specified"
4148
4959
4149
4960
#: bzrlib/builtins.py:6398
4150
4961
msgid "Both --switch and --all specified"
4151
msgstr ""
4962
msgstr "Both --switch and --all specified"
4152
4963
4153
4964
#: bzrlib/builtins.py:6401
4154
4965
msgid "No current view to disable"
4155
msgstr ""
4966
msgstr "No current view to disable"
4156
4967
4157
4968
#: bzrlib/builtins.py:6403
4158
4969
#, python-format
4159
4970
msgid "Disabled '%s' view.\n"
4160
msgstr ""
4971
msgstr "Disabled '%s' view.\n"
4161
4972
4162
4973
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4163
4974
msgid "Using '{0}' view: {1}\n"
4164
msgstr ""
4975
msgstr "Using '{0}' view: {1}\n"
4165
4976
4166
4977
#: bzrlib/builtins.py:6410
4167
4978
msgid "Views defined:\n"
4168
msgstr ""
4979
msgstr "Views defined:\n"
4169
4980
4170
4981
#: bzrlib/builtins.py:6419
4171
4982
msgid "No views defined.\n"
4172
msgstr ""
4983
msgstr "No views defined.\n"
4173
4984
4174
4985
#: bzrlib/builtins.py:6426
4175
4986
msgid "Cannot change the 'off' pseudo view"
4176
msgstr ""
4987
msgstr "Cannot change the 'off' pseudo view"
4177
4988
4178
4989
#: bzrlib/builtins.py:6434
4179
4990
msgid "No current view.\n"
4180
msgstr ""
4991
msgstr "No current view.\n"
4181
4992
4182
4993
#: bzrlib/builtins.py:6437
4183
4994
msgid "'{0}' view is: {1}\n"
4184
msgstr ""
4995
msgstr "'{0}' view is: {1}\n"
4185
4996
4186
4997
#: bzrlib/builtins.py:6457
4187
4998
msgid " <no hooks installed>\n"
4188
msgstr ""
4999
msgstr " <no hooks installed>\n"
4189
5000
4190
5001
#: bzrlib/builtins.py:6461
4191
5002
msgid "Remove a branch."
4192
msgstr ""
5003
msgstr "Remove a branch."
4193
5004
4194
5005
#: bzrlib/builtins.py:6463
4195
5006
msgid ""
4196
5007
"This will remove the branch from the specified location but \n"
4197
5008
"will keep any working tree or repository in place."
4198
5009
msgstr ""
5010
"This will remove the branch from the specified location but \n"
5011
"will keep any working tree or repository in place."
4199
5012
4200
5013
#: bzrlib/builtins.py:6468
4201
5014
msgid " Remove the branch at repo/trunk::"
4202
msgstr ""
5015
msgstr " Remove the branch at repo/trunk::"
4203
5016
4204
5017
#: bzrlib/builtins.py:6470
4205
5018
msgid " bzr remove-branch repo/trunk"
4206
msgstr ""
5019
msgstr " bzr remove-branch repo/trunk"
4207
5020
4208
5021
#: bzrlib/builtins.py:6477
4209
5022
msgid "Remove branch even if it is the active branch."
4210
msgstr ""
5023
msgstr "Remove branch even if it is the active branch."
4211
5024
4212
5025
#: bzrlib/builtins.py:6491
4213
5026
msgid "Branch is active. Use --force to remove it."
4214
msgstr ""
5027
msgstr "Branch is active. Use --force to remove it."
4215
5028
4216
5029
#: bzrlib/builtins.py:6495
4217
5030
msgid "Plaintext diff output."
4218
msgstr ""
5031
msgstr "Plaintext diff output."
4219
5032
4220
5033
#: bzrlib/builtins.py:6496
4221
5034
msgid "Temporarily set aside some changes from the current tree."
4222
msgstr ""
5035
msgstr "Temporarily set aside some changes from the current tree."
4223
5036
4224
5037
#: bzrlib/builtins.py:6498
4225
5038
msgid ""
4229
5042
"your working tree, and so they aren't propagated along with your branch nor\n"
4230
5043
"will they survive its deletion."
4231
5044
msgstr ""
5045
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
5046
"ie. out of the way, until a later time when you can bring them back from\n"
5047
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
5048
"your working tree, and so they aren't propagated along with your branch nor\n"
5049
"will they survive its deletion."
4232
5050
4233
5051
#: bzrlib/builtins.py:6504
4234
5052
msgid "If shelve --list is specified, previously-shelved changes are listed."
4235
5053
msgstr ""
5054
"If shelve --list is specified, previously-shelved changes are listed."
4236
5055
4237
5056
#: bzrlib/builtins.py:6506
4238
5057
msgid ""
4241
5060
"and you don't need to restore them later, use revert. If you want to\n"
4242
5061
"shelve all text changes at once, use shelve --all."
4243
5062
msgstr ""
5063
"Shelve is intended to help separate several sets of changes that have\n"
5064
"been inappropriately mingled. If you just want to get rid of all changes\n"
5065
"and you don't need to restore them later, use revert. If you want to\n"
5066
"shelve all text changes at once, use shelve --all."
4244
5067
4245
5068
#: bzrlib/builtins.py:6511
4246
5069
msgid ""
4247
5070
"If filenames are specified, only the changes to those files will be\n"
4248
5071
"shelved. Other files will be left untouched."
4249
5072
msgstr ""
5073
"If filenames are specified, only the changes to those files will be\n"
5074
"shelved. Other files will be left untouched."
4250
5075
4251
5076
#: bzrlib/builtins.py:6514
4252
5077
msgid ""
4253
5078
"If a revision is specified, changes since that revision will be shelved."
4254
5079
msgstr ""
5080
"If a revision is specified, changes since that revision will be shelved."
4255
5081
4256
5082
#: bzrlib/builtins.py:6516
4257
5083
msgid ""
4258
5084
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4259
5085
"restore the most recently shelved changes."
4260
5086
msgstr ""
5087
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
5088
"restore the most recently shelved changes."
4261
5089
4262
5090
#: bzrlib/builtins.py:6519
4263
5091
msgid ""
4265
5093
"editor program to decide what the file remaining in the working copy\n"
4266
5094
"should look like. To do this, add the configuration option"
4267
5095
msgstr ""
5096
"For complicated changes, it is possible to edit the changes in a separate\n"
5097
"editor program to decide what the file remaining in the working copy\n"
5098
"should look like. To do this, add the configuration option"
4268
5099
4269
5100
#: bzrlib/builtins.py:6523
4270
5101
msgid " change_editor = PROGRAM @new_path @old_path"
4271
msgstr ""
5102
msgstr " change_editor = PROGRAM @new_path @old_path"
4272
5103
4273
5104
#: bzrlib/builtins.py:6525
4274
5105
msgid ""
4278
5109
"contents of the file in the working tree.\n"
4279
5110
" "
4280
5111
msgstr ""
5112
"where @new_path is replaced with the path of the new version of the \n"
5113
"file and @old_path is replaced with the path of the old version of \n"
5114
"the file. The PROGRAM should save the new file with the desired \n"
5115
"contents of the file in the working tree.\n"
5116
" "
4281
5117
4282
5118
#: bzrlib/builtins.py:6537
4283
5119
msgid "Shelve all changes."
4284
msgstr ""
5120
msgstr "Shelve all changes."
4285
5121
4286
5122
#: bzrlib/builtins.py:6539
4287
5123
msgid "Method to use for writing diffs."
4288
msgstr ""
5124
msgstr "Method to use for writing diffs."
4289
5125
4290
5126
#: bzrlib/builtins.py:6539
4291
5127
msgid "writer"
4292
msgstr ""
5128
msgstr "writer"
4293
5129
4294
5130
#: bzrlib/builtins.py:6543
4295
5131
msgid "List shelved changes."
4296
msgstr ""
5132
msgstr "List shelved changes."
4297
5133
4298
5134
#: bzrlib/builtins.py:6545
4299
5135
msgid "Destroy removed changes instead of shelving them."
4300
msgstr ""
5136
msgstr "Destroy removed changes instead of shelving them."
4301
5137
4302
5138
#: bzrlib/builtins.py:6574
4303
5139
msgid "No shelved changes."
4304
msgstr ""
5140
msgstr "No shelved changes."
4305
5141
4306
5142
#: bzrlib/builtins.py:6585
4307
5143
msgid "Restore shelved changes."
4308
msgstr ""
5144
msgstr "Restore shelved changes."
4309
5145
4310
5146
#: bzrlib/builtins.py:6587
4311
5147
msgid ""
4313
5149
"specify a shelf by id those changes will be restored instead. This works\n"
4314
5150
"best when the changes don't depend on each other."
4315
5151
msgstr ""
5152
"By default, the most recently shelved changes are restored. However if you\n"
5153
"specify a shelf by id those changes will be restored instead. This works\n"
5154
"best when the changes don't depend on each other."
4316
5155
4317
5156
#: bzrlib/builtins.py:6596
4318
5157
msgid "The action to perform."
4319
msgstr ""
5158
msgstr "The action to perform."
4320
5159
4321
5160
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4322
5161
msgid "action"
4323
msgstr ""
5162
msgstr "action"
4324
5163
4325
5164
#: bzrlib/builtins.py:6598
4326
5165
msgid "Apply changes and remove from the shelf."
4327
msgstr ""
5166
msgstr "Apply changes and remove from the shelf."
4328
5167
4329
5168
#: bzrlib/builtins.py:6599
4330
5169
msgid "Show changes, but do not apply or remove them."
4331
msgstr ""
5170
msgstr "Show changes, but do not apply or remove them."
4332
5171
4333
5172
#: bzrlib/builtins.py:6600
4334
5173
msgid ""
4335
5174
"Instead of unshelving the changes, show the diff that would result from "
4336
5175
"unshelving."
4337
5176
msgstr ""
5177
"Instead of unshelving the changes, show the diff that would result from "
5178
"unshelving."
4338
5179
4339
5180
#: bzrlib/builtins.py:6602
4340
5181
msgid "Delete changes without applying them."
4341
msgstr ""
5182
msgstr "Delete changes without applying them."
4342
5183
4343
5184
#: bzrlib/builtins.py:6603
4344
5185
msgid "Apply changes but don't delete them."
4345
msgstr ""
5186
msgstr "Apply changes but don't delete them."
4346
5187
4347
5188
#: bzrlib/builtins.py:6618
4348
5189
msgid "Remove unwanted files from working tree."
4349
msgstr ""
5190
msgstr "Remove unwanted files from working tree."
4350
5191
4351
5192
#: bzrlib/builtins.py:6620
4352
5193
msgid ""
4353
5194
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4354
5195
"files are never deleted."
4355
5196
msgstr ""
5197
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
5198
"files are never deleted."
4356
5199
4357
5200
#: bzrlib/builtins.py:6623
4358
5201
msgid ""
4360
5203
"normal operations and selftests. (The value of these files decreases with\n"
4361
5204
"time.)"
4362
5205
msgstr ""
5206
"Another class is 'detritus', which includes files emitted by bzr during\n"
5207
"normal operations and selftests. (The value of these files decreases with\n"
5208
"time.)"
4363
5209
4364
5210
#: bzrlib/builtins.py:6627
4365
5211
msgid ""
4366
5212
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4367
5213
"flags are respected, and may be combined."
4368
5214
msgstr ""
5215
"If no options are specified, unknown files are deleted. Otherwise, option\n"
5216
"flags are respected, and may be combined."
4369
5217
4370
5218
#: bzrlib/builtins.py:6630
4371
5219
msgid "To check what clean-tree will do, use --dry-run."
4372
msgstr ""
5220
msgstr "To check what clean-tree will do, use --dry-run."
4373
5221
4374
5222
#: bzrlib/builtins.py:6633
4375
5223
msgid "Delete all ignored files."
4376
msgstr ""
5224
msgstr "Delete all ignored files."
4377
5225
4378
5226
#: bzrlib/builtins.py:6634
4379
5227
msgid ""
4380
5228
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4381
5229
msgstr ""
5230
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4382
5231
4383
5232
#: bzrlib/builtins.py:6637
4384
5233
msgid "Delete files unknown to bzr (default)."
4385
msgstr ""
5234
msgstr "Delete files unknown to bzr (default)."
4386
5235
4387
5236
#: bzrlib/builtins.py:6638
4388
5237
msgid "Show files to delete instead of deleting them."
4389
msgstr ""
5238
msgstr "Show files to delete instead of deleting them."
4390
5239
4391
5240
#: bzrlib/builtins.py:6640
4392
5241
msgid "Do not prompt before deleting."
4393
msgstr ""
5242
msgstr "Do not prompt before deleting."
4394
5243
4395
5244
#: bzrlib/bundle/__init__.py:59
4396
5245
msgid "A directory cannot be a bundle"
4397
msgstr ""
5246
msgstr "A directory cannot be a bundle"
4398
5247
4399
5248
#: bzrlib/bundle/apply_bundle.py:40
4400
5249
msgid "Install revisions"
4401
msgstr ""
5250
msgstr "Install revisions"
4402
5251
4403
5252
#: bzrlib/bundle/commands.py:64
4404
5253
msgid "--verbose requires a merge directive"
4405
msgstr ""
5254
msgstr "--verbose requires a merge directive"
4406
5255
4407
5256
#: bzrlib/bundle/commands.py:67
4408
5257
msgid "Bundle format not supported"
4409
msgstr ""
5258
msgstr "Bundle format not supported"
4410
5259
4411
5260
#: bzrlib/bundle/commands.py:77
4412
5261
msgid "Records\n"
4413
msgstr ""
5262
msgstr "Records\n"
4414
5263
4415
5264
#: bzrlib/bundle/commands.py:81
4416
5265
msgid "{0}: {1} ({2} multiparent)\n"
4417
msgstr ""
5266
msgstr "{0}: {1} ({2} multiparent)\n"
4418
5267
4419
5268
#: bzrlib/bundle/commands.py:83
4420
5269
#, python-format
4421
5270
msgid "unique files: %d\n"
4422
msgstr ""
5271
msgstr "unique files: %d\n"
4423
5272
4424
5273
#: bzrlib/bundle/commands.py:92
4425
5274
msgid "Revisions\n"
4426
msgstr ""
5275
msgstr "Revisions\n"
4427
5276
4428
5277
#: bzrlib/bundle/commands.py:93
4429
5278
#, python-format
4430
5279
msgid "nicks: %s\n"
4431
msgstr ""
5280
msgstr "nicks: %s\n"
4432
5281
4433
5282
#: bzrlib/bundle/commands.py:95
4434
5283
#, python-format
4436
5285
"committers: \n"
4437
5286
"%s\n"
4438
5287
msgstr ""
5288
"committers: \n"
5289
"%s\n"
4439
5290
4440
5291
#: bzrlib/bundle/commands.py:103
4441
5292
msgid "Decoded contents\n"
4442
msgstr ""
5293
msgstr "Decoded contents\n"
4443
5294
4444
5295
#: bzrlib/bundle/serializer/v4.py:327
4445
5296
#, python-format
4446
5297
msgid "Bundling %d revision."
4447
5298
msgid_plural "Bundling %d revisions."
4448
msgstr[0] ""
4449
msgstr[1] ""
5299
msgstr[0] "Bundling %d revision."
5300
msgstr[1] "Bundling %d revisions."
4450
5301
4451
5302
#: bzrlib/bzrdir.py:487
4452
5303
msgid ""
4453
5304
"making backup of {0}\n"
4454
5305
" to {1}"
4455
5306
msgstr ""
5307
"making backup of {0}\n"
5308
" to {1}"
4456
5309
4457
5310
#: bzrlib/bzrdir.py:510
4458
5311
msgid "renamed {0} to {1}"
4459
msgstr ""
5312
msgstr "renamed {0} to {1}"
4460
5313
4461
5314
#: bzrlib/bzrdir.py:1639
4462
5315
#, python-format
4464
5317
"Source repository format does not support stacking, using format:\n"
4465
5318
" %s"
4466
5319
msgstr ""
5320
"Source repository format does not support stacking, using format:\n"
5321
" %s"
4467
5322
4468
5323
#: bzrlib/bzrdir.py:1659
4469
5324
#, python-format
4471
5326
"Source branch format does not support stacking, using format:\n"
4472
5327
" %s"
4473
5328
msgstr ""
5329
"Source branch format does not support stacking, using format:\n"
5330
" %s"
4474
5331
4475
5332
#: bzrlib/bzrdir.py:1805
4476
5333
msgid "starting repository conversion"
4477
msgstr ""
5334
msgstr "starting repository conversion"
4478
5335
4479
5336
#: bzrlib/bzrdir.py:2026
4480
5337
msgid "Using default stacking branch {0} at {1}"
4481
msgstr ""
5338
msgstr "Using default stacking branch {0} at {1}"
4482
5339
4483
5340
#: bzrlib/check.py:108
4484
5341
msgid "check"
4485
msgstr ""
5342
msgstr "check"
4486
5343
4487
5344
#: bzrlib/check.py:110
4488
5345
msgid "checking revisions"
4489
msgstr ""
5346
msgstr "checking revisions"
4490
5347
4491
5348
#: bzrlib/check.py:112
4492
5349
msgid "checking commit contents"
4493
msgstr ""
5350
msgstr "checking commit contents"
4494
5351
4495
5352
#: bzrlib/check.py:114
4496
5353
msgid "checking file graphs"
4497
msgstr ""
5354
msgstr "checking file graphs"
4498
5355
4499
5356
#: bzrlib/check.py:118
4500
5357
msgid "checking branches and trees"
4501
msgstr ""
5358
msgstr "checking branches and trees"
4502
5359
4503
5360
#: bzrlib/check.py:205
4504
5361
msgid "checked repository {0} format {1}"
4505
msgstr ""
5362
msgstr "checked repository {0} format {1}"
4506
5363
4507
5364
#: bzrlib/check.py:208
4508
5365
#, python-format
4509
5366
msgid "%6d revisions"
4510
msgstr ""
5367
msgstr "%6d revisions"
4511
5368
4512
5369
#: bzrlib/check.py:209
4513
5370
#, python-format
4514
5371
msgid "%6d file-ids"
4515
msgstr ""
5372
msgstr "%6d file-ids"
4516
5373
4517
5374
#: bzrlib/check.py:211
4518
5375
#, python-format
4519
5376
msgid "%6d unreferenced text versions"
4520
msgstr ""
5377
msgstr "%6d unreferenced text versions"
4521
5378
4522
5379
#: bzrlib/check.py:215
4523
5380
msgid "unreferenced version: {{{0}}} in {1}"
4524
msgstr ""
5381
msgstr "unreferenced version: {{{0}}} in {1}"
4525
5382
4526
5383
#: bzrlib/check.py:218
4527
5384
#, python-format
4528
5385
msgid "%6d revisions are missing inventory_sha1"
4529
msgstr ""
5386
msgstr "%6d revisions are missing inventory_sha1"
4530
5387
4531
5388
#: bzrlib/check.py:221
4532
5389
#, python-format
4533
5390
msgid "%6d revisions are mentioned but not present"
4534
msgstr ""
5391
msgstr "%6d revisions are mentioned but not present"
4535
5392
4536
5393
#: bzrlib/check.py:224
4537
5394
#, python-format
4538
5395
msgid "%6d ghost revisions"
4539
msgstr ""
5396
msgstr "%6d ghost revisions"
4540
5397
4541
5398
#: bzrlib/check.py:229
4542
5399
#, python-format
4543
5400
msgid "%6d revisions missing parents in ancestry"
4544
msgstr ""
5401
msgstr "%6d revisions missing parents in ancestry"
4545
5402
4546
5403
#: bzrlib/check.py:233
4547
5404
#, python-format
4548
5405
msgid " %s should be in the ancestry for:"
4549
msgstr ""
5406
msgstr " %s should be in the ancestry for:"
4550
5407
4551
5408
#: bzrlib/check.py:237
4552
5409
#, python-format
4553
5410
msgid "%6d inconsistent parents"
4554
msgstr ""
5411
msgstr "%6d inconsistent parents"
4555
5412
4556
5413
#: bzrlib/check.py:241
4557
5414
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4558
msgstr ""
5415
msgstr " * {0} version {1} has parents {2!r} but should have {3!r}"
4559
5416
4560
5417
#: bzrlib/check.py:247
4561
5418
#, python-format
4562
5419
msgid "%6d revisions have incorrect parents in the revision index"
4563
msgstr ""
5420
msgstr "%6d revisions have incorrect parents in the revision index"
4564
5421
4565
5422
#: bzrlib/check.py:253
4566
5423
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4567
msgstr ""
5424
msgstr " {0} has wrong parents in index: {1!r} should be {2!r}"
4568
5425
4569
5426
#: bzrlib/check.py:267
4570
5427
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4571
msgstr ""
5428
msgstr "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4572
5429
4573
5430
#: bzrlib/check.py:296
4574
5431
msgid ""
4575
5432
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4576
5433
"{{{4}}}"
4577
5434
msgstr ""
5435
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5436
"{{{4}}}"
4578
5437
4579
5438
#: bzrlib/check.py:354
4580
5439
#, python-format
4581
5440
msgid "Checking branch at '%s'."
4582
msgstr ""
5441
msgstr "Checking branch at '%s'."
4583
5442
4584
5443
#: bzrlib/check.py:374
4585
5444
#, python-format
4586
5445
msgid "Checking working tree at '%s'."
4587
msgstr ""
5446
msgstr "Checking working tree at '%s'."
4588
5447
4589
5448
#: bzrlib/check.py:427 bzrlib/check.py:441
4590
5449
msgid "No branch found at specified location."
4591
msgstr ""
5450
msgstr "No branch found at specified location."
4592
5451
4593
5452
#: bzrlib/check.py:429 bzrlib/check.py:439
4594
5453
msgid "No working tree found at specified location."
4595
msgstr ""
5454
msgstr "No working tree found at specified location."
4596
5455
4597
5456
#: bzrlib/check.py:432
4598
5457
#, python-format
4599
5458
msgid "Checking repository at '%s'."
4600
msgstr ""
5459
msgstr "Checking repository at '%s'."
4601
5460
4602
5461
#: bzrlib/check.py:443
4603
5462
msgid "No repository found at specified location."
4604
msgstr ""
5463
msgstr "No repository found at specified location."
4605
5464
4606
5465
#: bzrlib/clean_tree.py:63
4607
5466
msgid "Nothing to delete."
4608
msgstr ""
5467
msgstr "Nothing to delete."
4609
5468
4610
5469
#: bzrlib/clean_tree.py:68
4611
5470
msgid "Are you sure you wish to delete these"
4612
msgstr ""
5471
msgstr "Are you sure you wish to delete these"
4613
5472
4614
5473
#: bzrlib/clean_tree.py:70
4615
5474
msgid "Canceled"
4616
msgstr ""
5475
msgstr "Cancelled"
4617
5476
4618
5477
#: bzrlib/clean_tree.py:107
4619
5478
#, python-format
4620
5479
msgid "unable to remove %s"
4621
msgstr ""
5480
msgstr "unable to remove %s"
4622
5481
4623
5482
#: bzrlib/clean_tree.py:111
4624
5483
msgid "deleting paths:"
4625
msgstr ""
5484
msgstr "deleting paths:"
4626
5485
4627
5486
#: bzrlib/clean_tree.py:125
4628
5487
msgid "unable to remove \"{0}\": {1}."
4629
msgstr ""
5488
msgstr "unable to remove \"{0}\": {1}."
4630
5489
4631
5490
#: bzrlib/clean_tree.py:130
4632
5491
msgid "No files deleted."
4633
msgstr ""
5492
msgstr "No files deleted."
4634
5493
4635
5494
#: bzrlib/cmd_version_info.py:47
4636
5495
msgid "No known version info format {0}. Supported types are: {1}"
4637
msgstr ""
5496
msgstr "No known version info format {0}. Supported types are: {1}"
4638
5497
4639
5498
#: bzrlib/cmd_version_info.py:52
4640
5499
msgid "Version info in Custom template-based format."
4641
msgstr ""
5500
msgstr "Version info in Custom template-based format."
4642
5501
4643
5502
#: bzrlib/cmd_version_info.py:52
4644
5503
msgid "Version info in Python format."
4645
msgstr ""
5504
msgstr "Version info in Python format."
4646
5505
4647
5506
#: bzrlib/cmd_version_info.py:52
4648
5507
msgid "Version info in RIO (simple text) format (default)."
4649
msgstr ""
5508
msgstr "Version info in RIO (simple text) format (default)."
4650
5509
4651
5510
#: bzrlib/cmd_version_info.py:53
4652
5511
msgid "Show version information about this tree."
4653
msgstr ""
5512
msgstr "Show version information about this tree."
4654
5513
4655
5514
#: bzrlib/cmd_version_info.py:55
4656
5515
msgid ""
4658
5517
"source code of an application. The output can be in one of the\n"
4659
5518
"supported formats or in a custom format based on a template."
4660
5519
msgstr ""
5520
"You can use this command to add information about version into\n"
5521
"source code of an application. The output can be in one of the\n"
5522
"supported formats or in a custom format based on a template."
4661
5523
4662
5524
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4663
5525
#: en/help_topics/configuration.txt:722
4664
5526
msgid "For example::"
4665
msgstr ""
5527
msgstr "For example::"
4666
5528
4667
5529
#: bzrlib/cmd_version_info.py:61
4668
5530
msgid ""
4669
5531
" bzr version-info --custom \\\n"
4670
5532
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4671
5533
msgstr ""
5534
" bzr version-info --custom \\\n"
5535
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4672
5536
4673
5537
#: bzrlib/cmd_version_info.py:64
4674
5538
msgid ""
4675
5539
"will produce a C header file with formatted string containing the\n"
4676
5540
"current revision number. Other supported variables in templates are:"
4677
5541
msgstr ""
5542
"will produce a C header file with formatted string containing the\n"
5543
"current revision number. Other supported variables in templates are:"
4678
5544
4679
5545
#: bzrlib/cmd_version_info.py:67
4680
5546
msgid ""
4686
5552
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4687
5553
" otherwise 1"
4688
5554
msgstr ""
5555
" * {date} - date of the last revision\n"
5556
" * {build_date} - current date\n"
5557
" * {revno} - revision number\n"
5558
" * {revision_id} - revision id\n"
5559
" * {branch_nick} - branch nickname\n"
5560
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5561
" otherwise 1"
4689
5562
4690
5563
#: bzrlib/cmd_version_info.py:77
4691
5564
msgid "Select the output format."
4692
msgstr ""
5565
msgstr "Select the output format."
4693
5566
4694
5567
#: bzrlib/cmd_version_info.py:81
4695
5568
msgid "Include all possible information."
4696
msgstr ""
5569
msgstr "Include all possible information."
4697
5570
4698
5571
#: bzrlib/cmd_version_info.py:82
4699
5572
msgid "Check if tree is clean."
4700
msgstr ""
5573
msgstr "Check if tree is clean."
4701
5574
4702
5575
#: bzrlib/cmd_version_info.py:84
4703
5576
msgid "Include the revision-history."
4704
msgstr ""
5577
msgstr "Include the revision-history."
4705
5578
4706
5579
#: bzrlib/cmd_version_info.py:86
4707
5580
msgid "Include the last revision for each file."
4708
msgstr ""
5581
msgstr "Include the last revision for each file."
4709
5582
4710
5583
#: bzrlib/cmd_version_info.py:87
4711
5584
msgid "Template for the output."
4712
msgstr ""
5585
msgstr "Template for the output."
4713
5586
4714
5587
#: bzrlib/cmd_version_info.py:101
4715
5588
msgid "bzr version-info --revision takes exactly one revision specifier"
4716
msgstr ""
5589
msgstr "bzr version-info --revision takes exactly one revision specifier"
4717
5590
4718
5591
#: bzrlib/commands.py:229
4719
5592
#, python-format
4720
5593
msgid "unknown command \"%s\""
4721
msgstr ""
5594
msgstr "unknown command \"%s\""
4722
5595
4723
5596
#: bzrlib/commands.py:476
4724
5597
msgid "No help for this command."
4725
msgstr ""
5598
msgstr "No help for this command."
4726
5599
4727
5600
#: bzrlib/commands.py:489
4728
5601
#, python-format
4729
5602
msgid ":Purpose: %s\n"
4730
msgstr ""
5603
msgstr ":Purpose: %s\n"
4731
5604
4732
5605
#: bzrlib/commands.py:491
4733
5606
#, python-format
4735
5608
":Usage:\n"
4736
5609
"%s\n"
4737
5610
msgstr ""
5611
":Usage:\n"
5612
"%s\n"
4738
5613
4739
5614
#: bzrlib/commands.py:493
4740
5615
#, python-format
4741
5616
msgid ":Usage: %s\n"
4742
msgstr ""
5617
msgstr ":Usage: %s\n"
4743
5618
4744
5619
#: bzrlib/commands.py:512
4745
5620
#, python-format
4746
5621
msgid ":Options:%s"
4747
msgstr ""
5622
msgstr ":Options:%s"
4748
5623
4749
5624
#: bzrlib/commands.py:523
4750
5625
#, python-format
4753
5628
" %s\n"
4754
5629
"\n"
4755
5630
msgstr ""
5631
":Description:\n"
5632
" %s\n"
5633
"\n"
4756
5634
4757
5635
#: bzrlib/commands.py:533
4758
5636
#, python-format
4760
5638
"See bzr help %s for more details and examples.\n"
4761
5639
"\n"
4762
5640
msgstr ""
5641
"See bzr help %s for more details and examples.\n"
5642
"\n"
4763
5643
4764
5644
#: bzrlib/commands.py:538
4765
5645
msgid ":Aliases: "
4766
msgstr ""
5646
msgstr ":Aliases: "
4767
5647
4768
5648
#: bzrlib/commands.py:542
4769
5649
#, python-format
4770
5650
msgid ":From: plugin \"%s\"\n"
4771
msgstr ""
5651
msgstr ":From: plugin \"%s\"\n"
4772
5652
4773
5653
#: bzrlib/commands.py:554
4774
5654
msgid ":doc:`{0} <{1}-help>`"
4775
msgstr ""
5655
msgstr ":doc:`{0} <{1}-help>`"
4776
5656
4777
5657
#: bzrlib/commands.py:558
4778
5658
#, python-format
4779
5659
msgid ":See also: %s"
4780
msgstr ""
5660
msgstr ":See also: %s"
4781
5661
4782
5662
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4783
5663
msgid "Only ASCII permitted in option names"
4784
msgstr ""
5664
msgstr "Only ASCII permitted in option names"
4785
5665
4786
5666
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4787
5667
msgid "command {0!r} needs one or more {1}"
4788
msgstr ""
5668
msgstr "command {0!r} needs one or more {1}"
4789
5669
4790
5670
#: bzrlib/commands.py:868
4791
5671
msgid "command {0!r} requires argument {1}"
4792
msgstr ""
5672
msgstr "command {0!r} requires argument {1}"
4793
5673
4794
5674
#: bzrlib/commands.py:875
4795
5675
msgid "extra argument to command {0}: {1}"
4796
msgstr ""
5676
msgstr "extra argument to command {0}: {1}"
4797
5677
4798
5678
#: bzrlib/commands.py:972
4799
5679
#, python-format
4800
5680
msgid "Profile data written to \"%s\"."
4801
msgstr ""
5681
msgstr "Profile data written to \"%s\"."
4802
5682
4803
5683
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4804
5684
msgid "added"
4805
msgstr ""
5685
msgstr "added"
4806
5686
4807
5687
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4808
5688
msgid "modified"
4809
msgstr ""
5689
msgstr "modified"
4810
5690
4811
5691
#: bzrlib/commit.py:131
4812
5692
#, python-format
4813
5693
msgid "Committing%s"
4814
msgstr ""
5694
msgstr "Committing%s"
4815
5695
4816
5696
#: bzrlib/commit.py:134
4817
5697
#, python-format
4818
5698
msgid "Committed revision %d."
4819
msgstr ""
5699
msgstr "Committed revision %d."
4820
5700
4821
5701
#: bzrlib/commit.py:143
4822
5702
#, python-format
4823
5703
msgid "deleted %s"
4824
msgstr ""
5704
msgstr "deleted %s"
4825
5705
4826
5706
#: bzrlib/commit.py:146
4827
5707
#, python-format
4828
5708
msgid "missing %s"
4829
msgstr ""
5709
msgstr "missing %s"
4830
5710
4831
5711
#: bzrlib/commit.py:511
4832
5712
msgid ""
4833
5713
"Conflicting tags in bound branch:\n"
4834
5714
"{0}"
4835
5715
msgstr ""
5716
"Conflicting tags in bound branch:\n"
5717
"{0}"
4836
5718
4837
5719
#: bzrlib/commit.py:742
4838
5720
msgid "renamed"
4839
msgstr ""
5721
msgstr "renamed"
4840
5722
4841
5723
#: bzrlib/commit.py:976
4842
5724
msgid "unchanged"
4843
msgstr ""
5725
msgstr "unchanged"
4844
5726
4845
5727
#: bzrlib/commit.py:998
4846
5728
msgid "{0} [{1}] - Stage"
4847
msgstr ""
5729
msgstr "{0} [{1}] - Stage"
4848
5730
4849
5731
#: bzrlib/commit.py:1001
4850
5732
#, python-format
4851
5733
msgid "%s - Stage"
4852
msgstr ""
5734
msgstr "%s - Stage"
4853
5735
4854
5736
#: bzrlib/commit_signature_commands.py:34
4855
5737
msgid "Sign all commits by a given committer."
4856
msgstr ""
5738
msgstr "Sign all commits by a given committer."
4857
5739
4858
5740
#: bzrlib/commit_signature_commands.py:36
4859
5741
msgid ""
4860
5742
"If location is not specified the local tree is used.\n"
4861
5743
"If committer is not specified the default committer is used."
4862
5744
msgstr ""
5745
"If location is not specified the local tree is used.\n"
5746
"If committer is not specified the default committer is used."
4863
5747
4864
5748
#: bzrlib/commit_signature_commands.py:39
4865
5749
msgid "This does not sign commits that already have signatures."
4866
msgstr ""
5750
msgstr "This does not sign commits that already have signatures."
4867
5751
4868
5752
#: bzrlib/commit_signature_commands.py:47
4869
5753
msgid ""
4870
5754
"Don't actually sign anything, just print the revisions that would be signed."
4871
5755
msgstr ""
5756
"Don't actually sign anything, just print the revisions that would be signed."
4872
5757
4873
5758
#: bzrlib/commit_signature_commands.py:98
4874
5759
#, python-format
4875
5760
msgid "Signed %d revision.\n"
4876
5761
msgid_plural "Signed %d revisions.\n"
4877
msgstr[0] ""
4878
msgstr[1] ""
5762
msgstr[0] "Signed %d revision.\n"
5763
msgstr[1] "Signed %d revisions.\n"
4879
5764
4880
5765
#: bzrlib/commit_signature_commands.py:103
4881
5766
msgid "Verify all commit signatures."
4882
msgstr ""
5767
msgstr "Verify all commit signatures."
4883
5768
4884
5769
#: bzrlib/commit_signature_commands.py:105
4885
5770
msgid ""
4886
5771
"Verifies that all commits in the branch are signed by known GnuPG keys."
4887
5772
msgstr ""
5773
"Verifies that all commits in the branch are signed by known GnuPG keys."
4888
5774
4889
5775
#: bzrlib/commit_signature_commands.py:110
4890
5776
msgid ""
4891
5777
"Comma separated list of GPG key patterns which are acceptable for "
4892
5778
"verification."
4893
5779
msgstr ""
5780
"Comma separated list of GPG key patterns which are acceptable for "
5781
"verification."
4894
5782
4895
5783
#: bzrlib/commit_signature_commands.py:148
4896
5784
msgid "Cannot verify a range of non-revision-history revisions"
4897
msgstr ""
5785
msgstr "Cannot verify a range of non-revision-history revisions"
4898
5786
4899
5787
#: bzrlib/commit_signature_commands.py:166
4900
5788
msgid "All commits signed with verifiable keys"
4901
msgstr ""
5789
msgstr "All commits signed with verifiable keys"
4902
5790
4903
5791
#: bzrlib/config.py:436
4904
5792
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4905
msgstr ""
5793
msgstr "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4906
5794
4907
5795
#: bzrlib/config.py:2452
4908
5796
msgid "{0} is not an SI unit."
4919
5807
#: bzrlib/config.py:3116
4920
5808
#, python-format
4921
5809
msgid "Invalid '%s', should be of the form 'name=value'"
4922
msgstr ""
5810
msgstr "Invalid '%s', should be of the form 'name=value'"
4923
5811
4924
5812
#: bzrlib/config.py:4018
4925
5813
msgid "Display, set or remove a configuration option."
4926
msgstr ""
5814
msgstr "Display, set or remove a configuration option."
4927
5815
4928
5816
#: bzrlib/config.py:4020
4929
5817
msgid "Display the active value for a given option."
4930
msgstr ""
5818
msgstr "Display the active value for a given option."
4931
5819
4932
5820
#: bzrlib/config.py:4022
4933
5821
msgid ""
4935
5823
"matching options are displayed mentioning their scope. The active value\n"
4936
5824
"that bzr will take into account is the first one displayed for each option."
4937
5825
msgstr ""
5826
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5827
"matching options are displayed mentioning their scope. The active value\n"
5828
"that bzr will take into account is the first one displayed for each option."
4938
5829
4939
5830
#: bzrlib/config.py:4026
4940
5831
msgid "If no NAME is given, --all .* is implied."
4941
msgstr ""
5832
msgstr "If no NAME is given, --all .* is implied."
4942
5833
4943
5834
#: bzrlib/config.py:4028
4944
5835
msgid ""
4946
5837
"is set in the most relevant scope and can be checked by displaying the\n"
4947
5838
"option again."
4948
5839
msgstr ""
5840
"Setting a value is achieved by using name=value without spaces. The value\n"
5841
"is set in the most relevant scope and can be checked by displaying the\n"
5842
"option again."
4949
5843
4950
5844
#: bzrlib/config.py:4040
4951
5845
msgid "Reduce the scope to the specified configuration file."
4952
msgstr ""
5846
msgstr "Reduce the scope to the specified configuration file."
4953
5847
4954
5848
#: bzrlib/config.py:4044
4955
5849
msgid "Display all the defined values for the matching options."
4956
msgstr ""
5850
msgstr "Display all the defined values for the matching options."
4957
5851
4958
5852
#: bzrlib/config.py:4046
4959
5853
msgid "Remove the option from the configuration file."
4960
msgstr ""
5854
msgstr "Remove the option from the configuration file."
4961
5855
4962
5856
#: bzrlib/conflicts.py:50
4963
5857
msgid "List files with conflicts."
4964
msgstr ""
5858
msgstr "List files with conflicts."
4965
5859
4966
5860
#: bzrlib/conflicts.py:57
4967
5861
msgid ""
4969
5863
"is supplied, the pathnames of files with text conflicts are listed,\n"
4970
5864
"instead. (This is useful for editing all files with text conflicts.)"
4971
5865
msgstr ""
5866
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5867
"is supplied, the pathnames of files with text conflicts are listed,\n"
5868
"instead. (This is useful for editing all files with text conflicts.)"
4972
5869
4973
5870
#: bzrlib/conflicts.py:61
4974
5871
msgid "Use bzr resolve when you have fixed a problem."
4975
msgstr ""
5872
msgstr "Use bzr resolve when you have fixed a problem."
4976
5873
4977
5874
#: bzrlib/conflicts.py:66
4978
5875
msgid "List paths of files with text conflicts."
4979
msgstr ""
5876
msgstr "List paths of files with text conflicts."
4980
5877
4981
5878
#: bzrlib/conflicts.py:85
4982
5879
msgid "Marks the conflict as resolved."
4983
msgstr ""
5880
msgstr "Marks the conflict as resolved."
4984
5881
4985
5882
#: bzrlib/conflicts.py:88
4986
5883
msgid "Resolve the conflict preserving the version in the working tree."
4987
msgstr ""
5884
msgstr "Resolve the conflict preserving the version in the working tree."
4988
5885
4989
5886
#: bzrlib/conflicts.py:91
4990
5887
msgid "Resolve the conflict taking the merged version into account."
4991
msgstr ""
5888
msgstr "Resolve the conflict taking the merged version into account."
4992
5889
4993
5890
#: bzrlib/conflicts.py:98
4994
5891
msgid "How to resolve the conflict."
4995
msgstr ""
5892
msgstr "How to resolve the conflict."
4996
5893
4997
5894
#: bzrlib/conflicts.py:104
4998
5895
msgid "Mark a conflict as resolved."
4999
msgstr ""
5896
msgstr "Mark a conflict as resolved."
5000
5897
5001
5898
#: bzrlib/conflicts.py:111
5002
5899
msgid ""
5005
5902
"as\n"
5006
5903
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5007
5904
msgstr ""
5905
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5906
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5907
"as\n"
5908
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5008
5909
5009
5910
#: bzrlib/conflicts.py:119
5010
5911
msgid "Resolve all conflicts in this tree."
5011
msgstr ""
5912
msgstr "Resolve all conflicts in this tree."
5012
5913
5013
5914
#: bzrlib/conflicts.py:126
5014
5915
msgid "If --all is specified, no FILE may be provided"
5015
msgstr ""
5916
msgstr "If --all is specified, no FILE may be provided"
5016
5917
5017
5918
#: bzrlib/conflicts.py:151
5018
5919
#, python-format
5019
5920
msgid "%d conflict auto-resolved."
5020
5921
msgid_plural "%d conflicts auto-resolved."
5021
msgstr[0] ""
5022
msgstr[1] ""
5922
msgstr[0] "%d conflict auto-resolved."
5923
msgstr[1] "%d conflicts auto-resolved."
5023
5924
5024
5925
#: bzrlib/conflicts.py:154
5025
5926
msgid "Remaining conflicts:"
5026
msgstr ""
5927
msgstr "Remaining conflicts:"
5027
5928
5028
5929
#: bzrlib/conflicts.py:159
5029
5930
msgid "All conflicts resolved."
5030
msgstr ""
5931
msgstr "All conflicts resolved."
5031
5932
5032
5933
#: bzrlib/conflicts.py:168
5033
5934
msgid "{0} conflict resolved, {1} remaining"
5034
5935
msgid_plural "{0} conflicts resolved, {1} remaining"
5035
msgstr[0] ""
5036
msgstr[1] ""
5936
msgstr[0] "{0} conflict resolved, {1} remaining"
5937
msgstr[1] "{0} conflicts resolved, {1} remaining"
5037
5938
5038
5939
#: bzrlib/controldir.py:712
5039
5940
msgid "{0} is{1} redirected to {2}"
5040
msgstr ""
5941
msgstr "{0} is{1} redirected to {2}"
5041
5942
5042
5943
#: bzrlib/diff.py:399
5043
5944
#, python-format
5044
5945
msgid "*** Ignoring files outside view. View is %s"
5045
msgstr ""
5946
msgstr "*** Ignoring files outside view. View is %s"
5046
5947
5047
5948
#: bzrlib/errors.py:157
5048
5949
msgid "The tree builder is already building a tree."
5049
msgstr ""
5950
msgstr "The tree builder is already building a tree."
5050
5951
5051
5952
#: bzrlib/errors.py:178
5052
5953
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5053
msgstr ""
5954
msgstr "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5054
5955
5055
5956
#: bzrlib/errors.py:197
5056
5957
msgid ""
5057
5958
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5058
5959
"versions \"%(minimum)s\" to \"%(current)s\"."
5059
5960
msgstr ""
5961
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5962
"versions \"%(minimum)s\" to \"%(current)s\"."
5060
5963
5061
5964
#: bzrlib/errors.py:209
5062
5965
msgid "The transport '%(transport)s' is only accessible within this process."
5063
5966
msgstr ""
5967
"The transport '%(transport)s' is only accessible within this process."
5064
5968
5065
5969
#: bzrlib/errors.py:227
5066
5970
msgid "Invalid revision number %(revno)s"
5067
msgstr ""
5971
msgstr "Invalid revision number %(revno)s"
5068
5972
5069
5973
#: bzrlib/errors.py:236
5070
5974
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5071
msgstr ""
5975
msgstr "Invalid revision-id {%(revision_id)s} in %(branch)s"
5072
5976
5073
5977
#: bzrlib/errors.py:247
5074
5978
msgid "Reserved revision-id {%(revision_id)s}"
5075
msgstr ""
5979
msgstr "Reserved revision-id {%(revision_id)s}"
5076
5980
5077
5981
#: bzrlib/errors.py:261
5078
5982
msgid "There is no public branch set for \"%(branch_url)s\"."
5079
msgstr ""
5983
msgstr "There is no public branch set for \"%(branch_url)s\"."
5080
5984
5081
5985
#: bzrlib/errors.py:271
5082
5986
msgid ""
5083
5987
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5084
5988
"obtain a list of topics."
5085
5989
msgstr ""
5990
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5991
"obtain a list of topics."
5086
5992
5087
5993
#: bzrlib/errors.py:280
5088
5994
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5089
msgstr ""
5995
msgstr "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5090
5996
5091
5997
#: bzrlib/errors.py:290
5092
5998
msgid ""
5093
5999
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5094
6000
msgstr ""
6001
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5095
6002
5096
6003
#: bzrlib/errors.py:299
5097
6004
msgid "The branch '%(branch)s' is not stacked."
5098
msgstr ""
6005
msgstr "The branch '%(branch)s' is not stacked."
5099
6006
5100
6007
#: bzrlib/errors.py:313
5101
6008
msgid "No WorkingTree exists for \"%(base)s\"."
5102
msgstr ""
6009
msgstr "No WorkingTree exists for \"%(base)s\"."
5103
6010
5104
6011
#: bzrlib/errors.py:322
5105
6012
msgid "Not currently building a tree."
5106
msgstr ""
6013
msgstr "Not currently building a tree."
5107
6014
5108
6015
#: bzrlib/errors.py:327
5109
6016
msgid "%(url)s is not a local path."
5110
msgstr ""
6017
msgstr "%(url)s is not a local path."
5111
6018
5112
6019
#: bzrlib/errors.py:355
5113
6020
msgid "%(not_locked)r is not write locked but needs to be."
5114
msgstr ""
6021
msgstr "%(not_locked)r is not write locked but needs to be."
5115
6022
5116
6023
#: bzrlib/errors.py:363
5117
6024
msgid "Error in command line options"
5118
msgstr ""
6025
msgstr "Error in command line options"
5119
6026
5120
6027
#: bzrlib/errors.py:368
5121
6028
msgid "%(value)s is not an index of type %(_type)s."
5122
msgstr ""
6029
msgstr "%(value)s is not an index of type %(_type)s."
5123
6030
5124
6031
#: bzrlib/errors.py:378
5125
6032
msgid "Error in data for index %(value)s."
5126
msgstr ""
6033
msgstr "Error in data for index %(value)s."
5127
6034
5128
6035
#: bzrlib/errors.py:387
5129
6036
msgid "The key '%(key)s' is already in index '%(index)s'."
5130
msgstr ""
6037
msgstr "The key '%(key)s' is already in index '%(index)s'."
5131
6038
5132
6039
#: bzrlib/errors.py:397
5133
6040
msgid "The key '%(key)s' is not a valid key."
5134
msgstr ""
6041
msgstr "The key '%(key)s' is not a valid key."
5135
6042
5136
6043
#: bzrlib/errors.py:406
5137
6044
msgid "Could not parse options for index %(value)s."
5138
msgstr ""
6045
msgstr "Could not parse options for index %(value)s."
5139
6046
5140
6047
#: bzrlib/errors.py:415
5141
6048
msgid "The value '%(value)s' is not a valid value."
5142
msgstr ""
6049
msgstr "The value '%(value)s' is not a valid value."
5143
6050
5144
6051
#: bzrlib/errors.py:424
5145
6052
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5146
msgstr ""
6053
msgstr "Bad value \"%(value)s\" for option \"%(name)s\"."
5147
6054
5148
6055
#: bzrlib/errors.py:443
5149
6056
msgid "Generic path error: %(path)r%(extra)s)"
5150
msgstr ""
6057
msgstr "Generic path error: %(path)r%(extra)s)"
5151
6058
5152
6059
#: bzrlib/errors.py:456
5153
6060
msgid "No such file: %(path)r%(extra)s"
5154
msgstr ""
6061
msgstr "No such file: %(path)r%(extra)s"
5155
6062
5156
6063
#: bzrlib/errors.py:461
5157
6064
msgid "File exists: %(path)r%(extra)s"
5158
msgstr ""
6065
msgstr "File exists: %(path)r%(extra)s"
5159
6066
5160
6067
#: bzrlib/errors.py:467
5161
6068
msgid ""
5162
6069
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5163
6070
"after to tell bzr about a rename that has already happened)%(extra)s"
5164
6071
msgstr ""
6072
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
6073
"after to tell bzr about a rename that has already happened)%(extra)s"
5165
6074
5166
6075
#: bzrlib/errors.py:483
5167
6076
msgid "\"%(path)s\" is not a directory %(extra)s"
5168
msgstr ""
6077
msgstr "\"%(path)s\" is not a directory %(extra)s"
5169
6078
5170
6079
#: bzrlib/errors.py:488
5171
6080
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5172
msgstr ""
6081
msgstr "\"%(path)s\" is not in the working directory %(extra)s"
5173
6082
5174
6083
#: bzrlib/errors.py:493
5175
6084
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5176
msgstr ""
6085
msgstr "Directory not empty: \"%(path)s\"%(extra)s"
5177
6086
5178
6087
#: bzrlib/errors.py:498
5179
6088
msgid "Hard-linking \"%(path)s\" is not supported"
5180
msgstr ""
6089
msgstr "Hard-linking \"%(path)s\" is not supported"
5181
6090
5182
6091
#: bzrlib/errors.py:513
5183
6092
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5184
msgstr ""
6093
msgstr "Device or resource busy: \"%(path)s\"%(extra)s"
5185
6094
5186
6095
#: bzrlib/errors.py:518
5187
6096
msgid "Permission denied: \"%(path)s\"%(extra)s"
5188
msgstr ""
6097
msgstr "Permission denied: \"%(path)s\"%(extra)s"
5189
6098
5190
6099
#: bzrlib/errors.py:523
5191
6100
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5192
msgstr ""
6101
msgstr "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5193
6102
5194
6103
#: bzrlib/errors.py:528
5195
6104
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5196
msgstr ""
6105
msgstr "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5197
6106
5198
6107
#: bzrlib/errors.py:539
5199
6108
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5200
msgstr ""
6109
msgstr "URLs differ by more than path: %(from_)r and %(to)r"
5201
6110
5202
6111
#: bzrlib/errors.py:561
5203
6112
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5204
msgstr ""
6113
msgstr "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5205
6114
5206
6115
#: bzrlib/errors.py:571
5207
6116
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5208
msgstr ""
6117
msgstr "Unsupported protocol for url \"%(path)s\"%(extra)s"
5209
6118
5210
6119
#: bzrlib/errors.py:579
5211
6120
msgid ""
5212
6121
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5213
6122
"upgrade the branch to permit branch stacking."
5214
6123
msgstr ""
6124
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
6125
"upgrade the branch to permit branch stacking."
5215
6126
5216
6127
#: bzrlib/errors.py:590
5217
6128
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5218
msgstr ""
6129
msgstr "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5219
6130
5220
6131
#: bzrlib/errors.py:600
5221
6132
msgid ""
5222
6133
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5223
6134
"need to upgrade the repository to permit branch stacking."
5224
6135
msgstr ""
6136
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
6137
"need to upgrade the repository to permit branch stacking."
5225
6138
5226
6139
#: bzrlib/errors.py:611
5227
6140
msgid "Error reading from %(path)r."
5228
msgstr ""
6141
msgstr "Error reading from %(path)r."
5229
6142
5230
6143
#: bzrlib/errors.py:630
5231
6144
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5232
msgstr ""
6145
msgstr "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5233
6146
5234
6147
#: bzrlib/errors.py:646
5235
6148
msgid "Path \"%(path)s\" is not unicode normalized"
5236
msgstr ""
6149
msgstr "Path \"%(path)s\" is not unicode normalised"
5237
6150
5238
6151
#: bzrlib/errors.py:654
5239
6152
msgid "Not a branch: \"%(path)s\"%(detail)s."
5240
msgstr ""
6153
msgstr "Not a branch: \"%(path)s\"%(detail)s."
5241
6154
5242
6155
#: bzrlib/errors.py:696
5243
6156
msgid "No submit branch available for branch \"%(path)s\""
5244
msgstr ""
6157
msgstr "No submit branch available for branch \"%(path)s\""
5245
6158
5246
6159
#: bzrlib/errors.py:705
5247
6160
msgid "A control directory already exists: \"%(path)s\"."
5249
6162
5250
6163
#: bzrlib/errors.py:710
5251
6164
msgid "Already a branch: \"%(path)s\"."
5252
msgstr ""
6165
msgstr "Already a branch: \"%(path)s\"."
5253
6166
5254
6167
#: bzrlib/errors.py:715
5255
6168
msgid "Invalid branch name: %(name)s"
5256
msgstr ""
6169
msgstr "Invalid branch name: %(name)s"
5257
6170
5258
6171
#: bzrlib/errors.py:724
5259
6172
msgid "Parent branch already exists: \"%(path)s\"."
5264
6177
"Directory contains a branch, but no working tree (use bzr checkout if you "
5265
6178
"wish to build a working tree): \"%(path)s\""
5266
6179
msgstr ""
6180
"Directory contains a branch, but no working tree (use bzr checkout if you "
6181
"wish to build a working tree): \"%(path)s\""
5267
6182
5268
6183
#: bzrlib/errors.py:735
5269
6184
msgid ""
5270
6185
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5271
6186
msgstr ""
6187
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5272
6188
5273
6189
#: bzrlib/errors.py:745
5274
6190
msgid ""
5275
6191
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5276
6192
msgstr ""
6193
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5277
6194
5278
6195
#: bzrlib/errors.py:755
5279
6196
msgid "No repository present: \"%(path)s\""
5280
msgstr ""
6197
msgstr "No repository present: \"%(path)s\""
5281
6198
5282
6199
#: bzrlib/errors.py:762
5283
6200
msgid ""
5284
6201
"Unsupported branch format: %(format)s\n"
5285
6202
"Please run 'bzr upgrade'"
5286
6203
msgstr ""
6204
"Unsupported branch format: %(format)s\n"
6205
"Please run 'bzr upgrade'"
5287
6206
5288
6207
#: bzrlib/errors.py:768
5289
6208
msgid "Unknown %(kind)s format: %(format)r"
5290
msgstr ""
6209
msgstr "Unknown %(kind)s format: %(format)r"
5291
6210
5292
6211
#: bzrlib/errors.py:777
5293
6212
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5294
msgstr ""
6213
msgstr "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5295
6214
5296
6215
#: bzrlib/errors.py:787
5297
6216
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5304
6223
"%(source)s\n"
5305
6224
"%(details)s"
5306
6225
msgstr ""
6226
"%(target)s\n"
6227
"is not compatible with\n"
6228
"%(source)s\n"
6229
"%(details)s"
5307
6230
5308
6231
#: bzrlib/errors.py:818
5309
6232
msgid "Revision is not compatible with %(repo_format)s"
5310
msgstr ""
6233
msgstr "Revision is not compatible with %(repo_format)s"
5311
6234
5312
6235
#: bzrlib/errors.py:828
5313
6236
msgid "%(context_info)s%(path)s is already versioned."
5314
msgstr ""
6237
msgstr "%(context_info)s%(path)s is already versioned."
5315
6238
5316
6239
#: bzrlib/errors.py:849
5317
6240
msgid "%(context_info)s%(path)s is not versioned."
5318
msgstr ""
6241
msgstr "%(context_info)s%(path)s is not versioned."
5319
6242
5320
6243
#: bzrlib/errors.py:870
5321
6244
msgid "Path(s) are not versioned: %(paths_as_string)s"
5322
msgstr ""
6245
msgstr "Path(s) are not versioned: %(paths_as_string)s"
5323
6246
5324
6247
#: bzrlib/errors.py:881
5325
6248
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5326
msgstr ""
6249
msgstr "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5327
6250
5328
6251
#: bzrlib/errors.py:900
5329
6252
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5330
msgstr ""
6253
msgstr "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5331
6254
5332
6255
#: bzrlib/errors.py:908
5333
6256
msgid ""
5334
6257
"Filename %(filename)r is not valid in your current filesystem encoding "
5335
6258
"%(fs_encoding)s"
5336
6259
msgstr ""
6260
"Filename %(filename)r is not valid in your current filesystem encoding "
6261
"%(fs_encoding)s"
5337
6262
5338
6263
#: bzrlib/errors.py:919
5339
6264
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5340
msgstr ""
6265
msgstr "Cannot operate on \"%(filename)s\" because it is a control file"
5341
6266
5342
6267
#: bzrlib/errors.py:937
5343
6268
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5344
msgstr ""
6269
msgstr "The lock for '%(lock_description)s' is in use and cannot be broken."
5345
6270
5346
6271
#: bzrlib/errors.py:976
5347
6272
msgid "Cannot lock %(lock)s: %(why)s"
5348
msgstr ""
6273
msgstr "Cannot lock %(lock)s: %(why)s"
5349
6274
5350
6275
#: bzrlib/errors.py:986
5351
6276
msgid ""
5352
6277
"A transaction related operation was attempted after the transaction finished."
5353
6278
msgstr ""
6279
"A transaction related operation was attempted after the transaction finished."
5354
6280
5355
6281
#: bzrlib/errors.py:1013
5356
6282
msgid "Cannot lock: transport is read only: %(transport)s"
5357
msgstr ""
6283
msgstr "Cannot lock: transport is read only: %(transport)s"
5358
6284
5359
6285
#: bzrlib/errors.py:1021
5360
6286
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5361
msgstr ""
6287
msgstr "Could not acquire lock \"%(lock)s\": %(msg)s"
5362
6288
5363
6289
#: bzrlib/errors.py:1032
5364
6290
msgid ""
5365
6291
"Lock was broken while still open: %(lock)s - check storage consistency!"
5366
6292
msgstr ""
6293
"Lock was broken while still open: %(lock)s - check storage consistency!"
5367
6294
5368
6295
#: bzrlib/errors.py:1043
5369
6296
msgid ""
5370
6297
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5371
6298
"%(holder)r, wanted to break %(target)r"
5372
6299
msgstr ""
6300
"Lock was released and re-acquired before being broken: %(lock)s: held by "
6301
"%(holder)r, wanted to break %(target)r"
5373
6302
5374
6303
#: bzrlib/errors.py:1055
5375
6304
msgid ""
5376
6305
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5377
6306
"Use 'bzr break-lock' to clear it"
5378
6307
msgstr ""
6308
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6309
"Use 'bzr break-lock' to clear it"
5379
6310
5380
6311
#: bzrlib/errors.py:1068
5381
6312
msgid "Lock not held: %(lock)s"
5382
msgstr ""
6313
msgstr "Lock not held: %(lock)s"
5383
6314
5384
6315
#: bzrlib/errors.py:1097
5385
6316
msgid "No changes to commit"
5386
msgstr ""
6317
msgstr "No changes to commit"
5387
6318
5388
6319
#: bzrlib/errors.py:1102
5389
6320
msgid ""
5390
6321
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5391
6322
msgstr ""
6323
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5392
6324
5393
6325
#: bzrlib/errors.py:1112
5394
6326
msgid ""
5395
6327
"Excluding paths during commit is not supported by repository at "
5396
6328
"%(repository)r."
5397
6329
msgstr ""
6330
"Excluding paths during commit is not supported by repository at "
6331
"%(repository)r."
5398
6332
5399
6333
#: bzrlib/errors.py:1121
5400
6334
msgid ""
5401
6335
"The specified commit message contains characters unsupported by the current "
5402
6336
"encoding."
5403
6337
msgstr ""
6338
"The specified commit message contains characters unsupported by the current "
6339
"encoding."
5404
6340
5405
6341
#: bzrlib/errors.py:1127
5406
6342
msgid "Upgrade URL cannot work with readonly URLs."
5407
msgstr ""
6343
msgstr "Upgrade URL cannot work with readonly URLs."
5408
6344
5409
6345
#: bzrlib/errors.py:1132
5410
6346
msgid "The branch format %(format)s is already at the most recent format."
5411
msgstr ""
6347
msgstr "The branch format %(format)s is already at the most recent format."
5412
6348
5413
6349
#: bzrlib/errors.py:1155
5414
6350
msgid "Option --change does not accept revision ranges"
5415
msgstr ""
6351
msgstr "Option --change does not accept revision ranges"
5416
6352
5417
6353
#: bzrlib/errors.py:1160
5418
6354
msgid "No namespace registered for string: %(spec)r"
5419
msgstr ""
6355
msgstr "No namespace registered for string: %(spec)r"
5420
6356
5421
6357
#: bzrlib/errors.py:1179
5422
6358
msgid ""
5423
6359
"Requested revision: '%(spec)s' does not exist in branch: "
5424
6360
"%(branch_url)s%(extra)s"
5425
6361
msgstr ""
6362
"Requested revision: '%(spec)s' does not exist in branch: "
6363
"%(branch_url)s%(extra)s"
5426
6364
5427
6365
#: bzrlib/errors.py:1193
5428
6366
msgid ""
5429
6367
"Operation denied because it would change the main history, which is not "
5430
6368
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5431
6369
msgstr ""
6370
"Operation denied because it would change the main history, which is not "
6371
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5432
6372
5433
6373
#: bzrlib/errors.py:1204
5434
6374
msgid ""
5435
6375
"These branches have diverged. Use the missing command to see how.\n"
5436
6376
"Use the merge command to reconcile them."
5437
6377
msgstr ""
6378
"These branches have diverged. Use the missing command to see how.\n"
6379
"Use the merge command to reconcile them."
5438
6380
5439
6381
#: bzrlib/errors.py:1224
5440
6382
msgid ""
5441
6383
"Branches have no common ancestor, and no merge base revision was specified."
5442
6384
msgstr ""
6385
"Branches have no common ancestor, and no merge base revision was specified."
5443
6386
5444
6387
#: bzrlib/errors.py:1230
5445
6388
msgid ""
5446
6389
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5447
6390
msgstr ""
6391
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5448
6392
5449
6393
#: bzrlib/errors.py:1236
5450
6394
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5451
msgstr ""
6395
msgstr "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5452
6396
5453
6397
#: bzrlib/errors.py:1245
5454
6398
msgid ""
5455
6399
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5456
6400
msgstr ""
6401
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5457
6402
5458
6403
#: bzrlib/errors.py:1254
5459
6404
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5460
msgstr ""
6405
msgstr "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5461
6406
5462
6407
#: bzrlib/errors.py:1263
5463
6408
msgid "Branch %(branch)s has no commits."
5464
msgstr ""
6409
msgstr "Branch %(branch)s has no commits."
5465
6410
5466
6411
#: bzrlib/errors.py:1281
5467
6412
msgid ""
5468
6413
"Bound branch %(branch)s is out of date with master branch "
5469
6414
"%(master)s.%(extra_help)s"
5470
6415
msgstr ""
6416
"Bound branch %(branch)s is out of date with master branch "
6417
"%(master)s.%(extra_help)s"
5471
6418
5472
6419
#: bzrlib/errors.py:1293
5473
6420
msgid ""
5474
6421
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5475
6422
"bound to %(remote)s."
5476
6423
msgstr ""
6424
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
6425
"bound to %(remote)s."
5477
6426
5478
6427
#: bzrlib/errors.py:1305
5479
6428
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5480
msgstr ""
6429
msgstr "Cannot pull --overwrite to a branch which is bound %(branch)s"
5481
6430
5482
6431
#: bzrlib/errors.py:1314
5483
6432
msgid ""
5484
6433
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5485
6434
"%(error)s"
5486
6435
msgstr ""
6436
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
6437
"%(error)s"
5487
6438
5488
6439
#: bzrlib/errors.py:1326
5489
6440
msgid "Error in processing weave: %(msg)s"
5490
msgstr ""
6441
msgstr "Error in processing weave: %(msg)s"
5491
6442
5492
6443
#: bzrlib/errors.py:1335
5493
6444
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5494
msgstr ""
6445
msgstr "Revision {%(revision_id)s} already present in %(weave)s"
5495
6446
5496
6447
#: bzrlib/errors.py:1346
5497
6448
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5498
msgstr ""
6449
msgstr "Revision {%(revision_id)s} not present in %(weave)s"
5499
6450
5500
6451
#: bzrlib/errors.py:1356
5501
6452
msgid "Weave invariant violated: %(what)s"
5502
msgstr ""
6453
msgstr "Weave invariant violated: %(what)s"
5503
6454
5504
6455
#: bzrlib/errors.py:1365
5505
6456
msgid "Parents are mismatched between two revisions. %(msg)s"
5506
msgstr ""
6457
msgstr "Parents are mismatched between two revisions. %(msg)s"
5507
6458
5508
6459
#: bzrlib/errors.py:1387
5509
6460
msgid ""
5510
6461
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5511
6462
"%(weave_b)s"
5512
6463
msgstr ""
6464
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
6465
"%(weave_b)s"
5513
6466
5514
6467
#: bzrlib/errors.py:1399
5515
6468
msgid "Versioned file error"
5516
msgstr ""
6469
msgstr "Versioned file error"
5517
6470
5518
6471
#: bzrlib/errors.py:1404
5519
6472
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5520
msgstr ""
6473
msgstr "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5521
6474
5522
6475
#: bzrlib/errors.py:1414
5523
6476
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5524
msgstr ""
6477
msgstr "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5525
6478
5526
6479
#: bzrlib/errors.py:1424
5527
6480
msgid "Text did not match its checksum: %(msg)s"
5528
msgstr ""
6481
msgstr "Text did not match its checksum: %(msg)s"
5529
6482
5530
6483
#: bzrlib/errors.py:1550
5531
6484
msgid "Export format %(format)r not supported"
5532
msgstr ""
6485
msgstr "Export format %(format)r not supported"
5533
6486
5534
6487
#: bzrlib/errors.py:1559
5535
6488
msgid "Transport error: %(msg)s %(orig_error)s"
5536
msgstr ""
6489
msgstr "Transport error: %(msg)s %(orig_error)s"
5537
6490
5538
6491
#: bzrlib/errors.py:1585
5539
6492
msgid "Generic bzr smart protocol error: %(details)s"
5540
msgstr ""
6493
msgstr "Generic bzr smart protocol error: %(details)s"
5541
6494
5542
6495
#: bzrlib/errors.py:1593
5543
6496
msgid "Received bad protocol version marker: %(marker)r"
5544
msgstr ""
6497
msgstr "Received bad protocol version marker: %(marker)r"
5545
6498
5546
6499
#: bzrlib/errors.py:1625
5547
6500
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5548
msgstr ""
6501
msgstr "Transport operation not possible: %(msg)s %(orig_error)s"
5549
6502
5550
6503
#: bzrlib/errors.py:1630
5551
6504
msgid "Connection error: %(msg)s %(orig_error)s"
5552
msgstr ""
6505
msgstr "Connection error: %(msg)s %(orig_error)s"
5553
6506
5554
6507
#: bzrlib/errors.py:1635
5555
6508
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5556
msgstr ""
6509
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5557
6510
5558
6511
#: bzrlib/errors.py:1656
5559
6512
msgid "Connection closed: %(msg)s %(orig_error)s"
5560
msgstr ""
6513
msgstr "Connection closed: %(msg)s %(orig_error)s"
5561
6514
5562
6515
#: bzrlib/errors.py:1661
5563
6516
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5564
msgstr ""
6517
msgstr "Connection Timeout: %(msg)s%(orig_error)s"
5565
6518
5566
6519
#: bzrlib/errors.py:1666
5567
6520
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5568
msgstr ""
6521
msgstr "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5569
6522
5570
6523
#: bzrlib/errors.py:1676
5571
6524
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5572
msgstr ""
6525
msgstr "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5573
6526
5574
6527
#: bzrlib/errors.py:1691
5575
6528
msgid "Certificate error: %(error)s"
5577
6530
5578
6531
#: bzrlib/errors.py:1699
5579
6532
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5580
msgstr ""
6533
msgstr "Invalid http range %(range)r for %(path)s: %(msg)s"
5581
6534
5582
6535
#: bzrlib/errors.py:1713
5583
6536
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5584
msgstr ""
6537
msgstr "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5585
6538
5586
6539
#: bzrlib/errors.py:1721
5587
6540
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5588
msgstr ""
6541
msgstr "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5589
6542
5590
6543
#: bzrlib/errors.py:1730
5591
6544
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5592
msgstr ""
6545
msgstr "%(source)s is%(permanently)s redirected to %(target)s"
5593
6546
5594
6547
#: bzrlib/errors.py:1744
5595
6548
msgid "Too many redirections"
5596
msgstr ""
6549
msgstr "Too many redirections"
5597
6550
5598
6551
#: bzrlib/errors.py:1749
5599
6552
msgid "Working tree has conflicts."
5600
msgstr ""
6553
msgstr "Working tree has conflicts."
5601
6554
5602
6555
#: bzrlib/errors.py:1753
5603
6556
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5604
msgstr ""
6557
msgstr "Config file %(filename)s is not UTF-8 encoded\n"
5605
6558
5606
6559
#: bzrlib/errors.py:1762
5607
6560
msgid ""
5608
6561
"Error(s) parsing config file %(filename)s:\n"
5609
6562
"%(errors)s"
5610
6563
msgstr ""
6564
"Error(s) parsing config file %(filename)s:\n"
6565
"%(errors)s"
5611
6566
5612
6567
#: bzrlib/errors.py:1772
5613
6568
msgid ""
5619
6574
5620
6575
#: bzrlib/errors.py:1782
5621
6576
msgid "%(username)r does not seem to contain a reasonable email address"
5622
msgstr ""
6577
msgstr "%(username)r does not seem to contain a reasonable email address"
5623
6578
5624
6579
#: bzrlib/errors.py:1791
5625
6580
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5626
msgstr ""
6581
msgstr "Failed to GPG sign data with command \"%(command_line)s\""
5627
6582
5628
6583
#: bzrlib/errors.py:1799
5629
6584
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5630
msgstr ""
6585
msgstr "Failed to verify GPG signature data with error \"%(error)s\""
5631
6586
5632
6587
#: bzrlib/errors.py:1807
5633
6588
msgid "Unable to import library \"%(library)s\": %(error)s"
5634
msgstr ""
6589
msgstr "Unable to import library \"%(library)s\": %(error)s"
5635
6590
5636
6591
#: bzrlib/errors.py:1815
5637
6592
msgid "python-gpgme is not installed, it is needed to verify signatures"
5638
msgstr ""
6593
msgstr "python-gpgme is not installed, it is needed to verify signatures"
5639
6594
5640
6595
#: bzrlib/errors.py:1823
5641
6596
msgid ""
5642
6597
"The working tree for %(basedir)s has changed since the last commit, but "
5643
6598
"weave merge requires that it be unchanged"
5644
6599
msgstr ""
6600
"The working tree for %(basedir)s has changed since the last commit, but "
6601
"weave merge requires that it be unchanged"
5645
6602
5646
6603
#: bzrlib/errors.py:1833
5647
6604
msgid ""
5648
6605
"Can't reprocess and show base, because reprocessing obscures the "
5649
6606
"relationship of conflicting lines to the base"
5650
6607
msgstr ""
6608
"Can't reprocess and show base, because reprocessing obscures the "
6609
"relationship of conflicting lines to the base"
5651
6610
5652
6611
#: bzrlib/errors.py:1839
5653
6612
msgid "Cycle in graph %(graph)r"
5654
msgstr ""
6613
msgstr "Cycle in graph %(graph)r"
5655
6614
5656
6615
#: bzrlib/errors.py:1867
5657
6616
msgid "File %(filename)s is not conflicted."
5658
msgstr ""
6617
msgstr "File %(filename)s is not conflicted."
5659
6618
5660
6619
#: bzrlib/errors.py:1889
5661
6620
msgid "No bundle was found in \"%(filename)s\"."
5662
msgstr ""
6621
msgstr "No bundle was found in \"%(filename)s\"."
5663
6622
5664
6623
#: bzrlib/errors.py:1898
5665
6624
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5666
msgstr ""
6625
msgstr "Unable to handle bundle version %(version)s: %(msg)s"
5667
6626
5668
6627
#: bzrlib/errors.py:1908
5669
6628
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5670
msgstr ""
6629
msgstr "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5671
6630
5672
6631
#: bzrlib/errors.py:1921
5673
6632
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5674
msgstr ""
6633
msgstr "File id {%(file_id)s} already exists in inventory as %(entry)s"
5675
6634
5676
6635
#: bzrlib/errors.py:1931
5677
6636
msgid "Key %(key)s is already present in map"
5678
msgstr ""
6637
msgstr "Key %(key)s is already present in map"
5679
6638
5680
6639
#: bzrlib/errors.py:1936
5681
6640
msgid "The prefix %(prefix)s is in the help search path twice."
5682
msgstr ""
6641
msgstr "The prefix %(prefix)s is in the help search path twice."
5683
6642
5684
6643
#: bzrlib/errors.py:1946
5685
6644
msgid ""
5687
6646
"file-id: %(file_id)r\n"
5688
6647
"root trans-id: %(root_trans_id)r\n"
5689
6648
msgstr ""
6649
"No final name for trans_id %(trans_id)r\n"
6650
"file-id: %(file_id)r\n"
6651
"root trans-id: %(root_trans_id)r\n"
5690
6652
5691
6653
#: bzrlib/errors.py:1978
5692
6654
msgid "Attempt to reuse a transform that has already been applied."
5693
msgstr ""
6655
msgstr "Attempt to reuse a transform that has already been applied."
5694
6656
5695
6657
#: bzrlib/errors.py:1983
5696
6658
msgid "Moving the root directory is not supported at this time"
5697
msgstr ""
6659
msgstr "Moving the root directory is not supported at this time"
5698
6660
5699
6661
#: bzrlib/errors.py:1988
5700
6662
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5701
msgstr ""
6663
msgstr "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5702
6664
5703
6665
#: bzrlib/errors.py:1999
5704
6666
msgid ""
5705
6667
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5706
6668
msgstr ""
6669
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5707
6670
5708
6671
#: bzrlib/errors.py:2035
5709
6672
msgid ""
5710
6673
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5711
6674
msgstr ""
6675
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5712
6676
5713
6677
#: bzrlib/errors.py:2065
5714
6678
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5715
msgstr ""
6679
msgstr "Unable to import paramiko (required for sftp support): %(error)s"
5716
6680
5717
6681
#: bzrlib/errors.py:2073
5718
6682
msgid "Nothing to merge."
5719
msgstr ""
6683
msgstr "Nothing to merge."
5720
6684
5721
6685
#: bzrlib/errors.py:2078
5722
6686
msgid "Format %(format)s cannot be initialised by this version of bzr."
5723
msgstr ""
6687
msgstr "Format %(format)s cannot be initialised by this version of bzr."
5724
6688
5725
6689
#: bzrlib/errors.py:2087
5726
6690
msgid ""
5727
6691
"Cannot convert from format %(from_format)s to format %(format)s. "
5728
6692
"%(problem)s"
5729
6693
msgstr ""
6694
"Cannot convert from format %(from_format)s to format %(format)s. "
6695
"%(problem)s"
5730
6696
5731
6697
#: bzrlib/errors.py:2099
5732
6698
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5733
msgstr ""
6699
msgstr "Could not find an appropriate Differ for file \"%(path)s\""
5734
6700
5735
6701
#: bzrlib/errors.py:2107
5736
6702
msgid "%(exe_name)s could not be found on this machine"
5737
msgstr ""
6703
msgstr "%(exe_name)s could not be found on this machine"
5738
6704
5739
6705
#: bzrlib/errors.py:2115
5740
6706
msgid "Diff is not installed on this machine: %(msg)s"
5741
msgstr ""
6707
msgstr "Diff is not installed on this machine: %(msg)s"
5742
6708
5743
6709
#: bzrlib/errors.py:2123
5744
6710
msgid "Diff3 is not installed on this machine."
5745
msgstr ""
6711
msgstr "Diff3 is not installed on this machine."
5746
6712
5747
6713
#: bzrlib/errors.py:2129
5748
6714
msgid "The content being inserted is already present."
5749
msgstr ""
6715
msgstr "The content being inserted is already present."
5750
6716
5751
6717
#: bzrlib/errors.py:2134
5752
6718
msgid ""
5755
6721
"to\n"
5756
6722
" keep, and delete it when you are done."
5757
6723
msgstr ""
6724
"This tree contains left-over files from a failed operation.\n"
6725
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6726
"to\n"
6727
" keep, and delete it when you are done."
5758
6728
5759
6729
#: bzrlib/errors.py:2145
5760
6730
msgid ""
5762
6732
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5763
6733
" wish to keep, and delete it when you are done."
5764
6734
msgstr ""
6735
"This tree contains left-over files from a failed operation.\n"
6736
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6737
" wish to keep, and delete it when you are done."
5765
6738
5766
6739
#: bzrlib/errors.py:2155
5767
6740
msgid ""
5770
6743
"to\n"
5771
6744
" keep, and delete it when you are done."
5772
6745
msgstr ""
6746
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6747
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6748
"to\n"
6749
" keep, and delete it when you are done."
5773
6750
5774
6751
#: bzrlib/errors.py:2166
5775
6752
msgid ""
5777
6754
"examine %(pending_deletion)s to see if it contains any files you wish to "
5778
6755
"keep, and delete it when you are done."
5779
6756
msgstr ""
6757
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6758
"examine %(pending_deletion)s to see if it contains any files you wish to "
6759
"keep, and delete it when you are done."
5780
6760
5781
6761
#: bzrlib/errors.py:2176
5782
6762
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5783
msgstr ""
6763
msgstr "Working tree is out of date, please run 'bzr update'.%(more)s"
5784
6764
5785
6765
#: bzrlib/errors.py:2190
5786
6766
msgid ""
5787
6767
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5788
6768
msgstr ""
6769
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5789
6770
5790
6771
#: bzrlib/errors.py:2203
5791
6772
msgid "Error in merge modified format"
5792
msgstr ""
6773
msgstr "Error in merge modified format"
5793
6774
5794
6775
#: bzrlib/errors.py:2208
5795
6776
msgid "Format error in conflict listings"
5796
msgstr ""
6777
msgstr "Format error in conflict listings"
5797
6778
5798
6779
#: bzrlib/errors.py:2212
5799
6780
msgid ""
5800
6781
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5801
6782
"Error: %(description)s"
5802
6783
msgstr ""
6784
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6785
"Error: %(description)s"
5803
6786
5804
6787
#: bzrlib/errors.py:2223
5805
6788
msgid ""
5806
6789
"An error has been detected in the repository %(repo_path)s.\n"
5807
6790
"Please run bzr reconcile on this repository."
5808
6791
msgstr ""
6792
"An error has been detected in the repository %(repo_path)s.\n"
6793
"Please run bzr reconcile on this repository."
5809
6794
5810
6795
#: bzrlib/errors.py:2234
5811
6796
msgid ""
5812
6797
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5813
6798
"reason: %(reason)s"
5814
6799
msgstr ""
6800
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6801
"reason: %(reason)s"
5815
6802
5816
6803
#: bzrlib/errors.py:2247
5817
6804
msgid ""
5818
6805
"An inconsistent delta was supplied: %(delta)r\n"
5819
6806
"reason: %(reason)s"
5820
6807
msgstr ""
6808
"An inconsistent delta was supplied: %(delta)r\n"
6809
"reason: %(reason)s"
5821
6810
5822
6811
#: bzrlib/errors.py:2259
5823
6812
msgid "To use this feature you must upgrade your branch at %(path)s."
5824
msgstr ""
6813
msgstr "To use this feature you must upgrade your branch at %(path)s."
5825
6814
5826
6815
#: bzrlib/errors.py:2268
5827
6816
msgid "To use this feature you must upgrade your repository at %(path)s."
5828
msgstr ""
6817
msgstr "To use this feature you must upgrade your repository at %(path)s."
5829
6818
5830
6819
#: bzrlib/errors.py:2273
5831
6820
msgid ""
5832
6821
"To use this feature you must upgrade your branch at %(path)s to a format "
5833
6822
"which supports rich roots."
5834
6823
msgstr ""
6824
"To use this feature you must upgrade your branch at %(path)s to a format "
6825
"which supports rich roots."
5835
6826
5836
6827
#: bzrlib/errors.py:2279
5837
6828
msgid "Cannot perform local-only commits on unbound branches."
5838
msgstr ""
6829
msgstr "Cannot perform local-only commits on unbound branches."
5839
6830
5840
6831
#: bzrlib/errors.py:2284
5841
6832
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5842
msgstr ""
6833
msgstr "The method %(mname)s is not supported on objects of type %(tname)s."
5843
6834
5844
6835
#: bzrlib/errors.py:2305
5845
6836
msgid "Ghost tags not supported by format %(format)r."
5846
msgstr ""
6837
msgstr "Ghost tags not supported by format %(format)r."
5847
6838
5848
6839
#: bzrlib/errors.py:2313
5849
6840
msgid "File is binary but should be text."
5850
msgstr ""
6841
msgstr "File is binary but should be text."
5851
6842
5852
6843
#: bzrlib/errors.py:2318
5853
6844
msgid "The path %(path)s is not permitted on this platform"
5854
msgstr ""
6845
msgstr "The path %(path)s is not permitted on this platform"
5855
6846
5856
6847
#: bzrlib/errors.py:2327
5857
6848
msgid ""
5859
6850
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5860
6851
" {%(measured)s}"
5861
6852
msgstr ""
6853
"Testament did not match expected value.\n"
6854
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6855
" {%(measured)s}"
5862
6856
5863
6857
#: bzrlib/errors.py:2339
5864
6858
msgid "Not a bzr revision-bundle: %(text)r"
5865
msgstr ""
6859
msgstr "Not a bzr revision-bundle: %(text)r"
5866
6860
5867
6861
#: bzrlib/errors.py:2348
5868
6862
msgid "Bad bzr revision-bundle: %(text)r"
5869
msgstr ""
6863
msgstr "Bad bzr revision-bundle: %(text)r"
5870
6864
5871
6865
#: bzrlib/errors.py:2357
5872
6866
msgid "Malformed bzr revision-bundle header: %(text)r"
5873
msgstr ""
6867
msgstr "Malformed bzr revision-bundle header: %(text)r"
5874
6868
5875
6869
#: bzrlib/errors.py:2362
5876
6870
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5877
msgstr ""
6871
msgstr "Malformed patches in bzr revision-bundle: %(text)r"
5878
6872
5879
6873
#: bzrlib/errors.py:2367
5880
6874
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5881
msgstr ""
6875
msgstr "Malformed footer in bzr revision-bundle: %(text)r"
5882
6876
5883
6877
#: bzrlib/errors.py:2372
5884
6878
msgid "End of line marker was not \\n in bzr revision-bundle"
5885
msgstr ""
6879
msgstr "End of line marker was not \\n in bzr revision-bundle"
5886
6880
5887
6881
#: bzrlib/errors.py:2382
5888
6882
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5889
msgstr ""
6883
msgstr "Bundle format %(bundle_format)s is incompatible with %(other)s"
5890
6884
5891
6885
#: bzrlib/errors.py:2392
5892
6886
msgid "Root class for inventory serialization errors"
5893
msgstr ""
6887
msgstr "Root class for inventory serialisation errors"
5894
6888
5895
6889
#: bzrlib/errors.py:2396
5896
6890
msgid ""
5897
6891
"The inventory was not in the expected format:\n"
5898
6892
" %(msg)s"
5899
6893
msgstr ""
6894
"The inventory was not in the expected format:\n"
6895
" %(msg)s"
5900
6896
5901
6897
#: bzrlib/errors.py:2405
5902
6898
msgid "This operation requires rich root data storage"
5903
msgstr ""
6899
msgstr "This operation requires rich root data storage"
5904
6900
5905
6901
#: bzrlib/errors.py:2418
5906
6902
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5907
msgstr ""
6903
msgstr "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5908
6904
5909
6905
#: bzrlib/errors.py:2427
5910
6906
msgid ""
5911
6907
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5912
6908
"variable."
5913
6909
msgstr ""
6910
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6911
"variable."
5914
6912
5915
6913
#: bzrlib/errors.py:2434
5916
6914
msgid ""
5917
6915
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5918
6916
"ghost at {%(ghost_revision_id)s}"
5919
6917
msgstr ""
6918
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6919
"ghost at {%(ghost_revision_id)s}"
5920
6920
5921
6921
#: bzrlib/errors.py:2444
5922
6922
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5923
msgstr ""
6923
msgstr "Ghost revision {%(revision_id)s} cannot be used here."
5924
6924
5925
6925
#: bzrlib/errors.py:2495
5926
6926
msgid ""
5927
6927
"A merge directive must provide either a bundle or a public branch location."
5928
6928
msgstr ""
6929
"A merge directive must provide either a bundle or a public branch location."
5929
6930
5930
6931
#: bzrlib/errors.py:2502
5931
6932
msgid "Bad merge directive payload %(start)r"
5932
msgstr ""
6933
msgstr "Bad merge directive payload %(start)r"
5933
6934
5934
6935
#: bzrlib/errors.py:2512
5935
6936
msgid "Preview patch does not match requested changes."
5936
msgstr ""
6937
msgstr "Preview patch does not match requested changes."
5937
6938
5938
6939
#: bzrlib/errors.py:2518
5939
6940
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5940
msgstr ""
6941
msgstr "Patch_type was %(patch_type)s, but no patch was supplied."
5941
6942
5942
6943
#: bzrlib/errors.py:2528
5943
6944
msgid ""
5945
6946
"this merge directive and the target location specified in the merge "
5946
6947
"directive is not a branch: %(location)s."
5947
6948
msgstr ""
6949
"Your branch does not have all of the revisions required in order to merge "
6950
"this merge directive and the target location specified in the merge "
6951
"directive is not a branch: %(location)s."
5948
6952
5949
6953
#: bzrlib/errors.py:2540
5950
6954
msgid "Unsupported entry kind %(kind)s"
5951
msgstr ""
6955
msgstr "Unsupported entry kind %(kind)s"
5952
6956
5953
6957
#: bzrlib/errors.py:2548
5954
6958
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5955
msgstr ""
6959
msgstr "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5956
6960
5957
6961
#: bzrlib/errors.py:2558
5958
6962
msgid "Subsume target %(other_tree)s needs to be upgraded."
5959
msgstr ""
6963
msgstr "Subsume target %(other_tree)s needs to be upgraded."
5960
6964
5961
6965
#: bzrlib/errors.py:2577
5962
6966
msgid "No such tag: %(tag_name)s"
5963
msgstr ""
6967
msgstr "No such tag: %(tag_name)s"
5964
6968
5965
6969
#: bzrlib/errors.py:2585
5966
6970
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5967
6971
msgstr ""
6972
"Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5968
6973
5969
6974
#: bzrlib/errors.py:2594
5970
6975
msgid "Tag %(tag_name)s already exists."
5971
msgstr ""
6976
msgstr "Tag %(tag_name)s already exists."
5972
6977
5973
6978
#: bzrlib/errors.py:2602
5974
6979
msgid ""
5975
6980
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5976
6981
"bugs\" for more information on this feature."
5977
6982
msgstr ""
6983
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6984
"bugs\" for more information on this feature."
5978
6985
5979
6986
#: bzrlib/errors.py:2612
5980
6987
msgid ""
5981
6988
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5982
6989
msgstr ""
6990
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5983
6991
5984
6992
#: bzrlib/errors.py:2622
5985
6993
msgid ""
5986
6994
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5987
6995
msgstr ""
6996
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5988
6997
5989
6998
#: bzrlib/errors.py:2632
5990
6999
msgid "Invalid line in bugs property: '%(line)s'"
5991
msgstr ""
7000
msgstr "Invalid line in bugs property: '%(line)s'"
5992
7001
5993
7002
#: bzrlib/errors.py:2640
5994
7003
msgid "Invalid bug status: '%(status)s'"
5995
msgstr ""
7004
msgstr "Invalid bug status: '%(status)s'"
5996
7005
5997
7006
#: bzrlib/errors.py:2648
5998
7007
msgid "Could not understand response from smart server: %(response_tuple)r"
5999
msgstr ""
7008
msgstr "Could not understand response from smart server: %(response_tuple)r"
6000
7009
6001
7010
#: bzrlib/errors.py:2687
6002
7011
msgid "Server sent an unexpected error: %(error_tuple)r"
6003
msgstr ""
7012
msgstr "Server sent an unexpected error: %(error_tuple)r"
6004
7013
6005
7014
#: bzrlib/errors.py:2706
6006
7015
msgid "Unrecognised container format: %(container_format)r"
6007
msgstr ""
7016
msgstr "Unrecognised container format: %(container_format)r"
6008
7017
6009
7018
#: bzrlib/errors.py:2714
6010
7019
msgid "Unexpected end of container stream"
6011
msgstr ""
7020
msgstr "Unexpected end of container stream"
6012
7021
6013
7022
#: bzrlib/errors.py:2719
6014
7023
msgid "Unknown record type: %(record_type)r"
6015
msgstr ""
7024
msgstr "Unknown record type: %(record_type)r"
6016
7025
6017
7026
#: bzrlib/errors.py:2727
6018
7027
msgid "Invalid record: %(reason)s"
6019
msgstr ""
7028
msgstr "Invalid record: %(reason)s"
6020
7029
6021
7030
#: bzrlib/errors.py:2735
6022
7031
msgid "Container has data after end marker: %(excess)r"
6023
msgstr ""
7032
msgstr "Container has data after end marker: %(excess)r"
6024
7033
6025
7034
#: bzrlib/errors.py:2743
6026
7035
msgid "Container has multiple records with the same name: %(name)s"
6027
msgstr ""
7036
msgstr "Container has multiple records with the same name: %(name)s"
6028
7037
6029
7038
#: bzrlib/errors.py:2756
6030
7039
msgid "Corrupt or incompatible data stream: %(reason)s"
6031
msgstr ""
7040
msgstr "Corrupt or incompatible data stream: %(reason)s"
6032
7041
6033
7042
#: bzrlib/errors.py:2764
6034
7043
msgid "SMTP error: %(error)s"
6035
msgstr ""
7044
msgstr "SMTP error: %(error)s"
6036
7045
6037
7046
#: bzrlib/errors.py:2772
6038
7047
msgid "No message supplied."
6039
msgstr ""
7048
msgstr "No message supplied."
6040
7049
6041
7050
#: bzrlib/errors.py:2777
6042
7051
msgid "No mail-to address (--mail-to) or output (-o) specified."
6043
msgstr ""
7052
msgstr "No mail-to address (--mail-to) or output (-o) specified."
6044
7053
6045
7054
#: bzrlib/errors.py:2782
6046
7055
msgid ""
6047
7056
"Unable to find mail client with the following names: "
6048
7057
"%(mail_command_list_string)s"
6049
7058
msgstr ""
7059
"Unable to find mail client with the following names: "
7060
"%(mail_command_list_string)s"
6050
7061
6051
7062
#: bzrlib/errors.py:2792
6052
7063
msgid "SMTP connection to %(host)s refused"
6053
msgstr ""
7064
msgstr "SMTP connection to %(host)s refused"
6054
7065
6055
7066
#: bzrlib/errors.py:2801
6056
7067
msgid "Please specify smtp_server. No server at default %(host)s."
6057
msgstr ""
7068
msgstr "Please specify smtp_server. No server at default %(host)s."
6058
7069
6059
7070
#: bzrlib/errors.py:2815
6060
7071
msgid ""
6061
7072
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6062
7073
"reconfigure."
6063
7074
msgstr ""
7075
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
7076
"reconfigure."
6064
7077
6065
7078
#: bzrlib/errors.py:2827
6066
7079
msgid "'%(display_url)s' is already a branch."
6067
msgstr ""
7080
msgstr "'%(display_url)s' is already a branch."
6068
7081
6069
7082
#: bzrlib/errors.py:2832
6070
7083
msgid "'%(display_url)s' is already a tree."
6071
msgstr ""
7084
msgstr "'%(display_url)s' is already a tree."
6072
7085
6073
7086
#: bzrlib/errors.py:2837
6074
7087
msgid "'%(display_url)s' is already a checkout."
6075
msgstr ""
7088
msgstr "'%(display_url)s' is already a checkout."
6076
7089
6077
7090
#: bzrlib/errors.py:2842
6078
7091
msgid "'%(display_url)s' is already a lightweight checkout."
6079
msgstr ""
7092
msgstr "'%(display_url)s' is already a lightweight checkout."
6080
7093
6081
7094
#: bzrlib/errors.py:2847
6082
7095
msgid "'%(display_url)s' is already using a shared repository."
6083
msgstr ""
7096
msgstr "'%(display_url)s' is already using a shared repository."
6084
7097
6085
7098
#: bzrlib/errors.py:2852
6086
7099
msgid "'%(display_url)s' is already standalone."
6087
msgstr ""
7100
msgstr "'%(display_url)s' is already standalone."
6088
7101
6089
7102
#: bzrlib/errors.py:2857
6090
7103
msgid "Shared repository '%(display_url)s' already creates working trees."
6091
msgstr ""
7104
msgstr "Shared repository '%(display_url)s' already creates working trees."
6092
7105
6093
7106
#: bzrlib/errors.py:2863
6094
7107
msgid ""
6095
7108
"Shared repository '%(display_url)s' already doesn't create working trees."
6096
7109
msgstr ""
7110
"Shared repository '%(display_url)s' already doesn't create working trees."
6097
7111
6098
7112
#: bzrlib/errors.py:2869
6099
7113
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6100
msgstr ""
7114
msgstr "Requested reconfiguration of '%(display_url)s' is not supported."
6101
7115
6102
7116
#: bzrlib/errors.py:2874
6103
7117
msgid "No location could be found to bind to at %(display_url)s."
6104
msgstr ""
7118
msgstr "No location could be found to bind to at %(display_url)s."
6105
7119
6106
7120
#: bzrlib/errors.py:2879
6107
7121
msgid ""
6108
7122
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6109
7123
"status).%(more)s"
6110
7124
msgstr ""
7125
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
7126
"status).%(more)s"
6111
7127
6112
7128
#: bzrlib/errors.py:2898
6113
7129
msgid ""
6114
7130
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6115
7131
"list).%(more)s"
6116
7132
msgstr ""
7133
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
7134
"list).%(more)s"
6117
7135
6118
7136
#: bzrlib/errors.py:2904
6119
7137
msgid "Variable {%(name)s} is not available."
6120
msgstr ""
7138
msgstr "Variable {%(name)s} is not available."
6121
7139
6122
7140
#: bzrlib/errors.py:2912
6123
7141
msgid "No template specified."
6124
msgstr ""
7142
msgstr "No template specified."
6125
7143
6126
7144
#: bzrlib/errors.py:2917
6127
7145
msgid "Unable to create symlink %(path_str)son this platform"
6128
msgstr ""
7146
msgstr "Unable to create symlink %(path_str)son this platform"
6129
7147
6130
7148
#: bzrlib/errors.py:2932
6131
7149
msgid ""
6132
7150
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6133
7151
"\"original\", \"local\"."
6134
7152
msgstr ""
7153
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
7154
"\"original\", \"local\"."
6135
7155
6136
7156
#: bzrlib/errors.py:2966
6137
7157
msgid ""
6138
7158
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6139
7159
msgstr ""
7160
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6140
7161
6141
7162
#: bzrlib/errors.py:2978
6142
7163
msgid "The \"%(config_id)s\" configuration does not exist."
6143
msgstr ""
7164
msgstr "The \"%(config_id)s\" configuration does not exist."
6144
7165
6145
7166
#: bzrlib/errors.py:2986
6146
7167
msgid "The \"%(option_name)s\" configuration option does not exist."
6147
msgstr ""
7168
msgstr "The \"%(option_name)s\" configuration option does not exist."
6148
7169
6149
7170
#: bzrlib/errors.py:2994
6150
7171
msgid "The alias \"%(alias_name)s\" does not exist."
6151
msgstr ""
7172
msgstr "The alias \"%(alias_name)s\" does not exist."
6152
7173
6153
7174
#: bzrlib/errors.py:3008
6154
7175
msgid "\"%(alias_name)s\" is not a valid location alias."
6155
msgstr ""
7176
msgstr "\"%(alias_name)s\" is not a valid location alias."
6156
7177
6157
7178
#: bzrlib/errors.py:3016
6158
7179
msgid "No %(alias_name)s location assigned."
6159
msgstr ""
7180
msgstr "No %(alias_name)s location assigned."
6160
7181
6161
7182
#: bzrlib/errors.py:3024
6162
7183
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6163
msgstr ""
7184
msgstr "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6164
7185
6165
7186
#: bzrlib/errors.py:3034
6166
7187
msgid "Unknown rules detected: %(unknowns_str)s."
6167
msgstr ""
7188
msgstr "Unknown rules detected: %(unknowns_str)s."
6168
7189
6169
7190
#: bzrlib/errors.py:3045
6170
7191
msgid "Tip change rejected: %(msg)s"
6171
msgstr ""
7192
msgstr "Tip change rejected: %(msg)s"
6172
7193
6173
7194
#: bzrlib/errors.py:3053
6174
7195
msgid "Shelf corrupt."
6175
msgstr ""
7196
msgstr "Shelf corrupt."
6176
7197
6177
7198
#: bzrlib/errors.py:3058
6178
7199
msgid "Corruption while decompressing repository file%(orig_error)s"
6179
msgstr ""
7200
msgstr "Corruption while decompressing repository file%(orig_error)s"
6180
7201
6181
7202
#: bzrlib/errors.py:3070
6182
7203
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6183
msgstr ""
7204
msgstr "No changes are shelved with id \"%(shelf_id)d\"."
6184
7205
6185
7206
#: bzrlib/errors.py:3078
6186
7207
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6187
msgstr ""
7208
msgstr "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6188
7209
6189
7210
#: bzrlib/errors.py:3086
6190
7211
msgid ""
6191
7212
"An attempt to access a url outside the server jail was made: '%(url)s'."
6192
7213
msgstr ""
7214
"An attempt to access a url outside the server jail was made: '%(url)s'."
6193
7215
6194
7216
#: bzrlib/errors.py:3094
6195
7217
msgid "The user aborted the operation."
6196
msgstr ""
7218
msgstr "The user aborted the operation."
6197
7219
6198
7220
#: bzrlib/errors.py:3099
6199
7221
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6200
msgstr ""
7222
msgstr "Branching '%(url)s'(%(format)s) must create a working tree."
6201
7223
6202
7224
#: bzrlib/errors.py:3109
6203
7225
msgid "No such view: %(view_name)s."
6204
msgstr ""
7226
msgstr "No such view: %(view_name)s."
6205
7227
6206
7228
#: bzrlib/errors.py:3119
6207
7229
msgid ""
6208
7230
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6209
7231
"to a later format."
6210
7232
msgstr ""
7233
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
7234
"to a later format."
6211
7235
6212
7236
#: bzrlib/errors.py:3128
6213
7237
msgid ""
6214
7238
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6215
7239
msgstr ""
7240
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6216
7241
6217
7242
#: bzrlib/errors.py:3195
6218
7243
msgid "%(bzrdir)r does not support co-located branches."
6219
msgstr ""
7244
msgstr "%(bzrdir)r does not support co-located branches."
6220
7245
6221
7246
#: bzrlib/errors.py:3201
6222
7247
msgid ""
6224
7249
"Please, set your name with the 'whoami' command.\n"
6225
7250
"E.g. bzr whoami \"Your Name <name@example.com>\""
6226
7251
msgstr ""
7252
"Unable to determine your name.\n"
7253
"Please, set your name with the 'whoami' command.\n"
7254
"E.g. bzr whoami \"Your Name <name@example.com>\""
6227
7255
6228
7256
#: bzrlib/errors.py:3210
6229
7257
msgid "Invalid pattern(s) found. %(msg)s"
6230
msgstr ""
7258
msgstr "Invalid pattern(s) found. %(msg)s"
6231
7259
6232
7260
#: bzrlib/errors.py:3218
6233
7261
msgid ""
6234
7262
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6235
7263
"unbind` to fix."
6236
7264
msgstr ""
7265
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
7266
"unbind` to fix."
6237
7267
6238
7268
#: bzrlib/errors.py:3229
6239
7269
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6240
msgstr ""
7270
msgstr "Loop involving %(refs)r while expanding \"%(string)s\"."
6241
7271
6242
7272
#: bzrlib/errors.py:3238
6243
7273
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6244
msgstr ""
7274
msgstr "Option %(name)s is not defined while expanding \"%(string)s\"."
6245
7275
6246
7276
#: bzrlib/errors.py:3247
6247
7277
msgid ""
6248
7278
"No compatible object available for operations from %(source)r to %(target)r."
6249
7279
msgstr ""
7280
"No compatible object available for operations from %(source)r to %(target)r."
6250
7281
6251
7282
#: bzrlib/errors.py:3257
6252
7283
msgid ""
6253
7284
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6254
7285
"%(arguments)s."
6255
7286
msgstr ""
7287
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
7288
"%(arguments)s."
6256
7289
6257
7290
#: bzrlib/errors.py:3267
6258
7291
msgid ""
6259
7292
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6260
7293
"format %(format)r"
6261
7294
msgstr ""
7295
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
7296
"format %(format)r"
6262
7297
6263
7298
#: bzrlib/errors.py:3279
6264
7299
msgid ""
6270
7305
6271
7306
#: bzrlib/errors.py:3292
6272
7307
msgid "Binary files section encountered."
6273
msgstr ""
7308
msgstr "Binary files section encountered."
6274
7309
6275
7310
#: bzrlib/errors.py:3300
6276
7311
msgid ""
6277
7312
"Malformed patch header. %(desc)s\n"
6278
7313
"%(line)r"
6279
7314
msgstr ""
7315
"Malformed patch header. %(desc)s\n"
7316
"%(line)r"
6280
7317
6281
7318
#: bzrlib/errors.py:3309
6282
7319
msgid ""
6283
7320
"Malformed hunk header. %(desc)s\n"
6284
7321
"%(line)r"
6285
7322
msgstr ""
7323
"Malformed hunk header. %(desc)s\n"
7324
"%(line)r"
6286
7325
6287
7326
#: bzrlib/errors.py:3318
6288
7327
msgid ""
6289
7328
"Malformed line. %(desc)s\n"
6290
7329
"%(line)r"
6291
7330
msgstr ""
7331
"Malformed line. %(desc)s\n"
7332
"%(line)r"
6292
7333
6293
7334
#: bzrlib/errors.py:3328
6294
7335
msgid ""
6295
7336
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6296
7337
"but patch says it should be \"%(patch_line)s\""
6297
7338
msgstr ""
7339
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
7340
"but patch says it should be \"%(patch_line)s\""
6298
7341
6299
7342
#: bzrlib/errors.py:3339
6300
7343
msgid "The feature %(feature)s has already been registered."
6303
7346
#: bzrlib/export_pot.py:252
6304
7347
#, python-format
6305
7348
msgid "Exporting messages from builtin command: %s"
6306
msgstr ""
7349
msgstr "Exporting messages from builtin command: %s"
6307
7350
6308
7351
#: bzrlib/export_pot.py:271
6309
7352
msgid "Exporting messages from plugin command: {0} in {1}"
6310
msgstr ""
7353
msgstr "Exporting messages from plugin command: {0} in {1}"
6311
7354
6312
7355
#: bzrlib/export_pot.py:292
6313
7356
#, python-format
6314
7357
msgid "Exporting message from error: %s"
6315
msgstr ""
7358
msgstr "Exporting message from error: %s"
6316
7359
6317
7360
#: bzrlib/fetch.py:98
6318
7361
msgid "Finding revisions"
6319
msgstr ""
7362
msgstr "Finding revisions"
6320
7363
6321
7364
#: bzrlib/fetch.py:103
6322
7365
msgid "Fetching revisions"
6323
msgstr ""
7366
msgstr "Fetching revisions"
6324
7367
6325
7368
#: bzrlib/foreign.py:262
6326
7369
msgid "Push into a different VCS without any custom bzr metadata."
6327
msgstr ""
7370
msgstr "Push into a different VCS without any custom bzr metadata."
6328
7371
6329
7372
#: bzrlib/foreign.py:264
6330
7373
msgid ""
6332
7375
"branch unless the --no-rebase option is used, in which case \n"
6333
7376
"the two branches will be out of sync after the push. "
6334
7377
msgstr ""
7378
"This will afterwards rebase the local branch on the remote\n"
7379
"branch unless the --no-rebase option is used, in which case \n"
7380
"the two branches will be out of sync after the push. "
6335
7381
6336
7382
#: bzrlib/foreign.py:277
6337
7383
msgid "Do not rebase after push."
6338
msgstr ""
7384
msgstr "Do not rebase after push."
6339
7385
6340
7386
#: bzrlib/foreign.py:311
6341
7387
#, python-format
6342
7388
msgid "Using saved location: %s\n"
6343
msgstr ""
7389
msgstr "Using saved location: %s\n"
6344
7390
6345
7391
#: bzrlib/foreign.py:321
6346
7392
msgid ""
6347
7393
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6348
7394
"regular push."
6349
7395
msgstr ""
7396
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
7397
"regular push."
6350
7398
6351
7399
#: bzrlib/gpg.py:366
6352
7400
msgid "No GnuPG key results for pattern: {0}"
6353
msgstr ""
7401
msgstr "No GnuPG key results for pattern: {0}"
6354
7402
6355
7403
#: bzrlib/gpg.py:439
6356
7404
msgid "{0} commits with valid signatures"
6357
msgstr ""
7405
msgstr "{0} commits with valid signatures"
6358
7406
6359
7407
#: bzrlib/gpg.py:445
6360
7408
msgid "{0} commit with unknown key"
6361
7409
msgid_plural "{0} commits with unknown keys"
6362
msgstr[0] ""
6363
msgstr[1] ""
7410
msgstr[0] "{0} commit with unknown key"
7411
msgstr[1] "{0} commits with unknown keys"
6364
7412
6365
7413
#: bzrlib/gpg.py:453
6366
7414
msgid "{0} commit not valid"
6367
7415
msgid_plural "{0} commits not valid"
6368
msgstr[0] ""
6369
msgstr[1] ""
7416
msgstr[0] "{0} commit not valid"
7417
msgstr[1] "{0} commits not valid"
6370
7418
6371
7419
#: bzrlib/gpg.py:461
6372
7420
msgid "{0} commit not signed"
6373
7421
msgid_plural "{0} commits not signed"
6374
msgstr[0] ""
6375
msgstr[1] ""
7422
msgstr[0] "{0} commit not signed"
7423
msgstr[1] "{0} commits not signed"
6376
7424
6377
7425
#: bzrlib/gpg.py:469
6378
7426
msgid "{0} commit with key now expired"
6379
7427
msgid_plural "{0} commits with key now expired"
6380
msgstr[0] ""
6381
msgstr[1] ""
7428
msgstr[0] "{0} commit with key now expired"
7429
msgstr[1] "{0} commits with key now expired"
6382
7430
6383
7431
#: bzrlib/gpg.py:489
6384
7432
msgid "{0} commit by author {1} with key {2} now expired"
6385
7433
msgid_plural "{0} commits by author {1} with key {2} now expired"
6386
msgstr[0] ""
6387
msgstr[1] ""
7434
msgstr[0] "{0} commit by author {1} with key {2} now expired"
7435
msgstr[1] "{0} commits by author {1} with key {2} now expired"
6388
7436
6389
7437
#: bzrlib/gpg.py:505
6390
7438
msgid "{0} signed {1} commit"
6391
7439
msgid_plural "{0} signed {1} commits"
6392
msgstr[0] ""
6393
msgstr[1] ""
7440
msgstr[0] "{0} signed {1} commit"
7441
msgstr[1] "{0} signed {1} commits"
6394
7442
6395
7443
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6396
7444
msgid "{0} commit by author {1}"
6397
7445
msgid_plural "{0} commits by author {1}"
6398
msgstr[0] ""
6399
msgstr[1] ""
7446
msgstr[0] "{0} commit by author {1}"
7447
msgstr[1] "{0} commits by author {1}"
6400
7448
6401
7449
#: bzrlib/gpg.py:554
6402
7450
msgid "Unknown key {0} signed {1} commit"
6403
7451
msgid_plural "Unknown key {0} signed {1} commits"
6404
msgstr[0] ""
6405
msgstr[1] ""
7452
msgstr[0] "Unknown key {0} signed {1} commit"
7453
msgstr[1] "Unknown key {0} signed {1} commits"
6406
7454
6407
7455
#: bzrlib/groupcompress.py:1739
6408
7456
#, python-format
6409
7457
msgid "Insert claimed random_id=True, but then inserted %r two times"
6410
msgstr ""
7458
msgstr "Insert claimed random_id=True, but then inserted %r two times"
6411
7459
6412
7460
#: bzrlib/hooks.py:313
6413
7461
#, python-format
6414
7462
msgid "Introduced in: %s"
6415
msgstr ""
7463
msgstr "Introduced in: %s"
6416
7464
6417
7465
#: bzrlib/hooks.py:316
6418
7466
#, python-format
6419
7467
msgid "Deprecated in: %s"
6420
msgstr ""
7468
msgstr "Deprecated in: %s"
6421
7469
6422
7470
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6423
7471
msgid "Walking content"
6424
msgstr ""
7472
msgstr "Walking content"
6425
7473
6426
7474
#: bzrlib/knit.py:3330
6427
7475
msgid "annotating"
6428
msgstr ""
7476
msgstr "annotating"
6429
7477
6430
7478
#: bzrlib/lock.py:548
6431
7479
msgid "{0!r} was {1} locked again"
6432
msgstr ""
7480
msgstr "{0!r} was {1} locked again"
6433
7481
6434
7482
#: bzrlib/lockdir.py:321
6435
7483
#, python-format
6436
7484
msgid "error removing pending lock: %s"
6437
msgstr ""
7485
msgstr "error removing pending lock: %s"
6438
7486
6439
7487
#: bzrlib/lockdir.py:616
6440
7488
msgid "Unable to obtain"
6441
msgstr ""
7489
msgstr "Unable to obtain"
6442
7490
6443
7491
#: bzrlib/lockdir.py:618
6444
7492
msgid "Lock owner changed for"
6445
msgstr ""
7493
msgstr "Lock owner changed for"
6446
7494
6447
7495
#: bzrlib/lockdir.py:620
6448
7496
msgid "{0} lock {1} {2}."
6449
msgstr ""
7497
msgstr "{0} lock {1} {2}."
6450
7498
6451
7499
#: bzrlib/lockdir.py:627
6452
7500
#, python-format
6453
7501
msgid "Will continue to try until %s, unless you press Ctrl-C."
6454
msgstr ""
7502
msgstr "Will continue to try until %s, unless you press Ctrl-C."
6455
7503
6456
7504
#: bzrlib/lockdir.py:629
6457
7505
msgid "See \"bzr help break-lock\" for more."
6458
msgstr ""
7506
msgstr "See \"bzr help break-lock\" for more."
6459
7507
6460
7508
#: bzrlib/lockdir.py:739
6461
7509
#, python-format
6462
7510
msgid ""
6463
7511
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6464
7512
msgstr ""
7513
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6465
7514
6466
7515
#: bzrlib/log.py:563
6467
7516
msgid "--exclude-common-ancestry requires two different revisions"
6468
msgstr ""
7517
msgstr "--exclude-common-ancestry requires two different revisions"
6469
7518
6470
7519
#: bzrlib/log.py:565
6471
7520
#, python-format
6472
7521
msgid "invalid direction %r"
6473
msgstr ""
7522
msgstr "invalid direction %r"
6474
7523
6475
7524
#: bzrlib/log.py:653
6476
7525
msgid "Start revision not found in history of end revision."
6477
msgstr ""
7526
msgstr "Start revision not found in history of end revision."
6478
7527
6479
7528
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6480
7529
msgid "Logging revision 0 is invalid."
6481
msgstr ""
7530
msgstr "Logging revision 0 is invalid."
6482
7531
6483
7532
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6484
7533
msgid "Start revision must be older than the end revision."
6485
msgstr ""
7534
msgstr "Start revision must be older than the end revision."
6486
7535
6487
7536
#: bzrlib/log.py:1818
6488
7537
#, python-format
6489
7538
msgid "unknown log formatter: %r"
6490
msgstr ""
7539
msgstr "unknown log formatter: %r"
6491
7540
6492
7541
#: bzrlib/log.py:2114
6493
7542
msgid "fixes bug"
6494
7543
msgid_plural "fixes bugs"
6495
msgstr[0] ""
6496
msgstr[1] ""
7544
msgstr[0] "fixes bug"
7545
msgstr[1] "fixes bugs"
6497
7546
6498
7547
#: bzrlib/merge.py:689
6499
7548
msgid "All changes applied successfully."
6500
msgstr ""
7549
msgstr "All changes applied successfully."
6501
7550
6502
7551
#: bzrlib/merge.py:691
6503
7552
#, python-format
6504
7553
msgid "%d conflicts encountered."
6505
msgstr ""
7554
msgstr "%d conflicts encountered."
6506
7555
6507
7556
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6508
7557
msgid "Preparing file merge"
6509
msgstr ""
7558
msgstr "Preparing file merge"
6510
7559
6511
7560
#: bzrlib/multiparent.py:426
6512
7561
msgid "Importing revisions"
6513
msgstr ""
7562
msgstr "Importing revisions"
6514
7563
6515
7564
#: bzrlib/option.py:526
6516
7565
msgid "Show help message."
6517
msgstr ""
7566
msgstr "Show help message."
6518
7567
6519
7568
#: bzrlib/option.py:528
6520
7569
msgid "Only display errors and warnings."
6521
msgstr ""
7570
msgstr "Only display errors and warnings."
6522
7571
6523
7572
#: bzrlib/option.py:531
6524
7573
msgid "Show usage message and options."
6525
msgstr ""
7574
msgstr "Show usage message and options."
6526
7575
6527
7576
#: bzrlib/option.py:533
6528
7577
msgid "Display more information."
6529
msgstr ""
7578
msgstr "Display more information."
6530
7579
6531
7580
#: bzrlib/option.py:541
6532
7581
msgid ""
6533
7582
"Select changes introduced by the specified revision. See also \"help "
6534
7583
"revisionspec\"."
6535
7584
msgstr ""
7585
"Select changes introduced by the specified revision. See also \"help "
7586
"revisionspec\"."
6536
7587
6537
7588
#: bzrlib/option.py:543
6538
7589
msgid "Branch to operate on, instead of working directory."
6539
msgstr ""
7590
msgstr "Branch to operate on, instead of working directory."
6540
7591
6541
7592
#: bzrlib/option.py:545
6542
7593
msgid "Detailed log format."
6543
msgstr ""
7594
msgstr "Detailed log format."
6544
7595
6545
7596
#: bzrlib/option.py:545
6546
7597
msgid "Format used by GNU ChangeLog files."
6547
msgstr ""
7598
msgstr "Format used by GNU ChangeLog files."
6548
7599
6549
7600
#: bzrlib/option.py:545
6550
7601
msgid "Log format with one line per revision."
6551
msgstr ""
7602
msgstr "Log format with one line per revision."
6552
7603
6553
7604
#: bzrlib/option.py:545
6554
7605
msgid "Moderately short log format."
6555
msgstr ""
7606
msgstr "Moderately short log format."
6556
7607
6557
7608
#: bzrlib/option.py:545
6558
7609
msgid "Use specified log format."
6559
msgstr ""
7610
msgstr "Use specified log format."
6560
7611
6561
7612
#: bzrlib/option.py:547
6562
7613
msgid "Log format"
6563
msgstr ""
7614
msgstr "Log format"
6564
7615
6565
7616
#: bzrlib/option.py:549
6566
7617
msgid "LCA-newness merge."
6567
msgstr ""
7618
msgstr "LCA-newness merge."
6568
7619
6569
7620
#: bzrlib/option.py:549
6570
7621
msgid "Merge using external diff3."
6571
msgstr ""
7622
msgstr "Merge using external diff3."
6572
7623
6573
7624
#: bzrlib/option.py:549
6574
7625
msgid "Native diff3-style merge."
6575
msgstr ""
7626
msgstr "Native diff3-style merge."
6576
7627
6577
7628
#: bzrlib/option.py:549
6578
7629
msgid "Select a particular merge algorithm."
6579
msgstr ""
7630
msgstr "Select a particular merge algorithm."
6580
7631
6581
7632
#: bzrlib/option.py:549
6582
7633
msgid "Weave-based merge."
6583
msgstr ""
7634
msgstr "Weave-based merge."
6584
7635
6585
7636
#: bzrlib/option.py:551
6586
7637
msgid "Merge algorithm"
6587
msgstr ""
7638
msgstr "Merge algorithm"
6588
7639
6589
7640
#: bzrlib/option.py:554
6590
7641
msgid "Message string."
6591
msgstr ""
7642
msgstr "Message string."
6592
7643
6593
7644
#: bzrlib/option.py:556
6594
7645
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6595
msgstr ""
7646
msgstr "Use an ASCII NUL (\\0) separator rather than a newline."
6596
7647
6597
7648
#: bzrlib/option.py:558
6598
7649
msgid "Ignore differences between branches and overwrite unconditionally."
6599
msgstr ""
7650
msgstr "Ignore differences between branches and overwrite unconditionally."
6600
7651
6601
7652
#: bzrlib/option.py:560
6602
7653
msgid "Remember the specified location as a default."
6603
msgstr ""
7654
msgstr "Remember the specified location as a default."
6604
7655
6605
7656
#: bzrlib/option.py:562
6606
7657
msgid "Reprocess to reduce spurious conflicts."
6607
msgstr ""
7658
msgstr "Reprocess to reduce spurious conflicts."
6608
7659
6609
7660
#: bzrlib/option.py:566
6610
7661
msgid "See \"help revisionspec\" for details."
6611
msgstr ""
7662
msgstr "See \"help revisionspec\" for details."
6612
7663
6613
7664
#: bzrlib/option.py:568
6614
7665
msgid "Show internal object ids."
6615
msgstr ""
7666
msgstr "Show internal object ids."
6616
7667
6617
7668
#: bzrlib/option.py:571
6618
7669
msgid "Display timezone as local, original, or utc."
6619
msgstr ""
7670
msgstr "Display timezone as local, original, or utc."
6620
7671
6621
7672
#: bzrlib/osutils.py:100
6622
7673
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6623
msgstr ""
7674
msgstr "Parameter {0!r} encoding is unsupported by {1} application locale."
6624
7675
6625
7676
#: bzrlib/osutils.py:220
6626
7677
msgid "lstat/stat of ({0!r}): {1!r}"
6627
msgstr ""
7678
msgstr "lstat/stat of ({0!r}): {1!r}"
6628
7679
6629
7680
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6630
7681
#, python-format
6631
7682
msgid "sorry, %r not allowed in path"
6632
msgstr ""
7683
msgstr "sorry, %r not allowed in path"
6633
7684
6634
7685
#: bzrlib/osutils.py:1259
6635
7686
#, python-format
6636
7687
msgid "%r is too short to calculate a relative path"
6637
msgstr ""
7688
msgstr "%r is too short to calculate a relative path"
6638
7689
6639
7690
#: bzrlib/plugin.py:143
6640
7691
#, python-format
6641
7692
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6642
msgstr ""
7693
msgstr "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6643
7694
6644
7695
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6645
7696
msgid "Enable completions for the selected plugin (default: all plugins)"
6646
msgstr ""
7697
msgstr "Enable completions for the selected plugin (default: all plugins)"
6647
7698
6648
7699
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6649
7700
msgid "Generate a shell function for bash command line completion."
6650
msgstr ""
7701
msgstr "Generate a shell function for bash command line completion."
6651
7702
6652
7703
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6653
7704
msgid ""
6655
7706
"automatically complete the currently typed command when the user presses\n"
6656
7707
"the completion key (usually tab)."
6657
7708
msgstr ""
7709
"This command generates a shell function which can be used by bash to\n"
7710
"automatically complete the currently typed command when the user presses\n"
7711
"the completion key (usually tab)."
6658
7712
6659
7713
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6660
7714
msgid ""
6661
7715
"Commonly used like this:\n"
6662
7716
" eval \"`bzr bash-completion`\""
6663
7717
msgstr ""
7718
"Commonly used like this:\n"
7719
" eval \"`bzr bash-completion`\""
6664
7720
6665
7721
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6666
7722
msgid "Name of the generated function (default: _bzr)"
6667
msgstr ""
7723
msgstr "Name of the generated function (default: _bzr)"
6668
7724
6669
7725
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6670
7726
msgid "Generate only the shell function, don't enable it"
6671
msgstr ""
7727
msgstr "Generate only the shell function, don't enable it"
6672
7728
6673
7729
#: bzrlib/plugins/launchpad/account.py:66
6674
7730
msgid "Setting ssh/sftp usernames for launchpad.net."
6675
msgstr ""
7731
msgstr "Setting ssh/sftp usernames for launchpad.net."
6676
7732
6677
7733
#: bzrlib/plugins/launchpad/cmds.py:44
6678
7734
msgid "Register a branch with launchpad.net."
6679
msgstr ""
7735
msgstr "Register a branch with launchpad.net."
6680
7736
6681
7737
#: bzrlib/plugins/launchpad/cmds.py:46
6682
7738
msgid ""
6684
7740
"launchpad.net. Registration allows the branch to be associated with\n"
6685
7741
"bugs or specifications."
6686
7742
msgstr ""
7743
"This command lists a bzr branch in the directory of branches on\n"
7744
"launchpad.net. Registration allows the branch to be associated with\n"
7745
"bugs or specifications."
6687
7746
6688
7747
#: bzrlib/plugins/launchpad/cmds.py:50
6689
7748
msgid ""
6690
7749
"Before using this command you must register the project to which the\n"
6691
7750
"branch belongs, and create an account for yourself on launchpad.net."
6692
7751
msgstr ""
7752
"Before using this command you must register the project to which the\n"
7753
"branch belongs, and create an account for yourself on launchpad.net."
6693
7754
6694
7755
#: bzrlib/plugins/launchpad/cmds.py:53
6695
7756
msgid ""
6702
7763
" public_url if there is one for the current branch, and\n"
6703
7764
" otherwise error."
6704
7765
msgstr ""
7766
"arguments:\n"
7767
" public_url: The publicly visible url for the branch to register.\n"
7768
" This must be an http or https url (which Launchpad can read\n"
7769
" from to access the branch). Local file urls, SFTP urls, and\n"
7770
" bzr+ssh urls will not work.\n"
7771
" If no public_url is provided, bzr will use the configured\n"
7772
" public_url if there is one for the current branch, and\n"
7773
" otherwise error."
6705
7774
6706
7775
#: bzrlib/plugins/launchpad/cmds.py:62
6707
7776
msgid ""
6709
7778
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6710
7779
" --project fooproject"
6711
7780
msgstr ""
7781
"example:\n"
7782
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7783
" --project fooproject"
6712
7784
6713
7785
#: bzrlib/plugins/launchpad/cmds.py:69
6714
7786
msgid "Launchpad project short name to associate with the branch."
6715
msgstr ""
7787
msgstr "Launchpad project short name to associate with the branch."
6716
7788
6717
7789
#: bzrlib/plugins/launchpad/cmds.py:76
6718
7790
msgid ""
6719
7791
"Short name for the branch; by default taken from the last component of the "
6720
7792
"url."
6721
7793
msgstr ""
7794
"Short name for the branch; by default taken from the last component of the "
7795
"url."
6722
7796
6723
7797
#: bzrlib/plugins/launchpad/cmds.py:80
6724
7798
msgid "One-sentence description of the branch."
6725
msgstr ""
7799
msgstr "One-sentence description of the branch."
6726
7800
6727
7801
#: bzrlib/plugins/launchpad/cmds.py:83
6728
7802
msgid "Longer description of the purpose or contents of the branch."
6729
msgstr ""
7803
msgstr "Longer description of the purpose or contents of the branch."
6730
7804
6731
7805
#: bzrlib/plugins/launchpad/cmds.py:86
6732
7806
msgid "Branch author's email address, if not yourself."
6733
msgstr ""
7807
msgstr "Branch author's email address, if not yourself."
6734
7808
6735
7809
#: bzrlib/plugins/launchpad/cmds.py:89
6736
7810
msgid "The bug this branch fixes."
6737
msgstr ""
7811
msgstr "The bug this branch fixes."
6738
7812
6739
7813
#: bzrlib/plugins/launchpad/cmds.py:92
6740
7814
msgid "Prepare the request but don't actually send it."
6741
msgstr ""
7815
msgstr "Prepare the request but don't actually send it."
6742
7816
6743
7817
#: bzrlib/plugins/launchpad/cmds.py:114
6744
7818
msgid ""
6745
7819
"register-branch requires a public branch url - see bzr help register-branch."
6746
7820
msgstr ""
7821
"register-branch requires a public branch url - see bzr help register-branch."
6747
7822
6748
7823
#: bzrlib/plugins/launchpad/cmds.py:122
6749
7824
msgid "--product is deprecated; please use --project."
6750
msgstr ""
7825
msgstr "--product is deprecated; please use --project."
6751
7826
6752
7827
#: bzrlib/plugins/launchpad/cmds.py:152
6753
7828
msgid "Open a Launchpad branch page in your web browser."
6754
msgstr ""
7829
msgstr "Open a Launchpad branch page in your web browser."
6755
7830
6756
7831
#: bzrlib/plugins/launchpad/cmds.py:157
6757
7832
msgid "Do not actually open the browser. Just say the URL we would use."
6758
msgstr ""
7833
msgstr "Do not actually open the browser. Just say the URL we would use."
6759
7834
6760
7835
#: bzrlib/plugins/launchpad/cmds.py:192
6761
7836
#, python-format
6762
7837
msgid "Opening %s in web browser"
6763
msgstr ""
7838
msgstr "Opening %s in web browser"
6764
7839
6765
7840
#: bzrlib/plugins/launchpad/cmds.py:200
6766
7841
msgid "Show or set the Launchpad user ID."
6767
msgstr ""
7842
msgstr "Show or set the Launchpad user ID."
6768
7843
6769
7844
#: bzrlib/plugins/launchpad/cmds.py:202
6770
7845
msgid ""
6772
7847
"Launchpad user ID. This command can be used to set or show the\n"
6773
7848
"user ID that Bazaar will use for such communication."
6774
7849
msgstr ""
7850
"When communicating with Launchpad, some commands need to know your\n"
7851
"Launchpad user ID. This command can be used to set or show the\n"
7852
"user ID that Bazaar will use for such communication."
6775
7853
6776
7854
#: bzrlib/plugins/launchpad/cmds.py:206
6777
7855
msgid ""
6778
7856
":Examples:\n"
6779
7857
" Show the Launchpad ID of the current user::"
6780
7858
msgstr ""
7859
":Examples:\n"
7860
" Show the Launchpad ID of the current user::"
6781
7861
6782
7862
#: bzrlib/plugins/launchpad/cmds.py:209
6783
7863
msgid " bzr launchpad-login"
6784
msgstr ""
7864
msgstr " bzr launchpad-login"
6785
7865
6786
7866
#: bzrlib/plugins/launchpad/cmds.py:211
6787
7867
msgid " Set the Launchpad ID of the current user to 'bob'::"
6788
msgstr ""
7868
msgstr " Set the Launchpad ID of the current user to 'bob'::"
6789
7869
6790
7870
#: bzrlib/plugins/launchpad/cmds.py:213
6791
7871
msgid " bzr launchpad-login bob"
6792
msgstr ""
7872
msgstr " bzr launchpad-login bob"
6793
7873
6794
7874
#: bzrlib/plugins/launchpad/cmds.py:220
6795
7875
msgid "Don't check that the user name is valid."
6796
msgstr ""
7876
msgstr "Don't check that the user name is valid."
6797
7877
6798
7878
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6799
7879
msgid "Launchpad user ID exists and has SSH keys.\n"
6800
msgstr ""
7880
msgstr "Launchpad user ID exists and has SSH keys.\n"
6801
7881
6802
7882
#: bzrlib/plugins/launchpad/cmds.py:238
6803
7883
msgid "No Launchpad user ID configured.\n"
6804
msgstr ""
7884
msgstr "No Launchpad user ID configured.\n"
6805
7885
6806
7886
#: bzrlib/plugins/launchpad/cmds.py:249
6807
7887
#, python-format
6808
7888
msgid "Launchpad user ID set to '%s'.\n"
6809
msgstr ""
7889
msgstr "Launchpad user ID set to '%s'.\n"
6810
7890
6811
7891
#: bzrlib/plugins/launchpad/cmds.py:255
6812
7892
msgid "Ask Launchpad to mirror a branch now."
6813
msgstr ""
7893
msgstr "Ask Launchpad to mirror a branch now."
6814
7894
6815
7895
#: bzrlib/plugins/launchpad/cmds.py:272
6816
7896
msgid "Propose merging a branch on Launchpad."
6817
msgstr ""
7897
msgstr "Propose merging a branch on Launchpad."
6818
7898
6819
7899
#: bzrlib/plugins/launchpad/cmds.py:274
6820
7900
msgid ""
6821
7901
"This will open your usual editor to provide the initial comment. When it\n"
6822
7902
"has created the proposal, it will open it in your default web browser."
6823
7903
msgstr ""
7904
"This will open your usual editor to provide the initial comment. When it\n"
7905
"has created the proposal, it will open it in your default web browser."
6824
7906
6825
7907
#: bzrlib/plugins/launchpad/cmds.py:277
6826
7908
msgid ""
6828
7910
"is not supplied, the remembered submit branch will be used. If no submit\n"
6829
7911
"branch is remembered, the development focus will be used."
6830
7912
msgstr ""
7913
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7914
"is not supplied, the remembered submit branch will be used. If no submit\n"
7915
"branch is remembered, the development focus will be used."
6831
7916
6832
7917
#: bzrlib/plugins/launchpad/cmds.py:281
6833
7918
msgid ""
6836
7921
"The parameter the launchpad account name of the desired reviewer. This\n"
6837
7922
"may optionally be followed by '=' and the review type. For example:"
6838
7923
msgstr ""
7924
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7925
"the merge proposal. This can be overridden by specifying --review (-R).\n"
7926
"The parameter the launchpad account name of the desired reviewer. This\n"
7927
"may optionally be followed by '=' and the review type. For example:"
6839
7928
6840
7929
#: bzrlib/plugins/launchpad/cmds.py:286
6841
7930
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6842
msgstr ""
7931
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
6843
7932
6844
7933
#: bzrlib/plugins/launchpad/cmds.py:288
6845
7934
msgid ""
6846
7935
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6847
7936
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6848
7937
msgstr ""
7938
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7939
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6849
7940
6850
7941
#: bzrlib/plugins/launchpad/cmds.py:293
6851
7942
msgid "Propose the merge on staging."
6852
msgstr ""
7943
msgstr "Propose the merge on staging."
6853
7944
6854
7945
#: bzrlib/plugins/launchpad/cmds.py:295
6855
7946
msgid "Commit message."
6856
msgstr ""
7947
msgstr "Commit message."
6857
7948
6858
7949
#: bzrlib/plugins/launchpad/cmds.py:297
6859
7950
msgid "Mark the proposal as approved immediately."
6860
msgstr ""
7951
msgstr "Mark the proposal as approved immediately."
6861
7952
6862
7953
#: bzrlib/plugins/launchpad/cmds.py:298
6863
7954
msgid "The bug this proposal fixes."
6864
msgstr ""
7955
msgstr "The bug this proposal fixes."
6865
7956
6866
7957
#: bzrlib/plugins/launchpad/cmds.py:300
6867
7958
msgid "Requested reviewer and optional type."
6868
msgstr ""
7959
msgstr "Requested reviewer and optional type."
6869
7960
6870
7961
#: bzrlib/plugins/launchpad/cmds.py:335
6871
7962
msgid "Find the proposal to merge this revision."
6872
msgstr ""
7963
msgstr "Find the proposal to merge this revision."
6873
7964
6874
7965
#: bzrlib/plugins/launchpad/cmds.py:337
6875
7966
msgid ""
6878
7969
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6879
7970
"are opened in a web browser."
6880
7971
msgstr ""
7972
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7973
"This works only if the selected branch was the merge proposal target, and\n"
7974
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7975
"are opened in a web browser."
6881
7976
6882
7977
#: bzrlib/plugins/launchpad/cmds.py:342
6883
7978
msgid ""
6884
7979
"Any revision involved in the merge may be specified-- the revision in\n"
6885
7980
"which the merge was performed, or one of the revisions that was merged."
6886
7981
msgstr ""
7982
"Any revision involved in the merge may be specified-- the revision in\n"
7983
"which the merge was performed, or one of the revisions that was merged."
6887
7984
6888
7985
#: bzrlib/plugins/launchpad/cmds.py:345
6889
7986
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6890
msgstr ""
7987
msgstr "So, to find the merge proposal that reviewed line 1 of README::"
6891
7988
6892
7989
#: bzrlib/plugins/launchpad/cmds.py:347
6893
7990
msgid " bzr lp-find-proposal -r annotate:README:1"
6894
msgstr ""
7991
msgstr " bzr lp-find-proposal -r annotate:README:1"
6895
7992
6896
7993
#: bzrlib/plugins/launchpad/cmds.py:363
6897
7994
msgid "No review found."
6898
msgstr ""
7995
msgstr "No review found."
6899
7996
6900
7997
#: bzrlib/plugins/launchpad/cmds.py:364
6901
7998
#, python-format
6902
7999
msgid "%d proposals(s) found."
6903
msgstr ""
8000
msgstr "%d proposals(s) found."
6904
8001
6905
8002
#: bzrlib/plugins/launchpad/cmds.py:374
6906
8003
msgid "Finding revision-id"
6907
msgstr ""
8004
msgstr "Finding revision-id"
6908
8005
6909
8006
#: bzrlib/plugins/launchpad/cmds.py:381
6910
8007
msgid "Finding merge"
6911
msgstr ""
8008
msgstr "Finding merge"
6912
8009
6913
8010
#: bzrlib/plugins/launchpad/cmds.py:386
6914
8011
msgid "Finding revno"
6915
msgstr ""
8012
msgstr "Finding revno"
6916
8013
6917
8014
#: bzrlib/plugins/launchpad/cmds.py:392
6918
8015
msgid "Finding Launchpad branch"
6919
msgstr ""
8016
msgstr "Finding Launchpad branch"
6920
8017
6921
8018
#: bzrlib/plugins/launchpad/cmds.py:395
6922
8019
msgid "Finding proposals"
6923
msgstr ""
8020
msgstr "Finding proposals"
6924
8021
6925
8022
#: bzrlib/plugins/launchpad/lp_api.py:241
6926
8023
#: bzrlib/plugins/launchpad/lp_api.py:246
6927
8024
#, python-format
6928
8025
msgid "%s is not registered on Launchpad"
6929
msgstr ""
8026
msgstr "%s is not registered on Launchpad"
6930
8027
6931
8028
#: bzrlib/plugins/launchpad/lp_api.py:256
6932
8029
#, python-format
6933
8030
msgid "%s has no development focus."
6934
msgstr ""
8031
msgstr "%s has no development focus."
6935
8032
6936
8033
#: bzrlib/plugins/launchpad/lp_api.py:261
6937
8034
#, python-format
6938
8035
msgid "development focus %s has no branch."
6939
msgstr ""
8036
msgstr "development focus %s has no branch."
6940
8037
6941
8038
#: bzrlib/plugins/launchpad/lp_api.py:266
6942
8039
#, python-format
6943
8040
msgid "source package %s has no branch."
6944
msgstr ""
8041
msgstr "source package %s has no branch."
6945
8042
6946
8043
#: bzrlib/plugins/launchpad/lp_api.py:270
6947
8044
#, python-format
6948
8045
msgid "%s has no associated product or source package."
6949
msgstr ""
8046
msgstr "%s has no associated product or source package."
6950
8047
6951
8048
#: bzrlib/plugins/launchpad/lp_api.py:282
6952
8049
#, python-format
6953
8050
msgid "%s is already up-to-date."
6954
msgstr ""
8051
msgstr "%s is already up-to-date."
6955
8052
6956
8053
#: bzrlib/plugins/launchpad/lp_api.py:289
6957
8054
#, python-format
6958
8055
msgid "Pushing to %s"
6959
msgstr ""
8056
msgstr "Pushing to %s"
6960
8057
6961
8058
#: bzrlib/plugins/launchpad/lp_directory.py:170
6962
8059
msgid ""
6964
8061
" local: {1}\n"
6965
8062
" remote: {2}"
6966
8063
msgstr ""
8064
"resolution for {0}\n"
8065
" local: {1}\n"
8066
" remote: {2}"
6967
8067
6968
8068
#: bzrlib/plugins/launchpad/lp_propose.py:150
6969
8069
#, python-format
6970
8070
msgid "There is already a branch merge proposal: %s"
6971
msgstr ""
8071
msgstr "There is already a branch merge proposal: %s"
6972
8072
6973
8073
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6974
8074
msgid "pb parameter to convert() is deprecated"
6975
msgstr ""
8075
msgstr "pb parameter to convert() is deprecated"
6976
8076
6977
8077
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6978
8078
msgid "starting upgrade from format 4 to 5"
6979
msgstr ""
8079
msgstr "starting upgrade from format 4 to 5"
6980
8080
6981
8081
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6982
8082
msgid "note: upgrade may be faster if all store files are ungzipped first"
6983
msgstr ""
8083
msgstr "note: upgrade may be faster if all store files are ungzipped first"
6984
8084
6985
8085
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6986
8086
msgid "converting revision"
6987
msgstr ""
8087
msgstr "converting revision"
6988
8088
6989
8089
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6990
8090
msgid "upgraded to weaves:"
6991
msgstr ""
8091
msgstr "upgraded to weaves:"
6992
8092
6993
8093
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6994
8094
#, python-format
6995
8095
msgid "%6d revisions and inventories"
6996
msgstr ""
8096
msgstr "%6d revisions and inventories"
6997
8097
6998
8098
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6999
8099
#, python-format
7000
8100
msgid "%6d revisions not present"
7001
msgstr ""
8101
msgstr "%6d revisions not present"
7002
8102
7003
8103
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7004
8104
#, python-format
7005
8105
msgid "%6d texts"
7006
msgstr ""
8106
msgstr "%6d texts"
7007
8107
7008
8108
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7009
8109
msgid "writing weave"
7010
msgstr ""
8110
msgstr "writing weave"
7011
8111
7012
8112
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7013
8113
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7014
8114
msgid "inventory"
7015
msgstr ""
8115
msgstr "inventory"
7016
8116
7017
8117
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7018
8118
msgid "write revision"
7019
msgstr ""
8119
msgstr "write revision"
7020
8120
7021
8121
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7022
8122
msgid "loading revision"
7023
msgstr ""
8123
msgstr "loading revision"
7024
8124
7025
8125
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7026
8126
#, python-format
7027
8127
msgid "revision {%s} not present in branch; will be converted as a ghost"
7028
msgstr ""
8128
msgstr "revision {%s} not present in branch; will be converted as a ghost"
7029
8129
7030
8130
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7031
8131
msgid "starting upgrade from format 5 to 6"
7032
msgstr ""
8132
msgstr "starting upgrade from format 5 to 6"
7033
8133
7034
8134
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7035
8135
#, python-format
7036
8136
msgid "adding prefixes to %s"
7037
msgstr ""
8137
msgstr "adding prefixes to %s"
7038
8138
7039
8139
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7040
8140
msgid "starting upgrade from format 6 to metadir"
7041
msgstr ""
8141
msgstr "starting upgrade from format 6 to metadir"
7042
8142
7043
8143
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7044
8144
msgid "Removing ancestry.weave"
7045
msgstr ""
8145
msgstr "Removing ancestry.weave"
7046
8146
7047
8147
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7048
8148
msgid "Finding branch files"
7049
msgstr ""
8149
msgstr "Finding branch files"
7050
8150
7051
8151
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7052
8152
msgid "Upgrading repository"
7053
msgstr ""
8153
msgstr "Upgrading repository"
7054
8154
7055
8155
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7056
8156
msgid "Upgrading branch"
7057
msgstr ""
8157
msgstr "Upgrading branch"
7058
8158
7059
8159
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7060
8160
msgid "No working tree."
7061
msgstr ""
8161
msgstr "No working tree."
7062
8162
7063
8163
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7064
8164
msgid "Upgrading working tree"
7065
msgstr ""
8165
msgstr "Upgrading working tree"
7066
8166
7067
8167
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7068
8168
#, python-format
7069
8169
msgid "Make %s lock"
7070
msgstr ""
8170
msgstr "Make %s lock"
7071
8171
7072
8172
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7073
8173
#, python-format
7074
8174
msgid "Moving %s"
7075
msgstr ""
8175
msgstr "Moving %s"
7076
8176
7077
8177
#: bzrlib/push.py:56
7078
8178
msgid "Created new branch."
7079
msgstr ""
8179
msgstr "Created new branch."
7080
8180
7081
8181
#: bzrlib/push.py:97
7082
8182
#, python-format
7083
8183
msgid ""
7084
8184
"Target directory %s already contains a .bzr directory, but it is not valid."
7085
8185
msgstr ""
8186
"Target directory %s already contains a .bzr directory, but it is not valid."
7086
8187
7087
8188
#: bzrlib/push.py:101
7088
8189
#, python-format
7090
8191
"Target directory %s already exists, but does not have a .bzr directory. "
7091
8192
"Supply --use-existing-dir to push there anyway."
7092
8193
msgstr ""
8194
"Target directory %s already exists, but does not have a .bzr directory. "
8195
"Supply --use-existing-dir to push there anyway."
7093
8196
7094
8197
#: bzrlib/push.py:122
7095
8198
#, python-format
7096
8199
msgid "Too many redirections trying to make %s."
7097
msgstr ""
8200
msgstr "Too many redirections trying to make %s."
7098
8201
7099
8202
#: bzrlib/push.py:148
7100
8203
msgid ""
7101
8204
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7102
8205
"information."
7103
8206
msgstr ""
8207
"These branches have diverged. See \"bzr help diverged-branches\" for more "
8208
"information."
7104
8209
7105
8210
#: bzrlib/push.py:152
7106
8211
#, python-format
7108
8213
"It is not possible to losslessly push to %s. You may want to use dpush "
7109
8214
"instead."
7110
8215
msgstr ""
8216
"It is not possible to losslessly push to %s. You may want to use dpush "
8217
"instead."
7111
8218
7112
8219
#: bzrlib/push.py:158
7113
8220
#, python-format
7116
8223
"repository. This is an unsupported configuration. Please move the target "
7117
8224
"directory out of the way and try again."
7118
8225
msgstr ""
8226
"At %s you have a valid .bzr control directory, but not a branch or "
8227
"repository. This is an unsupported configuration. Please move the target "
8228
"directory out of the way and try again."
7119
8229
7120
8230
#: bzrlib/reconcile.py:97
7121
8231
#, python-format
7122
8232
msgid "Reconciling branch %s"
7123
msgstr ""
8233
msgstr "Reconciling branch %s"
7124
8234
7125
8235
#: bzrlib/reconcile.py:103
7126
8236
#, python-format
7127
8237
msgid "Reconciling repository %s"
7128
msgstr ""
8238
msgstr "Reconciling repository %s"
7129
8239
7130
8240
#: bzrlib/reconcile.py:105
7131
8241
msgid "Reconciling repository"
7132
msgstr ""
8242
msgstr "Reconciling repository"
7133
8243
7134
8244
#: bzrlib/reconcile.py:111
7135
8245
#, python-format
7136
8246
msgid "%s cannot canonicalize CHKs."
7137
msgstr ""
8247
msgstr "%s cannot canonicalise CHKs."
7138
8248
7139
8249
#: bzrlib/reconcile.py:119
7140
8250
msgid "Reconcile aborted: revision index has inconsistent parents."
7141
msgstr ""
8251
msgstr "Reconcile aborted: revision index has inconsistent parents."
7142
8252
7143
8253
#: bzrlib/reconcile.py:121
7144
8254
msgid "Run \"bzr check\" for more details."
7145
msgstr ""
8255
msgstr "Run \"bzr check\" for more details."
7146
8256
7147
8257
#: bzrlib/reconcile.py:123
7148
8258
msgid "Reconciliation complete."
7149
msgstr ""
8259
msgstr "Reconciliation complete."
7150
8260
7151
8261
#: bzrlib/reconcile.py:166
7152
8262
msgid "Fixing last revision info {0} => {1}"
7153
msgstr ""
8263
msgstr "Fixing last revision info {0} => {1}"
7154
8264
7155
8265
#: bzrlib/reconcile.py:173
7156
8266
msgid "revision_history ok."
7157
msgstr ""
8267
msgstr "revision_history ok."
7158
8268
7159
8269
#: bzrlib/reconcile.py:234
7160
8270
msgid "Reading inventory data"
7161
msgstr ""
8271
msgstr "Reading inventory data"
7162
8272
7163
8273
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7164
8274
msgid "Inventory ok."
7165
msgstr ""
8275
msgstr "Inventory ok."
7166
8276
7167
8277
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7168
8278
msgid "Backing up inventory"
7169
msgstr ""
8279
msgstr "Backing up inventory"
7170
8280
7171
8281
#: bzrlib/reconcile.py:258
7172
8282
msgid "Backup inventory created."
7173
msgstr ""
8283
msgstr "Backup inventory created."
7174
8284
7175
8285
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7176
8286
msgid "Writing weave"
7177
msgstr ""
8287
msgstr "Writing weave"
7178
8288
7179
8289
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7180
8290
msgid "Inventory regenerated."
7181
msgstr ""
8291
msgstr "Inventory regenerated."
7182
8292
7183
8293
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7184
8294
msgid "Reading indexes"
7185
msgstr ""
8295
msgstr "Reading indexes"
7186
8296
7187
8297
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7188
8298
msgid "Checking unused inventories"
7189
msgstr ""
8299
msgstr "Checking unused inventories"
7190
8300
7191
8301
#: bzrlib/reconcile.py:388
7192
8302
msgid "Backup Inventory created"
7193
msgstr ""
8303
msgstr "Backup Inventory created"
7194
8304
7195
8305
#: bzrlib/reconcile.py:446
7196
8306
msgid "Fixing text parents"
7197
msgstr ""
8307
msgstr "Fixing text parents"
7198
8308
7199
8309
#: bzrlib/reconfigure.py:54
7200
8310
msgid "{0} is now stacked on {1}\n"
7201
msgstr ""
8311
msgstr "{0} is now stacked on {1}\n"
7202
8312
7203
8313
#: bzrlib/reconfigure.py:69
7204
8314
#, python-format
7205
8315
msgid "%s is now not stacked\n"
7206
msgstr ""
8316
msgstr "%s is now not stacked\n"
7207
8317
7208
8318
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7209
8319
#, python-format
7210
8320
msgid "bzr: ERROR (ignored): %s"
7211
msgstr ""
8321
msgstr "bzr: ERROR (ignored): %s"
7212
8322
7213
8323
#: bzrlib/remote.py:2534
7214
8324
msgid "Copying repository content as tarball..."
7215
msgstr ""
8325
msgstr "Copying repository content as tarball..."
7216
8326
7217
8327
#: bzrlib/rename_map.py:69
7218
8328
msgid "Calculating hashes"
7219
msgstr ""
8329
msgstr "Calculating hashes"
7220
8330
7221
8331
#: bzrlib/rename_map.py:107
7222
8332
msgid "Determining hash hits"
7223
msgstr ""
8333
msgstr "Determining hash hits"
7224
8334
7225
8335
#: bzrlib/rename_map.py:242
7226
8336
msgid "{0} => {1}"
7227
msgstr ""
8337
msgstr "{0} => {1}"
7228
8338
7229
8339
#: bzrlib/repository.py:1738
7230
8340
msgid "Moving repository to repository.backup"
7231
msgstr ""
8341
msgstr "Moving repository to repository.backup"
7232
8342
7233
8343
#: bzrlib/repository.py:1745
7234
8344
msgid "Creating new repository"
7235
msgstr ""
8345
msgstr "Creating new repository"
7236
8346
7237
8347
#: bzrlib/repository.py:1750
7238
8348
msgid "Copying content"
7239
msgstr ""
8349
msgstr "Copying content"
7240
8350
7241
8351
#: bzrlib/repository.py:1754
7242
8352
msgid "Deleting old repository content"
7243
msgstr ""
8353
msgstr "Deleting old repository content"
7244
8354
7245
8355
#: bzrlib/repository.py:1756
7246
8356
msgid "repository converted"
7247
msgstr ""
8357
msgstr "repository converted"
7248
8358
7249
8359
#: bzrlib/revisionspec.py:903
7250
8360
msgid "Using {0} {1}"
7251
msgstr ""
8361
msgstr "Using {0} {1}"
7252
8362
7253
8363
#: bzrlib/send.py:59
7254
8364
#, python-format
7255
8365
msgid "Mail client \"%s\" does not support specifying body"
7256
msgstr ""
8366
msgstr "Mail client \"%s\" does not support specifying body"
7257
8367
7258
8368
#: bzrlib/send.py:63
7259
8369
msgid "--remember requires a branch to be specified."
7260
msgstr ""
8370
msgstr "--remember requires a branch to be specified."
7261
8371
7262
8372
#: bzrlib/send.py:78
7263
8373
msgid "No submit branch known or specified"
7264
msgstr ""
8374
msgstr "No submit branch known or specified"
7265
8375
7266
8376
#: bzrlib/send.py:81
7267
8377
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7268
8378
msgstr ""
8379
"Using saved {0} location \"{1}\" to determine what changes to submit."
7269
8380
7270
8381
#: bzrlib/send.py:99
7271
8382
#, python-format
7272
8383
msgid "No such send format '%s'."
7273
msgstr ""
8384
msgstr "No such send format '%s'."
7274
8385
7275
8386
#: bzrlib/send.py:115
7276
8387
msgid "bzr send takes at most two one revision identifiers"
7277
msgstr ""
8388
msgstr "bzr send takes at most two one revision identifiers"
7278
8389
7279
8390
#: bzrlib/send.py:128
7280
8391
msgid "No revisions to submit."
7281
msgstr ""
8392
msgstr "No revisions to submit."
7282
8393
7283
8394
#: bzrlib/send.py:140
7284
8395
msgid ""
7285
8396
"- not supported for merge directives that use more than one output file."
7286
8397
msgstr ""
8398
"- not supported for merge directives that use more than one output file."
7287
8399
7288
8400
#: bzrlib/send.py:186
7289
8401
msgid "Format 0.9 does not permit bundle with no patch"
7290
msgstr ""
8402
msgstr "Format 0.9 does not permit bundle with no patch"
7291
8403
7292
8404
#: bzrlib/shelf_ui.py:46
7293
8405
#, python-format
7294
8406
msgid "Shelve adding file \"%(path)s\"?"
7295
msgstr ""
8407
msgstr "Shelve adding file \"%(path)s\"?"
7296
8408
7297
8409
#: bzrlib/shelf_ui.py:47
7298
8410
msgid "Shelve binary changes?"
7299
msgstr ""
8411
msgstr "Shelve binary changes?"
7300
8412
7301
8413
#: bzrlib/shelf_ui.py:48
7302
8414
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7303
msgstr ""
8415
msgstr "Shelve changing \"%s\" from %(other)s to %(this)s?"
7304
8416
7305
8417
#: bzrlib/shelf_ui.py:50
7306
8418
#, python-format
7307
8419
msgid "Shelve removing file \"%(path)s\"?"
7308
msgstr ""
8420
msgstr "Shelve removing file \"%(path)s\"?"
7309
8421
7310
8422
#: bzrlib/shelf_ui.py:51
7311
8423
#, python-format
7312
8424
msgid "Shelve %d change(s)?"
7313
msgstr ""
8425
msgstr "Shelve %d change(s)?"
7314
8426
7315
8427
#: bzrlib/shelf_ui.py:52
7316
8428
msgid "Shelve?"
7317
msgstr ""
8429
msgstr "Shelve?"
7318
8430
7319
8431
#: bzrlib/shelf_ui.py:53
7320
8432
#, python-format
7321
8433
msgid ""
7322
8434
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7323
8435
msgstr ""
8436
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7324
8437
7325
8438
#: bzrlib/shelf_ui.py:55
7326
8439
#, python-format
7327
8440
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7328
msgstr ""
8441
msgstr "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7329
8442
7330
8443
#: bzrlib/shelf_ui.py:70
7331
8444
#, python-format
7332
8445
msgid "Changes shelved with id \"%d\"."
7333
msgstr ""
8446
msgstr "Changes shelved with id \"%d\"."
7334
8447
7335
8448
#: bzrlib/shelf_ui.py:74
7336
8449
msgid "Selected changes destroyed."
7337
msgstr ""
8450
msgstr "Selected changes destroyed."
7338
8451
7339
8452
#: bzrlib/shelf_ui.py:78
7340
8453
msgid "Selected changes:"
7341
msgstr ""
8454
msgstr "Selected changes:"
7342
8455
7343
8456
#: bzrlib/shelf_ui.py:98
7344
8457
#, python-format
7345
8458
msgid "Delete file \"%(path)s\"?"
7346
msgstr ""
8459
msgstr "Delete file \"%(path)s\"?"
7347
8460
7348
8461
#: bzrlib/shelf_ui.py:99
7349
8462
msgid "Apply binary changes?"
7350
msgstr ""
8463
msgstr "Apply binary changes?"
7351
8464
7352
8465
#: bzrlib/shelf_ui.py:100
7353
8466
#, python-format
7354
8467
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7355
msgstr ""
8468
msgstr "Change \"%(path)s\" from %(this)s to %(other)s?"
7356
8469
7357
8470
#: bzrlib/shelf_ui.py:102
7358
8471
#, python-format
7359
8472
msgid "Add file \"%(path)s\"?"
7360
msgstr ""
8473
msgstr "Add file \"%(path)s\"?"
7361
8474
7362
8475
#: bzrlib/shelf_ui.py:103
7363
8476
#, python-format
7364
8477
msgid "Apply %d change(s)?"
7365
msgstr ""
8478
msgstr "Apply %d change(s)?"
7366
8479
7367
8480
#: bzrlib/shelf_ui.py:104
7368
8481
msgid "Apply change?"
7369
msgstr ""
8482
msgstr "Apply change?"
7370
8483
7371
8484
#: bzrlib/shelf_ui.py:105
7372
8485
#, python-format
7373
8486
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7374
msgstr ""
8487
msgstr "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7375
8488
7376
8489
#: bzrlib/shelf_ui.py:107
7377
8490
#, python-format
7378
8491
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7379
msgstr ""
8492
msgstr "Rename \"%(this)s\" => \"%(other)s\"?"
7380
8493
7381
8494
#: bzrlib/shelf_ui.py:402
7382
8495
msgid "No changes are shelved."
7383
msgstr ""
8496
msgstr "No changes are shelved."
7384
8497
7385
8498
#: bzrlib/shelf_ui.py:460
7386
8499
#, python-format
7387
8500
msgid "Using changes with id \"%d\"."
7388
msgstr ""
8501
msgstr "Using changes with id \"%d\"."
7389
8502
7390
8503
#: bzrlib/shelf_ui.py:464
7391
8504
#, python-format
7392
8505
msgid "Message: %s"
7393
msgstr ""
8506
msgstr "Message: %s"
7394
8507
7395
8508
#: bzrlib/shelf_ui.py:476
7396
8509
#, python-format
7397
8510
msgid "Deleted changes with id \"%d\"."
7398
msgstr ""
8511
msgstr "Deleted changes with id \"%d\"."
7399
8512
7400
8513
#: bzrlib/smart/medium.py:714
7401
8514
msgid "HPSS calls: {0} ({1} vfs) {2}"
7402
msgstr ""
8515
msgstr "HPSS calls: {0} ({1} vfs) {2}"
7403
8516
7404
8517
#: bzrlib/smart/server.py:169
7405
8518
msgid "Requested to stop gracefully"
7406
msgstr ""
8519
msgstr "Requested to stop gracefully"
7407
8520
7408
8521
#: bzrlib/smart/server.py:179
7409
8522
#, python-format
7410
8523
msgid "Waiting for %d client(s) to finish"
7411
msgstr ""
8524
msgstr "Waiting for %d client(s) to finish"
7412
8525
7413
8526
#: bzrlib/smart/server.py:185
7414
8527
#, python-format
7415
8528
msgid "Still waiting for %d client(s) to finish"
7416
msgstr ""
8529
msgstr "Still waiting for %d client(s) to finish"
7417
8530
7418
8531
#: bzrlib/smart/server.py:219
7419
8532
#, python-format
7420
8533
msgid "listening socket error: %s"
7421
msgstr ""
8534
msgstr "listening socket error: %s"
7422
8535
7423
8536
#: bzrlib/smart/server.py:452
7424
8537
#, python-format
7425
8538
msgid "listening on port: %s"
7426
msgstr ""
8539
msgstr "listening on port: %s"
7427
8540
7428
8541
#: bzrlib/switch.py:73
7429
8542
msgid "Pending merges must be committed or reverted before using switch."
7430
msgstr ""
8543
msgstr "Pending merges must be committed or reverted before using switch."
7431
8544
7432
8545
#: bzrlib/switch.py:100
7433
8546
msgid ""
7434
8547
"Cannot switch as local commits found in the checkout. Commit these to the "
7435
8548
"bound branch or use --force to throw them away."
7436
8549
msgstr ""
8550
"Cannot switch as local commits found in the checkout. Commit these to the "
8551
"bound branch or use --force to throw them away."
7437
8552
7438
8553
#: bzrlib/switch.py:105
7439
8554
#, python-format
7441
8556
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7442
8557
"anyway, use --force."
7443
8558
msgstr ""
8559
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8560
"anyway, use --force."
7444
8561
7445
8562
#: bzrlib/switch.py:129
7446
8563
msgid "Cannot switch a branch, only a checkout."
7447
msgstr ""
8564
msgstr "Cannot switch a branch, only a checkout."
7448
8565
7449
8566
#: bzrlib/switch.py:167
7450
8567
#, python-format
7451
8568
msgid "Tree is up to date at revision %d."
7452
msgstr ""
8569
msgstr "Tree is up to date at revision %d."
7453
8570
7454
8571
#: bzrlib/switch.py:173
7455
8572
#, python-format
7456
8573
msgid "Updated to revision %d."
7457
msgstr ""
8574
msgstr "Updated to revision %d."
7458
8575
7459
8576
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7460
8577
msgid "Apply phase"
7461
msgstr ""
8578
msgstr "Apply phase"
7462
8579
7463
8580
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7464
8581
msgid "removing file"
7465
msgstr ""
8582
msgstr "removing file"
7466
8583
7467
8584
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7468
8585
msgid "adding file"
7469
msgstr ""
8586
msgstr "adding file"
7470
8587
7471
8588
#: bzrlib/transform.py:2598
7472
8589
msgid "Building tree"
7473
msgstr ""
8590
msgstr "Building tree"
7474
8591
7475
8592
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7476
8593
msgid "Adding file contents"
7477
msgstr ""
8594
msgstr "Adding file contents"
7478
8595
7479
8596
#: bzrlib/transform.py:3017
7480
8597
msgid "Resolution pass"
7481
msgstr ""
8598
msgstr "Resolution pass"
7482
8599
7483
8600
#: bzrlib/transport/ftp/_gssapi.py:88
7484
8601
#, python-format
7485
8602
msgid "Authenticated as %s"
7486
msgstr ""
8603
msgstr "Authenticated as %s"
7487
8604
7488
8605
#: bzrlib/tree.py:647
7489
8606
msgid "*** {0} content-filter: {1} => {2!r}"
7490
msgstr ""
8607
msgstr "*** {0} content-filter: {1} => {2!r}"
7491
8608
7492
8609
#: bzrlib/upgrade.py:77
7493
8610
#, python-format
7494
8611
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7495
msgstr ""
8612
msgstr "This is a checkout. The branch (%s) needs to be upgraded separately."
7496
8613
7497
8614
#: bzrlib/upgrade.py:100
7498
8615
#, python-format
7499
8616
msgid "cannot upgrade from bzrdir format %s"
7500
msgstr ""
8617
msgstr "cannot upgrade from bzrdir format %s"
7501
8618
7502
8619
#: bzrlib/upgrade.py:103
7503
8620
#, python-format
7504
8621
msgid "starting upgrade of %s"
7505
msgstr ""
8622
msgstr "starting upgrade of %s"
7506
8623
7507
8624
#: bzrlib/upgrade.py:110
7508
8625
msgid "finished"
7509
msgstr ""
8626
msgstr "finished"
7510
8627
7511
8628
#: bzrlib/upgrade.py:120
7512
8629
msgid "Deleting backup.bzr"
7513
msgstr ""
8630
msgstr "Deleting backup.bzr"
7514
8631
7515
8632
#: bzrlib/upgrade.py:151
7516
8633
msgid ""
7517
8634
"\n"
7518
8635
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7519
8636
msgstr ""
8637
"\n"
8638
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7520
8639
7521
8640
#: bzrlib/upgrade.py:208
7522
8641
#, python-format
7523
8642
msgid "Found %d dependent branches - upgrading ..."
7524
msgstr ""
8643
msgstr "Found %d dependent branches - upgrading ..."
7525
8644
7526
8645
#: bzrlib/upgrade.py:276
7527
8646
msgid "Upgrading bzrdirs"
7528
msgstr ""
8647
msgstr "Upgrading bzrdirs"
7529
8648
7530
8649
#: bzrlib/upgrade.py:282
7531
8650
#, python-format
7532
8651
msgid "Upgrading %s"
7533
msgstr ""
8652
msgstr "Upgrading %s"
7534
8653
7535
8654
#: bzrlib/upgrade.py:283
7536
8655
msgid "Upgrading {0} {1} ..."
7537
msgstr ""
8656
msgstr "Upgrading {0} {1} ..."
7538
8657
7539
8658
#: bzrlib/upgrade.py:301
7540
8659
msgid "Removing backup ..."
7541
msgstr ""
8660
msgstr "Removing backup ..."
7542
8661
7543
8662
#: bzrlib/upgrade.py:305
7544
8663
msgid "failed to clean-up {0}: {1}"
7545
msgstr ""
8664
msgstr "failed to clean-up {0}: {1}"
7546
8665
7547
8666
#: bzrlib/vf_repository.py:1091
7548
8667
msgid "inventories"
7549
msgstr ""
8668
msgstr "inventories"
7550
8669
7551
8670
#: bzrlib/vf_repository.py:1117
7552
8671
msgid "texts"
7553
msgstr ""
8672
msgstr "texts"
7554
8673
7555
8674
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7556
8675
msgid "Calculating text parents"
7557
msgstr ""
8676
msgstr "Calculating text parents"
7558
8677
7559
8678
#: bzrlib/vf_repository.py:1707
7560
8679
msgid "Fetch texts"
7561
msgstr ""
8680
msgstr "Fetch texts"
7562
8681
7563
8682
#: bzrlib/vf_repository.py:2536
7564
8683
msgid "loading text store"
7565
msgstr ""
8684
msgstr "loading text store"
7566
8685
7567
8686
#: bzrlib/vf_repository.py:2542
7568
8687
msgid "checking text graph"
7569
msgstr ""
8688
msgstr "checking text graph"
7570
8689
7571
8690
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7572
8691
#: bzrlib/vf_repository.py:3127
7573
8692
msgid "Transferring revisions"
7574
msgstr ""
8693
msgstr "Transferring revisions"
7575
8694
7576
8695
#: bzrlib/win32utils.py:146
7577
8696
msgid "Failed to GetProcessMemoryInfo()"
7578
msgstr ""
8697
msgstr "Failed to GetProcessMemoryInfo()"
7579
8698
7580
8699
#: bzrlib/win32utils.py:167
7581
8700
msgid "Cannot debug memory on win32 without ctypes or win32process"
7582
msgstr ""
8701
msgstr "Cannot debug memory on win32 without ctypes or win32process"
7583
8702
7584
8703
#: bzrlib/win32utils.py:172
7585
8704
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7586
msgstr ""
8705
msgstr "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7587
8706
7588
8707
#: bzrlib/win32utils.py:180
7589
8708
#, python-format
7590
8709
msgid "WorkingSize %8d KiB"
7591
msgstr ""
8710
msgstr "WorkingSize %8d KiB"
7592
8711
7593
8712
#: bzrlib/win32utils.py:181
7594
8713
#, python-format
7595
8714
msgid "PeakWorking %8d KiB"
7596
msgstr ""
8715
msgstr "PeakWorking %8d KiB"
7597
8716
7598
8717
#: bzrlib/win32utils.py:182
7599
8718
#, python-format
7600
8719
msgid "PagefileUsage %8d KiB"
7601
msgstr ""
8720
msgstr "PagefileUsage %8d KiB"
7602
8721
7603
8722
#: bzrlib/win32utils.py:183
7604
8723
#, python-format
7605
8724
msgid "PeakPagefileUsage %8d KiB"
7606
msgstr ""
8725
msgstr "PeakPagefileUsage %8d KiB"
7607
8726
7608
8727
#: bzrlib/win32utils.py:185
7609
8728
#, python-format
7610
8729
msgid "PrivateUsage %8d KiB"
7611
msgstr ""
8730
msgstr "PrivateUsage %8d KiB"
7612
8731
7613
8732
#: bzrlib/win32utils.py:186
7614
8733
#, python-format
7615
8734
msgid "PageFaultCount %8d"
7616
msgstr ""
8735
msgstr "PageFaultCount %8d"
7617
8736
7618
8737
#: bzrlib/workingtree.py:1482
7619
8738
msgid "Rerun update after fixing the conflicts."
7620
msgstr ""
8739
msgstr "Rerun update after fixing the conflicts."
7621
8740
7622
8741
#: dummy/help_topics/authentication/summary.txt:1
7623
8742
msgid "Information on configuring authentication"
7624
msgstr ""
8743
msgstr "Information on configuring authentication"
7625
8744
7626
8745
#: dummy/help_topics/basic/detail.txt:1
7627
8746
msgid ""
7628
8747
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7629
8748
"http://bazaar.canonical.com/"
7630
8749
msgstr ""
8750
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8751
"http://bazaar.canonical.com/"
7631
8752
7632
8753
#: dummy/help_topics/basic/detail.txt:4
7633
8754
msgid ""
7635
8756
" bzr init makes this directory a versioned branch\n"
7636
8757
" bzr branch make a copy of another branch"
7637
8758
msgstr ""
8759
"Basic commands:\n"
8760
" bzr init makes this directory a versioned branch\n"
8761
" bzr branch make a copy of another branch"
7638
8762
7639
8763
#: dummy/help_topics/basic/detail.txt:8
7640
8764
msgid ""
7642
8766
" bzr ignore ignore a file or pattern\n"
7643
8767
" bzr mv move or rename a versioned file"
7644
8768
msgstr ""
8769
" bzr add make files or directories versioned\n"
8770
" bzr ignore ignore a file or pattern\n"
8771
" bzr mv move or rename a versioned file"
7645
8772
7646
8773
#: dummy/help_topics/basic/detail.txt:12
7647
8774
msgid ""
7648
8775
" bzr status summarize changes in working copy\n"
7649
8776
" bzr diff show detailed diffs"
7650
8777
msgstr ""
8778
" bzr status summarise changes in working copy\n"
8779
" bzr diff show detailed diffs"
7651
8780
7652
8781
#: dummy/help_topics/basic/detail.txt:15
7653
8782
msgid ""
7655
8784
" bzr commit save some or all changes\n"
7656
8785
" bzr send send changes via email"
7657
8786
msgstr ""
8787
" bzr merge pull in changes from another branch\n"
8788
" bzr commit save some or all changes\n"
8789
" bzr send send changes via email"
7658
8790
7659
8791
#: dummy/help_topics/basic/detail.txt:19
7660
8792
msgid ""
7661
8793
" bzr log show history of changes\n"
7662
8794
" bzr check validate storage"
7663
8795
msgstr ""
8796
" bzr log show history of changes\n"
8797
" bzr check validate storage"
7664
8798
7665
8799
#: dummy/help_topics/basic/detail.txt:22
7666
8800
msgid ""
7668
8802
" bzr help commands list all commands\n"
7669
8803
" bzr help topics list all help topics\n"
7670
8804
msgstr ""
8805
" bzr help init more help on e.g. init command\n"
8806
" bzr help commands list all commands\n"
8807
" bzr help topics list all help topics\n"
7671
8808
7672
8809
#: dummy/help_topics/basic/summary.txt:1
7673
8810
msgid "Basic commands"
7674
msgstr ""
8811
msgstr "Basic commands"
7675
8812
7676
8813
#: dummy/help_topics/branches/detail.txt:1
7677
8814
msgid "Branches"
7678
msgstr ""
8815
msgstr "Branches"
7679
8816
7680
8817
#: dummy/help_topics/branches/detail.txt:3
7681
8818
msgid ""
7684
8821
"branch history is stored), but multiple branches may share the same\n"
7685
8822
"repository (a shared repository). Branches can be copied and merged."
7686
8823
msgstr ""
8824
"A branch consists of the state of a project, including all of its\n"
8825
"history. All branches have a repository associated (which is where the\n"
8826
"branch history is stored), but multiple branches may share the same\n"
8827
"repository (a shared repository). Branches can be copied and merged."
7687
8828
7688
8829
#: dummy/help_topics/branches/detail.txt:8
7689
8830
msgid ""
7694
8835
"to succeed, it may be necessary to update the current branch using \n"
7695
8836
"``bzr update``."
7696
8837
msgstr ""
8838
"In addition, one branch may be bound to another one. Binding to another\n"
8839
"branch indicates that commits which happen in this branch must also \n"
8840
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8841
"commits when the two branches are out of date. In order for a commit \n"
8842
"to succeed, it may be necessary to update the current branch using \n"
8843
"``bzr update``."
7697
8844
7698
8845
#: dummy/help_topics/branches/detail.txt:15
7699
8846
#: dummy/help_topics/checkouts/detail.txt:66
7700
8847
#: dummy/help_topics/repositories/detail.txt:36
7701
8848
msgid "Related commands::"
7702
msgstr ""
8849
msgstr "Related commands::"
7703
8850
7704
8851
#: dummy/help_topics/branches/detail.txt:17
7705
8852
msgid ""
7708
8855
" merge Perform a three-way merge.\n"
7709
8856
" bind Bind a branch to another one.\n"
7710
8857
msgstr ""
8858
" init Change a directory into a versioned branch.\n"
8859
" branch Create a new branch that is a copy of an existing branch.\n"
8860
" merge Perform a three-way merge.\n"
8861
" bind Bind a branch to another one.\n"
7711
8862
7712
8863
#: dummy/help_topics/branches/summary.txt:1
7713
8864
msgid "Information on what a branch is"
7714
msgstr ""
8865
msgstr "Information on what a branch is"
7715
8866
7716
8867
#: dummy/help_topics/bugs/summary.txt:1
7717
8868
msgid "Bug tracker settings"
7718
msgstr ""
8869
msgstr "Bug tracker settings"
7719
8870
7720
8871
#: dummy/help_topics/checkouts/detail.txt:1
7721
8872
msgid "Checkouts"
7722
msgstr ""
8873
msgstr "Checkouts"
7723
8874
7724
8875
#: dummy/help_topics/checkouts/detail.txt:3
7725
8876
msgid ""
7731
8882
"doesn't have the same restrictions. And using checkouts still allows\n"
7732
8883
"others working on the project to use whatever workflow they like."
7733
8884
msgstr ""
8885
"Checkouts are source trees that are connected to a branch, so that when\n"
8886
"you commit in the source tree, the commit goes into that branch. They\n"
8887
"allow you to use a simpler, more centralised workflow, ignoring some of\n"
8888
"Bazaar's decentralised features until you want them. Using checkouts\n"
8889
"with shared repositories is very similar to working with SVN or CVS, but\n"
8890
"doesn't have the same restrictions. And using checkouts still allows\n"
8891
"others working on the project to use whatever workflow they like."
7734
8892
7735
8893
#: dummy/help_topics/checkouts/detail.txt:11
7736
8894
msgid ""
7745
8903
"facilitates lockstep development, where each developer is working together,\n"
7746
8904
"continuously integrating the changes of others."
7747
8905
msgstr ""
8906
"A checkout is created with the bzr checkout command (see \"help "
8907
"checkout\").\n"
8908
"You pass it a reference to another branch, and it will create a local copy\n"
8909
"for you that still contains a reference to the branch you created the\n"
8910
"checkout from (the master branch). Then if you make any commits they will "
8911
"be\n"
8912
"made on the other branch first. This creates an instant mirror of your work, "
8913
"or\n"
8914
"facilitates lockstep development, where each developer is working together,\n"
8915
"continuously integrating the changes of others."
7748
8916
7749
8917
#: dummy/help_topics/checkouts/detail.txt:19
7750
8918
msgid ""
7759
8927
"local\n"
7760
8928
"commit."
7761
8929
msgstr ""
8930
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8931
"you have the full history locally. As you have a first class branch you "
8932
"can\n"
8933
"also commit locally if you want, for instance due to the temporary loss af "
8934
"a\n"
8935
"network connection. Use the --local option to commit to do this. All the "
8936
"local\n"
8937
"commits will then be made on the master branch the next time you do a non-"
8938
"local\n"
8939
"commit."
7762
8940
7763
8941
#: dummy/help_topics/checkouts/detail.txt:26
7764
8942
msgid ""
7769
8947
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7770
8948
"command when needed."
7771
8949
msgstr ""
8950
"If you are using a checkout from a shared branch you will periodically want "
8951
"to\n"
8952
"pull in all the changes made by others. This is done using the \"update\"\n"
8953
"command. The changes need to be applied before any non-local commit, but\n"
8954
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8955
"command when needed."
7772
8956
7773
8957
#: dummy/help_topics/checkouts/detail.txt:32
7774
8958
msgid ""
7781
8965
"you\n"
7782
8966
"don't have a local branch, then you cannot commit locally."
7783
8967
msgstr ""
8968
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8969
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8970
"SVN checkout in that it is not a first class branch, it mainly consists of "
8971
"the\n"
8972
"working tree. This means that any history operations must query the master\n"
8973
"branch, which could be slow if a network connection is involved. Also, as "
8974
"you\n"
8975
"don't have a local branch, then you cannot commit locally."
7784
8976
7785
8977
#: dummy/help_topics/checkouts/detail.txt:39
7786
8978
msgid ""
7795
8987
"on\n"
7796
8988
"the same disk then there won't be a noticeable difference."
7797
8989
msgstr ""
8990
"Lightweight checkouts work best when you have fast reliable access to the\n"
8991
"master branch. This means that if the master branch is on the same disk or "
8992
"LAN\n"
8993
"a lightweight checkout will be faster than a heavyweight one for any "
8994
"commands\n"
8995
"that modify the revision history (as only one copy of the branch needs to\n"
8996
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8997
"that uses the history but does not change it, but if the master branch is "
8998
"on\n"
8999
"the same disk then there won't be a noticeable difference."
7798
9000
7799
9001
#: dummy/help_topics/checkouts/detail.txt:47
7800
9002
msgid ""
7803
9005
"switching the master branch that the checkout points to when you want to\n"
7804
9006
"work on a different branch."
7805
9007
msgstr ""
9008
"Another possible use for a checkout is to use it with a treeless repository\n"
9009
"containing your branches, where you maintain only one working tree by\n"
9010
"switching the master branch that the checkout points to when you want to\n"
9011
"work on a different branch."
7806
9012
7807
9013
#: dummy/help_topics/checkouts/detail.txt:52
7808
9014
msgid ""
7816
9022
"is\n"
7817
9023
"file permissions."
7818
9024
msgstr ""
9025
"Obviously to commit on a checkout you need to be able to write to the "
9026
"master\n"
9027
"branch. This means that the master branch must be accessible over a "
9028
"writeable\n"
9029
"protocol , such as sftp://, and that you have write permissions at the "
9030
"other\n"
9031
"end. Checkouts also work on the local file system, so that all that matters "
9032
"is\n"
9033
"file permissions."
7819
9034
7820
9035
#: dummy/help_topics/checkouts/detail.txt:58
7821
9036
msgid ""
7831
9046
"the\n"
7832
9047
"branch is bound it will tell you the location of the bound branch."
7833
9048
msgstr ""
9049
"You can change the master of a checkout by using the \"switch\" command "
9050
"(see\n"
9051
"\"help switch\"). This will change the location that the commits are sent "
9052
"to.\n"
9053
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
9054
"checkout. If you would like to convert your heavy checkout into a normal\n"
9055
"branch so that every commit is local, you can use the \"unbind\" command. To "
9056
"see\n"
9057
"whether or not a branch is bound or not you can use the \"info\" command. If "
9058
"the\n"
9059
"branch is bound it will tell you the location of the bound branch."
7834
9060
7835
9061
#: dummy/help_topics/checkouts/detail.txt:68
7836
9062
msgid ""
7852
9078
" bound, then it will also display the location of the bound "
7853
9079
"branch\n"
7854
9080
msgstr ""
9081
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
9082
" checkout\n"
9083
" update Pull any changes in the master branch in to your checkout\n"
9084
" commit Make a commit that is sent to the master branch. If you have\n"
9085
" a heavy checkout then the --local option will commit to the\n"
9086
" checkout without sending the commit to the master\n"
9087
" switch Change the master branch that the commits in the checkout "
9088
"will\n"
9089
" be sent to\n"
9090
" bind Turn a standalone branch into a heavy checkout so that any\n"
9091
" commits will be sent to the master branch\n"
9092
" unbind Turn a heavy checkout into a standalone branch so that any\n"
9093
" commits are only made locally\n"
9094
" info Displays whether a branch is bound or unbound. If the branch "
9095
"is\n"
9096
" bound, then it will also display the location of the bound "
9097
"branch\n"
7855
9098
7856
9099
#: dummy/help_topics/checkouts/summary.txt:1
7857
9100
msgid "Information on what a checkout is"
7858
msgstr ""
9101
msgstr "Information on what a checkout is"
7859
9102
7860
9103
#: dummy/help_topics/commands/summary.txt:1
7861
9104
msgid "Basic help for all commands"
7862
msgstr ""
9105
msgstr "Basic help for all commands"
7863
9106
7864
9107
#: dummy/help_topics/configuration/summary.txt:1
7865
9108
msgid "Details on the configuration settings available"
7866
msgstr ""
9109
msgstr "Details on the configuration settings available"
7867
9110
7868
9111
#: dummy/help_topics/conflict-types/summary.txt:1
7869
9112
msgid "Types of conflicts and what to do about them"
7870
msgstr ""
9113
msgstr "Types of conflicts and what to do about them"
7871
9114
7872
9115
#: dummy/help_topics/content-filters/summary.txt:1
7873
9116
msgid "Conversion of content into/from working trees"
7874
msgstr ""
9117
msgstr "Conversion of content into/from working trees"
7875
9118
7876
9119
#: dummy/help_topics/criss-cross/detail.txt:1
7877
9120
msgid "Criss-Cross"
7878
msgstr ""
9121
msgstr "Criss-Cross"
7879
9122
7880
9123
#: dummy/help_topics/criss-cross/detail.txt:3
7881
9124
msgid ""
7882
9125
"A criss-cross in the branch history can cause the default merge technique\n"
7883
9126
"to emit more conflicts than would normally be expected."
7884
9127
msgstr ""
9128
"A criss-cross in the branch history can cause the default merge technique\n"
9129
"to emit more conflicts than would normally be expected."
7885
9130
7886
9131
#: dummy/help_topics/criss-cross/detail.txt:6
7887
9132
msgid ""
7890
9135
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7891
9136
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7892
9137
msgstr ""
9138
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
9139
"give\n"
9140
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
9141
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7893
9142
7894
9143
#: dummy/help_topics/criss-cross/detail.txt:10
7895
9144
msgid ""
7900
9149
"time. They can be avoided by having each branch only merge from or into a\n"
7901
9150
"designated central branch (a \"star topology\")."
7902
9151
msgstr ""
9152
"Criss-crosses occur in a branch's history if two branches merge the same "
9153
"thing\n"
9154
"and then merge one another, or if two branches merge one another at the "
9155
"same\n"
9156
"time. They can be avoided by having each branch only merge from or into a\n"
9157
"designated central branch (a \"star topology\")."
7903
9158
7904
9159
#: dummy/help_topics/criss-cross/detail.txt:15
7905
9160
msgid ""
7910
9165
"differences between THIS and OTHER are due to one side adding lines, or\n"
7911
9166
"from another side removing lines."
7912
9167
msgstr ""
9168
"Criss-crosses cause problems because of the way merge works. Bazaar's "
9169
"default\n"
9170
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
9171
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
9172
"differences between THIS and OTHER are due to one side adding lines, or\n"
9173
"from another side removing lines."
7913
9174
7914
9175
#: dummy/help_topics/criss-cross/detail.txt:21
7915
9176
msgid ""
7919
9180
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7920
9181
"are emitted."
7921
9182
msgstr ""
9183
"Criss-crosses mean there is no good choice for a base. Selecting the "
9184
"recent\n"
9185
"merge points could cause one side's changes to be silently discarded.\n"
9186
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
9187
"are emitted."
7922
9188
7923
9189
#: dummy/help_topics/criss-cross/detail.txt:26
7924
9190
msgid ""
7926
9192
"line-origin detection instead of a basis revision to determine the cause of\n"
7927
9193
"differences.\n"
7928
9194
msgstr ""
9195
"The ``weave`` merge type is not affected by this problem because it uses\n"
9196
"line-origin detection instead of a basis revision to determine the cause of\n"
9197
"differences.\n"
7929
9198
7930
9199
#: dummy/help_topics/criss-cross/summary.txt:1
7931
9200
msgid "Information on criss-cross merging"
7932
msgstr ""
9201
msgstr "Information on criss-cross merging"
7933
9202
7934
9203
#: dummy/help_topics/current-formats/summary.txt:1
7935
9204
msgid "Current storage formats"
7936
msgstr ""
9205
msgstr "Current storage formats"
7937
9206
7938
9207
#: dummy/help_topics/debug-flags/summary.txt:1
7939
9208
msgid "Options to show or record debug information"
7940
msgstr ""
9209
msgstr "Options to show or record debug information"
7941
9210
7942
9211
#: dummy/help_topics/diverged-branches/summary.txt:1
7943
9212
msgid "How to fix diverged branches"
7944
msgstr ""
9213
msgstr "How to fix diverged branches"
7945
9214
7946
9215
#: dummy/help_topics/env-variables/summary.txt:1
7947
9216
msgid "Environment variable names and values"
7948
msgstr ""
9217
msgstr "Environment variable names and values"
7949
9218
7950
9219
#: dummy/help_topics/eol/summary.txt:1
7951
9220
msgid "Information on end-of-line handling"
7952
msgstr ""
9221
msgstr "Information on end-of-line handling"
7953
9222
7954
9223
#: dummy/help_topics/files/detail.txt:1
7955
9224
msgid "Files"
7956
msgstr ""
9225
msgstr "Files"
7957
9226
7958
9227
#: dummy/help_topics/files/detail.txt:3
7959
9228
msgid ""
7961
9230
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7962
9231
"bazaar\\\\2.0\\\\bazaar.conf"
7963
9232
msgstr ""
9233
":On Unix: ~/.bazaar/bazaar.conf\n"
9234
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
9235
"bazaar\\\\2.0\\\\bazaar.conf"
7964
9236
7965
9237
#: dummy/help_topics/files/detail.txt:6
7966
9238
msgid ""
7969
9241
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7970
9242
"commonly used options."
7971
9243
msgstr ""
9244
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
9245
"used to define general configuration that will be applied everywhere.\n"
9246
"The section ``[ALIASES]`` can be used to create command aliases for\n"
9247
"commonly used options."
7972
9248
7973
9249
#: dummy/help_topics/files/detail.txt:11
7974
9250
msgid "A typical config file might look something like::"
7975
msgstr ""
9251
msgstr "A typical config file might look something like::"
7976
9252
7977
9253
#: dummy/help_topics/files/detail.txt:13
7978
9254
msgid ""
7979
9255
" [DEFAULT]\n"
7980
9256
" email=John Doe <jdoe@isp.com>"
7981
9257
msgstr ""
9258
" [DEFAULT]\n"
9259
" email=John Doe <jdoe@isp.com>"
7982
9260
7983
9261
#: dummy/help_topics/files/detail.txt:16
7984
9262
msgid ""
7986
9264
" commit = commit --strict\n"
7987
9265
" log10 = log --short -r -10..-1\n"
7988
9266
msgstr ""
9267
" [ALIASES]\n"
9268
" commit = commit --strict\n"
9269
" log10 = log --short -r -10..-1\n"
7989
9270
7990
9271
#: dummy/help_topics/files/summary.txt:1
7991
9272
msgid "Information on configuration and log files"
7992
msgstr ""
9273
msgstr "Information on configuration and log files"
7993
9274
7994
9275
#: dummy/help_topics/formats/detail.txt:1
7995
9276
msgid "Storage Formats"
7996
msgstr ""
9277
msgstr "Storage Formats"
7997
9278
7998
9279
#: dummy/help_topics/formats/detail.txt:3
7999
9280
msgid ""
8003
9284
"formats may also be introduced to improve performance and\n"
8004
9285
"scalability."
8005
9286
msgstr ""
9287
"To ensure that older clients do not access data incorrectly,\n"
9288
"Bazaar's policy is to introduce a new storage format whenever\n"
9289
"new features requiring new metadata are added. New storage\n"
9290
"formats may also be introduced to improve performance and\n"
9291
"scalability."
8006
9292
8007
9293
#: dummy/help_topics/formats/detail.txt:9
8008
9294
msgid ""
8010
9296
"project is not using 2a, then you should suggest to the\n"
8011
9297
"project owner to upgrade."
8012
9298
msgstr ""
9299
"The newest format, 2a, is highly recommended. If your\n"
9300
"project is not using 2a, then you should suggest to the\n"
9301
"project owner to upgrade."
8013
9302
8014
9303
#: dummy/help_topics/formats/detail.txt:13
8015
9304
msgid ""
8016
9305
"\n"
8017
9306
".. note::"
8018
9307
msgstr ""
9308
"\n"
9309
".. note::"
8019
9310
8020
9311
#: dummy/help_topics/formats/detail.txt:16
8021
9312
msgid ""
8029
9320
" around the same time. 2a and all future formats will be\n"
8030
9321
" implicitly rich-root."
8031
9322
msgstr ""
9323
" Some of the older formats have two variants:\n"
9324
" a plain one and a rich-root one. The latter include an additional\n"
9325
" field about the root of the tree. There is no performance cost\n"
9326
" for using a rich-root format but you cannot easily merge changes\n"
9327
" from a rich-root format into a plain format. As a consequence,\n"
9328
" moving a project to a rich-root format takes some co-ordination\n"
9329
" in that all contributors need to upgrade their repositories\n"
9330
" around the same time. 2a and all future formats will be\n"
9331
" implicitly rich-root."
8032
9332
8033
9333
#: dummy/help_topics/formats/detail.txt:26
8034
9334
msgid ""
8036
9336
"currently supported formats. See :doc:`other-formats-help` for\n"
8037
9337
"descriptions of any available experimental and deprecated formats.\n"
8038
9338
msgstr ""
9339
"See :doc:`current-formats-help` for the complete list of\n"
9340
"currently supported formats. See :doc:`other-formats-help` for\n"
9341
"descriptions of any available experimental and deprecated formats.\n"
8039
9342
8040
9343
#: dummy/help_topics/formats/summary.txt:1
8041
9344
msgid "Information on choosing a storage format"
8042
msgstr ""
9345
msgstr "Information on choosing a storage format"
8043
9346
8044
9347
#: dummy/help_topics/global-options/detail.txt:1
8045
9348
msgid "Global Options"
8046
msgstr ""
9349
msgstr "Global Options"
8047
9350
8048
9351
#: dummy/help_topics/global-options/detail.txt:3
8049
9352
msgid ""
8050
9353
"These options may be used with any command, and may appear in front of any\n"
8051
9354
"command. (e.g. ``bzr --profile help``)."
8052
9355
msgstr ""
9356
"These options may be used with any command, and may appear in front of any\n"
9357
"command. (e.g. ``bzr --profile help``)."
8053
9358
8054
9359
#: dummy/help_topics/global-options/detail.txt:6
8055
9360
msgid ""
8063
9368
"--no-l10n Do not translate messages.\n"
8064
9369
"--concurrency Number of processes that can be run concurrently (selftest)."
8065
9370
msgstr ""
9371
"--version Print the version number. Must be supplied before the "
9372
"command.\n"
9373
"--no-aliases Do not process command aliases when running this command.\n"
9374
"--builtin Use the built-in version of a command, not the plugin "
9375
"version.\n"
9376
" This does not suppress other plugin effects.\n"
9377
"--no-plugins Do not process any plugins.\n"
9378
"--no-l10n Do not translate messages.\n"
9379
"--concurrency Number of processes that can be run concurrently (selftest)."
8066
9380
8067
9381
#: dummy/help_topics/global-options/detail.txt:14
8068
9382
msgid ""
8079
9393
" will be a pickle.\n"
8080
9394
"--coverage Generate line coverage report in the specified directory."
8081
9395
msgstr ""
9396
"--profile Profile execution using the hotshot profiler.\n"
9397
"--lsprof Profile execution using the lsprof profiler.\n"
9398
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
9399
" results to a specified file. If the filename ends with "
9400
"\".txt\",\n"
9401
" text format will be used. If the filename either starts "
9402
"with\n"
9403
" \"callgrind.out\" or end with \".callgrind\", the output will "
9404
"be\n"
9405
" formatted for use with KCacheGrind. Otherwise, the output\n"
9406
" will be a pickle.\n"
9407
"--coverage Generate line coverage report in the specified directory."
8082
9408
8083
9409
#: dummy/help_topics/global-options/detail.txt:24
8084
9410
msgid ""
8088
9414
"if\n"
8089
9415
" several options need to be overridden."
8090
9416
msgstr ""
9417
"-Oname=value Override the ``name`` config option setting it to ``value`` "
9418
"for\n"
9419
" the duration of the command. This can be used multiple times "
9420
"if\n"
9421
" several options need to be overridden."
8091
9422
8092
9423
#: dummy/help_topics/global-options/detail.txt:28
8093
9424
msgid ""
8094
9425
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8095
9426
"information on profiling."
8096
9427
msgstr ""
9428
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
9429
"information on profiling."
8097
9430
8098
9431
#: dummy/help_topics/global-options/detail.txt:31
8099
9432
msgid ""
8100
9433
"A number of debug flags are also available to assist troubleshooting and\n"
8101
9434
"development. See :doc:`debug-flags-help`.\n"
8102
9435
msgstr ""
9436
"A number of debug flags are also available to assist troubleshooting and\n"
9437
"development. See :doc:`debug-flags-help`.\n"
8103
9438
8104
9439
#: dummy/help_topics/global-options/summary.txt:1
8105
9440
msgid "Options that control how Bazaar runs"
8106
msgstr ""
9441
msgstr "Options that control how Bazaar runs"
8107
9442
8108
9443
#: dummy/help_topics/hidden-commands/summary.txt:1
8109
9444
msgid "All hidden commands"
8110
msgstr ""
9445
msgstr "All hidden commands"
8111
9446
8112
9447
#: dummy/help_topics/hooks/summary.txt:1
8113
9448
msgid "Points at which custom processing can be added"
8114
msgstr ""
9449
msgstr "Points at which custom processing can be added"
8115
9450
8116
9451
#: dummy/help_topics/launchpad/detail.txt:1
8117
9452
msgid "Integration with Launchpad.net"
8118
msgstr ""
9453
msgstr "Integration with Launchpad.net"
8119
9454
8120
9455
#: dummy/help_topics/launchpad/detail.txt:3
8121
9456
msgid ""
8122
9457
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8123
9458
"specification tracking."
8124
9459
msgstr ""
9460
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
9461
"specification tracking."
8125
9462
8126
9463
#: dummy/help_topics/launchpad/detail.txt:6
8127
9464
msgid ""
8128
9465
"The bzr client (through the plugin called 'launchpad') has special\n"
8129
9466
"features to communicate with Launchpad:"
8130
9467
msgstr ""
9468
"The bzr client (through the plugin called 'launchpad') has special\n"
9469
"features to communicate with Launchpad:"
8131
9470
8132
9471
#: dummy/help_topics/launchpad/detail.txt:9
8133
9472
msgid ""
8136
9475
" is then used by the 'lp:' transport to download your branches using\n"
8137
9476
" bzr+ssh://."
8138
9477
msgstr ""
9478
" * The launchpad-login command tells Bazaar your Launchpad user name. "
9479
"This\n"
9480
" is then used by the 'lp:' transport to download your branches using\n"
9481
" bzr+ssh://."
8139
9482
8140
9483
#: dummy/help_topics/launchpad/detail.txt:13
8141
9484
msgid ""
8145
9488
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8146
9489
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8147
9490
msgstr ""
9491
" * The 'lp:' transport uses Launchpad as a directory service: for "
9492
"example\n"
9493
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
9494
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
9495
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8148
9496
8149
9497
#: dummy/help_topics/launchpad/detail.txt:18
8150
9498
msgid ""
8155
9503
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8156
9504
" automatically be linked to the bug report."
8157
9505
msgstr ""
9506
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
9507
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
9508
"lp:12345'\n"
9509
" will record a revision property that marks that revision as fixing\n"
9510
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
9511
" automatically be linked to the bug report."
8158
9512
8159
9513
#: dummy/help_topics/launchpad/detail.txt:24
8160
9514
msgid ""
8163
9517
" its contents and allow it to be attached to bugs and other\n"
8164
9518
" objects."
8165
9519
msgstr ""
9520
" * The register-branch command tells Launchpad about the url of a\n"
9521
" public branch. Launchpad will then mirror the branch, display\n"
9522
" its contents and allow it to be attached to bugs and other\n"
9523
" objects."
8166
9524
8167
9525
#: dummy/help_topics/launchpad/detail.txt:29
8168
9526
msgid "For more information see http://help.launchpad.net/\n"
8169
msgstr ""
9527
msgstr "For more information see http://help.launchpad.net/\n"
8170
9528
8171
9529
#: dummy/help_topics/launchpad/summary.txt:1
8172
9530
msgid "Using Bazaar with Launchpad.net"
8173
msgstr ""
9531
msgstr "Using Bazaar with Launchpad.net"
8174
9532
8175
9533
#: dummy/help_topics/location-alias/summary.txt:1
8176
9534
msgid "Aliases for remembered locations"
8177
msgstr ""
9535
msgstr "Aliases for remembered locations"
8178
9536
8179
9537
#: dummy/help_topics/log-formats/summary.txt:1
8180
9538
msgid "Details on the logging formats available"
8181
msgstr ""
9539
msgstr "Details on the logging formats available"
8182
9540
8183
9541
#: dummy/help_topics/other-formats/summary.txt:1
8184
9542
msgid "Experimental and deprecated storage formats"
8185
msgstr ""
9543
msgstr "Experimental and deprecated storage formats"
8186
9544
8187
9545
#: dummy/help_topics/patterns/summary.txt:1
8188
9546
msgid "Information on the pattern syntax"
8189
msgstr ""
9547
msgstr "Information on the pattern syntax"
8190
9548
8191
9549
#: dummy/help_topics/repositories/detail.txt:1
8192
9550
msgid "Repositories"
8193
msgstr ""
9551
msgstr "Repositories"
8194
9552
8195
9553
#: dummy/help_topics/repositories/detail.txt:3
8196
9554
msgid ""
8197
9555
"Repositories in Bazaar are where committed information is stored. There is\n"
8198
9556
"a repository associated with every branch."
8199
9557
msgstr ""
9558
"Repositories in Bazaar are where committed information is stored. There is\n"
9559
"a repository associated with every branch."
8200
9560
8201
9561
#: dummy/help_topics/repositories/detail.txt:6
8202
9562
msgid ""
8205
9565
"very many commits in a short time period) you may want to ask bzr to\n"
8206
9566
"optimise the database indices. This can be done by the 'bzr pack' command."
8207
9567
msgstr ""
9568
"Repositories are a form of database. Bzr will usually maintain this for\n"
9569
"good performance automatically, but in some situations (e.g. when doing\n"
9570
"very many commits in a short time period) you may want to ask bzr to\n"
9571
"optimise the database indices. This can be done by the 'bzr pack' command."
8208
9572
8209
9573
#: dummy/help_topics/repositories/detail.txt:11
8210
9574
msgid ""
8217
9581
"it\n"
8218
9582
"can use."
8219
9583
msgstr ""
9584
"By default just running 'bzr init' will create a repository within the new\n"
9585
"branch but it is possible to create a shared repository which allows "
9586
"multiple\n"
9587
"branches to share their information in the same location. When a new branch "
9588
"is\n"
9589
"created it will first look to see if there is a containing shared repository "
9590
"it\n"
9591
"can use."
8220
9592
8221
9593
#: dummy/help_topics/repositories/detail.txt:17
8222
9594
msgid ""
8224
9596
"generally a large space saving. For some operations (e.g. branching\n"
8225
9597
"within the repository) this translates in to a large time saving."
8226
9598
msgstr ""
9599
"When two branches of the same project share a repository, there is\n"
9600
"generally a large space saving. For some operations (e.g. branching\n"
9601
"within the repository) this translates in to a large time saving."
8227
9602
8228
9603
#: dummy/help_topics/repositories/detail.txt:21
8229
9604
msgid ""
8235
9610
"this\n"
8236
9611
"directory will then use it for storage."
8237
9612
msgstr ""
9613
"To create a shared repository use the init-repository command (or the alias\n"
9614
"init-repo). This command takes the location of the repository to create. "
9615
"This\n"
9616
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
9617
"which contains a shared repository. Any new branches that are created in "
9618
"this\n"
9619
"directory will then use it for storage."
8238
9620
8239
9621
#: dummy/help_topics/repositories/detail.txt:27
8240
9622
msgid ""
8249
9631
"the branches will not have working trees pass the '--no-trees' option to\n"
8250
9632
"'init-repository'."
8251
9633
msgstr ""
9634
"It is a good idea to create a repository whenever you might create more\n"
9635
"than one branch of a project. This is true for both working areas where you\n"
9636
"are doing the development, and any server areas that you use for hosting\n"
9637
"projects. In the latter case, it is common to want branches without working\n"
9638
"trees. Since the files in the branch will not be edited directly there is "
9639
"no\n"
9640
"need to use up disk space for a working tree. To create a repository in "
9641
"which\n"
9642
"the branches will not have working trees pass the '--no-trees' option to\n"
9643
"'init-repository'."
8252
9644
8253
9645
#: dummy/help_topics/repositories/detail.txt:38
8254
9646
msgid ""
8256
9648
"one\n"
8257
9649
" in which new branches won't get a working tree.\n"
8258
9650
msgstr ""
9651
" init-repository Create a shared repository. Use --no-trees to create "
9652
"one\n"
9653
" in which new branches won't get a working tree.\n"
8259
9654
8260
9655
#: dummy/help_topics/repositories/summary.txt:1
8261
9656
msgid "Basic information on shared repositories."
8262
msgstr ""
9657
msgstr "Basic information on shared repositories."
8263
9658
8264
9659
#: dummy/help_topics/revisionspec/summary.txt:1
8265
9660
msgid "Explain how to use --revision"
8266
msgstr ""
9661
msgstr "Explain how to use --revision"
8267
9662
8268
9663
#: dummy/help_topics/rules/summary.txt:1
8269
9664
msgid "Information on defining rule-based preferences"
8270
msgstr ""
9665
msgstr "Information on defining rule-based preferences"
8271
9666
8272
9667
#: dummy/help_topics/standalone-trees/detail.txt:1
8273
9668
msgid "Standalone Trees"
8274
msgstr ""
9669
msgstr "Standalone Trees"
8275
9670
8276
9671
#: dummy/help_topics/standalone-trees/detail.txt:3
8277
9672
msgid ""
8280
9675
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8281
9676
"an existing project under version control."
8282
9677
msgstr ""
9678
"A standalone tree is a working tree with an associated repository. It\n"
9679
"is an independently usable branch, with no dependencies on any other.\n"
9680
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
9681
"an existing project under version control."
8283
9682
8284
9683
#: dummy/help_topics/standalone-trees/detail.txt:8
8285
9684
msgid "Related Commands::"
8286
msgstr ""
9685
msgstr "Related Commands::"
8287
9686
8288
9687
#: dummy/help_topics/standalone-trees/detail.txt:10
8289
9688
msgid " init Make a directory into a versioned branch.\n"
8290
msgstr ""
9689
msgstr " init Make a directory into a versioned branch.\n"
8291
9690
8292
9691
#: dummy/help_topics/standalone-trees/summary.txt:1
8293
9692
msgid "Information on what a standalone tree is"
8294
msgstr ""
9693
msgstr "Information on what a standalone tree is"
8295
9694
8296
9695
#: dummy/help_topics/standard-options/detail.txt:1
8297
9696
msgid "Standard Options"
8298
msgstr ""
9697
msgstr "Standard Options"
8299
9698
8300
9699
#: dummy/help_topics/standard-options/detail.txt:3
8301
9700
msgid "Standard options are legal for all commands."
8302
msgstr ""
9701
msgstr "Standard options are legal for all commands."
8303
9702
8304
9703
#: dummy/help_topics/standard-options/detail.txt:5
8305
9704
msgid ""
8307
9706
"--verbose, -v Display more information.\n"
8308
9707
"--quiet, -q Only display errors and warnings."
8309
9708
msgstr ""
9709
"--help, -h Show help message.\n"
9710
"--verbose, -v Display more information.\n"
9711
"--quiet, -q Only display errors and warnings."
8310
9712
8311
9713
#: dummy/help_topics/standard-options/detail.txt:9
8312
9714
msgid "Unlike global options, standard options can be used in aliases.\n"
8313
msgstr ""
9715
msgstr "Unlike global options, standard options can be used in aliases.\n"
8314
9716
8315
9717
#: dummy/help_topics/standard-options/summary.txt:1
8316
9718
msgid "Options that can be used with any command"
8317
msgstr ""
9719
msgstr "Options that can be used with any command"
8318
9720
8319
9721
#: dummy/help_topics/status-flags/detail.txt:1
8320
9722
msgid "Status Flags"
8321
msgstr ""
9723
msgstr "Status Flags"
8322
9724
8323
9725
#: dummy/help_topics/status-flags/detail.txt:3
8324
9726
msgid ""
8325
9727
"Status flags are used to summarise changes to the working tree in a concise\n"
8326
9728
"manner. They are in the form::"
8327
9729
msgstr ""
9730
"Status flags are used to summarise changes to the working tree in a concise\n"
9731
"manner. They are in the form::"
8328
9732
8329
9733
#: dummy/help_topics/status-flags/detail.txt:6
8330
9734
msgid " xxx <filename>"
8331
msgstr ""
9735
msgstr " xxx <filename>"
8332
9736
8333
9737
#: dummy/help_topics/status-flags/detail.txt:8
8334
9738
msgid "where the columns' meanings are as follows."
8335
msgstr ""
9739
msgstr "where the columns' meanings are as follows."
8336
9740
8337
9741
#: dummy/help_topics/status-flags/detail.txt:10
8338
9742
msgid "Column 1 - versioning/renames::"
8339
msgstr ""
9743
msgstr "Column 1 - versioning/renames::"
8340
9744
8341
9745
#: dummy/help_topics/status-flags/detail.txt:12
8342
9746
msgid ""
8348
9752
" C File has conflicts\n"
8349
9753
" P Entry for a pending merge (not a file)"
8350
9754
msgstr ""
9755
" + File versioned\n"
9756
" - File unversioned\n"
9757
" R File renamed\n"
9758
" ? File unknown\n"
9759
" X File non-existent (and unknown to bzr)\n"
9760
" C File has conflicts\n"
9761
" P Entry for a pending merge (not a file)"
8351
9762
8352
9763
#: dummy/help_topics/status-flags/detail.txt:20
8353
9764
msgid "Column 2 - contents::"
8354
msgstr ""
9765
msgstr "Column 2 - contents::"
8355
9766
8356
9767
#: dummy/help_topics/status-flags/detail.txt:22
8357
9768
msgid ""
8360
9771
" K File kind changed\n"
8361
9772
" M File modified"
8362
9773
msgstr ""
9774
" N File created\n"
9775
" D File deleted\n"
9776
" K File kind changed\n"
9777
" M File modified"
8363
9778
8364
9779
#: dummy/help_topics/status-flags/detail.txt:27
8365
9780
msgid "Column 3 - execute::"
8366
msgstr ""
9781
msgstr "Column 3 - execute::"
8367
9782
8368
9783
#: dummy/help_topics/status-flags/detail.txt:29
8369
9784
msgid " * The execute bit was changed\n"
8370
msgstr ""
9785
msgstr " * The execute bit was changed\n"
8371
9786
8372
9787
#: dummy/help_topics/status-flags/summary.txt:1
8373
9788
msgid "Help on status flags"
8374
msgstr ""
9789
msgstr "Help on status flags"
8375
9790
8376
9791
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8377
9792
msgid "Branches Out of Sync"
8378
msgstr ""
9793
msgstr "Branches Out of Sync"
8379
9794
8380
9795
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8381
9796
msgid ""
8385
9800
"have the same last revision as the new reference branch for the lightweight\n"
8386
9801
"checkout, data could be lost, so Bazaar refuses."
8387
9802
msgstr ""
9803
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
9804
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
9805
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
9806
"have the same last revision as the new reference branch for the lightweight\n"
9807
"checkout, data could be lost, so Bazaar refuses."
8388
9808
8389
9809
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8390
9810
msgid "How you deal with this depends on *why* the branches are out of sync."
8391
9811
msgstr ""
9812
"How you deal with this depends on *why* the branches are out of sync."
8392
9813
8393
9814
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8394
9815
msgid ""
8396
9817
"sync\n"
8397
9818
"by running \"bzr update\" (and possibly \"bzr commit\")."
8398
9819
msgstr ""
9820
"If you have a checkout and have done local commits, you can get back in "
9821
"sync\n"
9822
"by running \"bzr update\" (and possibly \"bzr commit\")."
8399
9823
8400
9824
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8401
9825
msgid ""
8407
9831
"and then push your changes. If you decide that some of the changes aren't\n"
8408
9832
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8409
9833
msgstr ""
9834
"If you have a branch and the remote branch is out-of-date, you can push\n"
9835
"the local changes using \"bzr push\". If the local branch is out of date, "
9836
"you\n"
9837
"can do \"bzr pull\". If both branches have had changes, you can merge, "
9838
"commit\n"
9839
"and then push your changes. If you decide that some of the changes aren't\n"
9840
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8410
9841
8411
9842
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8412
9843
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8413
msgstr ""
9844
msgstr "Steps to resolve \"out-of-sync\" when reconfiguring"
8414
9845
8415
9846
#: dummy/help_topics/topics/summary.txt:1
8416
9847
msgid "Topics list"
8417
msgstr ""
9848
msgstr "Topics list"
8418
9849
8419
9850
#: dummy/help_topics/url-special-chars/summary.txt:1
8420
9851
msgid "Special character handling in URLs"
8421
msgstr ""
9852
msgstr "Special character handling in URLs"
8422
9853
8423
9854
#: dummy/help_topics/urlspec/summary.txt:1
8424
9855
msgid "Supported transport protocols"
8425
msgstr ""
9856
msgstr "Supported transport protocols"
8426
9857
8427
9858
#: dummy/help_topics/working-trees/detail.txt:1
8428
9859
msgid "Working Trees"
8429
msgstr ""
9860
msgstr "Working Trees"
8430
9861
8431
9862
#: dummy/help_topics/working-trees/detail.txt:3
8432
9863
msgid ""
8436
9867
"branch, and when you commit the current state of the working tree is the\n"
8437
9868
"snapshot that is recorded in the commit."
8438
9869
msgstr ""
9870
"A working tree is the contents of a branch placed on disk so that you can\n"
9871
"see the files and edit them. The working tree is where you make changes to "
9872
"a\n"
9873
"branch, and when you commit the current state of the working tree is the\n"
9874
"snapshot that is recorded in the commit."
8439
9875
8440
9876
#: dummy/help_topics/working-trees/detail.txt:8
8441
9877
msgid ""
8447
9883
"are\n"
8448
9884
"difficult to deal with remotely."
8449
9885
msgstr ""
9886
"When you push a branch to a remote system, a working tree will not be\n"
9887
"created. If one is already present the files will not be updated. The\n"
9888
"branch information will be updated and the working tree will be marked\n"
9889
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
9890
"may be uncommitted changes or the update may cause content conflicts that "
9891
"are\n"
9892
"difficult to deal with remotely."
8450
9893
8451
9894
#: dummy/help_topics/working-trees/detail.txt:15
8452
9895
msgid ""
8458
9901
"the\n"
8459
9902
"working tree by running 'bzr update' in that directory."
8460
9903
msgstr ""
9904
"If you have a branch with no working tree you can use the 'checkout' "
9905
"command\n"
9906
"to create a working tree. If you run 'bzr checkout .' from the branch it "
9907
"will\n"
9908
"create the working tree. If the branch is updated remotely, you can update "
9909
"the\n"
9910
"working tree by running 'bzr update' in that directory."
8461
9911
8462
9912
#: dummy/help_topics/working-trees/detail.txt:20
8463
9913
msgid ""
8468
9918
"branch. It can also be useful when working with a '--no-trees' repository\n"
8469
9919
"(see 'bzr help repositories')."
8470
9920
msgstr ""
9921
"If you have a branch with a working tree that you do not want the 'remove-"
9922
"tree'\n"
9923
"command will remove the tree if it is safe. This can be done to avoid the\n"
9924
"warning about the remote working tree not being updated when pushing to the\n"
9925
"branch. It can also be useful when working with a '--no-trees' repository\n"
9926
"(see 'bzr help repositories')."
8471
9927
8472
9928
#: dummy/help_topics/working-trees/detail.txt:26
8473
9929
msgid ""
8482
9938
"SSH\n"
8483
9939
"after each push."
8484
9940
msgstr ""
9941
"If you want to have a working tree on a remote machine that you push to you\n"
9942
"can either run 'bzr update' in the remote branch after each push, or use "
9943
"some\n"
9944
"other method to update the tree during the push. There is an 'rspush' "
9945
"plugin\n"
9946
"that will update the working tree using rsync as well as doing a push. "
9947
"There\n"
9948
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
9949
"SSH\n"
9950
"after each push."
8485
9951
8486
9952
#: dummy/help_topics/working-trees/detail.txt:33
8487
9953
msgid "Useful commands::"
8488
msgstr ""
9954
msgstr "Useful commands::"
8489
9955
8490
9956
#: dummy/help_topics/working-trees/detail.txt:35
8491
9957
msgid ""
8496
9962
"branch\n"
8497
9963
" this will update the tree to match the branch.\n"
8498
9964
msgstr ""
9965
" checkout Create a working tree when a branch does not have one.\n"
9966
" remove-tree Removes the working tree from a branch when it is safe to do "
9967
"so.\n"
9968
" update When a working tree is out of sync with its associated "
9969
"branch\n"
9970
" this will update the tree to match the branch.\n"
8499
9971
8500
9972
#: dummy/help_topics/working-trees/summary.txt:1
8501
9973
msgid "Information on working trees"
8502
msgstr ""
9974
msgstr "Information on working trees"
8503
9975
8504
9976
#: en/help_topics/authentication.txt:1
8505
9977
msgid ""
8506
9978
"Authentication Settings\n"
8507
9979
"======================="
8508
9980
msgstr ""
9981
"Authentication Settings\n"
9982
"======================="
8509
9983
8510
9984
#: en/help_topics/authentication.txt:4
8511
9985
msgid ""
8513
9987
"Intent\n"
8514
9988
"------"
8515
9989
msgstr ""
9990
"\n"
9991
"Intent\n"
9992
"------"
8516
9993
8517
9994
#: en/help_topics/authentication.txt:8
8518
9995
msgid ""
8522
9999
"password\n"
8523
10000
"for every branch he uses."
8524
10001
msgstr ""
10002
"Many different authentication policies can be described in the\n"
10003
"``authentication.conf`` file but a particular user should need only a few\n"
10004
"definitions to cover his needs without having to specify a user and a "
10005
"password\n"
10006
"for every branch he uses."
8525
10007
8526
10008
#: en/help_topics/authentication.txt:13
8527
10009
msgid ""
8534
10016
"different\n"
8535
10017
"servers."
8536
10018
msgstr ""
10019
"The definitions found in this file are used to find the credentials to use "
10020
"for\n"
10021
"a given url. The same credentials can generally be used for as many branches "
10022
"as\n"
10023
"possible by grouping their declaration around the remote servers that need\n"
10024
"them. It's even possible to declare credentials that will be used by "
10025
"different\n"
10026
"servers."
8537
10027
8538
10028
#: en/help_topics/authentication.txt:19
8539
10029
msgid ""
8540
10030
"The intent is to make this file as small as possible to minimize maintenance."
8541
10031
msgstr ""
10032
"The intent is to make this file as small as possible to minimise maintenance."
8542
10033
8543
10034
#: en/help_topics/authentication.txt:21
8544
10035
msgid ""
8548
10039
"sharing\n"
8549
10040
"of your urls with others)."
8550
10041
msgstr ""
10042
"Once the relevant credentials are declared in this file you may use branch "
10043
"urls\n"
10044
"without embedding passwords (security hazard) or even users (enabling "
10045
"sharing\n"
10046
"of your urls with others)."
8551
10047
8552
10048
#: en/help_topics/authentication.txt:25
8553
10049
msgid "Instead of using::"
8554
msgstr ""
10050
msgstr "Instead of using::"
8555
10051
8556
10052
#: en/help_topics/authentication.txt:27
8557
10053
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8558
msgstr ""
10054
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8559
10055
8560
10056
#: en/help_topics/authentication.txt:29
8561
10057
msgid "you simply use::"
8562
msgstr ""
10058
msgstr "you simply use::"
8563
10059
8564
10060
#: en/help_topics/authentication.txt:31
8565
10061
msgid " bzr branch ftp://host.com/path/to/my/branch"
8566
msgstr ""
10062
msgstr " bzr branch ftp://host.com/path/to/my/branch"
8567
10063
8568
10064
#: en/help_topics/authentication.txt:33
8569
10065
msgid ""
8570
10066
"provided you have created the following ``authentication.conf`` file::"
8571
10067
msgstr ""
10068
"provided you have created the following ``authentication.conf`` file::"
8572
10069
8573
10070
#: en/help_topics/authentication.txt:35
8574
10071
msgid ""
8579
10076
" password=secret\n"
8580
10077
" "
8581
10078
msgstr ""
10079
" [myprojects]\n"
10080
" scheme=ftp\n"
10081
" host=host.com\n"
10082
" user=joe\n"
10083
" password=secret\n"
10084
" "
8582
10085
8583
10086
#: en/help_topics/authentication.txt:42
8584
10087
msgid ""
8585
10088
"Authentication definitions\n"
8586
10089
"--------------------------"
8587
10090
msgstr ""
10091
"Authentication definitions\n"
10092
"--------------------------"
8588
10093
8589
10094
#: en/help_topics/authentication.txt:45
8590
10095
msgid ""
8592
10097
"by\n"
8593
10098
"bzr:"
8594
10099
msgstr ""
10100
"There are two kinds of authentication used by the various schemes supported "
10101
"by\n"
10102
"bzr:"
8595
10103
8596
10104
#: en/help_topics/authentication.txt:48
8597
10105
msgid "1. user and password"
8598
msgstr ""
10106
msgstr "1. user and password"
8599
10107
8600
10108
#: en/help_topics/authentication.txt:50
8601
10109
msgid ""
8605
10113
"provide\n"
8606
10114
"our own less secure method."
8607
10115
msgstr ""
10116
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
10117
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
10118
"ssh agents are a better, more secure solution. So we have chosen to not "
10119
"provide\n"
10120
"our own less secure method."
8608
10121
8609
10122
#: en/help_topics/authentication.txt:55
8610
10123
msgid "2. user, realm and password"
8611
msgstr ""
10124
msgstr "2. user, realm and password"
8612
10125
8613
10126
#: en/help_topics/authentication.txt:57
8614
10127
msgid ""
8623
10136
"prompts\n"
8624
10137
"you for a password."
8625
10138
msgstr ""
10139
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
10140
"against a host. But, by using ``.htaccess`` files, for example, it is "
10141
"possible\n"
10142
"to define several (``user, realm, password``) for a given ``host``. So what "
10143
"is\n"
10144
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
10145
"is\n"
10146
"not taken into account in the definitions, but will displayed if bzr "
10147
"prompts\n"
10148
"you for a password."
8626
10149
8627
10150
#: en/help_topics/authentication.txt:64
8628
10151
msgid ""
8629
10152
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8630
10153
"specifying the appropriate port."
8631
10154
msgstr ""
10155
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
10156
"specifying the appropriate port."
8632
10157
8633
10158
#: en/help_topics/authentication.txt:67
8634
10159
msgid ""
8638
10163
"``user``,\n"
8639
10164
"``password``)."
8640
10165
msgstr ""
10166
"To take all schemes into account, the password will be deduced from a set "
10167
"of\n"
10168
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
10169
"``user``,\n"
10170
"``password``)."
8641
10171
8642
10172
#: en/help_topics/authentication.txt:71
8643
10173
msgid ""
8648
10178
" should be used instead since this is the real scheme regarding\n"
8649
10179
" authentication,"
8650
10180
msgstr ""
10181
" * ``scheme``: can be empty (meaning the rest of the definition can be "
10182
"used\n"
10183
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
10184
"``ssh``\n"
10185
" should be used instead since this is the real scheme regarding\n"
10186
" authentication,"
8651
10187
8652
10188
#: en/help_topics/authentication.txt:76
8653
10189
msgid " * ``host``: can be empty (to act as a default for any host),"
8654
msgstr ""
10190
msgstr " * ``host``: can be empty (to act as a default for any host),"
8655
10191
8656
10192
#: en/help_topics/authentication.txt:78
8657
10193
msgid ""
8661
10197
"only\n"
8662
10198
" when the server uses a port different than the scheme standard port,"
8663
10199
msgstr ""
10200
" * ``port`` can be empty (useful when an host provides several servers for "
10201
"the\n"
10202
" same scheme), only numerical values are allowed, this should be used "
10203
"only\n"
10204
" when the server uses a port different than the scheme standard port,"
8664
10205
8665
10206
#: en/help_topics/authentication.txt:82
8666
10207
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8667
msgstr ""
10208
msgstr " * ``path``: can be empty (FTP or SFTP will never user it),"
8668
10209
8669
10210
#: en/help_topics/authentication.txt:84
8670
10211
msgid ""
8671
10212
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8672
10213
" ``getpass.get_user()``),"
8673
10214
msgstr ""
10215
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
10216
" ``getpass.get_user()``),"
8674
10217
8675
10218
#: en/help_topics/authentication.txt:87
8676
10219
msgid ""
8677
10220
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8678
10221
" password."
8679
10222
msgstr ""
10223
" * ``password``: can be empty if you prefer to always be prompted for your\n"
10224
" password."
8680
10225
8681
10226
#: en/help_topics/authentication.txt:90
8682
10227
msgid ""
8684
10229
"a\n"
8685
10230
"(``user`` [, ``password``]) based on the following rules :"
8686
10231
msgstr ""
10232
"Multiple definitions can be provided and, for a given URL, bzr will select "
10233
"a\n"
10234
"(``user`` [, ``password``]) based on the following rules :"
8687
10235
8688
10236
#: en/help_topics/authentication.txt:93
8689
10237
msgid " 1. the first match wins,"
8690
msgstr ""
10238
msgstr " 1. the first match wins,"
8691
10239
8692
10240
#: en/help_topics/authentication.txt:95
8693
10241
msgid " 2. empty fields match everything,"
8694
msgstr ""
10242
msgstr " 2. empty fields match everything,"
8695
10243
8696
10244
#: en/help_topics/authentication.txt:97
8697
10245
msgid ""
8698
10246
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8699
10247
msgstr ""
10248
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8700
10249
8701
10250
#: en/help_topics/authentication.txt:99
8702
10251
msgid ""
8705
10254
"``projectbzr.sf.net``\n"
8706
10255
" will not match ``bzr.sf.net``)."
8707
10256
msgstr ""
10257
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
10258
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
10259
"``projectbzr.sf.net``\n"
10260
" will not match ``bzr.sf.net``)."
8708
10261
8709
10262
#: en/help_topics/authentication.txt:103
8710
10263
msgid ""
8711
10264
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8712
10265
msgstr ""
10266
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8713
10267
8714
10268
#: en/help_topics/authentication.txt:105
8715
10269
msgid ""
8717
10271
"above,\n"
8718
10272
" empty paths will match any provided path)."
8719
10273
msgstr ""
10274
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
10275
"above,\n"
10276
" empty paths will match any provided path)."
8720
10277
8721
10278
#: en/help_topics/authentication.txt:110
8722
10279
msgid ""
8723
10280
"File format\n"
8724
10281
"-----------"
8725
10282
msgstr ""
10283
"File format\n"
10284
"-----------"
8726
10285
8727
10286
#: en/help_topics/authentication.txt:113
8728
10287
msgid ""
8729
10288
"The general rules for :doc:`configuration files <configuration-help>`\n"
8730
10289
"apply except for the variable policies."
8731
10290
msgstr ""
10291
"The general rules for :doc:`configuration files <configuration-help>`\n"
10292
"apply except for the variable policies."
8732
10293
8733
10294
#: en/help_topics/authentication.txt:116
8734
10295
msgid "Each section describes an authentication definition."
8735
msgstr ""
10296
msgstr "Each section describes an authentication definition."
8736
10297
8737
10298
#: en/help_topics/authentication.txt:118
8738
10299
msgid ""
8740
10301
"reserved\n"
8741
10302
"and should appear as the *last* section."
8742
10303
msgstr ""
10304
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
10305
"reserved\n"
10306
"and should appear as the *last* section."
8743
10307
8744
10308
#: en/help_topics/authentication.txt:121
8745
10309
msgid "Each section should define:"
8746
msgstr ""
10310
msgstr "Each section should define:"
8747
10311
8748
10312
#: en/help_topics/authentication.txt:123
8749
10313
msgid "* ``user``: the login to be used,"
8750
msgstr ""
10314
msgstr "* ``user``: the login to be used,"
8751
10315
8752
10316
#: en/help_topics/authentication.txt:125
8753
10317
msgid "Each section could define:"
8754
msgstr ""
10318
msgstr "Each section could define:"
8755
10319
8756
10320
#: en/help_topics/authentication.txt:127
8757
10321
msgid "* ``host``: the remote server,"
8758
msgstr ""
10322
msgstr "* ``host``: the remote server,"
8759
10323
8760
10324
#: en/help_topics/authentication.txt:129
8761
10325
msgid "* ``port``: the port the server is listening,"
8762
msgstr ""
10326
msgstr "* ``port``: the port the server is listening,"
8763
10327
8764
10328
#: en/help_topics/authentication.txt:131
8765
10329
msgid "* ``path``: the branch location,"
8766
msgstr ""
10330
msgstr "* ``path``: the branch location,"
8767
10331
8768
10332
#: en/help_topics/authentication.txt:133
8769
10333
msgid "* ``password``: the password."
8770
msgstr ""
10334
msgstr "* ``password``: the password."
8771
10335
8772
10336
#: en/help_topics/authentication.txt:135
8773
10337
msgid ""
8775
10339
"Examples\n"
8776
10340
"--------"
8777
10341
msgstr ""
10342
"\n"
10343
"Examples\n"
10344
"--------"
8778
10345
8779
10346
#: en/help_topics/authentication.txt:139
8780
10347
msgid ""
8782
10349
"Personal projects hosted outside\n"
8783
10350
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8784
10351
msgstr ""
10352
"\n"
10353
"Personal projects hosted outside\n"
10354
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8785
10355
8786
10356
#: en/help_topics/authentication.txt:143
8787
10357
msgid ""
8791
10361
"with\n"
8792
10362
"some exceptions::"
8793
10363
msgstr ""
10364
"All connections are done with the same ``user`` (the remote one for which "
10365
"the\n"
10366
"default bzr one is not appropriate) and the password is always prompted "
10367
"with\n"
10368
"some exceptions::"
8794
10369
8795
10370
#: en/help_topics/authentication.txt:147
8796
10371
msgid ""
8812
10387
"foobar\n"
8813
10388
" user=foobar"
8814
10389
msgstr ""
10390
" # Pet projects on hobby.net\n"
10391
" [hobby]\n"
10392
" host=r.hobby.net\n"
10393
" user=jim\n"
10394
" password=obvious1234\n"
10395
" \n"
10396
" # Home server\n"
10397
" [home]\n"
10398
" scheme=https\n"
10399
" host=home.net\n"
10400
" user=joe\n"
10401
" password=1essobV10us\n"
10402
" \n"
10403
" [DEFAULT]\n"
10404
" # Our local user is barbaz, on all remote sites we're known as "
10405
"foobar\n"
10406
" user=foobar"
8815
10407
8816
10408
#: en/help_topics/authentication.txt:164
8817
10409
msgid ""
8819
10411
"Source hosting provider\n"
8820
10412
"~~~~~~~~~~~~~~~~~~~~~~~"
8821
10413
msgstr ""
10414
"\n"
10415
"Source hosting provider\n"
10416
"~~~~~~~~~~~~~~~~~~~~~~~"
8822
10417
8823
10418
#: en/help_topics/authentication.txt:168
8824
10419
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8825
msgstr ""
10420
msgstr "In the shp.net (fictitious) domain, each project has its own site::"
8826
10421
8827
10422
#: en/help_topics/authentication.txt:170
8828
10423
msgid ""
8836
10431
" # consider using an ssh agent if you don't want to supply\n"
8837
10432
" # a password interactively. (pageant, ssh-agent, etc)"
8838
10433
msgstr ""
10434
" [shpnet domain]\n"
10435
" # we use sftp, but ssh is the scheme used for authentication\n"
10436
" scheme=ssh\n"
10437
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
10438
" host=.shp.net\n"
10439
" user=joe\n"
10440
" # bzr don't support supplying a password for sftp,\n"
10441
" # consider using an ssh agent if you don't want to supply\n"
10442
" # a password interactively. (pageant, ssh-agent, etc)"
8839
10443
8840
10444
#: en/help_topics/authentication.txt:180
8841
10445
msgid ""
8842
10446
"HTTPS, SFTP servers and their proxy\n"
8843
10447
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8844
10448
msgstr ""
10449
"HTTPS, SFTP servers and their proxy\n"
10450
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8845
10451
8846
10452
#: en/help_topics/authentication.txt:183
8847
10453
msgid ""
8849
10455
"behind a\n"
8850
10456
"proxy, and the two branches use different authentication policies::"
8851
10457
msgstr ""
10458
"At company.com, the server hosting release and integration branches is "
10459
"behind a\n"
10460
"proxy, and the two branches use different authentication policies::"
8852
10461
8853
10462
#: en/help_topics/authentication.txt:186
8854
10463
msgid ""
8859
10468
" user=user1\n"
8860
10469
" password=pass1"
8861
10470
msgstr ""
10471
" [reference code]\n"
10472
" scheme=https\n"
10473
" host=dev.company.com\n"
10474
" path=/dev\n"
10475
" user=user1\n"
10476
" password=pass1"
8862
10477
8863
10478
#: en/help_topics/authentication.txt:193
8864
10479
msgid ""
8877
10492
" user=proxyuser1\n"
8878
10493
" password=proxypass1"
8879
10494
msgstr ""
10495
" # development branches on dev server\n"
10496
" [dev]\n"
10497
" scheme=ssh # bzr+ssh and sftp are available here\n"
10498
" host=dev.company.com\n"
10499
" path=/dev/integration\n"
10500
" user=user2\n"
10501
" \n"
10502
" # proxy\n"
10503
" [proxy]\n"
10504
" scheme=http\n"
10505
" host=proxy.company.com\n"
10506
" port=3128\n"
10507
" user=proxyuser1\n"
10508
" password=proxypass1"
8880
10509
8881
10510
#: en/help_topics/authentication.txt:208
8882
10511
msgid ""
8884
10513
"Planned enhancements\n"
8885
10514
"--------------------"
8886
10515
msgstr ""
10516
"\n"
10517
"Planned enhancements\n"
10518
"--------------------"
8887
10519
8888
10520
#: en/help_topics/authentication.txt:212
8889
10521
msgid ""
8890
10522
"The following are not yet implemented but planned as parts of a work in\n"
8891
10523
"progress:"
8892
10524
msgstr ""
10525
"The following are not yet implemented but planned as parts of a work in\n"
10526
"progress:"
8893
10527
8894
10528
#: en/help_topics/authentication.txt:215
8895
10529
msgid "* add a ``password_encoding`` field allowing:"
8896
msgstr ""
10530
msgstr "* add a ``password_encoding`` field allowing:"
8897
10531
8898
10532
#: en/help_topics/authentication.txt:217
8899
10533
msgid ""
8900
10534
" - storing the passwords in various obfuscating encodings (base64 for one),"
8901
10535
msgstr ""
10536
" - storing the passwords in various obfuscating encodings (base64 for one),"
8902
10537
8903
10538
#: en/help_topics/authentication.txt:219
8904
10539
msgid " - delegate password storage to plugins (.netrc for example)."
8905
msgstr ""
10540
msgstr " - delegate password storage to plugins (.netrc for example)."
8906
10541
8907
10542
#: en/help_topics/authentication.txt:221
8908
10543
msgid ""
8909
10544
"* update the credentials when the user is prompted for user or password,"
8910
10545
msgstr ""
10546
"* update the credentials when the user is prompted for user or password,"
8911
10547
8912
10548
#: en/help_topics/authentication.txt:223
8913
10549
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8914
msgstr ""
10550
msgstr "* add a ``verify_certificates`` field for ``HTTPS``."
8915
10551
8916
10552
#: en/help_topics/authentication.txt:225
8917
10553
msgid ""
8919
10555
"but\n"
8920
10556
"ignored in the actual implementation.\n"
8921
10557
msgstr ""
10558
"The ``password_encoding`` and ``verify_certificates`` fields are recognised "
10559
"but\n"
10560
"ignored in the actual implementation.\n"
8922
10561
8923
10562
#: en/help_topics/bugs.txt:1
8924
10563
msgid "Bug Tracker Settings"
8925
msgstr ""
10564
msgstr "Bug Tracker Settings"
8926
10565
8927
10566
#: en/help_topics/bugs.txt:3
8928
10567
msgid ""
8931
10570
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8932
10571
"(The only ``status`` value currently supported is ``fixed.``)"
8933
10572
msgstr ""
10573
"When making a commit, metadata about bugs fixed by that change can be\n"
10574
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
10575
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
10576
"(The only ``status`` value currently supported is ``fixed.``)"
8934
10577
8935
10578
#: en/help_topics/bugs.txt:8
8936
10579
msgid ""
8938
10581
"identifier\n"
8939
10582
"rather than a full URL. This looks like::"
8940
10583
msgstr ""
10584
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
10585
"identifier\n"
10586
"rather than a full URL. This looks like::"
8941
10587
8942
10588
#: en/help_topics/bugs.txt:11
8943
10589
msgid " bzr commit --fixes <tracker>:<id>"
8944
msgstr ""
10590
msgstr " bzr commit --fixes <tracker>:<id>"
8945
10591
8946
10592
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8947
10593
msgid "or::"
8948
msgstr ""
10594
msgstr "or::"
8949
10595
8950
10596
#: en/help_topics/bugs.txt:15
8951
10597
msgid " bzr commit --fixes <id>"
8952
msgstr ""
10598
msgstr " bzr commit --fixes <id>"
8953
10599
8954
10600
#: en/help_topics/bugs.txt:17
8955
10601
msgid ""
8959
10605
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8960
10606
"or global configuration is used."
8961
10607
msgstr ""
10608
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
10609
"the\n"
10610
"identifier for that bug within the bugtracker, usually the bug number.\n"
10611
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
10612
"or global configuration is used."
8962
10613
8963
10614
#: en/help_topics/bugs.txt:22
8964
10615
msgid ""
8967
10618
"use this feature, you just need to know the tracker identifier to use.\n"
8968
10619
"These are the bugtrackers that are built in:"
8969
10620
msgstr ""
10621
"Bazaar knows about a few bug trackers that have many users. If\n"
10622
"you use one of these bug trackers then there is no setup required to\n"
10623
"use this feature, you just need to know the tracker identifier to use.\n"
10624
"These are the bugtrackers that are built in:"
8970
10625
8971
10626
#: en/help_topics/bugs.txt:27
8972
10627
msgid ""
8978
10633
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8979
10634
" ============================ ============ ============"
8980
10635
msgstr ""
10636
" ============================ ============ ============\n"
10637
" URL Abbreviation Example\n"
10638
" ============================ ============ ============\n"
10639
" https://bugs.launchpad.net/ lp lp:12345\n"
10640
" http://bugs.debian.org/ deb deb:12345\n"
10641
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
10642
" ============================ ============ ============"
8981
10643
8982
10644
#: en/help_topics/bugs.txt:35
8983
10645
msgid ""
8988
10650
"of the schemes described below then you can write a plugin to support\n"
8989
10651
"it."
8990
10652
msgstr ""
10653
"For the bug trackers not listed above configuration is required.\n"
10654
"Support for generating the URLs for any project using Bugzilla or Trac\n"
10655
"is built in, along with a template mechanism for other bugtrackers with\n"
10656
"simple URL schemes. If your bug tracker can't be described by one\n"
10657
"of the schemes described below then you can write a plugin to support\n"
10658
"it."
8991
10659
8992
10660
#: en/help_topics/bugs.txt:42
8993
10661
msgid ""
8997
10665
"configuration section in ``locations.conf``. You can set up these values\n"
8998
10666
"for each of the projects you work on."
8999
10667
msgstr ""
10668
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
10669
"variable which contains the base URL of the bug tracker. These options\n"
10670
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
10671
"configuration section in ``locations.conf``. You can set up these values\n"
10672
"for each of the projects you work on."
9000
10673
9001
10674
#: en/help_topics/bugs.txt:48
9002
10675
msgid ""
9003
10676
"Note: As you provide a short name for each tracker, you can specify one or\n"
9004
10677
"more bugs in one or more trackers at commit time if you wish."
9005
10678
msgstr ""
10679
"Note: As you provide a short name for each tracker, you can specify one or\n"
10680
"more bugs in one or more trackers at commit time if you wish."
9006
10681
9007
10682
#: en/help_topics/bugs.txt:51
9008
10683
msgid ""
9009
10684
"Launchpad\n"
9010
10685
"---------"
9011
10686
msgstr ""
10687
"Launchpad\n"
10688
"---------"
9012
10689
9013
10690
#: en/help_topics/bugs.txt:54
9014
10691
msgid ""
9015
10692
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9016
10693
msgstr ""
10694
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9017
10695
9018
10696
#: en/help_topics/bugs.txt:56
9019
10697
msgid ""
9020
10698
"bugzilla_<tracker>_url\n"
9021
10699
"----------------------"
9022
10700
msgstr ""
10701
"bugzilla_<tracker>_url\n"
10702
"----------------------"
9023
10703
9024
10704
#: en/help_topics/bugs.txt:59
9025
10705
msgid ""
9028
10708
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9029
10709
"example::"
9030
10710
msgstr ""
10711
"If present, the location of the Bugzilla bug tracker referred to by\n"
10712
"<tracker>. This option can then be used together with ``bzr commit\n"
10713
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10714
"example::"
9031
10715
9032
10716
#: en/help_topics/bugs.txt:64
9033
10717
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9034
msgstr ""
10718
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9035
10719
9036
10720
#: en/help_topics/bugs.txt:66
9037
10721
msgid ""
9038
10722
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9039
10723
"fixed."
9040
10724
msgstr ""
10725
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
10726
"fixed."
9041
10727
9042
10728
#: en/help_topics/bugs.txt:69
9043
10729
msgid ""
9044
10730
"trac_<tracker>_url\n"
9045
10731
"------------------"
9046
10732
msgstr ""
10733
"trac_<tracker>_url\n"
10734
"------------------"
9047
10735
9048
10736
#: en/help_topics/bugs.txt:72
9049
10737
msgid ""
9052
10740
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9053
10741
"example::"
9054
10742
msgstr ""
10743
"If present, the location of the Trac instance referred to by\n"
10744
"<tracker>. This option can then be used together with ``bzr commit\n"
10745
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10746
"example::"
9055
10747
9056
10748
#: en/help_topics/bugs.txt:77
9057
10749
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9058
msgstr ""
10750
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9059
10751
9060
10752
#: en/help_topics/bugs.txt:79
9061
10753
msgid ""
9063
10755
"as\n"
9064
10756
"fixed."
9065
10757
msgstr ""
10758
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
10759
"as\n"
10760
"fixed."
9066
10761
9067
10762
#: en/help_topics/bugs.txt:82
9068
10763
msgid ""
9069
10764
"bugtracker_<tracker>_url\n"
9070
10765
"------------------------"
9071
10766
msgstr ""
10767
"bugtracker_<tracker>_url\n"
10768
"------------------------"
9072
10769
9073
10770
#: en/help_topics/bugs.txt:85
9074
10771
msgid ""
9078
10775
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9079
10776
"fixed by that commit. For example::"
9080
10777
msgstr ""
10778
"If present, the location of a generic bug tracker instance referred to by\n"
10779
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
10780
"which will be replaced by a specific bug ID. This option can then be used\n"
10781
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
10782
"fixed by that commit. For example::"
9081
10783
9082
10784
#: en/help_topics/bugs.txt:91
9083
10785
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9084
msgstr ""
10786
msgstr " bugtracker_python_url = http://bugs.python.org/issue{id}"
9085
10787
9086
10788
#: en/help_topics/bugs.txt:93
9087
10789
msgid ""
9088
10790
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9089
10791
"Roundup bug tracker as fixed, or::"
9090
10792
msgstr ""
10793
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
10794
"Roundup bug tracker as fixed, or::"
9091
10795
9092
10796
#: en/help_topics/bugs.txt:96
9093
10797
msgid ""
9094
10798
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9095
10799
msgstr ""
10800
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9096
10801
9097
10802
#: en/help_topics/bugs.txt:98
9098
10803
msgid ""
9099
10804
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9100
10805
"RT bug tracker as fixed, or::"
9101
10806
msgstr ""
10807
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
10808
"RT bug tracker as fixed, or::"
9102
10809
9103
10810
#: en/help_topics/bugs.txt:101
9104
10811
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9105
msgstr ""
10812
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9106
10813
9107
10814
#: en/help_topics/bugs.txt:103
9108
10815
msgid ""
9110
10817
"1234\n"
9111
10818
"in Hudson's JIRA bug tracker as fixed.\n"
9112
10819
msgstr ""
10820
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
10821
"1234\n"
10822
"in Hudson's JIRA bug tracker as fixed.\n"
9113
10823
9114
10824
#: en/help_topics/commands.txt:1
9115
10825
msgid ""
9204
10914
"view Manage filtered views.\n"
9205
10915
"whoami Show or set bzr user id.\n"
9206
10916
msgstr ""
10917
"add Add specified files or directories.\n"
10918
"alias Set/unset and display aliases.\n"
10919
"annotate Show the origin of each line in a file.\n"
10920
"bash-completion Generate a shell function for bash command line "
10921
"completion.\n"
10922
" [bash_completion]\n"
10923
"bind Convert the current branch into a checkout of the "
10924
"supplied\n"
10925
" branch.\n"
10926
"branch Create a new branch that is a copy of an existing branch.\n"
10927
"branches List the branches available at the current location.\n"
10928
"break-lock Break a dead lock.\n"
10929
"cat Write the contents of a file as of a given revision to\n"
10930
" standard output.\n"
10931
"check Validate working tree structure, branch consistency and\n"
10932
" repository history.\n"
10933
"checkout Create a new checkout of an existing branch.\n"
10934
"clean-tree Remove unwanted files from working tree.\n"
10935
"commit Commit changes into a new revision.\n"
10936
"config Display, set or remove a configuration option.\n"
10937
"conflicts List files with conflicts.\n"
10938
"deleted List files deleted in the working tree.\n"
10939
"diff Show differences in the working tree, between revisions "
10940
"or\n"
10941
" branches.\n"
10942
"dpush Push into a different VCS without any custom bzr "
10943
"metadata.\n"
10944
"export Export current or past revision to a destination directory "
10945
"or\n"
10946
" archive.\n"
10947
"help Show help on a command or other topic.\n"
10948
"ignore Ignore specified files or patterns.\n"
10949
"ignored List ignored files and the patterns that matched them.\n"
10950
"info Show information about a working tree, branch or "
10951
"repository.\n"
10952
"init Make a directory into a versioned branch.\n"
10953
"init-repository Create a shared repository for branches to share storage\n"
10954
" space.\n"
10955
"join Combine a tree into its containing tree.\n"
10956
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
10957
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
10958
"launchpad-open Open a Launchpad branch page in your web browser. "
10959
"[launchpad]\n"
10960
"log Show historical log for a branch or subset of a branch.\n"
10961
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
10962
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
10963
"ls List files in a tree.\n"
10964
"merge Perform a three-way merge.\n"
10965
"missing Show unmerged/unpulled revisions between two branches.\n"
10966
"mkdir Create a new versioned directory.\n"
10967
"mv Move or rename a file.\n"
10968
"nick Print or set the branch nickname.\n"
10969
"pack Compress the data within a repository.\n"
10970
"plugins List the installed plugins.\n"
10971
"pull Turn this branch into a mirror of another branch.\n"
10972
"push Update a mirror of this branch.\n"
10973
"reconcile Reconcile bzr metadata in a branch.\n"
10974
"reconfigure Reconfigure the type of a bzr directory.\n"
10975
"register-branch Register a branch with launchpad.net. [launchpad]\n"
10976
"remerge Redo a merge.\n"
10977
"remove Remove files or directories.\n"
10978
"remove-branch Remove a branch.\n"
10979
"remove-tree Remove the working tree from a given branch/checkout.\n"
10980
"renames Show list of renamed files.\n"
10981
"resolve Mark a conflict as resolved.\n"
10982
"revert Set files in the working tree back to the contents of a\n"
10983
" previous revision.\n"
10984
"revno Show current revision number.\n"
10985
"root Show the tree root directory.\n"
10986
"send Mail or create a merge-directive for submitting changes.\n"
10987
"serve Run the bzr server.\n"
10988
"shelve Temporarily set aside some changes from the current tree.\n"
10989
"sign-my-commits Sign all commits by a given committer.\n"
10990
"split Split a subdirectory of a tree into a separate tree.\n"
10991
"status Display status summary.\n"
10992
"switch Set the branch of a checkout and update.\n"
10993
"tag Create, remove or modify a tag naming a revision.\n"
10994
"tags List tags.\n"
10995
"testament Show testament (signing-form) of a revision.\n"
10996
"unbind Convert the current checkout into a regular branch.\n"
10997
"uncommit Remove the last committed revision.\n"
10998
"unshelve Restore shelved changes.\n"
10999
"update Update a working tree to a new revision.\n"
11000
"upgrade Upgrade a repository, branch or working tree to a newer\n"
11001
" format.\n"
11002
"verify-signatures Verify all commit signatures.\n"
11003
"version Show version of bzr.\n"
11004
"version-info Show version information about this tree.\n"
11005
"view Manage filtered views.\n"
11006
"whoami Show or set bzr user id.\n"
9207
11007
9208
11008
#: en/help_topics/configuration.txt:1
9209
11009
msgid ""
9210
11010
"Configuration Settings\n"
9211
11011
"======================="
9212
11012
msgstr ""
11013
"Configuration Settings\n"
11014
"======================="
9213
11015
9214
11016
#: en/help_topics/configuration.txt:4
9215
11017
msgid ""
9216
11018
"Environment settings\n"
9217
11019
"---------------------"
9218
11020
msgstr ""
11021
"Environment settings\n"
11022
"---------------------"
9219
11023
9220
11024
#: en/help_topics/configuration.txt:7
9221
11025
msgid ""
9222
11026
"While most configuration is handled by configuration files, some options\n"
9223
11027
"which may be semi-permanent can also be controlled through the environment."
9224
11028
msgstr ""
11029
"While most configuration is handled by configuration files, some options\n"
11030
"which may be semi-permanent can also be controlled through the environment."
9225
11031
9226
11032
#: en/help_topics/configuration.txt:10
9227
11033
msgid ""
9228
11034
"BZR_EMAIL\n"
9229
11035
"~~~~~~~~~"
9230
11036
msgstr ""
11037
"BZR_EMAIL\n"
11038
"~~~~~~~~~"
9231
11039
9232
11040
#: en/help_topics/configuration.txt:13
9233
11041
msgid "Override the email id used by Bazaar. Typical format::"
9234
msgstr ""
11042
msgstr "Override the email id used by Bazaar. Typical format::"
9235
11043
9236
11044
#: en/help_topics/configuration.txt:15
9237
11045
msgid " \"John Doe <jdoe@example.com>\""
9238
msgstr ""
11046
msgstr " \"John Doe <jdoe@example.com>\""
9239
11047
9240
11048
#: en/help_topics/configuration.txt:17
9241
11049
msgid "See also the ``email`` configuration option."
9242
msgstr ""
11050
msgstr "See also the ``email`` configuration option."
9243
11051
9244
11052
#: en/help_topics/configuration.txt:19
9245
11053
msgid ""
9246
11054
"BZR_PROGRESS_BAR\n"
9247
11055
"~~~~~~~~~~~~~~~~"
9248
11056
msgstr ""
11057
"BZR_PROGRESS_BAR\n"
11058
"~~~~~~~~~~~~~~~~"
9249
11059
9250
11060
#: en/help_topics/configuration.txt:22
9251
11061
msgid ""
9255
11065
"draws\n"
9256
11066
"the ordinary command line progress bar."
9257
11067
msgstr ""
11068
"Override the progress display. Possible values are \"none\" or \"text\". "
11069
"If\n"
11070
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
11071
"draws\n"
11072
"the ordinary command line progress bar."
9258
11073
9259
11074
#: en/help_topics/configuration.txt:26
9260
11075
msgid ""
9261
11076
"BZR_SIGQUIT_PDB\n"
9262
11077
"~~~~~~~~~~~~~~~"
9263
11078
msgstr ""
11079
"BZR_SIGQUIT_PDB\n"
11080
"~~~~~~~~~~~~~~~"
9264
11081
9265
11082
#: en/help_topics/configuration.txt:29
9266
11083
msgid ""
9267
11084
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9268
11085
msgstr ""
11086
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9269
11087
9270
11088
#: en/help_topics/configuration.txt:31
9271
11089
msgid ""
9272
11090
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9273
11091
"* 1 = Invoke breakin debugger (default)"
9274
11092
msgstr ""
11093
"* 0 = Standard SIGQUIT behaviour (normally, exit with a core dump)\n"
11094
"* 1 = Invoke breakin debugger (default)"
9275
11095
9276
11096
#: en/help_topics/configuration.txt:34
9277
11097
msgid ""
9278
11098
"BZR_HOME\n"
9279
11099
"~~~~~~~~"
9280
11100
msgstr ""
11101
"BZR_HOME\n"
11102
"~~~~~~~~"
9281
11103
9282
11104
#: en/help_topics/configuration.txt:37
9283
11105
msgid "Override the home directory used by Bazaar."
9284
msgstr ""
11106
msgstr "Override the home directory used by Bazaar."
9285
11107
9286
11108
#: en/help_topics/configuration.txt:39
9287
11109
msgid ""
9288
11110
"BZR_SSH\n"
9289
11111
"~~~~~~~"
9290
11112
msgstr ""
11113
"BZR_SSH\n"
11114
"~~~~~~~"
9291
11115
9292
11116
#: en/help_topics/configuration.txt:42
9293
11117
msgid "Select a different SSH implementation."
9294
msgstr ""
11118
msgstr "Select a different SSH implementation."
9295
11119
9296
11120
#: en/help_topics/configuration.txt:44
9297
11121
msgid ""
9298
11122
"BZR_PDB\n"
9299
11123
"~~~~~~~"
9300
11124
msgstr ""
11125
"BZR_PDB\n"
11126
"~~~~~~~"
9301
11127
9302
11128
#: en/help_topics/configuration.txt:47
9303
11129
msgid "Control whether to launch a debugger on error."
9304
msgstr ""
11130
msgstr "Control whether to launch a debugger on error."
9305
11131
9306
11132
#: en/help_topics/configuration.txt:49
9307
11133
msgid ""
9308
11134
"* 0 = Standard behavior\n"
9309
11135
"* 1 = Launch debugger"
9310
11136
msgstr ""
11137
"* 0 = Standard behaviour\n"
11138
"* 1 = Launch debugger"
9311
11139
9312
11140
#: en/help_topics/configuration.txt:52
9313
11141
msgid ""
9314
11142
"BZR_REMOTE_PATH\n"
9315
11143
"~~~~~~~~~~~~~~~"
9316
11144
msgstr ""
11145
"BZR_REMOTE_PATH\n"
11146
"~~~~~~~~~~~~~~~"
9317
11147
9318
11148
#: en/help_topics/configuration.txt:55
9319
11149
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9320
11150
msgstr ""
11151
"Path to the Bazaar executable to use when using the bzr+ssh protocol."
9321
11152
9322
11153
#: en/help_topics/configuration.txt:57
9323
11154
msgid "See also the ``bzr_remote_path`` configuration option."
9324
msgstr ""
11155
msgstr "See also the ``bzr_remote_path`` configuration option."
9325
11156
9326
11157
#: en/help_topics/configuration.txt:59
9327
11158
msgid ""
9328
11159
"BZR_EDITOR\n"
9329
11160
"~~~~~~~~~~"
9330
11161
msgstr ""
11162
"BZR_EDITOR\n"
11163
"~~~~~~~~~~"
9331
11164
9332
11165
#: en/help_topics/configuration.txt:62
9333
11166
msgid "Path to the editor Bazaar should use for commit messages, etc."
9334
msgstr ""
11167
msgstr "Path to the editor Bazaar should use for commit messages, etc."
9335
11168
9336
11169
#: en/help_topics/configuration.txt:64
9337
11170
msgid ""
9338
11171
"BZR_LOG\n"
9339
11172
"~~~~~~~"
9340
11173
msgstr ""
11174
"BZR_LOG\n"
11175
"~~~~~~~"
9341
11176
9342
11177
#: en/help_topics/configuration.txt:67
9343
11178
msgid ""
9344
11179
"Location of the Bazaar log file. You can check the current location by\n"
9345
11180
"running ``bzr version``."
9346
11181
msgstr ""
11182
"Location of the Bazaar log file. You can check the current location by\n"
11183
"running ``bzr version``."
9347
11184
9348
11185
#: en/help_topics/configuration.txt:70
9349
11186
msgid ""
9350
11187
"The log file contains debug information that is useful for diagnosing or\n"
9351
11188
"reporting problems with Bazaar."
9352
11189
msgstr ""
11190
"The log file contains debug information that is useful for diagnosing or\n"
11191
"reporting problems with Bazaar."
9353
11192
9354
11193
#: en/help_topics/configuration.txt:73
9355
11194
msgid ""
9356
11195
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9357
11196
"will disable logging."
9358
11197
msgstr ""
11198
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
11199
"will disable logging."
9359
11200
9360
11201
#: en/help_topics/configuration.txt:76
9361
11202
msgid ""
9363
11204
"BZR_PLUGIN_PATH\n"
9364
11205
"~~~~~~~~~~~~~~~"
9365
11206
msgstr ""
11207
"\n"
11208
"BZR_PLUGIN_PATH\n"
11209
"~~~~~~~~~~~~~~~"
9366
11210
9367
11211
#: en/help_topics/configuration.txt:80
9368
11212
msgid ""
9369
11213
"The path to the plugins directory that Bazaar should use.\n"
9370
11214
"If not set, Bazaar will search for plugins in:"
9371
11215
msgstr ""
11216
"The path to the plugins directory that Bazaar should use.\n"
11217
"If not set, Bazaar will search for plugins in:"
9372
11218
9373
11219
#: en/help_topics/configuration.txt:83
9374
11220
msgid ""
9375
11221
"* the user specific plugin directory (containing the ``user`` plugins),"
9376
11222
msgstr ""
11223
"* the user specific plugin directory (containing the ``user`` plugins),"
9377
11224
9378
11225
#: en/help_topics/configuration.txt:85
9379
11226
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9380
msgstr ""
11227
msgstr "* the bzrlib directory (containing the ``core`` plugins),"
9381
11228
9382
11229
#: en/help_topics/configuration.txt:87
9383
11230
msgid ""
9384
11231
"* the site specific plugin directory if applicable (containing\n"
9385
11232
" the ``site`` plugins)."
9386
11233
msgstr ""
11234
"* the site specific plugin directory if applicable (containing\n"
11235
" the ``site`` plugins)."
9387
11236
9388
11237
#: en/help_topics/configuration.txt:90
9389
11238
msgid ""
9390
11239
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9391
11240
"the way the plugin are searched. "
9392
11241
msgstr ""
11242
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
11243
"the way the plugin are searched. "
9393
11244
9394
11245
#: en/help_topics/configuration.txt:93
9395
11246
msgid ""
9398
11249
"platform specific appropriate character (':' on Unix,\n"
9399
11250
"';' on windows)"
9400
11251
msgstr ""
11252
"As for the ``PATH`` variables, if multiple directories are\n"
11253
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
11254
"platform specific appropriate character (':' on Unix,\n"
11255
"';' on windows)"
9401
11256
9402
11257
#: en/help_topics/configuration.txt:98
9403
11258
msgid ""
9405
11260
"in ``user``. However it will continue to search in ``core`` and\n"
9406
11261
"``site`` unless they are explicitly removed."
9407
11262
msgstr ""
11263
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
11264
"in ``user``. However it will continue to search in ``core`` and\n"
11265
"``site`` unless they are explicitly removed."
9408
11266
9409
11267
#: en/help_topics/configuration.txt:102
9410
11268
msgid ""
9411
11269
"If you need to change the order or remove one of these\n"
9412
11270
"directories, you should use special values:"
9413
11271
msgstr ""
11272
"If you need to change the order or remove one of these\n"
11273
"directories, you should use special values:"
9414
11274
9415
11275
#: en/help_topics/configuration.txt:105
9416
11276
msgid ""
9417
11277
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9418
11278
" path from the default values,"
9419
11279
msgstr ""
11280
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
11281
" path from the default values,"
9420
11282
9421
11283
#: en/help_topics/configuration.txt:108
9422
11284
msgid ""
9424
11286
" before the remaining default values (and also remove it from\n"
9425
11287
" the default values)."
9426
11288
msgstr ""
11289
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
11290
" before the remaining default values (and also remove it from\n"
11291
" the default values)."
9427
11292
9428
11293
#: en/help_topics/configuration.txt:112
9429
11294
msgid ""
9431
11296
"used literally, they will be substituted by the corresponding,\n"
9432
11297
"platform specific, values."
9433
11298
msgstr ""
11299
"Note that the special values 'user', 'core' and 'site' should be\n"
11300
"used literally, they will be substituted by the corresponding,\n"
11301
"platform specific, values."
9434
11302
9435
11303
#: en/help_topics/configuration.txt:116
9436
11304
msgid ""
9437
11305
"The examples below use ':' as the separator, windows users\n"
9438
11306
"should use ';'."
9439
11307
msgstr ""
11308
"The examples below use ':' as the separator, windows users\n"
11309
"should use ';'."
9440
11310
9441
11311
#: en/help_topics/configuration.txt:119
9442
11312
msgid "Overriding the default user plugin directory::"
9443
msgstr ""
11313
msgstr "Overriding the default user plugin directory::"
9444
11314
9445
11315
#: en/help_topics/configuration.txt:121
9446
11316
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9447
msgstr ""
11317
msgstr " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9448
11318
9449
11319
#: en/help_topics/configuration.txt:123
9450
11320
msgid "Disabling the site directory while retaining the user directory::"
9451
msgstr ""
11321
msgstr "Disabling the site directory while retaining the user directory::"
9452
11322
9453
11323
#: en/help_topics/configuration.txt:125
9454
11324
msgid " BZR_PLUGIN_PATH='-site:+user'"
9455
msgstr ""
11325
msgstr " BZR_PLUGIN_PATH='-site:+user'"
9456
11326
9457
11327
#: en/help_topics/configuration.txt:127
9458
11328
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9459
msgstr ""
11329
msgstr "Disabling all plugins (better achieved with --no-plugins)::"
9460
11330
9461
11331
#: en/help_topics/configuration.txt:129
9462
11332
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9463
msgstr ""
11333
msgstr " BZR_PLUGIN_PATH='-user:-core:-site'"
9464
11334
9465
11335
#: en/help_topics/configuration.txt:131
9466
11336
msgid "Overriding the default site plugin directory::"
9467
msgstr ""
11337
msgstr "Overriding the default site plugin directory::"
9468
11338
9469
11339
#: en/help_topics/configuration.txt:133
9470
11340
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9471
msgstr ""
11341
msgstr " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9472
11342
9473
11343
#: en/help_topics/configuration.txt:135
9474
11344
msgid ""
9475
11345
"BZR_DISABLE_PLUGINS\n"
9476
11346
"~~~~~~~~~~~~~~~~~~~"
9477
11347
msgstr ""
11348
"BZR_DISABLE_PLUGINS\n"
11349
"~~~~~~~~~~~~~~~~~~~"
9478
11350
9479
11351
#: en/help_topics/configuration.txt:138
9480
11352
msgid ""
9483
11355
"uninstalling them completely. Such plugins can be specified in\n"
9484
11356
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9485
11357
msgstr ""
11358
"Under special circumstances (mostly when trying to diagnose a\n"
11359
"bug), it's better to disable a plugin (or several) rather than\n"
11360
"uninstalling them completely. Such plugins can be specified in\n"
11361
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9486
11362
9487
11363
#: en/help_topics/configuration.txt:143
9488
11364
msgid ""
9490
11366
"will raise an import error if they are explicitly imported (by\n"
9491
11367
"another plugin that depends on them for example)."
9492
11368
msgstr ""
11369
"In that case, ``bzr`` will stop loading the specified plugins and\n"
11370
"will raise an import error if they are explicitly imported (by\n"
11371
"another plugin that depends on them for example)."
9493
11372
9494
11373
#: en/help_topics/configuration.txt:147
9495
11374
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9496
msgstr ""
11375
msgstr "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9497
11376
9498
11377
#: en/help_topics/configuration.txt:149
9499
11378
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9500
msgstr ""
11379
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9501
11380
9502
11381
#: en/help_topics/configuration.txt:151
9503
11382
msgid ""
9504
11383
"BZR_PLUGINS_AT\n"
9505
11384
"~~~~~~~~~~~~~~"
9506
11385
msgstr ""
11386
"BZR_PLUGINS_AT\n"
11387
"~~~~~~~~~~~~~~"
9507
11388
9508
11389
#: en/help_topics/configuration.txt:154
9509
11390
msgid ""
9515
11396
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9516
11397
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9517
11398
msgstr ""
11399
"When adding a new feature or working on a bug in a plugin,\n"
11400
"developers often need to use a specific version of a given\n"
11401
"plugin. Since python requires that the directory containing the\n"
11402
"code is named like the plugin itself this make it impossible to\n"
11403
"use arbitrary directory names (using a two-level directory scheme\n"
11404
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
11405
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9518
11406
9519
11407
#: en/help_topics/configuration.txt:162
9520
11408
msgid ""
9521
11409
"Plugins specified in this environment variable takes precedence\n"
9522
11410
"over the ones in ``BZR_PLUGIN_PATH``."
9523
11411
msgstr ""
11412
"Plugins specified in this environment variable takes precedence\n"
11413
"over the ones in ``BZR_PLUGIN_PATH``."
9524
11414
9525
11415
#: en/help_topics/configuration.txt:165
9526
11416
msgid ""
9531
11421
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9532
11422
"separator, use ';' on windows."
9533
11423
msgstr ""
11424
"The variable specified a list of ``plugin_name@plugin path``,\n"
11425
"``plugin_name`` being the name of the plugin as it appears in\n"
11426
"python module paths, ``plugin_path`` being the path to the\n"
11427
"directory containing the plugin code itself\n"
11428
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
11429
"separator, use ';' on windows."
9534
11430
9535
11431
#: en/help_topics/configuration.txt:172
9536
11432
msgid ""
9537
11433
"Example:\n"
9538
11434
"~~~~~~~~"
9539
11435
msgstr ""
11436
"Example:\n"
11437
"~~~~~~~~"
9540
11438
9541
11439
#: en/help_topics/configuration.txt:175
9542
11440
msgid ""
9543
11441
"Using a specific version of ``myplugin``:\n"
9544
11442
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9545
11443
msgstr ""
11444
"Using a specific version of ``myplugin``:\n"
11445
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9546
11446
9547
11447
#: en/help_topics/configuration.txt:178
9548
11448
msgid ""
9549
11449
"BZRPATH\n"
9550
11450
"~~~~~~~"
9551
11451
msgstr ""
11452
"BZRPATH\n"
11453
"~~~~~~~"
9552
11454
9553
11455
#: en/help_topics/configuration.txt:181
9554
11456
msgid "The path where Bazaar should look for shell plugin external commands."
9555
11457
msgstr ""
11458
"The path where Bazaar should look for shell plugin external commands."
9556
11459
9557
11460
#: en/help_topics/configuration.txt:183
9558
11461
msgid ""
9560
11463
"http_proxy, https_proxy\n"
9561
11464
"~~~~~~~~~~~~~~~~~~~~~~~"
9562
11465
msgstr ""
11466
"\n"
11467
"http_proxy, https_proxy\n"
11468
"~~~~~~~~~~~~~~~~~~~~~~~"
9563
11469
9564
11470
#: en/help_topics/configuration.txt:187
9565
11471
msgid "Specifies the network proxy for outgoing connections, for example::"
9566
msgstr ""
11472
msgstr "Specifies the network proxy for outgoing connections, for example::"
9567
11473
9568
11474
#: en/help_topics/configuration.txt:189
9569
11475
msgid ""
9570
11476
" http_proxy=http://proxy.example.com:3128/ \n"
9571
11477
" https_proxy=http://proxy.example.com:3128/"
9572
11478
msgstr ""
11479
" http_proxy=http://proxy.example.com:3128/ \n"
11480
" https_proxy=http://proxy.example.com:3128/"
9573
11481
9574
11482
#: en/help_topics/configuration.txt:192
9575
11483
msgid ""
9577
11485
"Configuration files\n"
9578
11486
"-------------------"
9579
11487
msgstr ""
11488
"\n"
11489
"Configuration files\n"
11490
"-------------------"
9580
11491
9581
11492
#: en/help_topics/configuration.txt:196
9582
11493
msgid ""
9583
11494
"Location\n"
9584
11495
"~~~~~~~~"
9585
11496
msgstr ""
11497
"Location\n"
11498
"~~~~~~~~"
9586
11499
9587
11500
#: en/help_topics/configuration.txt:199
9588
11501
msgid ""
9592
11505
"Windows. (You can check the location for your system by using\n"
9593
11506
"``bzr version``.)"
9594
11507
msgstr ""
11508
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
11509
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
11510
"on\n"
11511
"Windows. (You can check the location for your system by using\n"
11512
"``bzr version``.)"
9595
11513
9596
11514
#: en/help_topics/configuration.txt:204
9597
11515
msgid "There are three primary configuration files in this location:"
9598
msgstr ""
11516
msgstr "There are three primary configuration files in this location:"
9599
11517
9600
11518
#: en/help_topics/configuration.txt:206
9601
11519
msgid "* ``bazaar.conf`` describes default configuration options,"
9602
msgstr ""
11520
msgstr "* ``bazaar.conf`` describes default configuration options,"
9603
11521
9604
11522
#: en/help_topics/configuration.txt:208
9605
11523
msgid ""
9606
11524
"* ``locations.conf`` describes configuration information for\n"
9607
11525
" specific branch locations,"
9608
11526
msgstr ""
11527
"* ``locations.conf`` describes configuration information for\n"
11528
" specific branch locations,"
9609
11529
9610
11530
#: en/help_topics/configuration.txt:211
9611
11531
msgid ""
9612
11532
"* ``authentication.conf`` describes credential information for\n"
9613
11533
" remote servers."
9614
11534
msgstr ""
11535
"* ``authentication.conf`` describes credential information for\n"
11536
" remote servers."
9615
11537
9616
11538
#: en/help_topics/configuration.txt:214
9617
11539
msgid ""
9624
11546
"you\n"
9625
11547
"can do so in ``locations.conf``."
9626
11548
msgstr ""
11549
"Each branch can also contain a configuration file that sets values specific\n"
11550
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
11551
"the\n"
11552
"branch. This file is visible to all users of a branch, if you wish to "
11553
"override\n"
11554
"one of the values for a branch with a setting that is specific to you then "
11555
"you\n"
11556
"can do so in ``locations.conf``."
9627
11557
9628
11558
#: en/help_topics/configuration.txt:220
9629
11559
msgid ""
9630
11560
"General format\n"
9631
11561
"~~~~~~~~~~~~~~"
9632
11562
msgstr ""
11563
"General format\n"
11564
"~~~~~~~~~~~~~~"
9633
11565
9634
11566
#: en/help_topics/configuration.txt:223
9635
11567
msgid ""
9636
11568
"An ini file has three types of contructs: section headers, section\n"
9637
11569
"options and comments."
9638
11570
msgstr ""
11571
"An ini file has three types of contructs: section headers, section\n"
11572
"options and comments."
9639
11573
9640
11574
#: en/help_topics/configuration.txt:226
9641
11575
msgid ""
9642
11576
"Comments\n"
9643
11577
"^^^^^^^^"
9644
11578
msgstr ""
11579
"Comments\n"
11580
"^^^^^^^^"
9645
11581
9646
11582
#: en/help_topics/configuration.txt:229
9647
11583
msgid ""
9649
11585
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9650
11586
"Bazaar when parsing ini files."
9651
11587
msgstr ""
11588
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
11589
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
11590
"Bazaar when parsing ini files."
9652
11591
9653
11592
#: en/help_topics/configuration.txt:233
9654
11593
msgid ""
9655
11594
"Section headers\n"
9656
11595
"^^^^^^^^^^^^^^^"
9657
11596
msgstr ""
11597
"Section headers\n"
11598
"^^^^^^^^^^^^^^^"
9658
11599
9659
11600
#: en/help_topics/configuration.txt:236
9660
11601
msgid ""
9661
11602
"A section header is a word enclosed in brackets that starts at the begining\n"
9662
11603
"of a line. A typical section header looks like this::"
9663
11604
msgstr ""
11605
"A section header is a word enclosed in brackets that starts at the "
11606
"beginning\n"
11607
"of a line. A typical section header looks like this::"
9664
11608
9665
11609
#: en/help_topics/configuration.txt:239
9666
11610
msgid " [DEFAULT]"
9667
msgstr ""
11611
msgstr " [DEFAULT]"
9668
11612
9669
11613
#: en/help_topics/configuration.txt:241
9670
11614
msgid ""
9673
11617
"for\n"
9674
11618
"setting options which can be overridden with the branch config file."
9675
11619
msgstr ""
11620
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
11621
"[ALIASES]. Section headers are case sensitive. The default section provides "
11622
"for\n"
11623
"setting options which can be overridden with the branch config file."
9676
11624
9677
11625
#: en/help_topics/configuration.txt:245
9678
11626
msgid ""
9681
11629
"potentially valid section headers. A section header uses the path for\n"
9682
11630
"the branch as the section header. Some examples include::"
9683
11631
msgstr ""
11632
"For ``locations.conf``, the options from the section with the\n"
11633
"longest matching section header are used to the exclusion of other\n"
11634
"potentially valid section headers. A section header uses the path for\n"
11635
"the branch as the section header. Some examples include::"
9684
11636
9685
11637
#: en/help_topics/configuration.txt:250
9686
11638
msgid ""
9687
11639
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9688
11640
" [/home/jdoe/branches/]"
9689
11641
msgstr ""
11642
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
11643
" [/home/jdoe/branches/]"
9690
11644
9691
11645
#: en/help_topics/configuration.txt:253
9692
11646
msgid ""
9694
11648
"Section options\n"
9695
11649
"^^^^^^^^^^^^^^^"
9696
11650
msgstr ""
11651
"\n"
11652
"Section options\n"
11653
"^^^^^^^^^^^^^^^"
9697
11654
9698
11655
#: en/help_topics/configuration.txt:257
9699
11656
msgid ""
9700
11657
"A section option resides within a section. A section option contains an\n"
9701
11658
"option name, an equals sign and a value. For example::"
9702
11659
msgstr ""
11660
"A section option resides within a section. A section option contains an\n"
11661
"option name, an equals sign and a value. For example::"
9703
11662
9704
11663
#: en/help_topics/configuration.txt:260
9705
11664
msgid ""
9706
11665
" email = John Doe <jdoe@isp.com>\n"
9707
11666
" gpg_signing_key = Amy Pond <amy@example.com>"
9708
11667
msgstr ""
11668
" email = John Doe <jdoe@isp.com>\n"
11669
" gpg_signing_key = Amy Pond <amy@example.com>"
9709
11670
9710
11671
#: en/help_topics/configuration.txt:263
9711
11672
msgid ""
9712
11673
"A option can reference other options by enclosing them in curly brackets::"
9713
11674
msgstr ""
11675
"A option can reference other options by enclosing them in curly brackets::"
9714
11676
9715
11677
#: en/help_topics/configuration.txt:265
9716
11678
msgid ""
9718
11680
" my_server = bzr+ssh://example.com\n"
9719
11681
" push_location = {my_server}/project/{my_branch_name}"
9720
11682
msgstr ""
11683
" my_branch_name = feature_x\n"
11684
" my_server = bzr+ssh://example.com\n"
11685
" push_location = {my_server}/project/{my_branch_name}"
9721
11686
9722
11687
#: en/help_topics/configuration.txt:269
9723
11688
msgid ""
9724
11689
"Option policies\n"
9725
11690
"^^^^^^^^^^^^^^^"
9726
11691
msgstr ""
11692
"Option policies\n"
11693
"^^^^^^^^^^^^^^^"
9727
11694
9728
11695
#: en/help_topics/configuration.txt:272
9729
11696
msgid ""
9732
11699
"option value is interpreted for contained locations. Currently\n"
9733
11700
"there are three policies available:"
9734
11701
msgstr ""
11702
"Options defined in a section affect the named directory or URL plus\n"
11703
"any locations they contain. Policies can be used to change how an\n"
11704
"option value is interpreted for contained locations. Currently\n"
11705
"there are three policies available:"
9735
11706
9736
11707
#: en/help_topics/configuration.txt:277
9737
11708
msgid ""
9745
11716
" for contained locations, any additional path components are\n"
9746
11717
" appended to the value."
9747
11718
msgstr ""
11719
" none:\n"
11720
" the value is interpreted the same for contained locations. This is\n"
11721
" the default behaviour.\n"
11722
" norecurse:\n"
11723
" the value is only used for the exact location specified by the\n"
11724
" section name.\n"
11725
" appendpath:\n"
11726
" for contained locations, any additional path components are\n"
11727
" appended to the value."
9748
11728
9749
11729
#: en/help_topics/configuration.txt:287
9750
11730
msgid ""
9753
11733
"For example, to define the push location for a tree of branches, the\n"
9754
11734
"following could be used::"
9755
11735
msgstr ""
11736
"Policies are specified by keys with names of the form "
11737
"\"<option_name>:policy\".\n"
11738
"For example, to define the push location for a tree of branches, the\n"
11739
"following could be used::"
9756
11740
9757
11741
#: en/help_topics/configuration.txt:291
9758
11742
msgid ""
9760
11744
" push_location = sftp://example.com/location\n"
9761
11745
" push_location:policy = appendpath"
9762
11746
msgstr ""
11747
" [/top/location]\n"
11748
" push_location = sftp://example.com/location\n"
11749
" push_location:policy = appendpath"
9763
11750
9764
11751
#: en/help_topics/configuration.txt:295
9765
11752
msgid ""
9766
11753
"With this configuration, the push location for ``/top/location/branch1``\n"
9767
11754
"would be ``sftp://example.com/location/branch1``."
9768
11755
msgstr ""
11756
"With this configuration, the push location for ``/top/location/branch1``\n"
11757
"would be ``sftp://example.com/location/branch1``."
9769
11758
9770
11759
#: en/help_topics/configuration.txt:298
9771
11760
msgid ""
9772
11761
"Section local options\n"
9773
11762
"^^^^^^^^^^^^^^^^^^^^^"
9774
11763
msgstr ""
11764
"Section local options\n"
11765
"^^^^^^^^^^^^^^^^^^^^^"
9775
11766
9776
11767
#: en/help_topics/configuration.txt:301
9777
11768
msgid ""
9778
11769
"Some options are defined automatically inside a given section and can be\n"
9779
11770
"refered to in this section only. "
9780
11771
msgstr ""
11772
"Some options are defined automatically inside a given section and can be\n"
11773
"referred to in this section only. "
9781
11774
9782
11775
#: en/help_topics/configuration.txt:304
9783
11776
msgid "For example, the ``appendpath`` policy can be used like this::"
9784
msgstr ""
11777
msgstr "For example, the ``appendpath`` policy can be used like this::"
9785
11778
9786
11779
#: en/help_topics/configuration.txt:306
9787
11780
msgid ""
9789
11782
" mypush = lp:~vila/bzr\n"
9790
11783
" mypush:policy=appendpath"
9791
11784
msgstr ""
11785
" [/home/vila/src/bzr/bugs]\n"
11786
" mypush = lp:~vila/bzr\n"
11787
" mypush:policy=appendpath"
9792
11788
9793
11789
#: en/help_topics/configuration.txt:310
9794
11790
msgid "Using ``relpath`` to achieve the same result is done like this::"
9795
msgstr ""
11791
msgstr "Using ``relpath`` to achieve the same result is done like this::"
9796
11792
9797
11793
#: en/help_topics/configuration.txt:312
9798
11794
msgid ""
9799
11795
" [/home/vila/src/bzr/bugs]\n"
9800
11796
" mypush = lp:~vila/bzr/{relpath}"
9801
11797
msgstr ""
11798
" [/home/vila/src/bzr/bugs]\n"
11799
" mypush = lp:~vila/bzr/{relpath}"
9802
11800
9803
11801
#: en/help_topics/configuration.txt:315
9804
11802
msgid ""
9805
11803
"In both cases, when used in a directory like\n"
9806
11804
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9807
11805
msgstr ""
11806
"In both cases, when used in a directory like\n"
11807
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9808
11808
9809
11809
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9810
11810
msgid ""
9811
11811
" $ bzr config mypush\n"
9812
11812
" lp:~vila/bzr/832013-expand-in-stack"
9813
11813
msgstr ""
11814
" $ bzr config mypush\n"
11815
" lp:~vila/bzr/832013-expand-in-stack"
9814
11816
9815
11817
#: en/help_topics/configuration.txt:321
9816
11818
msgid "Another such option is ``basename`` which can be used like this::"
9817
msgstr ""
11819
msgstr "Another such option is ``basename`` which can be used like this::"
9818
11820
9819
11821
#: en/help_topics/configuration.txt:323
9820
11822
msgid ""
9821
11823
" [/home/vila/src/bzr]\n"
9822
11824
" mypush = lp:~vila/bzr/{basename}"
9823
11825
msgstr ""
11826
" [/home/vila/src/bzr]\n"
11827
" mypush = lp:~vila/bzr/{basename}"
9824
11828
9825
11829
#: en/help_topics/configuration.txt:326
9826
11830
msgid ""
9827
11831
"When used in a directory like\n"
9828
11832
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9829
11833
msgstr ""
11834
"When used in a directory like\n"
11835
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9830
11836
9831
11837
#: en/help_topics/configuration.txt:332
9832
11838
msgid ""
9834
11840
"itself is defined as the relative path between the section name and the\n"
9835
11841
"location it matches."
9836
11842
msgstr ""
11843
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
11844
"itself is defined as the relative path between the section name and the\n"
11845
"location it matches."
9837
11846
9838
11847
#: en/help_topics/configuration.txt:336
9839
11848
msgid ""
9843
11852
"used\n"
9844
11853
"like this::"
9845
11854
msgstr ""
11855
"Another such option is ``branchname``, which refers to the name of a "
11856
"colocated\n"
11857
"branch. For non-colocated branches, it behaves like basename. It can be "
11858
"used\n"
11859
"like this::"
9846
11860
9847
11861
#: en/help_topics/configuration.txt:340
9848
11862
msgid ""
9849
11863
" [/home/vila/src/bzr/bugs]\n"
9850
11864
" mypush = lp:~vila/bzr/{branchname}"
9851
11865
msgstr ""
11866
" [/home/vila/src/bzr/bugs]\n"
11867
" mypush = lp:~vila/bzr/{branchname}"
9852
11868
9853
11869
#: en/help_topics/configuration.txt:343
9854
11870
msgid ""
9855
11871
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9856
11872
"get::"
9857
11873
msgstr ""
11874
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
11875
"get::"
9858
11876
9859
11877
#: en/help_topics/configuration.txt:345
9860
11878
msgid ""
9861
11879
" bzr config mypush\n"
9862
11880
" lp:~vila/bzr/832013-expand-in-stack"
9863
11881
msgstr ""
11882
" bzr config mypush\n"
11883
" lp:~vila/bzr/832013-expand-in-stack"
9864
11884
9865
11885
#: en/help_topics/configuration.txt:348
9866
11886
msgid ""
9868
11888
"values in any other section from the same ``Store`` nor from any other\n"
9869
11889
"``Store``."
9870
11890
msgstr ""
11891
"When an option is local to a Section, it cannot be referred to from option\n"
11892
"values in any other section from the same ``Store`` nor from any other\n"
11893
"``Store``."
9871
11894
9872
11895
#: en/help_topics/configuration.txt:352
9873
11896
msgid ""
9875
11898
"The main configuration file, bazaar.conf\n"
9876
11899
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9877
11900
msgstr ""
11901
"\n"
11902
"The main configuration file, bazaar.conf\n"
11903
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9878
11904
9879
11905
#: en/help_topics/configuration.txt:356
9880
11906
msgid ""
9883
11909
"configuration options for all branches. The default section can be\n"
9884
11910
"overriden by providing a branch-specific section in ``locations.conf``."
9885
11911
msgstr ""
11912
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
11913
"The default section contains the default\n"
11914
"configuration options for all branches. The default section can be\n"
11915
"overridden by providing a branch-specific section in ``locations.conf``."
9886
11916
9887
11917
#: en/help_topics/configuration.txt:361
9888
11918
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9889
msgstr ""
11919
msgstr "A typical ``bazaar.conf`` section often looks like the following::"
9890
11920
9891
11921
#: en/help_topics/configuration.txt:363
9892
11922
msgid ""
9895
11925
" editor = /usr/bin/vim\n"
9896
11926
" create_signatures = when-required"
9897
11927
msgstr ""
11928
" [DEFAULT]\n"
11929
" email = John Doe <jdoe@isp.com>\n"
11930
" editor = /usr/bin/vim\n"
11931
" create_signatures = when-required"
9898
11932
9899
11933
#: en/help_topics/configuration.txt:368
9900
11934
msgid ""
9902
11936
"The branch location configuration file, locations.conf\n"
9903
11937
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9904
11938
msgstr ""
11939
"\n"
11940
"The branch location configuration file, locations.conf\n"
11941
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9905
11942
9906
11943
#: en/help_topics/configuration.txt:372
9907
11944
msgid ""
9912
11949
"default, will be the path to a branch that you wish to override a value\n"
9913
11950
"for. The '?' and '*' wildcards are supported::"
9914
11951
msgstr ""
11952
"``locations.conf`` allows one to specify overriding settings for\n"
11953
"a specific branch. The format is almost identical to the default section in\n"
11954
"bazaar.conf with one significant change: The section header, instead of "
11955
"saying\n"
11956
"default, will be the path to a branch that you wish to override a value\n"
11957
"for. The '?' and '*' wildcards are supported::"
9915
11958
9916
11959
#: en/help_topics/configuration.txt:378
9917
11960
msgid ""
9918
11961
" [/home/jdoe/branches/nethack]\n"
9919
11962
" email = Nethack Admin <nethack@nethack.com>"
9920
11963
msgstr ""
11964
" [/home/jdoe/branches/nethack]\n"
11965
" email = Nethack Admin <nethack@nethack.com>"
9921
11966
9922
11967
#: en/help_topics/configuration.txt:381
9923
11968
msgid ""
9924
11969
" [http://hypothetical.site.com/branches/devel-branch]\n"
9925
11970
" create_signatures = always"
9926
11971
msgstr ""
11972
" [http://hypothetical.site.com/branches/devel-branch]\n"
11973
" create_signatures = always"
9927
11974
9928
11975
#: en/help_topics/configuration.txt:384
9929
11976
msgid ""
9930
11977
"The authentication configuration file, authentication.conf\n"
9931
11978
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9932
11979
msgstr ""
11980
"The authentication configuration file, authentication.conf\n"
11981
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9933
11982
9934
11983
#: en/help_topics/configuration.txt:387
9935
11984
msgid ""
9938
11987
"part\n"
9939
11988
"of bzr that requires authentication (smtp for example)."
9940
11989
msgstr ""
11990
"``authentication.conf`` allows one to specify credentials for\n"
11991
"remote servers. This can be used for all the supported transports and any "
11992
"part\n"
11993
"of bzr that requires authentication (smtp for example)."
9941
11994
9942
11995
#: en/help_topics/configuration.txt:391
9943
11996
msgid ""
9944
11997
"The syntax of the file obeys the same rules as the others except for the\n"
9945
11998
"option policies which don't apply."
9946
11999
msgstr ""
12000
"The syntax of the file obeys the same rules as the others except for the\n"
12001
"option policies which don't apply."
9947
12002
9948
12003
#: en/help_topics/configuration.txt:394
9949
12004
msgid ""
9951
12006
"configuration\n"
9952
12007
"file see :doc:`authentication-help`."
9953
12008
msgstr ""
12009
"For more information on the possible uses of the authentication "
12010
"configuration\n"
12011
"file see :doc:`authentication-help`."
9954
12012
9955
12013
#: en/help_topics/configuration.txt:397
9956
12014
msgid ""
9958
12016
"Common options\n"
9959
12017
"--------------"
9960
12018
msgstr ""
12019
"\n"
12020
"Common options\n"
12021
"--------------"
9961
12022
9962
12023
#: en/help_topics/configuration.txt:401
9963
12024
msgid ""
9964
12025
"debug_flags\n"
9965
12026
"~~~~~~~~~~~"
9966
12027
msgstr ""
12028
"debug_flags\n"
12029
"~~~~~~~~~~~"
9967
12030
9968
12031
#: en/help_topics/configuration.txt:404
9969
12032
msgid ""
9971
12034
"can be used as with the -D command-line option (see `help global-options`).\n"
9972
12035
"For example::"
9973
12036
msgstr ""
12037
"A comma-separated list of debugging options to turn on. The same values\n"
12038
"can be used as with the -D command-line option (see `help global-options`).\n"
12039
"For example::"
9974
12040
9975
12041
#: en/help_topics/configuration.txt:408
9976
12042
msgid " debug_flags = hpss"
9977
msgstr ""
12043
msgstr " debug_flags = hpss"
9978
12044
9979
12045
#: en/help_topics/configuration.txt:412
9980
12046
msgid " debug_flags = hpss,evil"
9981
msgstr ""
12047
msgstr " debug_flags = hpss,evil"
9982
12048
9983
12049
#: en/help_topics/configuration.txt:414
9984
12050
msgid ""
9985
12051
"email\n"
9986
12052
"~~~~~"
9987
12053
msgstr ""
12054
"email\n"
12055
"~~~~~"
9988
12056
9989
12057
#: en/help_topics/configuration.txt:417
9990
12058
msgid ""
9991
12059
"The email address to use when committing a branch. Typically takes the form\n"
9992
12060
"of::"
9993
12061
msgstr ""
12062
"The email address to use when committing a branch. Typically takes the form\n"
12063
"of::"
9994
12064
9995
12065
#: en/help_topics/configuration.txt:420
9996
12066
msgid " email = Full Name <account@hostname.tld>"
9997
msgstr ""
12067
msgstr " email = Full Name <account@hostname.tld>"
9998
12068
9999
12069
#: en/help_topics/configuration.txt:422
10000
12070
msgid ""
10001
12071
"editor\n"
10002
12072
"~~~~~~"
10003
12073
msgstr ""
12074
"editor\n"
12075
"~~~~~~"
10004
12076
10005
12077
#: en/help_topics/configuration.txt:425
10006
12078
msgid ""
10009
12081
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10010
12082
"variables."
10011
12083
msgstr ""
12084
"The path of the editor that you wish to use if *bzr commit* is run without\n"
12085
"a commit message. This setting is trumped by the environment variable\n"
12086
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
12087
"variables."
10012
12088
10013
12089
#: en/help_topics/configuration.txt:430
10014
12090
msgid ""
10015
12091
"log_format\n"
10016
12092
"~~~~~~~~~~"
10017
12093
msgstr ""
12094
"log_format\n"
12095
"~~~~~~~~~~"
10018
12096
10019
12097
#: en/help_topics/configuration.txt:433
10020
12098
msgid ""
10022
12100
"and ``line``. Additional formats may be provided by plugins. The default\n"
10023
12101
"value is ``long``."
10024
12102
msgstr ""
12103
"The default log format to use. Standard log formats are ``long``, ``short``\n"
12104
"and ``line``. Additional formats may be provided by plugins. The default\n"
12105
"value is ``long``."
10025
12106
10026
12107
#: en/help_topics/configuration.txt:437
10027
12108
msgid ""
10028
12109
"check_signatures\n"
10029
12110
"~~~~~~~~~~~~~~~~"
10030
12111
msgstr ""
12112
"check_signatures\n"
12113
"~~~~~~~~~~~~~~~~"
10031
12114
10032
12115
#: en/help_topics/configuration.txt:440
10033
12116
msgid ""
10034
12117
"Reserved for future use. These options will allow a policy for branches to\n"
10035
12118
"require signatures."
10036
12119
msgstr ""
12120
"Reserved for future use. These options will allow a policy for branches to\n"
12121
"require signatures."
10037
12122
10038
12123
#: en/help_topics/configuration.txt:443
10039
12124
msgid ""
10040
12125
"require\n"
10041
12126
" The gnupg signature for revisions must be present and must be valid."
10042
12127
msgstr ""
12128
"require\n"
12129
" The gnupg signature for revisions must be present and must be valid."
10043
12130
10044
12131
#: en/help_topics/configuration.txt:446
10045
12132
msgid ""
10046
12133
"ignore\n"
10047
12134
" Do not check gnupg signatures of revisions."
10048
12135
msgstr ""
12136
"ignore\n"
12137
" Do not check gnupg signatures of revisions."
10049
12138
10050
12139
#: en/help_topics/configuration.txt:449
10051
12140
msgid ""
10054
12143
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10055
12144
" no signature is present."
10056
12145
msgstr ""
12146
"check-available\n"
12147
" (default) If gnupg signatures for revisions are present, check them.\n"
12148
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
12149
" no signature is present."
10057
12150
10058
12151
#: en/help_topics/configuration.txt:454
10059
12152
msgid ""
10060
12153
"create_signatures\n"
10061
12154
"~~~~~~~~~~~~~~~~~"
10062
12155
msgstr ""
12156
"create_signatures\n"
12157
"~~~~~~~~~~~~~~~~~"
10063
12158
10064
12159
#: en/help_topics/configuration.txt:457
10065
12160
msgid ""
10067
12162
"not\n"
10068
12163
"sign new commits."
10069
12164
msgstr ""
12165
"Defines the behaviour of signing revisions on commits. By default bzr will "
12166
"not\n"
12167
"sign new commits."
10070
12168
10071
12169
#: en/help_topics/configuration.txt:460
10072
12170
msgid ""
10075
12173
"the\n"
10076
12174
" commit will not be made."
10077
12175
msgstr ""
12176
"always\n"
12177
" Sign every new revision that is committed. If the signing fails then "
12178
"the\n"
12179
" commit will not be made."
10078
12180
10079
12181
#: en/help_topics/configuration.txt:464
10080
12182
msgid ""
10081
12183
"when-required\n"
10082
12184
" Reserved for future use."
10083
12185
msgstr ""
12186
"when-required\n"
12187
" Reserved for future use."
10084
12188
10085
12189
#: en/help_topics/configuration.txt:467
10086
12190
msgid ""
10087
12191
"never\n"
10088
12192
" Reserved for future use."
10089
12193
msgstr ""
12194
"never\n"
12195
" Reserved for future use."
10090
12196
10091
12197
#: en/help_topics/configuration.txt:470
10092
12198
msgid ""
10095
12201
"refuse\n"
10096
12202
"to sign newly committed revisions, even if the branch requires signatures."
10097
12203
msgstr ""
12204
"In future it is planned that ``when-required`` will sign newly\n"
12205
"committed revisions only when the branch requires them. ``never`` will "
12206
"refuse\n"
12207
"to sign newly committed revisions, even if the branch requires signatures."
10098
12208
10099
12209
#: en/help_topics/configuration.txt:474
10100
12210
msgid ""
10101
12211
"dirstate.fdatasync\n"
10102
12212
"~~~~~~~~~~~~~~~~~~"
10103
12213
msgstr ""
12214
"dirstate.fdatasync\n"
12215
"~~~~~~~~~~~~~~~~~~"
10104
12216
10105
12217
#: en/help_topics/configuration.txt:477
10106
12218
msgid ""
10108
12220
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10109
12221
"should not be lost if the machine crashes. See also repository.fdatasync."
10110
12222
msgstr ""
12223
"If true (default), working tree metadata changes are flushed through the\n"
12224
"OS buffers to physical disk. This is somewhat slower, but means data\n"
12225
"should not be lost if the machine crashes. See also repository.fdatasync."
10111
12226
10112
12227
#: en/help_topics/configuration.txt:481
10113
12228
msgid ""
10114
12229
"gpg_signing_key\n"
10115
12230
"~~~~~~~~~~~~~~~"
10116
12231
msgstr ""
12232
"gpg_signing_key\n"
12233
"~~~~~~~~~~~~~~~"
10117
12234
10118
12235
#: en/help_topics/configuration.txt:484
10119
12236
msgid ""
10121
12238
"address, key fingerprint or full key ID. When unset or when set to\n"
10122
12239
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10123
12240
msgstr ""
12241
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
12242
"address, key fingerprint or full key ID. When unset or when set to\n"
12243
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10124
12244
10125
12245
#: en/help_topics/configuration.txt:488
10126
12246
msgid ""
10127
12247
"recurse\n"
10128
12248
"~~~~~~~"
10129
12249
msgstr ""
12250
"recurse\n"
12251
"~~~~~~~"
10130
12252
10131
12253
#: en/help_topics/configuration.txt:491
10132
12254
msgid ""
10133
12255
"Only useful in ``locations.conf``. Defines whether or not the\n"
10134
12256
"configuration for this section applies to subdirectories:"
10135
12257
msgstr ""
12258
"Only useful in ``locations.conf``. Defines whether or not the\n"
12259
"configuration for this section applies to subdirectories:"
10136
12260
10137
12261
#: en/help_topics/configuration.txt:494
10138
12262
msgid ""
10139
12263
"true\n"
10140
12264
" (default) This section applies to subdirectories as well."
10141
12265
msgstr ""
12266
"true\n"
12267
" (default) This section applies to subdirectories as well."
10142
12268
10143
12269
#: en/help_topics/configuration.txt:497
10144
12270
msgid ""
10146
12272
" This section only applies to the branch at this directory and not\n"
10147
12273
" branches below it."
10148
12274
msgstr ""
12275
"false\n"
12276
" This section only applies to the branch at this directory and not\n"
12277
" branches below it."
10149
12278
10150
12279
#: en/help_topics/configuration.txt:501
10151
12280
msgid ""
10152
12281
"gpg_signing_command\n"
10153
12282
"~~~~~~~~~~~~~~~~~~~"
10154
12283
msgstr ""
12284
"gpg_signing_command\n"
12285
"~~~~~~~~~~~~~~~~~~~"
10155
12286
10156
12287
#: en/help_topics/configuration.txt:504
10157
12288
msgid ""
10159
12290
"revisions.\n"
10160
12291
"For example::"
10161
12292
msgstr ""
12293
"(Default: \"gpg\"). Which program should be used to sign and check "
12294
"revisions.\n"
12295
"For example::"
10162
12296
10163
12297
#: en/help_topics/configuration.txt:507
10164
12298
msgid " gpg_signing_command = /usr/bin/gnpg"
10165
msgstr ""
12299
msgstr " gpg_signing_command = /usr/bin/gnpg"
10166
12300
10167
12301
#: en/help_topics/configuration.txt:509
10168
12302
msgid ""
10169
12303
"The specified command must accept the options \"--clearsign\" and \"-u "
10170
12304
"<email>\"."
10171
12305
msgstr ""
12306
"The specified command must accept the options \"--clearsign\" and \"-u "
12307
"<email>\"."
10172
12308
10173
12309
#: en/help_topics/configuration.txt:511
10174
12310
msgid ""
10175
12311
"bzr_remote_path\n"
10176
12312
"~~~~~~~~~~~~~~~"
10177
12313
msgstr ""
12314
"bzr_remote_path\n"
12315
"~~~~~~~~~~~~~~~"
10178
12316
10179
12317
#: en/help_topics/configuration.txt:514
10180
12318
msgid ""
10182
12320
"smart\n"
10183
12321
"server for bzr. This value may only be specified in locations.conf, because:"
10184
12322
msgstr ""
12323
"(Default: \"bzr\"). The path to the command that should be used to run the "
12324
"smart\n"
12325
"server for bzr. This value may only be specified in locations.conf, because:"
10185
12326
10186
12327
#: en/help_topics/configuration.txt:517
10187
12328
msgid ""
10189
12330
"- allowing remote branch.conf files to specify commands would be a security\n"
10190
12331
" risk"
10191
12332
msgstr ""
12333
"- it's needed before branch.conf is accessible\n"
12334
"- allowing remote branch.conf files to specify commands would be a security\n"
12335
" risk"
10192
12336
10193
12337
#: en/help_topics/configuration.txt:521
10194
12338
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10195
msgstr ""
12339
msgstr "It is overridden by the BZR_REMOTE_PATH environment variable."
10196
12340
10197
12341
#: en/help_topics/configuration.txt:523
10198
12342
msgid ""
10199
12343
"smtp_server\n"
10200
12344
"~~~~~~~~~~~"
10201
12345
msgstr ""
12346
"smtp_server\n"
12347
"~~~~~~~~~~~"
10202
12348
10203
12349
#: en/help_topics/configuration.txt:526
10204
12350
msgid ""
10205
12351
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10206
12352
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10207
12353
msgstr ""
12354
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
12355
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10208
12356
10209
12357
#: en/help_topics/configuration.txt:529
10210
12358
msgid ""
10211
12359
"smtp_username, smtp_password\n"
10212
12360
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10213
12361
msgstr ""
12362
"smtp_username, smtp_password\n"
12363
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10214
12364
10215
12365
#: en/help_topics/configuration.txt:532
10216
12366
msgid ""
10219
12369
"These settings are only needed if the SMTP server requires authentication\n"
10220
12370
"to send mail."
10221
12371
msgstr ""
12372
"User and password to authenticate to the SMTP server. If smtp_username\n"
12373
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
12374
"These settings are only needed if the SMTP server requires authentication\n"
12375
"to send mail."
10222
12376
10223
12377
#: en/help_topics/configuration.txt:537
10224
12378
msgid ""
10225
12379
"locks.steal_dead\n"
10226
12380
"~~~~~~~~~~~~~~~~"
10227
12381
msgstr ""
12382
"locks.steal_dead\n"
12383
"~~~~~~~~~~~~~~~~"
10228
12384
10229
12385
#: en/help_topics/configuration.txt:540
10230
12386
msgid ""
10233
12389
"print a message and you can break the lock manually, if you are satisfied\n"
10234
12390
"the object is no longer in use."
10235
12391
msgstr ""
12392
"If set to true, bzr will automatically break locks held by processes from\n"
12393
"the same machine and user that are no longer alive. Otherwise, it will\n"
12394
"print a message and you can break the lock manually, if you are satisfied\n"
12395
"the object is no longer in use."
10236
12396
10237
12397
#: en/help_topics/configuration.txt:545
10238
12398
msgid ""
10239
12399
"mail_client\n"
10240
12400
"~~~~~~~~~~~"
10241
12401
msgstr ""
12402
"mail_client\n"
12403
"~~~~~~~~~~~"
10242
12404
10243
12405
#: en/help_topics/configuration.txt:548
10244
12406
msgid ""
10248
12410
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10249
12411
"``editor``."
10250
12412
msgstr ""
12413
"A mail client to use for sending merge requests.\n"
12414
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
12415
"it\n"
12416
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
12417
"``editor``."
10251
12418
10252
12419
#: en/help_topics/configuration.txt:553
10253
12420
msgid "Supported values for specific clients:"
10254
msgstr ""
12421
msgstr "Supported values for specific clients:"
10255
12422
10256
12423
#: en/help_topics/configuration.txt:555
10257
12424
msgid ""
10263
12430
"1.5,\n"
10264
12431
" this works around some bugs that xdg-email doesn't handle."
10265
12432
msgstr ""
12433
":claws: Use Claws. This skips a dialogue for attaching files.\n"
12434
":evolution: Use Evolution.\n"
12435
":kmail: Use KMail.\n"
12436
":mutt: Use Mutt.\n"
12437
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
12438
"1.5,\n"
12439
" this works around some bugs that xdg-email doesn't handle."
10266
12440
10267
12441
#: en/help_topics/configuration.txt:562
10268
12442
msgid "Supported generic values are:"
10269
msgstr ""
12443
msgstr "Supported generic values are:"
10270
12444
10271
12445
#: en/help_topics/configuration.txt:564
10272
12446
msgid ""
10277
12451
":mapi: Use your preferred e-mail client on Windows.\n"
10278
12452
":xdg-email: Use xdg-email to run your preferred mail program"
10279
12453
msgstr ""
12454
":default: See above.\n"
12455
":editor: Use your editor to compose the merge request. This also uses\n"
12456
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
12457
" smtp_username and smtp_password.\n"
12458
":mapi: Use your preferred e-mail client on Windows.\n"
12459
":xdg-email: Use xdg-email to run your preferred mail program"
10280
12460
10281
12461
#: en/help_topics/configuration.txt:571
10282
12462
msgid ""
10283
12463
"repository.fdatasync\n"
10284
12464
"~~~~~~~~~~~~~~~~~~~~"
10285
12465
msgstr ""
12466
"repository.fdatasync\n"
12467
"~~~~~~~~~~~~~~~~~~~~"
10286
12468
10287
12469
#: en/help_topics/configuration.txt:574
10288
12470
msgid ""
10290
12472
"to physical disk. This is somewhat slower, but means data should not be\n"
10291
12473
"lost if the machine crashes. See also dirstate.fdatasync."
10292
12474
msgstr ""
12475
"If true (default), repository changes are flushed through the OS buffers\n"
12476
"to physical disk. This is somewhat slower, but means data should not be\n"
12477
"lost if the machine crashes. See also dirstate.fdatasync."
10293
12478
10294
12479
#: en/help_topics/configuration.txt:578
10295
12480
msgid ""
10296
12481
"submit_branch\n"
10297
12482
"~~~~~~~~~~~~~"
10298
12483
msgstr ""
12484
"submit_branch\n"
12485
"~~~~~~~~~~~~~"
10299
12486
10300
12487
#: en/help_topics/configuration.txt:581
10301
12488
msgid ""
10305
12492
"This\n"
10306
12493
"should usually be set on a per-branch or per-location basis."
10307
12494
msgstr ""
12495
"The branch you intend to submit your current work to. This is "
12496
"automatically\n"
12497
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
12498
"This\n"
12499
"should usually be set on a per-branch or per-location basis."
10308
12500
10309
12501
#: en/help_topics/configuration.txt:585
10310
12502
msgid ""
10311
12503
"public_branch\n"
10312
12504
"~~~~~~~~~~~~~"
10313
12505
msgstr ""
12506
"public_branch\n"
12507
"~~~~~~~~~~~~~"
10314
12508
10315
12509
#: en/help_topics/configuration.txt:588
10316
12510
msgid ""
10318
12512
"is\n"
10319
12513
"not publically-accessible). Used (and set) by ``bzr send``."
10320
12514
msgstr ""
12515
"A publicly-accessible version of this branch (implying that this version is\n"
12516
"not publicly-accessible). Used (and set) by ``bzr send``."
10321
12517
10322
12518
#: en/help_topics/configuration.txt:591
10323
12519
msgid ""
10324
12520
"suppress_warnings\n"
10325
12521
"~~~~~~~~~~~~~~~~~"
10326
12522
msgstr ""
12523
"suppress_warnings\n"
12524
"~~~~~~~~~~~~~~~~~"
10327
12525
10328
12526
#: en/help_topics/configuration.txt:594
10329
12527
msgid ""
10330
12528
"A list of strings, each string represent a warning that can be emitted by\n"
10331
12529
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10332
12530
msgstr ""
12531
"A list of strings, each string represent a warning that can be emitted by\n"
12532
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10333
12533
10334
12534
#: en/help_topics/configuration.txt:597
10335
12535
msgid "Valid values:"
10336
msgstr ""
12536
msgstr "Valid values:"
10337
12537
10338
12538
#: en/help_topics/configuration.txt:599
10339
12539
msgid ""
10342
12542
"are\n"
10343
12543
" using deprecated formats."
10344
12544
msgstr ""
12545
"* ``format_deprecation``:\n"
12546
" whether the format deprecation warning is shown on repositories that "
12547
"are\n"
12548
" using deprecated formats."
10345
12549
10346
12550
#: en/help_topics/configuration.txt:603
10347
12551
msgid ""
10348
12552
"default_format\n"
10349
12553
"~~~~~~~~~~~~~~"
10350
12554
msgstr ""
12555
"default_format\n"
12556
"~~~~~~~~~~~~~~"
10351
12557
10352
12558
#: en/help_topics/configuration.txt:606
10353
12559
msgid ""
10355
12561
"``bzr\n"
10356
12562
"help formats`` for possible values."
10357
12563
msgstr ""
12564
"A format name for the default format used when creating branches. See "
12565
"``bzr\n"
12566
"help formats`` for possible values."
10358
12567
10359
12568
#: en/help_topics/configuration.txt:609
10360
12569
msgid ""
10362
12571
"Unicode options\n"
10363
12572
"---------------"
10364
12573
msgstr ""
12574
"\n"
12575
"Unicode options\n"
12576
"---------------"
10365
12577
10366
12578
#: en/help_topics/configuration.txt:613
10367
12579
msgid ""
10368
12580
"output_encoding\n"
10369
12581
"~~~~~~~~~~~~~~~"
10370
12582
msgstr ""
12583
"output_encoding\n"
12584
"~~~~~~~~~~~~~~~"
10371
12585
10372
12586
#: en/help_topics/configuration.txt:616
10373
12587
msgid ""
10375
12589
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10376
12590
"is the terminal encoding prefered by the operating system."
10377
12591
msgstr ""
12592
"A Python unicode encoding name for text output from bzr, such as log\n"
12593
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
12594
"is the terminal encoding preferred by the operating system."
10378
12595
10379
12596
#: en/help_topics/configuration.txt:620
10380
12597
msgid ""
10382
12599
"Branch type specific options\n"
10383
12600
"----------------------------"
10384
12601
msgstr ""
12602
"\n"
12603
"Branch type specific options\n"
12604
"----------------------------"
10385
12605
10386
12606
#: en/help_topics/configuration.txt:624
10387
12607
msgid ""
10390
12610
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10391
12611
"manually set in ``locations.conf`` or ``bazaar.conf``."
10392
12612
msgstr ""
12613
"These options apply only to branches that use the ``dirstate-tags`` or\n"
12614
"later format. They\n"
12615
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
12616
"manually set in ``locations.conf`` or ``bazaar.conf``."
10393
12617
10394
12618
#: en/help_topics/configuration.txt:629
10395
12619
msgid ""
10396
12620
"append_revisions_only\n"
10397
12621
"~~~~~~~~~~~~~~~~~~~~~"
10398
12622
msgstr ""
12623
"append_revisions_only\n"
12624
"~~~~~~~~~~~~~~~~~~~~~"
10399
12625
10400
12626
#: en/help_topics/configuration.txt:632
10401
12627
msgid ""
10406
12632
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10407
12633
"compatibility with previous bzr versions (older than 2.2)."
10408
12634
msgstr ""
12635
"If set to \"True\" then revisions can only be appended to the log, not\n"
12636
"removed. A branch with this setting enabled can only pull from another\n"
12637
"branch if the other branch's log is a longer version of its own. This is\n"
12638
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
12639
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
12640
"compatibility with previous bzr versions (older than 2.2)."
10409
12641
10410
12642
#: en/help_topics/configuration.txt:639
10411
12643
msgid ""
10412
12644
"parent_location\n"
10413
12645
"~~~~~~~~~~~~~~~"
10414
12646
msgstr ""
12647
"parent_location\n"
12648
"~~~~~~~~~~~~~~~"
10415
12649
10416
12650
#: en/help_topics/configuration.txt:642
10417
12651
msgid ""
10420
12654
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10421
12655
"--remember``."
10422
12656
msgstr ""
12657
"If present, the location of the default branch for pull or merge. This "
12658
"option\n"
12659
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
12660
"--remember``."
10423
12661
10424
12662
#: en/help_topics/configuration.txt:646
10425
12663
msgid ""
10426
12664
"push_location\n"
10427
12665
"~~~~~~~~~~~~~"
10428
12666
msgstr ""
12667
"push_location\n"
12668
"~~~~~~~~~~~~~"
10429
12669
10430
12670
#: en/help_topics/configuration.txt:649
10431
12671
msgid ""
10432
12672
"If present, the location of the default branch for push. This option\n"
10433
12673
"is normally set by the first ``push`` or ``push --remember``."
10434
12674
msgstr ""
12675
"If present, the location of the default branch for push. This option\n"
12676
"is normally set by the first ``push`` or ``push --remember``."
10435
12677
10436
12678
#: en/help_topics/configuration.txt:652
10437
12679
msgid ""
10438
12680
"push_strict\n"
10439
12681
"~~~~~~~~~~~"
10440
12682
msgstr ""
12683
"push_strict\n"
12684
"~~~~~~~~~~~"
10441
12685
10442
12686
#: en/help_topics/configuration.txt:655
10443
12687
msgid ""
10444
12688
"If present, defines the ``--strict`` option default value for checking\n"
10445
12689
"uncommitted changes before pushing."
10446
12690
msgstr ""
12691
"If present, defines the ``--strict`` option default value for checking\n"
12692
"uncommitted changes before pushing."
10447
12693
10448
12694
#: en/help_topics/configuration.txt:658
10449
12695
msgid ""
10450
12696
"dpush_strict\n"
10451
12697
"~~~~~~~~~~~~"
10452
12698
msgstr ""
12699
"dpush_strict\n"
12700
"~~~~~~~~~~~~"
10453
12701
10454
12702
#: en/help_topics/configuration.txt:661
10455
12703
msgid ""
10457
12705
"uncommitted changes before pushing into a different VCS without any\n"
10458
12706
"custom bzr metadata."
10459
12707
msgstr ""
12708
"If present, defines the ``--strict`` option default value for checking\n"
12709
"uncommitted changes before pushing into a different VCS without any\n"
12710
"custom bzr metadata."
10460
12711
10461
12712
#: en/help_topics/configuration.txt:665
10462
12713
msgid ""
10463
12714
"bound_location\n"
10464
12715
"~~~~~~~~~~~~~~"
10465
12716
msgstr ""
12717
"bound_location\n"
12718
"~~~~~~~~~~~~~~"
10466
12719
10467
12720
#: en/help_topics/configuration.txt:668
10468
12721
msgid ""
10469
12722
"The location that commits should go to when acting as a checkout.\n"
10470
12723
"This option is normally set by ``bind``."
10471
12724
msgstr ""
12725
"The location that commits should go to when acting as a checkout.\n"
12726
"This option is normally set by ``bind``."
10472
12727
10473
12728
#: en/help_topics/configuration.txt:671
10474
12729
msgid ""
10475
12730
"bound\n"
10476
12731
"~~~~~"
10477
12732
msgstr ""
12733
"bound\n"
12734
"~~~~~"
10478
12735
10479
12736
#: en/help_topics/configuration.txt:674
10480
12737
msgid ""
10482
12739
"commit to\n"
10483
12740
"the bound_location. This option is normally set by ``bind``/``unbind``."
10484
12741
msgstr ""
12742
"If set to \"True\", the branch should act as a checkout, and push each "
12743
"commit to\n"
12744
"the bound_location. This option is normally set by ``bind``/``unbind``."
10485
12745
10486
12746
#: en/help_topics/configuration.txt:677
10487
12747
msgid ""
10488
12748
"send_strict\n"
10489
12749
"~~~~~~~~~~~"
10490
12750
msgstr ""
12751
"send_strict\n"
12752
"~~~~~~~~~~~"
10491
12753
10492
12754
#: en/help_topics/configuration.txt:680
10493
12755
msgid ""
10494
12756
"If present, defines the ``--strict`` option default value for checking\n"
10495
12757
"uncommitted changes before sending a merge directive."
10496
12758
msgstr ""
12759
"If present, defines the ``--strict`` option default value for checking\n"
12760
"uncommitted changes before sending a merge directive."
10497
12761
10498
12762
#: en/help_topics/configuration.txt:683
10499
12763
msgid ""
10500
12764
"add.maximum_file_size\n"
10501
12765
"~~~~~~~~~~~~~~~~~~~~~"
10502
12766
msgstr ""
12767
"add.maximum_file_size\n"
12768
"~~~~~~~~~~~~~~~~~~~~~"
10503
12769
10504
12770
#: en/help_topics/configuration.txt:686
10505
12771
msgid ""
10512
12778
"0 \n"
10513
12779
"will disable skipping."
10514
12780
msgstr ""
12781
"Defines the maximum file size the command line \"add\" operation will allow\n"
12782
"in recursive mode, with files larger than this value being skipped. You may "
12783
"\n"
12784
"specify this value as an integer (in which case it is interpreted as bytes), "
12785
"\n"
12786
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
12787
"0 \n"
12788
"will disable skipping."
10515
12789
10516
12790
#: en/help_topics/configuration.txt:692
10517
12791
msgid ""
10518
12792
"External Merge Tools\n"
10519
12793
"--------------------"
10520
12794
msgstr ""
12795
"External Merge Tools\n"
12796
"--------------------"
10521
12797
10522
12798
#: en/help_topics/configuration.txt:695
10523
12799
msgid ""
10524
12800
"bzr.mergetool.<name>\n"
10525
12801
"~~~~~~~~~~~~~~~~~~~~"
10526
12802
msgstr ""
12803
"bzr.mergetool.<name>\n"
12804
"~~~~~~~~~~~~~~~~~~~~"
10527
12805
10528
12806
#: en/help_topics/configuration.txt:698
10529
12807
msgid ""
10532
12810
"The\n"
10533
12811
"executable may omit its path if it can be found on the PATH."
10534
12812
msgstr ""
12813
"Defines an external merge tool called <name> with the given command-line.\n"
12814
"Arguments containing spaces should be quoted using single or double quotes. "
12815
"The\n"
12816
"executable may omit its path if it can be found on the PATH."
10535
12817
10536
12818
#: en/help_topics/configuration.txt:702
10537
12819
msgid ""
10539
12821
"filenames\n"
10540
12822
"involved in the merge conflict::"
10541
12823
msgstr ""
12824
"The following markers can be used in the command-line to substitute "
12825
"filenames\n"
12826
"involved in the merge conflict::"
10542
12827
10543
12828
#: en/help_topics/configuration.txt:705
10544
12829
msgid ""
10550
12835
"merge\n"
10551
12836
" succeeds."
10552
12837
msgstr ""
12838
" {base} file.BASE\n"
12839
" {this} file.THIS\n"
12840
" {other} file.OTHER\n"
12841
" {result} output file\n"
12842
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
12843
"merge\n"
12844
" succeeds."
10553
12845
10554
12846
#: en/help_topics/configuration.txt:714
10555
12847
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10556
msgstr ""
12848
msgstr " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10557
12849
10558
12850
#: en/help_topics/configuration.txt:716
10559
12851
msgid ""
10560
12852
"bzr.default_mergetool\n"
10561
12853
"~~~~~~~~~~~~~~~~~~~~~"
10562
12854
msgstr ""
12855
"bzr.default_mergetool\n"
12856
"~~~~~~~~~~~~~~~~~~~~~"
10563
12857
10564
12858
#: en/help_topics/configuration.txt:719
10565
12859
msgid ""
10567
12861
"by\n"
10568
12862
"default in tools such as ``bzr qconflicts``."
10569
12863
msgstr ""
12864
"Specifies which external merge tool (as defined above) should be selected "
12865
"by\n"
12866
"default in tools such as ``bzr qconflicts``."
10570
12867
10571
12868
#: en/help_topics/configuration.txt:724
10572
12869
msgid " bzr.default_mergetool = kdiff3\n"
10573
msgstr ""
12870
msgstr " bzr.default_mergetool = kdiff3\n"
10574
12871
10575
12872
#: en/help_topics/conflict-types.txt:1
10576
12873
msgid ""
10577
12874
"Conflict Types\n"
10578
12875
"=============="
10579
12876
msgstr ""
12877
"Conflict Types\n"
12878
"=============="
10580
12879
10581
12880
#: en/help_topics/conflict-types.txt:4
10582
12881
msgid ""
10585
12884
"they\n"
10586
12885
"may conflict with the current state of your working tree. "
10587
12886
msgstr ""
12887
"Some operations, like merge, revert and pull, modify the contents of your\n"
12888
"working tree. These modifications are programmatically generated, and so "
12889
"they\n"
12890
"may conflict with the current state of your working tree. "
10588
12891
10589
12892
#: en/help_topics/conflict-types.txt:8
10590
12893
msgid ""
10593
12896
"conflicts\n"
10594
12897
"have been resolved."
10595
12898
msgstr ""
12899
"When conflicts are present in your working tree (as shown by ``bzr\n"
12900
"conflicts``), you should resolve them and then inform bzr that the "
12901
"conflicts\n"
12902
"have been resolved."
10596
12903
10597
12904
#: en/help_topics/conflict-types.txt:12
10598
12905
msgid ""
10603
12910
"presented\n"
10604
12911
"in a way that is not easy to understand."
10605
12912
msgstr ""
12913
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
12914
"should resolve them is not the one responsible for their occurrence, as is "
12915
"the\n"
12916
"case when merging other people's work or because some conflicts are "
12917
"presented\n"
12918
"in a way that is not easy to understand."
10606
12919
10607
12920
#: en/help_topics/conflict-types.txt:17
10608
12921
msgid ""
10618
12931
"to\n"
10619
12932
"do."
10620
12933
msgstr ""
12934
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
12935
"conflict if and only if there's an actual conceptual conflict in the source\n"
12936
"tree. Because Bazaar doesn't understand the real meaning of the files "
12937
"being\n"
12938
"versioned, it can, when faced with ambiguities, fall short in either "
12939
"direction\n"
12940
"trying to resolve the conflict itself. Many kinds of changes can be "
12941
"combined\n"
12942
"programmatically, but sometimes only a human can determine the right thing "
12943
"to\n"
12944
"do."
10621
12945
10622
12946
#: en/help_topics/conflict-types.txt:25
10623
12947
msgid ""
10626
12950
"present the conflicting versions, and it's up to you to find the correct\n"
10627
12951
"resolution."
10628
12952
msgstr ""
12953
"When Bazaar generates a conflict, it adds information into the working tree "
12954
"to\n"
12955
"present the conflicting versions, and it's up to you to find the correct\n"
12956
"resolution."
10629
12957
10630
12958
#: en/help_topics/conflict-types.txt:29
10631
12959
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10632
msgstr ""
12960
msgstr "Whatever the conflict is, resolving it is roughly done in two steps:"
10633
12961
10634
12962
#: en/help_topics/conflict-types.txt:31
10635
12963
msgid ""
10637
12965
"the\n"
10638
12966
" state you want to keep, then"
10639
12967
msgstr ""
12968
"1. Modify the working tree content so that the conflicted item is now in "
12969
"the\n"
12970
" state you want to keep, then"
10640
12971
10641
12972
#: en/help_topics/conflict-types.txt:34
10642
12973
msgid ""
10643
12974
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10644
12975
" remaining generated information (``bzr resolve <item>``)."
10645
12976
msgstr ""
12977
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
12978
" remaining generated information (``bzr resolve <item>``)."
10646
12979
10647
12980
#: en/help_topics/conflict-types.txt:37
10648
12981
msgid ""
10650
12983
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10651
12984
"itself already made a choice, when possible."
10652
12985
msgstr ""
12986
"For most conflict types, there are some obvious ways to modify the working\n"
12987
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
12988
"itself already made a choice, when possible."
10653
12989
10654
12990
#: en/help_topics/conflict-types.txt:41
10655
12991
msgid ""
10656
12992
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10657
12993
"different ways to resolve the conflict."
10658
12994
msgstr ""
12995
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
12996
"different ways to resolve the conflict."
10659
12997
10660
12998
#: en/help_topics/conflict-types.txt:44
10661
12999
msgid ""
10663
13001
"to\n"
10664
13002
"resolve the conflict is outlined."
10665
13003
msgstr ""
13004
"Each type of conflict is explained below, and the action which must be done "
13005
"to\n"
13006
"resolve the conflict is outlined."
10666
13007
10667
13008
#: en/help_topics/conflict-types.txt:47
10668
13009
msgid ""
10671
13012
"these actions, Bazaar can provide some help. In the end you should at least\n"
10672
13013
"inform Bazaar that you're done with the conflict with::"
10673
13014
msgstr ""
13015
"Various actions are available depending on the kind of conflict, for some "
13016
"of\n"
13017
"these actions, Bazaar can provide some help. In the end you should at least\n"
13018
"inform Bazaar that you're done with the conflict with::"
10674
13019
10675
13020
#: en/help_topics/conflict-types.txt:51
10676
13021
msgid " ``bzr resolve FILE --action=done'"
10677
msgstr ""
13022
msgstr " ``bzr resolve FILE --action=done'"
10678
13023
10679
13024
#: en/help_topics/conflict-types.txt:53
10680
13025
msgid ""
10682
13027
"can\n"
10683
13028
"simply use::"
10684
13029
msgstr ""
13030
"Note that this is the default action when a single file is involved so you "
13031
"can\n"
13032
"simply use::"
10685
13033
10686
13034
#: en/help_topics/conflict-types.txt:56
10687
13035
msgid " ``bzr resolve FILE``"
10688
msgstr ""
13036
msgstr " ``bzr resolve FILE``"
10689
13037
10690
13038
#: en/help_topics/conflict-types.txt:58
10691
13039
msgid "See ``bzr help resolve`` for more details."
10692
msgstr ""
13040
msgstr "See ``bzr help resolve`` for more details."
10693
13041
10694
13042
#: en/help_topics/conflict-types.txt:60
10695
13043
msgid ""
10696
13044
"Text conflicts\n"
10697
13045
"--------------"
10698
13046
msgstr ""
13047
"Text conflicts\n"
13048
"--------------"
10699
13049
10700
13050
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10701
13051
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10703
13053
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10704
13054
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10705
13055
msgid "Typical message::"
10706
msgstr ""
13056
msgstr "Typical message::"
10707
13057
10708
13058
#: en/help_topics/conflict-types.txt:65
10709
13059
msgid " Text conflict in FILE"
10710
msgstr ""
13060
msgstr " Text conflict in FILE"
10711
13061
10712
13062
#: en/help_topics/conflict-types.txt:67
10713
13063
msgid ""
10722
13072
"basis\n"
10723
13073
"for comparison."
10724
13074
msgstr ""
13075
"These are produced when a text merge cannot completely reconcile two sets "
13076
"of\n"
13077
"text changes. Bazaar will emit files for each version with the extensions\n"
13078
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
13079
"tree,\n"
13080
"i.e. the tree that you are merging changes into. OTHER is the version that "
13081
"you\n"
13082
"are merging into the target. BASE is an older version that is used as a "
13083
"basis\n"
13084
"for comparison."
10725
13085
10726
13086
#: en/help_topics/conflict-types.txt:74
10727
13087
msgid ""
10729
13089
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10730
13090
"\"herringbone\" markers like ``<<<<<<<``."
10731
13091
msgstr ""
13092
"In the main copy of the file, Bazaar will include all the changes that it\n"
13093
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
13094
"\"herringbone\" markers like ``<<<<<<<``."
10732
13095
10733
13096
#: en/help_topics/conflict-types.txt:78
10734
13097
msgid ""
10738
13101
"leader\n"
10739
13102
"released Bazaar.\" A conflict would look like this::"
10740
13103
msgstr ""
13104
"Say the initial text is \"The project leader released it.\", and THIS "
13105
"modifies it\n"
13106
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
13107
"leader\n"
13108
"released Bazaar.\" A conflict would look like this::"
10741
13109
10742
13110
#: en/help_topics/conflict-types.txt:82
10743
13111
msgid ""
10747
13115
" The project leader released Bazaar.\n"
10748
13116
" >>>>>>> MERGE-SOURCE"
10749
13117
msgstr ""
13118
" <<<<<<< TREE\n"
13119
" Martin Pool released it.\n"
13120
" =======\n"
13121
" The project leader released Bazaar.\n"
13122
" >>>>>>> MERGE-SOURCE"
10750
13123
10751
13124
#: en/help_topics/conflict-types.txt:88
10752
13125
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10753
msgstr ""
13126
msgstr "The correct resolution would be \"Martin Pool released Bazaar.\""
10754
13127
10755
13128
#: en/help_topics/conflict-types.txt:90
10756
13129
msgid ""
10760
13133
"set of changes over the other (but see below when you encounter these\n"
10761
13134
"cases). More often, the two sets of changes must be intelligently combined."
10762
13135
msgstr ""
13136
"You can handle text conflicts either by editing the main copy of the file,\n"
13137
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
13138
"worth mentioning that resolving text conflicts rarely involves picking one\n"
13139
"set of changes over the other (but see below when you encounter these\n"
13140
"cases). More often, the two sets of changes must be intelligently combined."
10763
13141
10764
13142
#: en/help_topics/conflict-types.txt:96
10765
13143
msgid ""
10768
13146
"be\n"
10769
13147
"ready to commit."
10770
13148
msgstr ""
13149
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
13150
"you are done editing, the file should look like it never had a conflict, and "
13151
"be\n"
13152
"ready to commit."
10771
13153
10772
13154
#: en/help_topics/conflict-types.txt:100
10773
13155
msgid ""
10774
13156
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10775
13157
"Bazaar will auto-detect which conflicts you have resolved."
10776
13158
msgstr ""
13159
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
13160
"Bazaar will auto-detect which conflicts you have resolved."
10777
13161
10778
13162
#: en/help_topics/conflict-types.txt:103
10779
13163
msgid ""
10781
13165
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10782
13166
"working tree."
10783
13167
msgstr ""
13168
"When the conflict is resolved, Bazaar deletes the previously generated\n"
13169
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
13170
"working tree."
10784
13171
10785
13172
#: en/help_topics/conflict-types.txt:107
10786
13173
msgid ""
10788
13175
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10789
13176
"resolve`` with one of the following actions:"
10790
13177
msgstr ""
13178
"\n"
13179
"When you want to pick one set of changes over the other, you can use ``bzr\n"
13180
"resolve`` with one of the following actions:"
10791
13181
10792
13182
#: en/help_topics/conflict-types.txt:111
10793
13183
msgid ""
10794
13184
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10795
13185
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10796
13186
msgstr ""
13187
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
13188
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10797
13189
10798
13190
#: en/help_topics/conflict-types.txt:114
10799
13191
msgid ""
10800
13192
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10801
13193
"modifications will be taken into account."
10802
13194
msgstr ""
13195
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
13196
"modifications will be taken into account."
10803
13197
10804
13198
#: en/help_topics/conflict-types.txt:117
10805
13199
msgid ""
10806
13200
"Content conflicts\n"
10807
13201
"-----------------"
10808
13202
msgstr ""
13203
"Content conflicts\n"
13204
"-----------------"
10809
13205
10810
13206
#: en/help_topics/conflict-types.txt:122
10811
13207
msgid " Contents conflict in FILE"
10812
msgstr ""
13208
msgstr " Contents conflict in FILE"
10813
13209
10814
13210
#: en/help_topics/conflict-types.txt:124
10815
13211
msgid ""
10821
13217
"files\n"
10822
13218
"that are deleted on one side, and modified on the other."
10823
13219
msgstr ""
13220
"This conflict happens when there are conflicting changes in the working "
13221
"tree\n"
13222
"and the merge source, but the conflicted items are not text files. They "
13223
"may\n"
13224
"be binary files, or symlinks, or directories. It can even happen with "
13225
"files\n"
13226
"that are deleted on one side, and modified on the other."
10824
13227
10825
13228
#: en/help_topics/conflict-types.txt:129
10826
13229
msgid ""
10832
13235
"\"main\n"
10833
13236
"copy\" has been renamed to THIS or OTHER."
10834
13237
msgstr ""
13238
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
13239
"be\n"
13240
"regular files, symlinks or directories). But it will not include a \"main "
13241
"copy\"\n"
13242
"of the file with herringbone conflict markers. It will appear that the "
13243
"\"main\n"
13244
"copy\" has been renamed to THIS or OTHER."
10835
13245
10836
13246
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10837
13247
msgid ""
10839
13249
"version\n"
10840
13250
"or a combination of both."
10841
13251
msgstr ""
13252
"To resolve that kind of conflict, you should rebuild FILE from either "
13253
"version\n"
13254
"or a combination of both."
10842
13255
10843
13256
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10844
13257
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10845
13258
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10846
13259
#: en/help_topics/conflict-types.txt:361
10847
13260
msgid "``bzr resolve`` recognizes the following actions:"
10848
msgstr ""
13261
msgstr "``bzr resolve`` recognises the following actions:"
10849
13262
10850
13263
#: en/help_topics/conflict-types.txt:139
10851
13264
msgid ""
10853
13266
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10854
13267
"* ``--action=done`` will just mark the conflict as resolved."
10855
13268
msgstr ""
13269
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
13270
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
13271
"* ``--action=done`` will just mark the conflict as resolved."
10856
13272
10857
13273
#: en/help_topics/conflict-types.txt:143
10858
13274
msgid ""
10860
13276
"and\n"
10861
13277
"``.OTHER`` files if they are still present in the working tree."
10862
13278
msgstr ""
13279
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
13280
"and\n"
13281
"``.OTHER`` files if they are still present in the working tree."
10863
13282
10864
13283
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10865
13284
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10868
13287
msgid ""
10869
13288
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10870
13289
msgstr ""
13290
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10871
13291
10872
13292
#: en/help_topics/conflict-types.txt:148
10873
13293
msgid ""
10874
13294
"Tag conflicts\n"
10875
13295
"-------------"
10876
13296
msgstr ""
13297
"Tag conflicts\n"
13298
"-------------"
10877
13299
10878
13300
#: en/help_topics/conflict-types.txt:153
10879
13301
msgid ""
10880
13302
" Conflicting tags:\n"
10881
13303
" version-0.1"
10882
13304
msgstr ""
13305
" Conflicting tags:\n"
13306
" version-0.1"
10883
13307
10884
13308
#: en/help_topics/conflict-types.txt:156
10885
13309
msgid ""
10889
13313
"different revisions. You need not resolve these conflicts, but subsequent\n"
10890
13314
"uses of pull or push will result in the same message."
10891
13315
msgstr ""
13316
"When pulling from or pushing to another branch, Bazaar informs you about "
13317
"tags\n"
13318
"that conflict between the two branches; that is the same tag points to two\n"
13319
"different revisions. You need not resolve these conflicts, but subsequent\n"
13320
"uses of pull or push will result in the same message."
10892
13321
10893
13322
#: en/help_topics/conflict-types.txt:161
10894
13323
msgid ""
10907
13336
"overwrite\n"
10908
13337
"all tags as well.)"
10909
13338
msgstr ""
13339
"To resolve the conflict, you must apply the correct tags to either the "
13340
"target\n"
13341
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
13342
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
13343
"target branch's tags match the source branch, then in the target branch do\n"
13344
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
13345
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
13346
"source\n"
13347
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
13348
"favor of the target branch, you need to similarly use ``tag --force`` in "
13349
"the\n"
13350
"source branch. (Note that pulling or pushing using --overwrite will "
13351
"overwrite\n"
13352
"all tags as well.)"
10910
13353
10911
13354
#: en/help_topics/conflict-types.txt:172
10912
13355
msgid ""
10913
13356
"Duplicate paths\n"
10914
13357
"---------------"
10915
13358
msgstr ""
13359
"Duplicate paths\n"
13360
"---------------"
10916
13361
10917
13362
#: en/help_topics/conflict-types.txt:177
10918
13363
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10919
msgstr ""
13364
msgstr " Conflict adding file FILE. Moved existing file to FILE.moved."
10920
13365
10921
13366
#: en/help_topics/conflict-types.txt:179
10922
13367
msgid ""
10923
13368
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10924
13369
"already been used. The existing file will be renamed to \"FILE.moved\". "
10925
13370
msgstr ""
13371
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
13372
"already been used. The existing file will be renamed to \"FILE.moved\". "
10926
13373
10927
13374
#: en/help_topics/conflict-types.txt:187
10928
13375
msgid ""
10931
13378
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10932
13379
"* ``--action=done`` will just mark the conflict as resolved."
10933
13380
msgstr ""
13381
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
13382
"FILE``,\n"
13383
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
13384
"* ``--action=done`` will just mark the conflict as resolved."
10934
13385
10935
13386
#: en/help_topics/conflict-types.txt:191
10936
13387
msgid ""
10937
13388
"Note that you must get rid of FILE.moved before using ``--action=done``."
10938
13389
msgstr ""
13390
"Note that you must get rid of FILE.moved before using ``--action=done``."
10939
13391
10940
13392
#: en/help_topics/conflict-types.txt:195
10941
13393
msgid ""
10942
13394
"Unversioned parent\n"
10943
13395
"------------------"
10944
13396
msgstr ""
13397
"Unversioned parent\n"
13398
"------------------"
10945
13399
10946
13400
#: en/help_topics/conflict-types.txt:200
10947
13401
msgid ""
10948
13402
" Conflict because FILE is not versioned, but has versioned children."
10949
13403
msgstr ""
13404
" Conflict because FILE is not versioned, but has versioned children."
10950
13405
10951
13406
#: en/help_topics/conflict-types.txt:202
10952
13407
msgid ""
10962
13417
"resolve\n"
10963
13418
"FILE\" to mark the conflict as resolved."
10964
13419
msgstr ""
13420
"Sometimes Bazaar will attempt to create a file whose parent directory is "
13421
"not\n"
13422
"versioned. This happens when the directory has been deleted in the target,\n"
13423
"but has a new child in the source, or vice versa. In this situation, "
13424
"Bazaar\n"
13425
"will version the parent directory as well. Resolving this issue depends\n"
13426
"very much on the particular scenario. You may wish to rename or delete "
13427
"either\n"
13428
"the file or the directory. When you are satisfied, you can run \"bzr "
13429
"resolve\n"
13430
"FILE\" to mark the conflict as resolved."
10965
13431
10966
13432
#: en/help_topics/conflict-types.txt:210
10967
13433
msgid ""
10968
13434
"Missing parent\n"
10969
13435
"--------------"
10970
13436
msgstr ""
13437
"Missing parent\n"
13438
"--------------"
10971
13439
10972
13440
#: en/help_topics/conflict-types.txt:215
10973
13441
msgid " Conflict adding files to FILE. Created directory."
10974
msgstr ""
13442
msgstr " Conflict adding files to FILE. Created directory."
10975
13443
10976
13444
#: en/help_topics/conflict-types.txt:217
10977
13445
msgid ""
10982
13450
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10983
13451
"Resolving this issue depends very much on the particular scenario."
10984
13452
msgstr ""
13453
"This happens when a directory has been deleted in the target, but has new\n"
13454
"children in the source. This is similar to the \"unversioned parent\" "
13455
"conflict,\n"
13456
"except that the parent directory does not *exist*, instead of just being\n"
13457
"unversioned. In this situation, Bazaar will create the missing parent.\n"
13458
"Resolving this issue depends very much on the particular scenario."
10985
13459
10986
13460
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10987
13461
msgid ""
10988
13462
"To resolve that kind of conflict, you should either remove or rename the\n"
10989
13463
"children or the directory or a combination of both."
10990
13464
msgstr ""
13465
"To resolve that kind of conflict, you should either remove or rename the\n"
13466
"children or the directory or a combination of both."
10991
13467
10992
13468
#: en/help_topics/conflict-types.txt:228
10993
13469
msgid ""
10998
13474
" and restoring the directory,\n"
10999
13475
"* ``--action=done`` will just mark the conflict as resolved."
11000
13476
msgstr ""
13477
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
13478
" children,\n"
13479
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
13480
"children\n"
13481
" and restoring the directory,\n"
13482
"* ``--action=done`` will just mark the conflict as resolved."
11001
13483
11002
13484
#: en/help_topics/conflict-types.txt:236
11003
13485
msgid ""
11004
13486
"Deleting parent\n"
11005
13487
"---------------"
11006
13488
msgstr ""
13489
"Deleting parent\n"
13490
"---------------"
11007
13491
11008
13492
#: en/help_topics/conflict-types.txt:241
11009
13493
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11010
msgstr ""
13494
msgstr " Conflict: can't delete DIR because it is not empty. Not deleting."
11011
13495
11012
13496
#: en/help_topics/conflict-types.txt:243
11013
13497
msgid ""
11017
13501
"will retain the directory. Resolving this issue depends very much on the\n"
11018
13502
"particular scenario."
11019
13503
msgstr ""
13504
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
13505
"source, but has new children in the target (either because a directory\n"
13506
"deletion is merged or because the merge introduce new children). Bazaar\n"
13507
"will retain the directory. Resolving this issue depends very much on the\n"
13508
"particular scenario."
11020
13509
11021
13510
#: en/help_topics/conflict-types.txt:254
11022
13511
msgid ""
11023
13512
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11024
13513
"directory,"
11025
13514
msgstr ""
13515
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
13516
"directory,"
11026
13517
11027
13518
#: en/help_topics/conflict-types.txt:256
11028
13519
msgid ""
11029
13520
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11030
13521
" children,"
11031
13522
msgstr ""
13523
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
13524
" children,"
11032
13525
11033
13526
#: en/help_topics/conflict-types.txt:259
11034
13527
msgid "* ``--action=done`` will just mark the conflict as resolved."
11035
msgstr ""
13528
msgstr "* ``--action=done`` will just mark the conflict as resolved."
11036
13529
11037
13530
#: en/help_topics/conflict-types.txt:261
11038
13531
msgid ""
11040
13533
"present, they become potential orphans has they don't have a directory\n"
11041
13534
"parent anymore."
11042
13535
msgstr ""
13536
"Note that when merging a directory deletion, if unversioned files are\n"
13537
"present, they become potential orphans has they don't have a directory\n"
13538
"parent any more."
11043
13539
11044
13540
#: en/help_topics/conflict-types.txt:265
11045
13541
msgid ""
11046
13542
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11047
13543
"setting the ``bzr.transform.orphan_policy`` configuration option."
11048
13544
msgstr ""
13545
"Handling such orphans, *before* the conflict is created, is controlled by\n"
13546
"setting the ``bzr.transform.orphan_policy`` configuration option."
11049
13547
11050
13548
#: en/help_topics/conflict-types.txt:268
11051
13549
msgid "There are two possible values for this option:"
11052
msgstr ""
13550
msgstr "There are two possible values for this option:"
11053
13551
11054
13552
#: en/help_topics/conflict-types.txt:270
11055
13553
msgid ""
11056
13554
"* ``conflict`` (the default): will leave the orphans in place and\n"
11057
13555
" generate a conflicts,"
11058
13556
msgstr ""
13557
"* ``conflict`` (the default): will leave the orphans in place and\n"
13558
" generate a conflicts,"
11059
13559
11060
13560
#: en/help_topics/conflict-types.txt:273
11061
13561
msgid ""
11063
13563
"root\n"
11064
13564
" of the working tree with names like ``<file>.~#~``."
11065
13565
msgstr ""
13566
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
13567
"root\n"
13568
" of the working tree with names like ``<file>.~#~``."
11066
13569
11067
13570
#: en/help_topics/conflict-types.txt:278
11068
13571
msgid ""
11069
13572
"Path conflict\n"
11070
13573
"-------------"
11071
13574
msgstr ""
13575
"Path conflict\n"
13576
"-------------"
11072
13577
11073
13578
#: en/help_topics/conflict-types.txt:283
11074
13579
msgid " Path conflict: PATH1 / PATH2"
11075
msgstr ""
13580
msgstr " Path conflict: PATH1 / PATH2"
11076
13581
11077
13582
#: en/help_topics/conflict-types.txt:285
11078
13583
msgid ""
11080
13585
"parent\n"
11081
13586
"directory of a file. Bazaar will use the path elements from the source."
11082
13587
msgstr ""
13588
"This happens when the source and target have each modified the name or "
13589
"parent\n"
13590
"directory of a file. Bazaar will use the path elements from the source."
11083
13591
11084
13592
#: en/help_topics/conflict-types.txt:288
11085
13593
msgid ""
11087
13595
"be\n"
11088
13596
"retained for the file involved."
11089
13597
msgstr ""
13598
"To resolve that kind of conflict, you just have to decide what name should "
13599
"be\n"
13600
"retained for the file involved."
11090
13601
11091
13602
#: en/help_topics/conflict-types.txt:293
11092
13603
msgid ""
11096
13607
"``PATH2``,\n"
11097
13608
"* ``--action=done`` will just mark the conflict as resolved."
11098
13609
msgstr ""
13610
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
13611
" issuing ``bzr mv PATH2 PATH1``,\n"
13612
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
13613
"``PATH2``,\n"
13614
"* ``--action=done`` will just mark the conflict as resolved."
11099
13615
11100
13616
#: en/help_topics/conflict-types.txt:300
11101
13617
msgid ""
11102
13618
"Parent loop\n"
11103
13619
"-----------"
11104
13620
msgstr ""
13621
"Parent loop\n"
13622
"-----------"
11105
13623
11106
13624
#: en/help_topics/conflict-types.txt:305
11107
13625
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11108
msgstr ""
13626
msgstr " Conflict moving FILE into DIRECTORY. Cancelled move."
11109
13627
11110
13628
#: en/help_topics/conflict-types.txt:307
11111
13629
msgid ""
11114
13632
"itself.\n"
11115
13633
"For example::"
11116
13634
msgstr ""
13635
"This happens when the source and the target have each moved directories, so\n"
13636
"that, if the change could be applied, a directory would be contained by "
13637
"itself.\n"
13638
"For example::"
11117
13639
11118
13640
#: en/help_topics/conflict-types.txt:311
11119
13641
msgid ""
11128
13650
" $ bzr commit ../other -m \"OTHER\"\n"
11129
13651
" $ bzr merge ../other"
11130
13652
msgstr ""
13653
" $ bzr init\n"
13654
" $ bzr mkdir white\n"
13655
" $ bzr mkdir black\n"
13656
" $ bzr commit -m \"BASE\"\n"
13657
" $ bzr branch . ../other\n"
13658
" $ bzr mv white black\n"
13659
" $ bzr commit -m \"THIS\"\n"
13660
" $ bzr mv ../other/black ../other/white\n"
13661
" $ bzr commit ../other -m \"OTHER\"\n"
13662
" $ bzr merge ../other"
11131
13663
11132
13664
#: en/help_topics/conflict-types.txt:322
11133
13665
msgid ""
11135
13667
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11136
13668
"name should be retained for the directories involved."
11137
13669
msgstr ""
13670
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
13671
"``black``. To resolve that kind of conflict, you just have to decide what\n"
13672
"name should be retained for the directories involved."
11138
13673
11139
13674
#: en/help_topics/conflict-types.txt:328
11140
13675
msgid ""
11145
13680
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11146
13681
"* ``--action=done`` will just mark the conflict as resolved."
11147
13682
msgstr ""
13683
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
13684
"\n"
13685
" in ``black``,\n"
13686
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
13687
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
13688
"* ``--action=done`` will just mark the conflict as resolved."
11148
13689
11149
13690
#: en/help_topics/conflict-types.txt:336
11150
13691
msgid ""
11151
13692
"Non-directory parent\n"
11152
13693
"--------------------"
11153
13694
msgstr ""
13695
"Non-directory parent\n"
13696
"--------------------"
11154
13697
11155
13698
#: en/help_topics/conflict-types.txt:341
11156
13699
msgid ""
11157
13700
" Conflict: foo.new is not a directory, but has files in it.\n"
11158
13701
" Created directory."
11159
13702
msgstr ""
13703
" Conflict: foo.new is not a directory, but has files in it.\n"
13704
" Created directory."
11160
13705
11161
13706
#: en/help_topics/conflict-types.txt:344
11162
13707
msgid ""
11164
13709
"side\n"
11165
13710
"has changed the directory into a file or symlink. For example::"
11166
13711
msgstr ""
13712
"This happens when one side has added files to a directory, and the other "
13713
"side\n"
13714
"has changed the directory into a file or symlink. For example::"
11167
13715
11168
13716
#: en/help_topics/conflict-types.txt:347
11169
13717
msgid ""
11178
13726
" $ bzr commit ../other -m \"OTHER\"\n"
11179
13727
" $ bzr merge ../other"
11180
13728
msgstr ""
13729
" $ bzr init\n"
13730
" $ bzr mkdir foo\n"
13731
" $ bzr commit -m \"BASE\"\n"
13732
" $ bzr branch . ../other\n"
13733
" $ rmdir foo\n"
13734
" $ touch foo\n"
13735
" $ bzr commit -m \"THIS\"\n"
13736
" $ bzr mkdir ../other/foo/bar\n"
13737
" $ bzr commit ../other -m \"OTHER\"\n"
13738
" $ bzr merge ../other"
11181
13739
11182
13740
#: en/help_topics/conflict-types.txt:358
11183
13741
msgid ""
11184
13742
"To resolve that kind of conflict, you have to decide what name should be\n"
11185
13743
"retained for the file, directory or symlink involved."
11186
13744
msgstr ""
13745
"To resolve that kind of conflict, you have to decide what name should be\n"
13746
"retained for the file, directory or symlink involved."
11187
13747
11188
13748
#: en/help_topics/conflict-types.txt:363
11189
13749
msgid ""
11193
13753
" ``bzr mv foo.new foo``,\n"
11194
13754
"* ``--action=done`` will just mark the conflict as resolved."
11195
13755
msgstr ""
13756
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
13757
" ``bzr add foo``,\n"
13758
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
13759
" ``bzr mv foo.new foo``,\n"
13760
"* ``--action=done`` will just mark the conflict as resolved."
11196
13761
11197
13762
#: en/help_topics/conflict-types.txt:371
11198
13763
msgid ""
11199
13764
"MalformedTransform\n"
11200
13765
"------------------"
11201
13766
msgstr ""
13767
"MalformedTransform\n"
13768
"------------------"
11202
13769
11203
13770
#: en/help_topics/conflict-types.txt:374
11204
13771
msgid ""
11209
13776
"you\n"
11210
13777
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11211
13778
msgstr ""
13779
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
13780
"exception. This means that Bazaar encountered a filesystem conflict that it "
13781
"was\n"
13782
"unable to resolve. This usually indicates a bug. Please let us know if "
13783
"you\n"
13784
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11212
13785
11213
13786
#: en/help_topics/content-filters.txt:1
11214
13787
msgid ""
11215
13788
"Content Filters\n"
11216
13789
"==============="
11217
13790
msgstr ""
13791
"Content Filters\n"
13792
"==============="
11218
13793
11219
13794
#: en/help_topics/content-filters.txt:4
11220
13795
msgid ""
11221
13796
"Content formats\n"
11222
13797
"---------------"
11223
13798
msgstr ""
13799
"Content formats\n"
13800
"---------------"
11224
13801
11225
13802
#: en/help_topics/content-filters.txt:7
11226
13803
msgid ""
11233
13810
"and trailing spaces on lines in text files to be implicitly stripped\n"
11234
13811
"when committed."
11235
13812
msgstr ""
13813
"Bazaar's content filtering allows you to store files in a different\n"
13814
"format from the copy in your working tree. This lets you, or your\n"
13815
"co-developers, use Windows development tools that expect CRLF files\n"
13816
"on projects that use other line-ending conventions. Among other things,\n"
13817
"content filters also let Unix developers more easily work on projects\n"
13818
"using Windows line-ending conventions, keyword expansion/compression,\n"
13819
"and trailing spaces on lines in text files to be implicitly stripped\n"
13820
"when committed."
11236
13821
11237
13822
#: en/help_topics/content-filters.txt:16
11238
13823
msgid "To generalize, there are two content formats supported by Bazaar:"
11239
msgstr ""
13824
msgstr "To generalise, there are two content formats supported by Bazaar:"
11240
13825
11241
13826
#: en/help_topics/content-filters.txt:18
11242
13827
msgid ""
11243
13828
"* a canonical format - how files are stored internally\n"
11244
13829
"* a convenience format - how files are created in a working tree."
11245
13830
msgstr ""
13831
"* a canonical format - how files are stored internally\n"
13832
"* a convenience format - how files are created in a working tree."
11246
13833
11247
13834
#: en/help_topics/content-filters.txt:21
11248
13835
msgid ""
11250
13837
"Format conversion\n"
11251
13838
"-----------------"
11252
13839
msgstr ""
13840
"\n"
13841
"Format conversion\n"
13842
"-----------------"
11253
13843
11254
13844
#: en/help_topics/content-filters.txt:25
11255
13845
msgid ""
11256
13846
"The conversion between these formats is done by content filters.\n"
11257
13847
"A content filter has two parts:"
11258
13848
msgstr ""
13849
"The conversion between these formats is done by content filters.\n"
13850
"A content filter has two parts:"
11259
13851
11260
13852
#: en/help_topics/content-filters.txt:28
11261
13853
msgid ""
11262
13854
"* a read converter - converts from convenience to canonical format\n"
11263
13855
"* a write converter - converts from canonical to convenience format."
11264
13856
msgstr ""
13857
"* a read converter - converts from convenience to canonical format\n"
13858
"* a write converter - converts from canonical to convenience format."
11265
13859
11266
13860
#: en/help_topics/content-filters.txt:31
11267
13861
msgid ""
11272
13866
"trailing whitespace off lines in source code while the matching\n"
11273
13867
"write converter might pass content through unchanged."
11274
13868
msgstr ""
13869
"Many of these converters will provide *round-trip* conversion,\n"
13870
"i.e. applying the read converter followed by the write converter\n"
13871
"gives back the original content. However, others may provide an\n"
13872
"asymmetric conversion. For example, a read converter might strip\n"
13873
"trailing whitespace off lines in source code while the matching\n"
13874
"write converter might pass content through unchanged."
11275
13875
11276
13876
#: en/help_topics/content-filters.txt:38
11277
13877
msgid ""
11279
13879
"Enabling content filters\n"
11280
13880
"------------------------"
11281
13881
msgstr ""
13882
"\n"
13883
"Enabling content filters\n"
13884
"------------------------"
11282
13885
11283
13886
#: en/help_topics/content-filters.txt:42
11284
13887
msgid ""
11291
13894
"using rule-based preferences. See ``bzr help rules`` for general\n"
11292
13895
"information about defining these."
11293
13896
msgstr ""
13897
"Content filters are typically provided by plugins, so the first step\n"
13898
"in using them is to install the relevant plugins and read their\n"
13899
"documentation. Some plugins may be very specific about which files\n"
13900
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
13901
"In other cases, the plugin may leave it in the user's hands to\n"
13902
"define which files are to be filtered. This is typically done\n"
13903
"using rule-based preferences. See ``bzr help rules`` for general\n"
13904
"information about defining these."
11294
13905
11295
13906
#: en/help_topics/content-filters.txt:51
11296
13907
msgid ""
11298
13909
"Impact on commands\n"
11299
13910
"------------------"
11300
13911
msgstr ""
13912
"\n"
13913
"Impact on commands\n"
13914
"------------------"
11301
13915
11302
13916
#: en/help_topics/content-filters.txt:55
11303
13917
msgid ""
11306
13920
"will apply read converters to files in the working tree, then compare\n"
11307
13921
"the results to the content last committed."
11308
13922
msgstr ""
13923
"Read converters are only applied to commands that read content from\n"
13924
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
13925
"will apply read converters to files in the working tree, then compare\n"
13926
"the results to the content last committed."
11309
13927
11310
13928
#: en/help_topics/content-filters.txt:60
11311
13929
msgid ""
11314
13932
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11315
13933
"respectively."
11316
13934
msgstr ""
13935
"Write converters are only applied by commands that **create files in a\n"
13936
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
13937
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
13938
"respectively."
11317
13939
11318
13940
#: en/help_topics/content-filters.txt:65
11319
13941
msgid ""
11323
13945
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11324
13946
"for more information on hooks."
11325
13947
msgstr ""
13948
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
13949
"committing files. If this makes sense for a given plugin providing\n"
13950
"a content filter, the plugin can usually achieve this effect by using a\n"
13951
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
13952
"for more information on hooks."
11326
13953
11327
13954
#: en/help_topics/content-filters.txt:71
11328
13955
msgid ""
11330
13957
"Refreshing your working tree\n"
11331
13958
"----------------------------"
11332
13959
msgstr ""
13960
"\n"
13961
"Refreshing your working tree\n"
13962
"----------------------------"
11333
13963
11334
13964
#: en/help_topics/content-filters.txt:75
11335
13965
msgid ""
11340
13970
"in one or both directions, e.g. after installing or reconfiguring\n"
11341
13971
"plugins providing it."
11342
13972
msgstr ""
13973
"For performance reasons, Bazaar caches the timestamps of files in\n"
13974
"a working tree, and assumes files are unchanged if their timestamps\n"
13975
"match the cached values. As a consequence, there are times when\n"
13976
"you may need to explicitly ask for content filtering to be reapplied\n"
13977
"in one or both directions, e.g. after installing or reconfiguring\n"
13978
"plugins providing it."
11343
13979
11344
13980
#: en/help_topics/content-filters.txt:82
11345
13981
msgid "Here are some general guidelines for doing this:"
11346
msgstr ""
13982
msgstr "Here are some general guidelines for doing this:"
11347
13983
11348
13984
#: en/help_topics/content-filters.txt:84
11349
13985
msgid ""
11352
13988
" relevant read converters and compare the end result with the\n"
11353
13989
" canonical format."
11354
13990
msgstr ""
13991
" * To reapply read converters, ``touch`` files, i.e. update their\n"
13992
" timestamp. Operations like ``bzr status`` should then reapply the\n"
13993
" relevant read converters and compare the end result with the\n"
13994
" canonical format."
11355
13995
11356
13996
#: en/help_topics/content-filters.txt:89
11357
13997
msgid ""
11358
13998
" * To reapply write converters, ensure there are no local changes,\n"
11359
13999
" delete the relevant files and run ``bzr revert`` on those files."
11360
14000
msgstr ""
14001
" * To reapply write converters, ensure there are no local changes,\n"
14002
" delete the relevant files and run ``bzr revert`` on those files."
11361
14003
11362
14004
#: en/help_topics/content-filters.txt:92
11363
14005
msgid ""
11364
14006
"Note: In the future, it is likely that additional options will be added\n"
11365
14007
"to commands to make this refreshing process faster and safer.\n"
11366
14008
msgstr ""
14009
"Note: In the future, it is likely that additional options will be added\n"
14010
"to commands to make this refreshing process faster and safer.\n"
11367
14011
11368
14012
#: en/help_topics/current-formats.txt:1
11369
14013
msgid "Current Storage Formats"
11370
msgstr ""
14014
msgstr "Current Storage Formats"
11371
14015
11372
14016
#: en/help_topics/current-formats.txt:3
11373
14017
msgid ""
11376
14020
" compress storage. Provides rich roots which are a one-way\n"
11377
14021
" transition."
11378
14022
msgstr ""
14023
":2a:\n"
14024
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
14025
" compress storage. Provides rich roots which are a one-way\n"
14026
" transition."
11379
14027
11380
14028
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11381
14029
msgid ""
11382
14030
"\n"
11383
14031
"See :doc:`formats-help` for more about storage formats."
11384
14032
msgstr ""
14033
"\n"
14034
"See :doc:`formats-help` for more about storage formats."
11385
14035
11386
14036
#: en/help_topics/debug-flags.txt:1
11387
14037
msgid ""
11388
14038
"Debug Flags\n"
11389
14039
"==========="
11390
14040
msgstr ""
14041
"Debug Flags\n"
14042
"==========="
11391
14043
11392
14044
#: en/help_topics/debug-flags.txt:4
11393
14045
msgid ""
11394
14046
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11395
14047
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11396
14048
msgstr ""
14049
"These flags can be passed on the bzr command line or (without the ``-D``\n"
14050
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11397
14051
11398
14052
#: en/help_topics/debug-flags.txt:7
11399
14053
msgid ""
11444
14098
"appropriate\n"
11445
14099
" for the format, even for non-local fetches.\n"
11446
14100
msgstr ""
14101
"-Dauth Trace authentication sections used.\n"
14102
"-Dbytes Print out how many bytes were transferred\n"
14103
"-Ddirstate Trace dirstate activity (verbose!)\n"
14104
"-Derror Instead of normal error handling, always print a "
14105
"traceback\n"
14106
" on error.\n"
14107
"-Devil Capture call sites that do expensive or badly-scaling\n"
14108
" operations.\n"
14109
"-Dfetch Trace history copying between repositories.\n"
14110
"-Dfilters Emit information for debugging content filtering.\n"
14111
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
14112
"fetch.\n"
14113
"-Dgraph Trace graph traversal.\n"
14114
"-Dhashcache Log every time a working file is read to determine its "
14115
"hash.\n"
14116
"-Dhooks Trace hook execution.\n"
14117
"-Dhpss Trace smart protocol requests and responses.\n"
14118
"-Dhpssdetail More hpss details.\n"
14119
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
14120
"-Dhttp Trace http connections, requests and responses.\n"
14121
"-Dindex Trace major index operations.\n"
14122
"-Dknit Trace knit operations.\n"
14123
"-Dlock Trace when lockdir locks are taken or released.\n"
14124
"-Dnoretry If a connection is reset, fail immediately rather than\n"
14125
" retrying the request.\n"
14126
"-Dprogress Trace progress bar operations.\n"
14127
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
14128
"-Dmerge Emit information for debugging merges.\n"
14129
"-Dno_apport Don't use apport to report crashes.\n"
14130
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
14131
"-Dpack Emit information about pack operations.\n"
14132
"-Drelock Emit a message every time a branch or repository object "
14133
"is\n"
14134
" unlocked then relocked the same way.\n"
14135
"-Dsftp Trace SFTP internals.\n"
14136
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
14137
"expected\n"
14138
"-Dstream Trace fetch streams.\n"
14139
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
14140
"portable\n"
14141
" manner.\n"
14142
"-Dunlock Some errors during unlock are treated as warnings.\n"
14143
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
14144
"-DIDS_always Always use InterDifferingSerializer to fetch if "
14145
"appropriate\n"
14146
" for the format, even for non-local fetches.\n"
11447
14147
11448
14148
#: en/help_topics/diverged-branches.txt:1
11449
14149
msgid ""
11450
14150
"Diverged Branches\n"
11451
14151
"================="
11452
14152
msgstr ""
14153
"Diverged Branches\n"
14154
"================="
11453
14155
11454
14156
#: en/help_topics/diverged-branches.txt:4
11455
14157
msgid ""
11465
14167
"source\n"
11466
14168
"branch."
11467
14169
msgstr ""
14170
"When Bazaar tries to push one branch onto another, it requires that the\n"
14171
"destination branch must be ready to receive the source branch. If this "
14172
"isn't\n"
14173
"the case, then we say that the branches have ``diverged``. Branches are\n"
14174
"considered diverged if the destination branch's most recent commit is one "
14175
"that\n"
14176
"has not been merged (directly or indirectly) by the source branch. To "
14177
"recover\n"
14178
"from diverged branches, one must merge the missing revisions into the "
14179
"source\n"
14180
"branch."
11468
14181
11469
14182
#: en/help_topics/diverged-branches.txt:12
11470
14183
msgid ""
11473
14186
"last pull and you have local commits that have not yet been pushed to the\n"
11474
14187
"mainline, then your local branch and the mainline have diverged."
11475
14188
msgstr ""
14189
"This situation commonly arises when using a centralised workflow with local\n"
14190
"commits. If someone else has committed new work to the mainline since your\n"
14191
"last pull and you have local commits that have not yet been pushed to the\n"
14192
"mainline, then your local branch and the mainline have diverged."
11476
14193
11477
14194
#: en/help_topics/diverged-branches.txt:17
11478
14195
msgid ""
11479
14196
"Discovering What Has Diverged\n"
11480
14197
"-----------------------------"
11481
14198
msgstr ""
14199
"Discovering What Has Diverged\n"
14200
"-----------------------------"
11482
14201
11483
14202
#: en/help_topics/diverged-branches.txt:20
11484
14203
msgid ""
11492
14211
"old=other_branch``\n"
11493
14212
"to show the differences between other_branch and your current branch."
11494
14213
msgstr ""
14214
"The ``bzr missing`` command is used to find out what revisions are in "
14215
"another\n"
14216
"branch that are not present in the current branch, and vice-versa. It shows "
14217
"a\n"
14218
"summary of which extra revisions exist in each branch. If you want to see "
14219
"the\n"
14220
"precise effects of those revisions, you can use ``bzr diff --"
14221
"old=other_branch``\n"
14222
"to show the differences between other_branch and your current branch."
11495
14223
11496
14224
#: en/help_topics/diverged-branches.txt:26
11497
14225
msgid ""
11498
14226
"A Solution\n"
11499
14227
"----------"
11500
14228
msgstr ""
14229
"A Solution\n"
14230
"----------"
11501
14231
11502
14232
#: en/help_topics/diverged-branches.txt:29
11503
14233
msgid ""
11518
14248
"local\n"
11519
14249
"branch can now be pushed to the mainline.\n"
11520
14250
msgstr ""
14251
"The solution is to merge the revisions from the mainline into your local\n"
14252
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
14253
"mainline. This merge may result in conflicts if the other developer's "
14254
"changes\n"
14255
"overlap with your changes. These conflicts should be resolved before\n"
14256
"continuing. After any conflicts have been resolved, or even if there were "
14257
"no\n"
14258
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
14259
"to your local branch. This requirement gives you an opportunity to test "
14260
"the\n"
14261
"resulting working tree for correctness, since the merged revisions could "
14262
"have\n"
14263
"made arbitrary changes. After testing, you should commit the merge using\n"
14264
"``bzr commit``. This clears up the diverged branches situation. Your "
14265
"local\n"
14266
"branch can now be pushed to the mainline.\n"
11521
14267
11522
14268
#: en/help_topics/env-variables.txt:1
11523
14269
msgid "Environment Variables"
11524
msgstr ""
14270
msgstr "Environment Variables"
11525
14271
11526
14272
#: en/help_topics/env-variables.txt:3
11527
14273
msgid ""
11562
14308
"=================== "
11563
14309
"===========================================================\n"
11564
14310
msgstr ""
14311
"=================== "
14312
"===========================================================\n"
14313
"BZRPATH Path where bzr is to look for shell plugin external\n"
14314
" commands.\n"
14315
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
14316
"EMAIL E-Mail address of the user.\n"
14317
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
14318
"EDITOR Editor for editing commit messages.\n"
14319
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
14320
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
14321
"BZR_PLUGINS_AT Plugins to load from a directory not in "
14322
"BZR_PLUGIN_PATH.\n"
14323
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
14324
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
14325
"and\n"
14326
" HOME.\n"
14327
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
14328
"URLs).\n"
14329
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
14330
"sshcorp,\n"
14331
" plink or lsh.\n"
14332
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
14333
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
14334
"BZR_COLUMNS Override implicit terminal width.\n"
14335
"BZR_CONCURRENCY Number of processes that can be run concurrently "
14336
"(selftest)\n"
14337
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
14338
"'text'.\n"
14339
"BZR_PDB Control whether to launch a debugger on error.\n"
14340
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
14341
" breakin debugger.\n"
14342
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
14343
"(instead\n"
14344
" of char-based).\n"
14345
"=================== "
14346
"===========================================================\n"
11565
14347
11566
14348
#: en/help_topics/eol.txt:1
11567
14349
msgid ""
11568
14350
"End of Line Conversion\n"
11569
14351
"======================"
11570
14352
msgstr ""
14353
"End of Line Conversion\n"
14354
"======================"
11571
14355
11572
14356
#: en/help_topics/eol.txt:4
11573
14357
msgid ""
11575
14359
"stores a canonical format but outputs a convenience format. See\n"
11576
14360
"``bzr help content-filters`` for general information about using these."
11577
14361
msgstr ""
14362
"EOL conversion is provided as a content filter where Bazaar internally\n"
14363
"stores a canonical format but outputs a convenience format. See\n"
14364
"``bzr help content-filters`` for general information about using these."
11578
14365
11579
14366
#: en/help_topics/eol.txt:8
11580
14367
msgid ""
11585
14372
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11586
14373
"or later."
11587
14374
msgstr ""
14375
"Note: Content filtering is only supported in recently added formats,\n"
14376
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
14377
"in a recent format. (Just setting the format on the repository\n"
14378
"is not enough.) If content filtering does not appear to be working, use\n"
14379
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
14380
"or later."
11588
14381
11589
14382
#: en/help_topics/eol.txt:15
11590
14383
msgid ""
11594
14387
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11595
14388
"supported in a future verison of Bazaar."
11596
14389
msgstr ""
14390
"EOL conversion needs to be enabled for selected file patterns using\n"
14391
"rules. See ``bzr help rules`` for general information on defining rules.\n"
14392
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
14393
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
14394
"supported in a future version of Bazaar."
11597
14395
11598
14396
#: en/help_topics/eol.txt:21
11599
14397
msgid ""
11600
14398
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11601
14399
"(If a value is not set, ``exact`` is the default.)"
11602
14400
msgstr ""
14401
"To configure which files to filter, set ``eol`` to one of the values below.\n"
14402
"(If a value is not set, ``exact`` is the default.)"
11603
14403
11604
14404
#: en/help_topics/eol.txt:24
11605
14405
msgid ""
11615
14415
" ``exact`` No conversion Exactly as in file\n"
11616
14416
" ========== ===================================== ======================"
11617
14417
msgstr ""
14418
" ========== ===================================== ======================\n"
14419
" Value Checkout end-of-lines as Commit end-of-lines as\n"
14420
" ========== ===================================== ======================\n"
14421
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
14422
" ---------- ------------------------------------- ----------------------\n"
14423
" ``lf`` ``lf`` ``lf``\n"
14424
" ---------- ------------------------------------- ----------------------\n"
14425
" ``crlf`` ``crlf`` ``lf``\n"
14426
" ---------- ------------------------------------- ----------------------\n"
14427
" ``exact`` No conversion Exactly as in file\n"
14428
" ========== ===================================== ======================"
11618
14429
11619
14430
#: en/help_topics/eol.txt:36
11620
14431
msgid ""
11621
14432
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11622
14433
"byte is detected in the file."
11623
14434
msgstr ""
14435
"Note: For safety reasons, no conversion is applied to any file where a null\n"
14436
"byte is detected in the file."
11624
14437
11625
14438
#: en/help_topics/eol.txt:39
11626
14439
msgid ""
11627
14440
"For users working on a cross-platform project, here is a suggested rule\n"
11628
14441
"to use as a starting point::"
11629
14442
msgstr ""
14443
"For users working on a cross-platform project, here is a suggested rule\n"
14444
"to use as a starting point::"
11630
14445
11631
14446
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11632
14447
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11634
14449
" [name *]\n"
11635
14450
" eol = native"
11636
14451
msgstr ""
14452
" [name *]\n"
14453
" eol = native"
11637
14454
11638
14455
#: en/help_topics/eol.txt:45
11639
14456
msgid ""
11641
14458
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11642
14459
"by giving more explicit patterns earlier in the rules file. For example::"
11643
14460
msgstr ""
14461
"If you have binary files that do not contain a null byte though, be\n"
14462
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
14463
"by giving more explicit patterns earlier in the rules file. For example::"
11644
14464
11645
14465
#: en/help_topics/eol.txt:49
11646
14466
msgid ""
11647
14467
" [name *.png]\n"
11648
14468
" eol = exact"
11649
14469
msgstr ""
14470
" [name *.png]\n"
14471
" eol = exact"
11650
14472
11651
14473
#: en/help_topics/eol.txt:55
11652
14474
msgid ""
11656
14478
"endings or line endings get mixed during editing, it gets committed\n"
11657
14479
"correctly and gets checked out correctly. For example::"
11658
14480
msgstr ""
14481
"If your working tree is on a network drive shared by users on different\n"
14482
"operating systems, you typically want to force certain conventions for\n"
14483
"certain files. In that way, if a file is created with the wrong line\n"
14484
"endings or line endings get mixed during editing, it gets committed\n"
14485
"correctly and gets checked out correctly. For example::"
11659
14486
11660
14487
#: en/help_topics/eol.txt:61
11661
14488
msgid ""
11662
14489
" [name *.bat]\n"
11663
14490
" eol = crlf"
11664
14491
msgstr ""
14492
" [name *.bat]\n"
14493
" eol = crlf"
11665
14494
11666
14495
#: en/help_topics/eol.txt:64
11667
14496
msgid ""
11668
14497
" [name *.sh]\n"
11669
14498
" eol = lf"
11670
14499
msgstr ""
14500
" [name *.sh]\n"
14501
" eol = lf"
11671
14502
11672
14503
#: en/help_topics/eol.txt:70
11673
14504
msgid ""
11677
14508
"introducing mixed line endings will be corrected during commit for files\n"
11678
14509
"with those settings."
11679
14510
msgstr ""
14511
"If you take the care to create files with their required endings, you can\n"
14512
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
14513
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
14514
"introducing mixed line endings will be corrected during commit for files\n"
14515
"with those settings."
11680
14516
11681
14517
#: en/help_topics/eol.txt:76
11682
14518
msgid ""
11683
14519
"If you have sample test data that deliberately has text files with mixed\n"
11684
14520
"newline conventions, you can ask for those to be left alone like this::"
11685
14521
msgstr ""
14522
"If you have sample test data that deliberately has text files with mixed\n"
14523
"newline conventions, you can ask for those to be left alone like this::"
11686
14524
11687
14525
#: en/help_topics/eol.txt:79
11688
14526
msgid ""
11689
14527
" [name test_data/]\n"
11690
14528
" eol = exact"
11691
14529
msgstr ""
14530
" [name test_data/]\n"
14531
" eol = exact"
11692
14532
11693
14533
#: en/help_topics/eol.txt:85
11694
14534
msgid ""
11698
14538
"In the future, a ``binary = true`` rule may be added but it is not\n"
11699
14539
"supported yet.)"
11700
14540
msgstr ""
14541
"Note that ``exact`` does not imply the file is binary but it does mean\n"
14542
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
14543
"of content analysis to detect binary files for commands like ``diff``.\n"
14544
"In the future, a ``binary = true`` rule may be added but it is not\n"
14545
"supported yet.)"
11701
14546
11702
14547
#: en/help_topics/eol.txt:91
11703
14548
msgid ""
11708
14553
"may also help users who do not have rules configured. To do this, set\n"
11709
14554
"``eol`` to one of the values below."
11710
14555
msgstr ""
14556
"If you have an existing repository with text files already stored using\n"
14557
"Windows newline conventions (``crlf``), then you may want to keep using "
14558
"that\n"
14559
"convention in the repository. Forcing certain files to this convention\n"
14560
"may also help users who do not have rules configured. To do this, set\n"
14561
"``eol`` to one of the values below."
11711
14562
11712
14563
#: en/help_topics/eol.txt:97
11713
14564
msgid ""
11727
14578
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11728
14579
" ============================ ======================== ======================"
11729
14580
msgstr ""
14581
" ============================ ======================== "
14582
"======================\n"
14583
" Value Checkout end-of-lines as Commit end-of-lines "
14584
"as\n"
14585
" ============================ ======================== "
14586
"======================\n"
14587
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
14588
" ``lf`` otherwise\n"
14589
" ---------------------------- ------------------------ ----------------------"
14590
"\n"
14591
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
14592
" ---------------------------- ------------------------ ----------------------"
14593
"\n"
14594
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
14595
" ============================ ======================== ======================"
11730
14596
11731
14597
#: en/help_topics/eol.txt:108
11732
14598
msgid ""
11734
14600
"conventions in their Bazaar repository, this rule is suggested as a\n"
11735
14601
"starting point::"
11736
14602
msgstr ""
14603
"For users working on an existing project that uses Windows newline\n"
14604
"conventions in their Bazaar repository, this rule is suggested as a\n"
14605
"starting point::"
11737
14606
11738
14607
#: en/help_topics/eol.txt:112
11739
14608
msgid ""
11740
14609
" [name *]\n"
11741
14610
" eol = native-with-crlf-in-repo"
11742
14611
msgstr ""
14612
" [name *]\n"
14613
" eol = native-with-crlf-in-repo"
11743
14614
11744
14615
#: en/help_topics/eol.txt:115
11745
14616
msgid ""
11747
14618
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11748
14619
"``crlf`` and ``exact``."
11749
14620
msgstr ""
14621
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
14622
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
14623
"``crlf`` and ``exact``."
11750
14624
11751
14625
#: en/help_topics/eol.txt:119
11752
14626
msgid ""
11755
14629
"are found. A precommit hook should be used if you wish to validate\n"
11756
14630
"(and not just convert) content before committing.\n"
11757
14631
msgstr ""
14632
"Note: Bazaar's EOL conversion will convert the content of files but\n"
14633
"never reject files because a given line ending or mixed line endings\n"
14634
"are found. A pre-commit hook should be used if you wish to validate\n"
14635
"(and not just convert) content before committing.\n"
11758
14636
11759
14637
#: en/help_topics/hidden-commands.txt:1
11760
14638
msgid ""
11794
14672
"wait-until-signalled Test helper for\n"
11795
14673
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11796
14674
msgstr ""
14675
"added List files added in working tree.\n"
14676
"ancestry List all revisions merged into this branch.\n"
14677
"assert-fail Test reporting of assertion failures\n"
14678
"bundle-info Output interesting stats about a bundle\n"
14679
"bundle-revisions Create a merge-directive for submitting changes.\n"
14680
"cat-revision Write out metadata for a revision.\n"
14681
"dump-btree Dump the contents of a btree index file to stdout.\n"
14682
"export-pot Export command helps and error messages in po format.\n"
14683
"file-id Print file_id of a particular file or directory.\n"
14684
"file-path Print path of file_ids to a file or directory.\n"
14685
"find-merge-base Find and print a base revision for merging two "
14686
"branches.\n"
14687
"hooks Show hooks.\n"
14688
"inventory Show inventory of the current working copy or a "
14689
"revision.\n"
14690
"local-time-offset Show the offset in seconds from GMT to local time.\n"
14691
"lookup-revision Lookup the revision-id from a revision-number\n"
14692
"merge-directive Generate a merge directive for auto-merge tools.\n"
14693
"modified List files modified in working tree.\n"
14694
"re-sign Create a digital signature for an existing revision.\n"
14695
"reference list, view and set branch locations for nested trees.\n"
14696
"relpath Show path of a file relative to root\n"
14697
"repair-workingtree Reset the working tree state file.\n"
14698
"revision-history Display the list of revision ids on a branch.\n"
14699
"revision-info Show revision number and revision id for a given "
14700
"revision\n"
14701
" identifier.\n"
14702
"rocks Statement of optimism.\n"
14703
"selftest Run internal test suite.\n"
14704
"shell-complete Show appropriate completions for context.\n"
14705
"test-script Run a shell-like test from a file.\n"
14706
"touching-revisions Return revision-ids which affected a particular file.\n"
14707
"unknowns List unknown files.\n"
14708
"wait-until-signalled Test helper for\n"
14709
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11797
14710
11798
14711
#: en/help_topics/hooks.txt:1
11799
14712
msgid ""
11801
14714
"Hooks\n"
11802
14715
"====="
11803
14716
msgstr ""
14717
"\n"
14718
"Hooks\n"
14719
"====="
11804
14720
11805
14721
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11806
14722
msgid ""
11807
14723
"Introduction\n"
11808
14724
"------------"
11809
14725
msgstr ""
14726
"Introduction\n"
14727
"------------"
11810
14728
11811
14729
#: en/help_topics/hooks.txt:8
11812
14730
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11813
msgstr ""
14731
msgstr "A hook of type *xxx* of class *yyy* needs to be registered using::"
11814
14732
11815
14733
#: en/help_topics/hooks.txt:10
11816
14734
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11817
msgstr ""
14735
msgstr " yyy.hooks.install_named_hook(\"xxx\", ...)"
11818
14736
11819
14737
#: en/help_topics/hooks.txt:12
11820
14738
msgid ""
11821
14739
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11822
14740
msgstr ""
14741
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11823
14742
11824
14743
#: en/help_topics/hooks.txt:14
11825
14744
msgid ""
11828
14747
"instance, BranchHooks as the class is the hooks class for\n"
11829
14748
"`bzrlib.branch.Branch.hooks`."
11830
14749
msgstr ""
14750
"The class that contains each hook is given before the hooks it supplies. "
14751
"For\n"
14752
"instance, BranchHooks as the class is the hooks class for\n"
14753
"`bzrlib.branch.Branch.hooks`."
11831
14754
11832
14755
#: en/help_topics/hooks.txt:18
11833
14756
msgid ""
11835
14758
"machine where bzr was invoked) or the server (the machine addressed by\n"
11836
14759
"the branch URL). These may be, but are not necessarily, the same machine."
11837
14760
msgstr ""
14761
"Each description also indicates whether the hook runs on the client (the\n"
14762
"machine where bzr was invoked) or the server (the machine addressed by\n"
14763
"the branch URL). These may be, but are not necessarily, the same machine."
11838
14764
11839
14765
#: en/help_topics/hooks.txt:22
11840
14766
msgid ""
11841
14767
"Plugins (including hooks) are run on the server if all of these is true:"
11842
14768
msgstr ""
14769
"Plugins (including hooks) are run on the server if all of these is true:"
11843
14770
11844
14771
#: en/help_topics/hooks.txt:24
11845
14772
msgid ""
11848
14775
"\"http://\"\n"
11849
14776
" URL when a smart server is available via HTTP)."
11850
14777
msgstr ""
14778
" * The connection is via a smart server (accessed with a URL starting with\n"
14779
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
14780
"\"http://\"\n"
14781
" URL when a smart server is available via HTTP)."
11851
14782
11852
14783
#: en/help_topics/hooks.txt:28
11853
14784
msgid ""
11855
14786
"rather\n"
11856
14787
" than client specific code (such as commit)."
11857
14788
msgstr ""
14789
" * The hook is either server specific or part of general infrastructure "
14790
"rather\n"
14791
" than client specific code (such as commit)."
11858
14792
11859
14793
#: en/help_topics/hooks.txt:31
11860
14794
msgid ""
11862
14796
"BranchHooks\n"
11863
14797
"-----------"
11864
14798
msgstr ""
14799
"\n"
14800
"BranchHooks\n"
14801
"-----------"
11865
14802
11866
14803
#: en/help_topics/hooks.txt:35
11867
14804
msgid ""
11868
14805
"automatic_tag_name\n"
11869
14806
"~~~~~~~~~~~~~~~~~~"
11870
14807
msgstr ""
14808
"automatic_tag_name\n"
14809
"~~~~~~~~~~~~~~~~~~"
11871
14810
11872
14811
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11873
14812
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11874
14813
msgid "Introduced in: 2.2"
11875
msgstr ""
14814
msgstr "Introduced in: 2.2"
11876
14815
11877
14816
#: en/help_topics/hooks.txt:40
11878
14817
msgid ""
11881
14820
"return a tag name or None if no tag name could be determined. The\n"
11882
14821
"first non-None tag name returned will be used."
11883
14822
msgstr ""
14823
"Called to determine an automatic tag name for a revision.\n"
14824
"automatic_tag_name is called with (branch, revision_id) and should\n"
14825
"return a tag name or None if no tag name could be determined. The\n"
14826
"first non-None tag name returned will be used."
11884
14827
11885
14828
#: en/help_topics/hooks.txt:45
11886
14829
msgid ""
11887
14830
"open\n"
11888
14831
"~~~~"
11889
14832
msgstr ""
14833
"open\n"
14834
"~~~~"
11890
14835
11891
14836
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11892
14837
#: en/help_topics/hooks.txt:307
11893
14838
msgid "Introduced in: 1.8"
11894
msgstr ""
14839
msgstr "Introduced in: 1.8"
11895
14840
11896
14841
#: en/help_topics/hooks.txt:50
11897
14842
msgid ""
11898
14843
"Called with the Branch object that has been opened after a branch is\n"
11899
14844
"opened."
11900
14845
msgstr ""
14846
"Called with the Branch object that has been opened after a branch is\n"
14847
"opened."
11901
14848
11902
14849
#: en/help_topics/hooks.txt:53
11903
14850
msgid ""
11904
14851
"post_branch_init\n"
11905
14852
"~~~~~~~~~~~~~~~~"
11906
14853
msgstr ""
14854
"post_branch_init\n"
14855
"~~~~~~~~~~~~~~~~"
11907
14856
11908
14857
#: en/help_topics/hooks.txt:58
11909
14858
msgid ""
11912
14861
"branch and checkout (both heavyweight and lightweight) will all\n"
11913
14862
"trigger this hook."
11914
14863
msgstr ""
14864
"Called after new branch initialisation completes. post_branch_init is\n"
14865
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
14866
"branch and checkout (both heavyweight and lightweight) will all\n"
14867
"trigger this hook."
11915
14868
11916
14869
#: en/help_topics/hooks.txt:63
11917
14870
msgid ""
11918
14871
"post_change_branch_tip\n"
11919
14872
"~~~~~~~~~~~~~~~~~~~~~~"
11920
14873
msgstr ""
14874
"post_change_branch_tip\n"
14875
"~~~~~~~~~~~~~~~~~~~~~~"
11921
14876
11922
14877
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11923
14878
msgid "Introduced in: 1.4"
11924
msgstr ""
14879
msgstr "Introduced in: 1.4"
11925
14880
11926
14881
#: en/help_topics/hooks.txt:68
11927
14882
msgid ""
11930
14885
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11931
14886
"uncommit will all trigger this hook."
11932
14887
msgstr ""
14888
"Called in bzr client and server after a change to the tip of a branch\n"
14889
"is made. post_change_branch_tip is called with a\n"
14890
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
14891
"uncommit will all trigger this hook."
11933
14892
11934
14893
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11935
14894
msgid ""
11936
14895
"post_commit\n"
11937
14896
"~~~~~~~~~~~"
11938
14897
msgstr ""
14898
"post_commit\n"
14899
"~~~~~~~~~~~"
11939
14900
11940
14901
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11941
14902
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11942
14903
msgid "Introduced in: 0.15"
11943
msgstr ""
14904
msgstr "Introduced in: 0.15"
11944
14905
11945
14906
#: en/help_topics/hooks.txt:78
11946
14907
msgid ""
11949
14910
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11950
14911
"branch."
11951
14912
msgstr ""
14913
"Called in the bzr client after a commit has completed. post_commit is\n"
14914
"called with (local, master, old_revno, old_revid, new_revno,\n"
14915
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
14916
"branch."
11952
14917
11953
14918
#: en/help_topics/hooks.txt:83
11954
14919
msgid ""
11955
14920
"post_pull\n"
11956
14921
"~~~~~~~~~"
11957
14922
msgstr ""
14923
"post_pull\n"
14924
"~~~~~~~~~"
11958
14925
11959
14926
#: en/help_topics/hooks.txt:88
11960
14927
msgid ""
11961
14928
"Called after a pull operation completes. post_pull is called with a\n"
11962
14929
"bzrlib.branch.PullResult object and only runs in the bzr client."
11963
14930
msgstr ""
14931
"Called after a pull operation completes. post_pull is called with a\n"
14932
"bzrlib.branch.PullResult object and only runs in the bzr client."
11964
14933
11965
14934
#: en/help_topics/hooks.txt:91
11966
14935
msgid ""
11967
14936
"post_push\n"
11968
14937
"~~~~~~~~~"
11969
14938
msgstr ""
14939
"post_push\n"
14940
"~~~~~~~~~"
11970
14941
11971
14942
#: en/help_topics/hooks.txt:96
11972
14943
msgid ""
11973
14944
"Called after a push operation completes. post_push is called with a\n"
11974
14945
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11975
14946
msgstr ""
14947
"Called after a push operation completes. post_push is called with a\n"
14948
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11976
14949
11977
14950
#: en/help_topics/hooks.txt:99
11978
14951
msgid ""
11979
14952
"post_switch\n"
11980
14953
"~~~~~~~~~~~"
11981
14954
msgstr ""
14955
"post_switch\n"
14956
"~~~~~~~~~~~"
11982
14957
11983
14958
#: en/help_topics/hooks.txt:104
11984
14959
msgid ""
11985
14960
"Called after a checkout switches branch. post_switch is called with a\n"
11986
14961
"bzrlib.branch.SwitchHookParams."
11987
14962
msgstr ""
14963
"Called after a checkout switches branch. post_switch is called with a\n"
14964
"bzrlib.branch.SwitchHookParams."
11988
14965
11989
14966
#: en/help_topics/hooks.txt:107
11990
14967
msgid ""
11991
14968
"post_uncommit\n"
11992
14969
"~~~~~~~~~~~~~"
11993
14970
msgstr ""
14971
"post_uncommit\n"
14972
"~~~~~~~~~~~~~"
11994
14973
11995
14974
#: en/help_topics/hooks.txt:112
11996
14975
msgid ""
12000
14979
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12001
14980
"of None."
12002
14981
msgstr ""
14982
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
14983
"called with (local, master, old_revno, old_revid, new_revno,\n"
14984
"new_revid) where local is the local branch or None, master is the\n"
14985
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
14986
"of None."
12003
14987
12004
14988
#: en/help_topics/hooks.txt:118
12005
14989
msgid ""
12006
14990
"pre_change_branch_tip\n"
12007
14991
"~~~~~~~~~~~~~~~~~~~~~"
12008
14992
msgstr ""
14993
"pre_change_branch_tip\n"
14994
"~~~~~~~~~~~~~~~~~~~~~"
12009
14995
12010
14996
#: en/help_topics/hooks.txt:121
12011
14997
msgid "Introduced in: 1.6"
12012
msgstr ""
14998
msgstr "Introduced in: 1.6"
12013
14999
12014
15000
#: en/help_topics/hooks.txt:123
12015
15001
msgid ""
12018
15004
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12019
15005
"uncommit will all trigger this hook."
12020
15006
msgstr ""
15007
"Called in bzr client and server before a change to the tip of a branch\n"
15008
"is made. pre_change_branch_tip is called with a\n"
15009
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
15010
"uncommit will all trigger this hook."
12021
15011
12022
15012
#: en/help_topics/hooks.txt:128
12023
15013
msgid ""
12024
15014
"pre_commit\n"
12025
15015
"~~~~~~~~~~"
12026
15016
msgstr ""
15017
"pre_commit\n"
15018
"~~~~~~~~~~"
12027
15019
12028
15020
#: en/help_topics/hooks.txt:131
12029
15021
msgid "Introduced in: 0.91"
12030
msgstr ""
15022
msgstr "Introduced in: 0.91"
12031
15023
12032
15024
#: en/help_topics/hooks.txt:133
12033
15025
msgid ""
12040
15032
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12041
15033
"tree."
12042
15034
msgstr ""
15035
"Called after a commit is calculated but before it is completed.\n"
15036
"pre_commit is called with (local, master, old_revno, old_revid,\n"
15037
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
15038
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
15039
"TreeDelta object describing changes from the basis revision. hooks\n"
15040
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
15041
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
15042
"tree."
12043
15043
12044
15044
#: en/help_topics/hooks.txt:142
12045
15045
msgid ""
12046
15046
"transform_fallback_location\n"
12047
15047
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12048
15048
msgstr ""
15049
"transform_fallback_location\n"
15050
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12049
15051
12050
15052
#: en/help_topics/hooks.txt:145
12051
15053
msgid "Introduced in: 1.9"
12052
msgstr ""
15054
msgstr "Introduced in: 1.9"
12053
15055
12054
15056
#: en/help_topics/hooks.txt:147
12055
15057
msgid ""
12064
15066
"called with the url returned from the previous hook.The order is\n"
12065
15067
"however undefined."
12066
15068
msgstr ""
15069
"Called when a stacked branch is activating its fallback locations.\n"
15070
"transform_fallback_location is called with (branch, url), and should\n"
15071
"return a new url. Returning the same url allows it to be used as-is,\n"
15072
"returning a different one can be used to cause the branch to stack on\n"
15073
"a closer copy of that fallback_location. Note that the branch cannot\n"
15074
"have history accessing methods called on it during this hook because\n"
15075
"the fallback locations have not been activated. When there are\n"
15076
"multiple hooks installed for transform_fallback_location, all are\n"
15077
"called with the url returned from the previous hook.The order is\n"
15078
"however undefined."
12067
15079
12068
15080
#: en/help_topics/hooks.txt:158
12069
15081
msgid ""
12070
15082
"CommandHooks\n"
12071
15083
"------------"
12072
15084
msgstr ""
15085
"CommandHooks\n"
15086
"------------"
12073
15087
12074
15088
#: en/help_topics/hooks.txt:161
12075
15089
msgid ""
12076
15090
"extend_command\n"
12077
15091
"~~~~~~~~~~~~~~"
12078
15092
msgstr ""
15093
"extend_command\n"
15094
"~~~~~~~~~~~~~~"
12079
15095
12080
15096
#: en/help_topics/hooks.txt:164
12081
15097
msgid "Introduced in: 1.13"
12082
msgstr ""
15098
msgstr "Introduced in: 1.13"
12083
15099
12084
15100
#: en/help_topics/hooks.txt:166
12085
15101
msgid ""
12087
15103
"adding or removing options, docs etc. Called with the new\n"
12088
15104
"bzrlib.commands.Command object."
12089
15105
msgstr ""
15106
"Called after creating a command object to allow modifications such as\n"
15107
"adding or removing options, docs etc. Called with the new\n"
15108
"bzrlib.commands.Command object."
12090
15109
12091
15110
#: en/help_topics/hooks.txt:170
12092
15111
msgid ""
12093
15112
"get_command\n"
12094
15113
"~~~~~~~~~~~"
12095
15114
msgstr ""
15115
"get_command\n"
15116
"~~~~~~~~~~~"
12096
15117
12097
15118
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12098
15119
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12099
15120
msgid "Introduced in: 1.17"
12100
msgstr ""
15121
msgstr "Introduced in: 1.17"
12101
15122
12102
15123
#: en/help_topics/hooks.txt:175
12103
15124
msgid ""
12108
15129
"Many users will prefer to use bzrlib.commands.register_command or\n"
12109
15130
"plugin_cmds.register_lazy."
12110
15131
msgstr ""
15132
"Called when creating a single command. Called with (cmd_or_None,\n"
15133
"command_name). get_command should either return the cmd_or_None\n"
15134
"parameter, or a replacement Command object that should be used for the\n"
15135
"command. Note that the Command.hooks hooks are core infrastructure.\n"
15136
"Many users will prefer to use bzrlib.commands.register_command or\n"
15137
"plugin_cmds.register_lazy."
12111
15138
12112
15139
#: en/help_topics/hooks.txt:182
12113
15140
msgid ""
12114
15141
"get_missing_command\n"
12115
15142
"~~~~~~~~~~~~~~~~~~~"
12116
15143
msgstr ""
15144
"get_missing_command\n"
15145
"~~~~~~~~~~~~~~~~~~~"
12117
15146
12118
15147
#: en/help_topics/hooks.txt:187
12119
15148
msgid ""
12121
15150
"Called with (command_name). get_missing_command should either return\n"
12122
15151
"None, or a Command object to be used for the command."
12123
15152
msgstr ""
15153
"Called when creating a single command if no command could be found.\n"
15154
"Called with (command_name). get_missing_command should either return\n"
15155
"None, or a Command object to be used for the command."
12124
15156
12125
15157
#: en/help_topics/hooks.txt:191
12126
15158
msgid ""
12127
15159
"list_commands\n"
12128
15160
"~~~~~~~~~~~~~"
12129
15161
msgstr ""
15162
"list_commands\n"
15163
"~~~~~~~~~~~~~"
12130
15164
12131
15165
#: en/help_topics/hooks.txt:196
12132
15166
msgid ""
12135
15169
"- e.g. to remove a command. list_commands should return the updated\n"
12136
15170
"set of command names."
12137
15171
msgstr ""
15172
"Called when enumerating commands. Called with a set of cmd_name\n"
15173
"strings for all the commands found so far. This set is safe to mutate\n"
15174
"- e.g. to remove a command. list_commands should return the updated\n"
15175
"set of command names."
12138
15176
12139
15177
#: en/help_topics/hooks.txt:201
12140
15178
msgid ""
12141
15179
"post_command\n"
12142
15180
"~~~~~~~~~~~~"
12143
15181
msgstr ""
15182
"post_command\n"
15183
"~~~~~~~~~~~~"
12144
15184
12145
15185
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12146
15186
msgid "Introduced in: 2.6"
12147
msgstr ""
15187
msgstr "Introduced in: 2.6"
12148
15188
12149
15189
#: en/help_topics/hooks.txt:206
12150
15190
msgid "Called after executing a command. Called with the command object."
12151
msgstr ""
15191
msgstr "Called after executing a command. Called with the command object."
12152
15192
12153
15193
#: en/help_topics/hooks.txt:208
12154
15194
msgid ""
12155
15195
"pre_command\n"
12156
15196
"~~~~~~~~~~~"
12157
15197
msgstr ""
15198
"pre_command\n"
15199
"~~~~~~~~~~~"
12158
15200
12159
15201
#: en/help_topics/hooks.txt:213
12160
15202
msgid "Called prior to executing a command. Called with the command object."
12161
msgstr ""
15203
msgstr "Called prior to executing a command. Called with the command object."
12162
15204
12163
15205
#: en/help_topics/hooks.txt:215
12164
15206
msgid ""
12165
15207
"_ConfigHooks\n"
12166
15208
"------------"
12167
15209
msgstr ""
15210
"_ConfigHooks\n"
15211
"------------"
12168
15212
12169
15213
#: en/help_topics/hooks.txt:218
12170
15214
msgid ""
12171
15215
"get\n"
12172
15216
"~~~"
12173
15217
msgstr ""
15218
"get\n"
15219
"~~~"
12174
15220
12175
15221
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12176
15222
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12177
15223
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12178
15224
#: en/help_topics/hooks.txt:446
12179
15225
msgid "Introduced in: 2.4"
12180
msgstr ""
15226
msgstr "Introduced in: 2.4"
12181
15227
12182
15228
#: en/help_topics/hooks.txt:223
12183
15229
msgid ""
12184
15230
"Invoked when a config option is read. The signature is (stack, name,\n"
12185
15231
"value)."
12186
15232
msgstr ""
15233
"Invoked when a config option is read. The signature is (stack, name,\n"
15234
"value)."
12187
15235
12188
15236
#: en/help_topics/hooks.txt:226
12189
15237
msgid ""
12190
15238
"load\n"
12191
15239
"~~~~"
12192
15240
msgstr ""
15241
"load\n"
15242
"~~~~"
12193
15243
12194
15244
#: en/help_topics/hooks.txt:231
12195
15245
msgid "Invoked when a config store is loaded. The signature is (store)."
12196
msgstr ""
15246
msgstr "Invoked when a config store is loaded. The signature is (store)."
12197
15247
12198
15248
#: en/help_topics/hooks.txt:233
12199
15249
msgid ""
12200
15250
"remove\n"
12201
15251
"~~~~~~"
12202
15252
msgstr ""
15253
"remove\n"
15254
"~~~~~~"
12203
15255
12204
15256
#: en/help_topics/hooks.txt:238
12205
15257
msgid ""
12206
15258
"Invoked when a config option is removed. The signature is (stack,\n"
12207
15259
"name)."
12208
15260
msgstr ""
15261
"Invoked when a config option is removed. The signature is (stack,\n"
15262
"name)."
12209
15263
12210
15264
#: en/help_topics/hooks.txt:241
12211
15265
msgid ""
12212
15266
"save\n"
12213
15267
"~~~~"
12214
15268
msgstr ""
15269
"save\n"
15270
"~~~~"
12215
15271
12216
15272
#: en/help_topics/hooks.txt:246
12217
15273
msgid "Invoked when a config store is saved. The signature is (store)."
12218
msgstr ""
15274
msgstr "Invoked when a config store is saved. The signature is (store)."
12219
15275
12220
15276
#: en/help_topics/hooks.txt:248
12221
15277
msgid ""
12222
15278
"set\n"
12223
15279
"~~~"
12224
15280
msgstr ""
15281
"set\n"
15282
"~~~"
12225
15283
12226
15284
#: en/help_topics/hooks.txt:253
12227
15285
msgid ""
12228
15286
"Invoked when a config option is set. The signature is (stack, name,\n"
12229
15287
"value)."
12230
15288
msgstr ""
15289
"Invoked when a config option is set. The signature is (stack, name,\n"
15290
"value)."
12231
15291
12232
15292
#: en/help_topics/hooks.txt:256
12233
15293
msgid ""
12234
15294
"ControlDirHooks\n"
12235
15295
"---------------"
12236
15296
msgstr ""
15297
"ControlDirHooks\n"
15298
"---------------"
12237
15299
12238
15300
#: en/help_topics/hooks.txt:259
12239
15301
msgid ""
12240
15302
"post_repo_init\n"
12241
15303
"~~~~~~~~~~~~~~"
12242
15304
msgstr ""
15305
"post_repo_init\n"
15306
"~~~~~~~~~~~~~~"
12243
15307
12244
15308
#: en/help_topics/hooks.txt:264
12245
15309
msgid ""
12246
15310
"Invoked after a repository has been initialized. post_repo_init is\n"
12247
15311
"called with a bzrlib.controldir.RepoInitHookParams."
12248
15312
msgstr ""
15313
"Invoked after a repository has been initialised. post_repo_init is\n"
15314
"called with a bzrlib.controldir.RepoInitHookParams."
12249
15315
12250
15316
#: en/help_topics/hooks.txt:267
12251
15317
msgid ""
12252
15318
"pre_open\n"
12253
15319
"~~~~~~~~"
12254
15320
msgstr ""
15321
"pre_open\n"
15322
"~~~~~~~~"
12255
15323
12256
15324
#: en/help_topics/hooks.txt:270
12257
15325
msgid "Introduced in: 1.14"
12258
msgstr ""
15326
msgstr "Introduced in: 1.14"
12259
15327
12260
15328
#: en/help_topics/hooks.txt:272
12261
15329
msgid ""
12262
15330
"Invoked before attempting to open a ControlDir with the transport that\n"
12263
15331
"the open will use."
12264
15332
msgstr ""
15333
"Invoked before attempting to open a ControlDir with the transport that\n"
15334
"the open will use."
12265
15335
12266
15336
#: en/help_topics/hooks.txt:275
12267
15337
msgid ""
12268
15338
"InfoHooks\n"
12269
15339
"---------"
12270
15340
msgstr ""
15341
"InfoHooks\n"
15342
"---------"
12271
15343
12272
15344
#: en/help_topics/hooks.txt:278
12273
15345
msgid ""
12274
15346
"repository\n"
12275
15347
"~~~~~~~~~~"
12276
15348
msgstr ""
15349
"repository\n"
15350
"~~~~~~~~~~"
12277
15351
12278
15352
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12279
15353
#: en/help_topics/hooks.txt:524
12280
15354
msgid "Introduced in: 1.15"
12281
msgstr ""
15355
msgstr "Introduced in: 1.15"
12282
15356
12283
15357
#: en/help_topics/hooks.txt:283
12284
15358
msgid ""
12286
15360
"called with a statistics dictionary as returned by the repository and\n"
12287
15361
"a file-like object to write to."
12288
15362
msgstr ""
15363
"Invoked when displaying the statistics for a repository. repository is\n"
15364
"called with a statistics dictionary as returned by the repository and\n"
15365
"a file-like object to write to."
12289
15366
12290
15367
#: en/help_topics/hooks.txt:287
12291
15368
msgid ""
12292
15369
"LockHooks\n"
12293
15370
"---------"
12294
15371
msgstr ""
15372
"LockHooks\n"
15373
"---------"
12295
15374
12296
15375
#: en/help_topics/hooks.txt:290
12297
15376
msgid ""
12298
15377
"lock_acquired\n"
12299
15378
"~~~~~~~~~~~~~"
12300
15379
msgstr ""
15380
"lock_acquired\n"
15381
"~~~~~~~~~~~~~"
12301
15382
12302
15383
#: en/help_topics/hooks.txt:295
12303
15384
msgid ""
12304
15385
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12305
15386
msgstr ""
15387
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12306
15388
12307
15389
#: en/help_topics/hooks.txt:297
12308
15390
msgid ""
12309
15391
"lock_broken\n"
12310
15392
"~~~~~~~~~~~"
12311
15393
msgstr ""
15394
"lock_broken\n"
15395
"~~~~~~~~~~~"
12312
15396
12313
15397
#: en/help_topics/hooks.txt:302
12314
15398
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12315
msgstr ""
15399
msgstr "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12316
15400
12317
15401
#: en/help_topics/hooks.txt:304
12318
15402
msgid ""
12319
15403
"lock_released\n"
12320
15404
"~~~~~~~~~~~~~"
12321
15405
msgstr ""
15406
"lock_released\n"
15407
"~~~~~~~~~~~~~"
12322
15408
12323
15409
#: en/help_topics/hooks.txt:309
12324
15410
msgid ""
12325
15411
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12326
15412
msgstr ""
15413
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12327
15414
12328
15415
#: en/help_topics/hooks.txt:311
12329
15416
msgid ""
12330
15417
"MergeHooks\n"
12331
15418
"----------"
12332
15419
msgstr ""
15420
"MergeHooks\n"
15421
"----------"
12333
15422
12334
15423
#: en/help_topics/hooks.txt:314
12335
15424
msgid ""
12336
15425
"merge_file_content\n"
12337
15426
"~~~~~~~~~~~~~~~~~~"
12338
15427
msgstr ""
15428
"merge_file_content\n"
15429
"~~~~~~~~~~~~~~~~~~"
12339
15430
12340
15431
#: en/help_topics/hooks.txt:317
12341
15432
msgid "Introduced in: 2.1"
12342
msgstr ""
15433
msgstr "Introduced in: 2.1"
12343
15434
12344
15435
#: en/help_topics/hooks.txt:319
12345
15436
msgid ""
12350
15441
"deleted the file and the other has changed it). See the\n"
12351
15442
"AbstractPerFileMerger API docs for details on how it is used by merge."
12352
15443
msgstr ""
15444
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
15445
"object when starting a merge. Should return either None or a subclass\n"
15446
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
15447
"called per file that needs to be merged (including when one side has\n"
15448
"deleted the file and the other has changed it). See the\n"
15449
"AbstractPerFileMerger API docs for details on how it is used by merge."
12353
15450
12354
15451
#: en/help_topics/hooks.txt:326
12355
15452
msgid ""
12394
15491
"MergeDirectiveHooks\n"
12395
15492
"-------------------"
12396
15493
msgstr ""
15494
"MergeDirectiveHooks\n"
15495
"-------------------"
12397
15496
12398
15497
#: en/help_topics/hooks.txt:345
12399
15498
msgid ""
12400
15499
"merge_request_body\n"
12401
15500
"~~~~~~~~~~~~~~~~~~"
12402
15501
msgstr ""
15502
"merge_request_body\n"
15503
"~~~~~~~~~~~~~~~~~~"
12403
15504
12404
15505
#: en/help_topics/hooks.txt:348
12405
15506
msgid "Introduced in: 1.15.0"
12406
msgstr ""
15507
msgstr "Introduced in: 1.15.0"
12407
15508
12408
15509
#: en/help_topics/hooks.txt:350
12409
15510
msgid ""
12411
15512
"request. Callbacks must return a body. If more than one callback is\n"
12412
15513
"registered, the output of one callback is provided to the next."
12413
15514
msgstr ""
15515
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
15516
"request. Callbacks must return a body. If more than one callback is\n"
15517
"registered, the output of one callback is provided to the next."
12414
15518
12415
15519
#: en/help_topics/hooks.txt:354
12416
15520
msgid ""
12417
15521
"MessageEditorHooks\n"
12418
15522
"------------------"
12419
15523
msgstr ""
15524
"MessageEditorHooks\n"
15525
"------------------"
12420
15526
12421
15527
#: en/help_topics/hooks.txt:357
12422
15528
msgid ""
12423
15529
"commit_message_template\n"
12424
15530
"~~~~~~~~~~~~~~~~~~~~~~~"
12425
15531
msgstr ""
15532
"commit_message_template\n"
15533
"~~~~~~~~~~~~~~~~~~~~~~~"
12426
15534
12427
15535
#: en/help_topics/hooks.txt:360
12428
15536
msgid "Introduced in: 1.10"
12429
msgstr ""
15537
msgstr "Introduced in: 1.10"
12430
15538
12431
15539
#: en/help_topics/hooks.txt:362
12432
15540
msgid ""
12438
15546
"they are chained with the result from the first passed into the\n"
12439
15547
"second, and so on."
12440
15548
msgstr ""
15549
"Called when a commit message is being generated.\n"
15550
"commit_message_template is called with the bzrlib.commit.Commit object\n"
15551
"and the message that is known so far. commit_message_template must\n"
15552
"return a new message to use (which could be the same as it was given).\n"
15553
"When there are multiple hooks registered for commit_message_template,\n"
15554
"they are chained with the result from the first passed into the\n"
15555
"second, and so on."
12441
15556
12442
15557
#: en/help_topics/hooks.txt:370
12443
15558
msgid ""
12444
15559
"set_commit_message\n"
12445
15560
"~~~~~~~~~~~~~~~~~~"
12446
15561
msgstr ""
15562
"set_commit_message\n"
15563
"~~~~~~~~~~~~~~~~~~"
12447
15564
12448
15565
#: en/help_topics/hooks.txt:375
12449
15566
msgid ""
12453
15570
"far. set_commit_message must return the message to use or None if it\n"
12454
15571
"should use the message editor as normal."
12455
15572
msgstr ""
15573
"Set a fixed commit message. set_commit_message is called with the\n"
15574
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
15575
"properties by editing commit.builder._revprops) and the message so\n"
15576
"far. set_commit_message must return the message to use or None if it\n"
15577
"should use the message editor as normal."
12456
15578
12457
15579
#: en/help_topics/hooks.txt:381
12458
15580
msgid ""
12459
15581
"MutableTreeHooks\n"
12460
15582
"----------------"
12461
15583
msgstr ""
15584
"MutableTreeHooks\n"
15585
"----------------"
12462
15586
12463
15587
#: en/help_topics/hooks.txt:384
12464
15588
msgid ""
12478
15602
12479
15603
#: en/help_topics/hooks.txt:395
12480
15604
msgid "Introduced in: 2.0"
12481
msgstr ""
15605
msgstr "Introduced in: 2.0"
12482
15606
12483
15607
#: en/help_topics/hooks.txt:397
12484
15608
msgid ""
12487
15611
"commit was performed on is available via the mutable_tree attribute of\n"
12488
15612
"that object."
12489
15613
msgstr ""
15614
"Called after a commit is performed on a tree. The hook is called with\n"
15615
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
15616
"commit was performed on is available via the mutable_tree attribute of\n"
15617
"that object."
12490
15618
12491
15619
#: en/help_topics/hooks.txt:402
12492
15620
msgid ""
12525
15653
"start_commit\n"
12526
15654
"~~~~~~~~~~~~"
12527
15655
msgstr ""
15656
"start_commit\n"
15657
"~~~~~~~~~~~~"
12528
15658
12529
15659
#: en/help_topics/hooks.txt:423
12530
15660
msgid ""
12533
15663
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12534
15664
"being performed on."
12535
15665
msgstr ""
15666
"Called before a commit is performed on a tree. The start commit hook\n"
15667
"is able to change the tree before the commit takes place. start_commit\n"
15668
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
15669
"being performed on."
12536
15670
12537
15671
#: en/help_topics/hooks.txt:428
12538
15672
msgid ""
12539
15673
"SmartClientHooks\n"
12540
15674
"----------------"
12541
15675
msgstr ""
15676
"SmartClientHooks\n"
15677
"----------------"
12542
15678
12543
15679
#: en/help_topics/hooks.txt:431
12544
15680
msgid ""
12545
15681
"call\n"
12546
15682
"~~~~"
12547
15683
msgstr ""
15684
"call\n"
15685
"~~~~"
12548
15686
12549
15687
#: en/help_topics/hooks.txt:434
12550
15688
msgid "Introduced in: unknown"
12551
msgstr ""
15689
msgstr "Introduced in: unknown"
12552
15690
12553
15691
#: en/help_topics/hooks.txt:436
12554
15692
msgid ""
12556
15694
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12557
15695
"Streaming request bodies, and responses, are not accessible."
12558
15696
msgstr ""
15697
"Called when the smart client is submitting a request to the smart\n"
15698
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
15699
"Streaming request bodies, and responses, are not accessible."
12559
15700
12560
15701
#: en/help_topics/hooks.txt:440
12561
15702
msgid ""
12562
15703
"SmartServerHooks\n"
12563
15704
"----------------"
12564
15705
msgstr ""
15706
"SmartServerHooks\n"
15707
"----------------"
12565
15708
12566
15709
#: en/help_topics/hooks.txt:443
12567
15710
msgid ""
12568
15711
"server_exception\n"
12569
15712
"~~~~~~~~~~~~~~~~"
12570
15713
msgstr ""
15714
"server_exception\n"
15715
"~~~~~~~~~~~~~~~~"
12571
15716
12572
15717
#: en/help_topics/hooks.txt:448
12573
15718
msgid ""
12576
15721
"exception has been handled, in which case the server will exit\n"
12577
15722
"normally."
12578
15723
msgstr ""
15724
"Called by the bzr server when an exception occurs. server_exception is\n"
15725
"called with the sys.exc_info() tuple return true for the hook if the\n"
15726
"exception has been handled, in which case the server will exit\n"
15727
"normally."
12579
15728
12580
15729
#: en/help_topics/hooks.txt:453
12581
15730
msgid ""
12582
15731
"server_started\n"
12583
15732
"~~~~~~~~~~~~~~"
12584
15733
msgstr ""
15734
"server_started\n"
15735
"~~~~~~~~~~~~~~"
12585
15736
12586
15737
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12587
15738
msgid "Introduced in: 0.16"
12588
msgstr ""
15739
msgstr "Introduced in: 0.16"
12589
15740
12590
15741
#: en/help_topics/hooks.txt:458
12591
15742
msgid ""
12595
15746
"locations, and public_url is the public URL for the directory being\n"
12596
15747
"served."
12597
15748
msgstr ""
15749
"Called by the bzr server when it starts serving a directory.\n"
15750
"server_started is called with (backing urls, public url), where\n"
15751
"backing_url is a list of URLs giving the server-specific directory\n"
15752
"locations, and public_url is the public URL for the directory being\n"
15753
"served."
12598
15754
12599
15755
#: en/help_topics/hooks.txt:464
12600
15756
msgid ""
12601
15757
"server_started_ex\n"
12602
15758
"~~~~~~~~~~~~~~~~~"
12603
15759
msgstr ""
15760
"server_started_ex\n"
15761
"~~~~~~~~~~~~~~~~~"
12604
15762
12605
15763
#: en/help_topics/hooks.txt:469
12606
15764
msgid ""
12607
15765
"Called by the bzr server when it starts serving a directory.\n"
12608
15766
"server_started is called with (backing_urls, server_obj)."
12609
15767
msgstr ""
15768
"Called by the bzr server when it starts serving a directory.\n"
15769
"server_started is called with (backing_urls, server_obj)."
12610
15770
12611
15771
#: en/help_topics/hooks.txt:472
12612
15772
msgid ""
12613
15773
"server_stopped\n"
12614
15774
"~~~~~~~~~~~~~~"
12615
15775
msgstr ""
15776
"server_stopped\n"
15777
"~~~~~~~~~~~~~~"
12616
15778
12617
15779
#: en/help_topics/hooks.txt:477
12618
15780
msgid ""
12620
15782
"server_stopped is called with the same parameters as the\n"
12621
15783
"server_started hook: (backing_urls, public_url)."
12622
15784
msgstr ""
15785
"Called by the bzr server when it stops serving a directory.\n"
15786
"server_stopped is called with the same parameters as the\n"
15787
"server_started hook: (backing_urls, public_url)."
12623
15788
12624
15789
#: en/help_topics/hooks.txt:481
12625
15790
msgid ""
12626
15791
"StatusHooks\n"
12627
15792
"-----------"
12628
15793
msgstr ""
15794
"StatusHooks\n"
15795
"-----------"
12629
15796
12630
15797
#: en/help_topics/hooks.txt:484
12631
15798
msgid ""
12632
15799
"post_status\n"
12633
15800
"~~~~~~~~~~~"
12634
15801
msgstr ""
15802
"post_status\n"
15803
"~~~~~~~~~~~"
12635
15804
12636
15805
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12637
15806
msgid "Introduced in: 2.3"
12638
msgstr ""
15807
msgstr "Introduced in: 2.3"
12639
15808
12640
15809
#: en/help_topics/hooks.txt:489
12641
15810
msgid ""
12645
15814
"correspond to the command line options specified by the user for the\n"
12646
15815
"status command. to_file is the output stream for writing."
12647
15816
msgstr ""
15817
"Called with argument StatusHookParams after Bazaar has displayed the\n"
15818
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15819
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15820
"correspond to the command line options specified by the user for the\n"
15821
"status command. to_file is the output stream for writing."
12648
15822
12649
15823
#: en/help_topics/hooks.txt:495
12650
15824
msgid ""
12651
15825
"pre_status\n"
12652
15826
"~~~~~~~~~~"
12653
15827
msgstr ""
15828
"pre_status\n"
15829
"~~~~~~~~~~"
12654
15830
12655
15831
#: en/help_topics/hooks.txt:500
12656
15832
msgid ""
12660
15836
"correspond to the command line options specified by the user for the\n"
12661
15837
"status command. to_file is the output stream for writing."
12662
15838
msgstr ""
15839
"Called with argument StatusHookParams before Bazaar displays the\n"
15840
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15841
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15842
"correspond to the command line options specified by the user for the\n"
15843
"status command. to_file is the output stream for writing."
12663
15844
12664
15845
#: en/help_topics/hooks.txt:506
12665
15846
msgid ""
12692
15873
"RioVersionInfoBuilderHooks\n"
12693
15874
"--------------------------"
12694
15875
msgstr ""
15876
"RioVersionInfoBuilderHooks\n"
15877
"--------------------------"
12695
15878
12696
15879
#: en/help_topics/hooks.txt:521
12697
15880
msgid ""
12698
15881
"revision\n"
12699
15882
"~~~~~~~~"
12700
15883
msgstr ""
15884
"revision\n"
15885
"~~~~~~~~"
12701
15886
12702
15887
#: en/help_topics/hooks.txt:526
12703
15888
msgid ""
12705
15890
"that is printed. revision is called with a revision object and a RIO\n"
12706
15891
"stanza.\n"
12707
15892
msgstr ""
15893
"Invoked when adding information about a revision to the RIO stanza\n"
15894
"that is printed. revision is called with a revision object and a RIO\n"
15895
"stanza.\n"
12708
15896
12709
15897
#: en/help_topics/location-alias.txt:1
12710
15898
msgid ""
12711
15899
"Location aliases\n"
12712
15900
"================"
12713
15901
msgstr ""
15902
"Location aliases\n"
15903
"================"
12714
15904
12715
15905
#: en/help_topics/location-alias.txt:4
12716
15906
msgid ""
12718
15908
"These\n"
12719
15909
"can be used with most commands that expect a location, such as `bzr push`."
12720
15910
msgstr ""
15911
"Bazaar defines several aliases for locations associated with a branch. "
15912
"These\n"
15913
"can be used with most commands that expect a location, such as `bzr push`."
12721
15914
12722
15915
#: en/help_topics/location-alias.txt:7
12723
15916
msgid "The aliases are::"
12724
msgstr ""
15917
msgstr "The aliases are::"
12725
15918
12726
15919
#: en/help_topics/location-alias.txt:9
12727
15920
msgid ""
12732
15925
" :submit The submit branch for this branch.\n"
12733
15926
" :this This branch."
12734
15927
msgstr ""
15928
" :bound The branch this branch is bound to, for bound branches.\n"
15929
" :parent The parent of this branch.\n"
15930
" :public The public location of this branch.\n"
15931
" :push The saved location used for `bzr push` with no arguments.\n"
15932
" :submit The submit branch for this branch.\n"
15933
" :this This branch."
12735
15934
12736
15935
#: en/help_topics/location-alias.txt:16
12737
15936
msgid "For example, to push to the parent location::"
12738
msgstr ""
15937
msgstr "For example, to push to the parent location::"
12739
15938
12740
15939
#: en/help_topics/location-alias.txt:18
12741
15940
msgid " bzr push :parent\n"
12742
msgstr ""
15941
msgstr " bzr push :parent\n"
12743
15942
12744
15943
#: en/help_topics/log-formats.txt:1
12745
15944
msgid ""
12746
15945
"Log Formats\n"
12747
15946
"==========="
12748
15947
msgstr ""
15948
"Log Formats\n"
15949
"==========="
12749
15950
12750
15951
#: en/help_topics/log-formats.txt:4
12751
15952
msgid ""
12752
15953
"A log format controls how information about each revision is displayed.\n"
12753
15954
"The standard log formats are compared below::"
12754
15955
msgstr ""
15956
"A log format controls how information about each revision is displayed.\n"
15957
"The standard log formats are compared below::"
12755
15958
12756
15959
#: en/help_topics/log-formats.txt:7
12757
15960
msgid ""
12772
15975
" preferred levels all 1 1\n"
12773
15976
" digital signature optional - -"
12774
15977
msgstr ""
15978
" Feature long short line\n"
15979
" ---------------------- ------------- ------------ -------------------\n"
15980
" design goal detailed view concise view 1 revision per line\n"
15981
" committer name+email name only name only\n"
15982
" author name+email - -\n"
15983
" date-time format full date only date only\n"
15984
" commit message full full top line\n"
15985
" tags yes yes yes\n"
15986
" merges indicator - yes -\n"
15987
" status/delta optional optional -\n"
15988
" diff/patch optional optional -\n"
15989
" revision-id optional optional -\n"
15990
" branch nick yes - -\n"
15991
" foreign vcs properties yes yes -\n"
15992
" preferred levels all 1 1\n"
15993
" digital signature optional - -"
12775
15994
12776
15995
#: en/help_topics/log-formats.txt:24
12777
15996
msgid ""
12778
15997
"The default format is ``long``. To change this, define the ``log_format``\n"
12779
15998
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12780
15999
msgstr ""
16000
"The default format is ``long``. To change this, define the ``log_format``\n"
16001
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12781
16002
12782
16003
#: en/help_topics/log-formats.txt:27
12783
16004
msgid ""
12784
16005
" [DEFAULT]\n"
12785
16006
" log_format = short"
12786
16007
msgstr ""
16008
" [DEFAULT]\n"
16009
" log_format = short"
12787
16010
12788
16011
#: en/help_topics/log-formats.txt:30
12789
16012
msgid ""
12790
16013
"Alternatively, to change the log format used for a given query, use the\n"
12791
16014
"--long, --short or --line options."
12792
16015
msgstr ""
16016
"Alternatively, to change the log format used for a given query, use the\n"
16017
"--long, --short or --line options."
12793
16018
12794
16019
#: en/help_topics/log-formats.txt:33
12795
16020
msgid ""
12796
16021
"If one of the standard log formats does not meet your needs, additional\n"
12797
16022
"formats can be provided by plugins.\n"
12798
16023
msgstr ""
16024
"If one of the standard log formats does not meet your needs, additional\n"
16025
"formats can be provided by plugins.\n"
12799
16026
12800
16027
#: en/help_topics/other-formats.txt:1
12801
16028
msgid "Other Storage Formats"
12802
msgstr ""
16029
msgstr "Other Storage Formats"
12803
16030
12804
16031
#: en/help_topics/other-formats.txt:3
12805
16032
msgid "Experimental formats are shown below."
12806
msgstr ""
16033
msgstr "Experimental formats are shown below."
12807
16034
12808
16035
#: en/help_topics/other-formats.txt:5
12809
16036
msgid ""
12811
16038
" (native) The 2a format with experimental support for colocated\n"
12812
16039
" branches."
12813
16040
msgstr ""
16041
":development-colo:\n"
16042
" (native) The 2a format with experimental support for colocated\n"
16043
" branches."
12814
16044
12815
16045
#: en/help_topics/other-formats.txt:9
12816
16046
msgid ""
12817
16047
"\n"
12818
16048
"Deprecated formats are shown below."
12819
16049
msgstr ""
16050
"\n"
16051
"Deprecated formats are shown below."
12820
16052
12821
16053
#: en/help_topics/other-formats.txt:12
12822
16054
msgid ""
12825
16057
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12826
16058
" by bzr < 0.92."
12827
16059
msgstr ""
16060
":pack-0.92:\n"
16061
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
16062
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
16063
" by bzr < 0.92."
12828
16064
12829
16065
#: en/help_topics/patterns.txt:1
12830
16066
msgid ""
12831
16067
"Patterns\n"
12832
16068
"========"
12833
16069
msgstr ""
16070
"Patterns\n"
16071
"========"
12834
16072
12835
16073
#: en/help_topics/patterns.txt:4
12836
16074
msgid ""
12839
16077
"and preferences can be associated with files using rule patterns.\n"
12840
16078
"The pattern syntax is described below."
12841
16079
msgstr ""
16080
"Bazaar uses patterns to match files at various times. For example,\n"
16081
"the ``add`` command skips over files that match ignore patterns\n"
16082
"and preferences can be associated with files using rule patterns.\n"
16083
"The pattern syntax is described below."
12842
16084
12843
16085
#: en/help_topics/patterns.txt:9
12844
16086
msgid ""
12848
16090
"component of the path. To match a file only in the root directory,\n"
12849
16091
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12850
16092
msgstr ""
16093
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
16094
"slash or is a regular expression, it is compared to the whole path\n"
16095
"from the branch root. Otherwise, it is compared to only the last\n"
16096
"component of the path. To match a file only in the root directory,\n"
16097
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12851
16098
12852
16099
#: en/help_topics/patterns.txt:15
12853
16100
msgid "Patterns may include globbing wildcards such as::"
12854
msgstr ""
16101
msgstr "Patterns may include globbing wildcards such as::"
12855
16102
12856
16103
#: en/help_topics/patterns.txt:17
12857
16104
msgid ""
12860
16107
" /**/ - Matches 0 or more directories in a path\n"
12861
16108
" [a-z] - Matches a single character from within a group of characters"
12862
16109
msgstr ""
16110
" ? - Matches any single character except '/'\n"
16111
" * - Matches 0 or more characters except '/'\n"
16112
" /**/ - Matches 0 or more directories in a path\n"
16113
" [a-z] - Matches a single character from within a group of characters"
12863
16114
12864
16115
#: en/help_topics/patterns.txt:22
12865
16116
msgid ""
12868
16119
"expression. Regular expression patterns may not include named or\n"
12869
16120
"numbered groups."
12870
16121
msgstr ""
16122
"Patterns may also be `Python regular expressions`_. Regular expression\n"
16123
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
16124
"expression. Regular expression patterns may not include named or\n"
16125
"numbered groups."
12871
16126
12872
16127
#: en/help_topics/patterns.txt:27
12873
16128
msgid ""
12874
16129
"Case insensitive ignore patterns can be specified with regular expressions\n"
12875
16130
"by using the ``i`` (for ignore case) flag in the pattern."
12876
16131
msgstr ""
16132
"Case insensitive ignore patterns can be specified with regular expressions\n"
16133
"by using the ``i`` (for ignore case) flag in the pattern."
12877
16134
12878
16135
#: en/help_topics/patterns.txt:30
12879
16136
msgid ""
12880
16137
"For example, a case insensitive match for ``foo`` may be specified as::"
12881
16138
msgstr ""
16139
"For example, a case insensitive match for ``foo`` may be specified as::"
12882
16140
12883
16141
#: en/help_topics/patterns.txt:32
12884
16142
msgid " RE:(?i)foo"
12885
msgstr ""
16143
msgstr " RE:(?i)foo"
12886
16144
12887
16145
#: en/help_topics/patterns.txt:34
12888
16146
msgid ""
12889
16147
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12890
16148
"matched by that pattern will not be ignored."
12891
16149
msgstr ""
16150
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
16151
"matched by that pattern will not be ignored."
12892
16152
12893
16153
#: en/help_topics/patterns.txt:37
12894
16154
msgid ""
12895
16155
".. _Python regular expressions: http://docs.python.org/library/re.html"
12896
16156
msgstr ""
16157
".. _Python regular expressions: http://docs.python.org/library/re.html"
12897
16158
12898
16159
#: en/help_topics/revisionspec.txt:1
12899
16160
msgid "Revision Identifiers"
12900
msgstr ""
16161
msgstr "Revision Identifiers"
12901
16162
12902
16163
#: en/help_topics/revisionspec.txt:3
12903
16164
msgid ""
12906
16167
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12907
16168
"'before:yesterday' and 'submit:'."
12908
16169
msgstr ""
16170
"A revision identifier refers to a specific state of a branch's history. It\n"
16171
"can be expressed in several ways. It can begin with a keyword to\n"
16172
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
16173
"'before:yesterday' and 'submit:'."
12909
16174
12910
16175
#: en/help_topics/revisionspec.txt:8
12911
16176
msgid ""
12917
16182
"will\n"
12918
16183
"be found first."
12919
16184
msgstr ""
16185
"Alternately, it can be given without a keyword, in which case it will be\n"
16186
"checked as a revision number, a tag, a revision id, a date specification, or "
16187
"a\n"
16188
"branch specification, in that order. For example, 'date:today' could be\n"
16189
"written as simply 'today', though if you have a tag called 'today' that "
16190
"will\n"
16191
"be found first."
12920
16192
12921
16193
#: en/help_topics/revisionspec.txt:14
12922
16194
msgid ""
12926
16198
"or\n"
12927
16199
"spaces around the '..')."
12928
16200
msgstr ""
16201
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
16202
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
16203
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
16204
"or\n"
16205
"spaces around the '..')."
12929
16206
12930
16207
#: en/help_topics/revisionspec.txt:19
12931
16208
msgid ""
12944
16221
"and\n"
12945
16222
"3649, but not 3647."
12946
16223
msgstr ""
16224
"Ranges are interpreted differently by different commands. To the \"log\" "
16225
"command,\n"
16226
"a range is a sequence of log messages, but to the \"diff\" command, the "
16227
"range\n"
16228
"denotes a change between revisions (and not a sequence of changes). In\n"
16229
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
16230
"consider it\n"
16231
"to be open-ended, that is, they include one end but not the other. For "
16232
"example:\n"
16233
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
16234
"3649,\n"
16235
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
16236
"and\n"
16237
"3649, but not 3647."
12947
16238
12948
16239
#: en/help_topics/revisionspec.txt:28
12949
16240
msgid "The keywords used as revision selection methods are the following:"
12950
msgstr ""
16241
msgstr "The keywords used as revision selection methods are the following:"
12951
16242
12952
16243
#: en/help_topics/revisionspec.txt:30
12953
16244
msgid ""
12974
16265
":last:\n"
12975
16266
"\tSelects the nth revision from the end."
12976
16267
msgstr ""
16268
":revid:\n"
16269
"\tSelects a revision using the revision id.\n"
16270
":submit:\n"
16271
"\tSelects a common ancestor with the submit branch.\n"
16272
":ancestor:\n"
16273
"\tSelects a common ancestor with a second branch.\n"
16274
":date:\n"
16275
"\tSelects a revision on the basis of a datestamp.\n"
16276
":branch:\n"
16277
"\tSelects the last revision of a specified branch.\n"
16278
":tag:\n"
16279
"\tSelects a revision identified by a tag name.\n"
16280
":revno:\n"
16281
"\tSelects a revision using a number.\n"
16282
":before:\n"
16283
"\tSelects the parent of the revision specified.\n"
16284
":annotate:\n"
16285
"\tSelect the revision that last modified the specified line.\n"
16286
":mainline:\n"
16287
"\tSelect mainline revision that merged the specified revision.\n"
16288
":last:\n"
16289
"\tSelects the nth revision from the end."
12977
16290
12978
16291
#: en/help_topics/revisionspec.txt:53
12979
16292
msgid "In addition, plugins can provide other keywords."
12980
msgstr ""
16293
msgstr "In addition, plugins can provide other keywords."
12981
16294
12982
16295
#: en/help_topics/revisionspec.txt:55
12983
16296
msgid "A detailed description of each keyword is given below."
12984
msgstr ""
16297
msgstr "A detailed description of each keyword is given below."
12985
16298
12986
16299
#: en/help_topics/revisionspec.txt:57
12987
16300
msgid ":revid:"
12988
msgstr ""
16301
msgstr ":revid:"
12989
16302
12990
16303
#: en/help_topics/revisionspec.txt:59
12991
16304
msgid ""
12994
16307
" Including merges, and pending merges.\n"
12995
16308
" Examples::"
12996
16309
msgstr ""
16310
" Supply a specific revision id, that can be used to specify any\n"
16311
" revision id in the ancestry of the branch.\n"
16312
" Including merges, and pending merges.\n"
16313
" Examples::"
12997
16314
12998
16315
#: en/help_topics/revisionspec.txt:64
12999
16316
msgid ""
13000
16317
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13001
16318
msgstr ""
16319
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13002
16320
13003
16321
#: en/help_topics/revisionspec.txt:66
13004
16322
msgid ":submit:"
13005
msgstr ""
16323
msgstr ":submit:"
13006
16324
13007
16325
#: en/help_topics/revisionspec.txt:68
13008
16326
msgid ""
13012
16330
" used by the bundle and merge directive commands. If no submit branch\n"
13013
16331
" is specified, the parent branch is used instead."
13014
16332
msgstr ""
16333
" Diffing against this shows all the changes that were made in this "
16334
"branch,\n"
16335
" and is a good predictor of what merge will do. The submit branch is\n"
16336
" used by the bundle and merge directive commands. If no submit branch\n"
16337
" is specified, the parent branch is used instead."
13015
16338
13016
16339
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13017
16340
msgid ""
13019
16342
" branches. Usually this is the branch point, but it could also be\n"
13020
16343
" a revision that was merged."
13021
16344
msgstr ""
16345
" The common ancestor is the last revision that existed in both\n"
16346
" branches. Usually this is the branch point, but it could also be\n"
16347
" a revision that was merged."
13022
16348
13023
16349
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13024
16350
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13025
16351
#: en/help_topics/revisionspec.txt:153
13026
16352
msgid " Examples::"
13027
msgstr ""
16353
msgstr " Examples::"
13028
16354
13029
16355
#: en/help_topics/revisionspec.txt:79
13030
16356
msgid " $ bzr diff -r submit:"
13031
msgstr ""
16357
msgstr " $ bzr diff -r submit:"
13032
16358
13033
16359
#: en/help_topics/revisionspec.txt:81
13034
16360
msgid ":ancestor:"
13035
msgstr ""
16361
msgstr ":ancestor:"
13036
16362
13037
16363
#: en/help_topics/revisionspec.txt:83
13038
16364
msgid " Supply the path to a branch to select the common ancestor."
13039
msgstr ""
16365
msgstr " Supply the path to a branch to select the common ancestor."
13040
16366
13041
16367
#: en/help_topics/revisionspec.txt:89
13042
16368
msgid ""
13044
16370
" that your branch introduces, while excluding the changes that you\n"
13045
16371
" have not merged from the remote branch."
13046
16372
msgstr ""
16373
" This is frequently used with 'diff' to return all of the changes\n"
16374
" that your branch introduces, while excluding the changes that you\n"
16375
" have not merged from the remote branch."
13047
16376
13048
16377
#: en/help_topics/revisionspec.txt:95
13049
16378
msgid ""
13050
16379
" ancestor:/path/to/branch\n"
13051
16380
" $ bzr diff -r ancestor:../../mainline/branch"
13052
16381
msgstr ""
16382
" ancestor:/path/to/branch\n"
16383
" $ bzr diff -r ancestor:../../mainline/branch"
13053
16384
13054
16385
#: en/help_topics/revisionspec.txt:98
13055
16386
msgid ":date:"
13056
msgstr ""
16387
msgstr ":date:"
13057
16388
13058
16389
#: en/help_topics/revisionspec.txt:100
13059
16390
msgid ""
13062
16393
" Matches the first entry after a given date (either at midnight or\n"
13063
16394
" at a specified time)."
13064
16395
msgstr ""
16396
" Supply a datestamp to select the first revision that matches the date.\n"
16397
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
16398
" Matches the first entry after a given date (either at midnight or\n"
16399
" at a specified time)."
13065
16400
13066
16401
#: en/help_topics/revisionspec.txt:105
13067
16402
msgid " One way to display all the changes since yesterday would be::"
13068
msgstr ""
16403
msgstr " One way to display all the changes since yesterday would be::"
13069
16404
13070
16405
#: en/help_topics/revisionspec.txt:107
13071
16406
msgid " bzr log -r date:yesterday.."
13072
msgstr ""
16407
msgstr " bzr log -r date:yesterday.."
13073
16408
13074
16409
#: en/help_topics/revisionspec.txt:111
13075
16410
msgid ""
13078
16413
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13079
16414
" August 14th, 2006 at 5:10pm."
13080
16415
msgstr ""
16416
" date:yesterday -> select the first revision since "
16417
"yesterday\n"
16418
" date:2006-08-14,17:10:14 -> select the first revision after\n"
16419
" August 14th, 2006 at 5:10pm."
13081
16420
13082
16421
#: en/help_topics/revisionspec.txt:115
13083
16422
msgid ":branch:"
13084
msgstr ""
16423
msgstr ":branch:"
13085
16424
13086
16425
#: en/help_topics/revisionspec.txt:117
13087
16426
msgid " Supply the path to a branch to select its last revision."
13088
msgstr ""
16427
msgstr " Supply the path to a branch to select its last revision."
13089
16428
13090
16429
#: en/help_topics/revisionspec.txt:121
13091
16430
msgid " branch:/path/to/branch"
13092
msgstr ""
16431
msgstr " branch:/path/to/branch"
13093
16432
13094
16433
#: en/help_topics/revisionspec.txt:123
13095
16434
msgid ":tag:"
13096
msgstr ""
16435
msgstr ":tag:"
13097
16436
13098
16437
#: en/help_topics/revisionspec.txt:125
13099
16438
msgid " Tags are stored in the branch and created by the 'tag' command."
13100
msgstr ""
16439
msgstr " Tags are stored in the branch and created by the 'tag' command."
13101
16440
13102
16441
#: en/help_topics/revisionspec.txt:127
13103
16442
msgid ":revno:"
13104
msgstr ""
16443
msgstr ":revno:"
13105
16444
13106
16445
#: en/help_topics/revisionspec.txt:129
13107
16446
msgid ""
13112
16451
" first revision is returned.\n"
13113
16452
" Examples::"
13114
16453
msgstr ""
16454
" Use an integer to specify a revision in the history of the branch.\n"
16455
" Optionally a branch can be specified. A negative number will count\n"
16456
" from the end of the branch (-1 is the last revision, -2 the previous\n"
16457
" one). If the negative number is larger than the branch's history, the\n"
16458
" first revision is returned.\n"
16459
" Examples::"
13115
16460
13116
16461
#: en/help_topics/revisionspec.txt:136
13117
16462
msgid ""
13124
16469
" -1000000 -> Most likely the first revision, unless\n"
13125
16470
" your history is very long."
13126
16471
msgstr ""
16472
" revno:1 -> return the first revision of this branch\n"
16473
" revno:3:/path/to/branch -> return the 3rd revision of\n"
16474
" the branch '/path/to/branch'\n"
16475
" revno:-1 -> The last revision in a branch.\n"
16476
" -2:http://other/branch -> The second to last revision in the\n"
16477
" remote branch.\n"
16478
" -1000000 -> Most likely the first revision, unless\n"
16479
" your history is very long."
13127
16480
13128
16481
#: en/help_topics/revisionspec.txt:145
13129
16482
msgid ":before:"
13130
msgstr ""
16483
msgstr ":before:"
13131
16484
13132
16485
#: en/help_topics/revisionspec.txt:147
13133
16486
msgid ""
13137
16490
"history\n"
13138
16491
" of a branch."
13139
16492
msgstr ""
16493
" Supply any revision spec to return the parent of that revision. This "
16494
"is\n"
16495
" mostly useful when inspecting revisions that are not in the revision "
16496
"history\n"
16497
" of a branch."
13140
16498
13141
16499
#: en/help_topics/revisionspec.txt:151
13142
16500
msgid ""
13143
16501
" It is an error to request the parent of the null revision (before:0)."
13144
16502
msgstr ""
16503
" It is an error to request the parent of the null revision (before:0)."
13145
16504
13146
16505
#: en/help_topics/revisionspec.txt:155
13147
16506
msgid ""
13154
16513
" (What changes did revision 1913 introduce).\n"
13155
16514
" This is equivalent to: bzr diff -c 1913"
13156
16515
msgstr ""
16516
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
16517
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
16518
" aaaa@bbbb-1234567890\n"
16519
" bzr diff -r before:1913..1913\n"
16520
" -> Find the changes between revision 1913 and its parent "
16521
"(1912).\n"
16522
" (What changes did revision 1913 introduce).\n"
16523
" This is equivalent to: bzr diff -c 1913"
13157
16524
13158
16525
#: en/help_topics/revisionspec.txt:163
13159
16526
msgid ":annotate:"
13160
msgstr ""
16527
msgstr ":annotate:"
13161
16528
13162
16529
#: en/help_topics/revisionspec.txt:165
13163
16530
msgid ""
13167
16534
" start at 1, and are relative to the current version, not the last-\n"
13168
16535
" committed version of the file."
13169
16536
msgstr ""
16537
" Select the revision that last modified the specified line. Line is\n"
16538
" specified as path:number. Path is a relative path to the file. "
16539
"Numbers\n"
16540
" start at 1, and are relative to the current version, not the last-\n"
16541
" committed version of the file."
13170
16542
13171
16543
#: en/help_topics/revisionspec.txt:170
13172
16544
msgid ":mainline:"
13173
msgstr ""
16545
msgstr ":mainline:"
13174
16546
13175
16547
#: en/help_topics/revisionspec.txt:172
13176
16548
msgid ""
13177
16549
" Select the revision that merged the specified revision into mainline."
13178
16550
msgstr ""
16551
" Select the revision that merged the specified revision into mainline."
13179
16552
13180
16553
#: en/help_topics/revisionspec.txt:174
13181
16554
msgid ":last:"
13182
msgstr ""
16555
msgstr ":last:"
13183
16556
13184
16557
#: en/help_topics/revisionspec.txt:176
13185
16558
msgid ""
13187
16560
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13188
16561
" Examples::"
13189
16562
msgstr ""
16563
" Supply a positive number to get the nth revision from the end.\n"
16564
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
16565
" Examples::"
13190
16566
13191
16567
#: en/help_topics/revisionspec.txt:180
13192
16568
msgid ""
13193
16569
" last:1 -> return the last revision\n"
13194
16570
" last:3 -> return the revision 2 before the end.\n"
13195
16571
msgstr ""
16572
" last:1 -> return the last revision\n"
16573
" last:3 -> return the revision 2 before the end.\n"
13196
16574
13197
16575
#: en/help_topics/rules.txt:1
13198
16576
msgid ""
13199
16577
"Rules\n"
13200
16578
"====="
13201
16579
msgstr ""
16580
"Rules\n"
16581
"====="
13202
16582
13203
16583
#: en/help_topics/rules.txt:7
13204
16584
msgid ""
13206
16586
"patterns and the contents of each section are the preferences for files\n"
13207
16587
"matching that pattern(s). For example::"
13208
16588
msgstr ""
16589
"Rules are defined in ini file format where the sections are file glob\n"
16590
"patterns and the contents of each section are the preferences for files\n"
16591
"matching that pattern(s). For example::"
13209
16592
13210
16593
#: en/help_topics/rules.txt:11
13211
16594
msgid ""
13212
16595
" [name *.bat]\n"
13213
16596
" eol = native"
13214
16597
msgstr ""
16598
" [name *.bat]\n"
16599
" eol = native"
13215
16600
13216
16601
#: en/help_topics/rules.txt:14
13217
16602
msgid ""
13218
16603
" [name *.html *.xml]\n"
13219
16604
" keywords = xml_escape"
13220
16605
msgstr ""
16606
" [name *.html *.xml]\n"
16607
" keywords = xml_escape"
13221
16608
13222
16609
#: en/help_topics/rules.txt:17
13223
16610
msgid ""
13227
16614
"Keyword support is provided by the `keywords plugin\n"
13228
16615
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13229
16616
msgstr ""
16617
"Preferences like these are useful for commands and plugins wishing to\n"
16618
"provide custom behaviour for selected files. For more information on \n"
16619
"end of line conversion see :doc:`eol-help`.\n"
16620
"Keyword support is provided by the `keywords plugin\n"
16621
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13230
16622
13231
16623
#: en/help_topics/rules.txt:23
13232
16624
msgid ""
13233
16625
"Files\n"
13234
16626
"-----"
13235
16627
msgstr ""
16628
"Files\n"
16629
"-----"
13236
16630
13237
16631
#: en/help_topics/rules.txt:26
13238
16632
msgid ""
13239
16633
"Default rules for all branches are defined in the optional file\n"
13240
16634
"``BZR_HOME/rules``. "
13241
16635
msgstr ""
16636
"Default rules for all branches are defined in the optional file\n"
16637
"``BZR_HOME/rules``. "
13242
16638
13243
16639
#: en/help_topics/rules.txt:29
13244
16640
msgid ""
13245
16641
"Rule Patterns\n"
13246
16642
"-------------"
13247
16643
msgstr ""
16644
"Rule Patterns\n"
16645
"-------------"
13248
16646
13249
16647
#: en/help_topics/rules.txt:32
13250
16648
msgid ""
13253
16651
"the top of the file. Rule patterns use exactly the same conventions\n"
13254
16652
"as ignore patterns. See :doc:`patterns-help` for details."
13255
16653
msgstr ""
16654
"Patterns are ordered and searching stops as soon as one matches.\n"
16655
"As a consequence, more explicit patterns should be placed towards\n"
16656
"the top of the file. Rule patterns use exactly the same conventions\n"
16657
"as ignore patterns. See :doc:`patterns-help` for details."
13256
16658
13257
16659
#: en/help_topics/rules.txt:37
13258
16660
msgid ".. note::"
13259
msgstr ""
16661
msgstr ".. note::"
13260
16662
13261
16663
#: en/help_topics/rules.txt:39
13262
16664
msgid ""
13263
16665
" Patterns containing square brackets or spaces should be\n"
13264
16666
" surrounded in quotes to ensure they are correctly parsed.\n"
13265
16667
msgstr ""
16668
" Patterns containing square brackets or spaces should be\n"
16669
" surrounded in quotes to ensure they are correctly parsed.\n"
13266
16670
13267
16671
#: en/help_topics/topics.txt:1
13268
16672
msgid ""
13303
16707
"urlspec Supported transport protocols\n"
13304
16708
"working-trees Information on working trees\n"
13305
16709
msgstr ""
16710
"authentication Information on configuring authentication\n"
16711
"basic Basic commands\n"
16712
"branches Information on what a branch is\n"
16713
"bugs Bug tracker settings\n"
16714
"checkouts Information on what a checkout is\n"
16715
"commands Basic help for all commands\n"
16716
"configuration Details on the configuration settings available\n"
16717
"conflict-types Types of conflicts and what to do about them\n"
16718
"content-filters Conversion of content into/from working trees\n"
16719
"criss-cross Information on criss-cross merging\n"
16720
"current-formats Current storage formats\n"
16721
"debug-flags Options to show or record debug information\n"
16722
"diverged-branches How to fix diverged branches\n"
16723
"env-variables Environment variable names and values\n"
16724
"eol Information on end-of-line handling\n"
16725
"files Information on configuration and log files\n"
16726
"formats Information on choosing a storage format\n"
16727
"global-options Options that control how Bazaar runs\n"
16728
"hidden-commands All hidden commands\n"
16729
"hooks Points at which custom processing can be added\n"
16730
"launchpad Using Bazaar with Launchpad.net\n"
16731
"location-alias Aliases for remembered locations\n"
16732
"log-formats Details on the logging formats available\n"
16733
"other-formats Experimental and deprecated storage formats\n"
16734
"patterns Information on the pattern syntax\n"
16735
"repositories Basic information on shared repositories.\n"
16736
"revisionspec Explain how to use --revision\n"
16737
"rules Information on defining rule-based preferences\n"
16738
"standalone-trees Information on what a standalone tree is\n"
16739
"standard-options Options that can be used with any command\n"
16740
"status-flags Help on status flags\n"
16741
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
16742
"topics Topics list\n"
16743
"url-special-chars Special character handling in URLs\n"
16744
"urlspec Supported transport protocols\n"
16745
"working-trees Information on working trees\n"
13306
16746
13307
16747
#: en/help_topics/url-special-chars.txt:1
13308
16748
msgid ""
13309
16749
"Special character handling in URLs\n"
13310
16750
"=================================="
13311
16751
msgstr ""
16752
"Special character handling in URLs\n"
16753
"=================================="
13312
16754
13313
16755
#: en/help_topics/url-special-chars.txt:4
13314
16756
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13315
msgstr ""
16757
msgstr "Bazaar allows locations to be specified in multiple ways, either:"
13316
16758
13317
16759
#: en/help_topics/url-special-chars.txt:6
13318
16760
msgid " * Fully qualified URLs"
13319
msgstr ""
16761
msgstr " * Fully qualified URLs"
13320
16762
13321
16763
#: en/help_topics/url-special-chars.txt:8
13322
16764
msgid " * File system paths, relative or absolute"
13323
msgstr ""
16765
msgstr " * File system paths, relative or absolute"
13324
16766
13325
16767
#: en/help_topics/url-special-chars.txt:10
13326
16768
msgid ""
13328
16770
"that are specified it will automatically determine the appropriate URL\n"
13329
16771
"representation, and escape special characters where necessary."
13330
16772
msgstr ""
16773
"Internally bzr treats all locations as URLs. For any file system paths\n"
16774
"that are specified it will automatically determine the appropriate URL\n"
16775
"representation, and escape special characters where necessary."
13331
16776
13332
16777
#: en/help_topics/url-special-chars.txt:14
13333
16778
msgid ""
13338
16783
"be\n"
13339
16784
"urlencoded when the path is converted to a URL."
13340
16785
msgstr ""
16786
"There are a few characters which have special meaning in URLs and need "
16787
"careful\n"
16788
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
16789
"value in URLs. Any non-ASCII characters in a file path will automatically "
16790
"be\n"
16791
"urlencoded when the path is converted to a URL."
13341
16792
13342
16793
#: en/help_topics/url-special-chars.txt:19
13343
16794
msgid ""
13348
16799
"generous in what it accepts as a URL and to print them in a way that\n"
13349
16800
"will be readable."
13350
16801
msgstr ""
16802
"URLs represent non-ASCII characters in an encoding defined by the server, "
16803
"but\n"
16804
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
16805
"be\n"
16806
"generous in what it accepts as a URL and to print them in a way that\n"
16807
"will be readable."
13351
16808
13352
16809
#: en/help_topics/url-special-chars.txt:24
13353
16810
msgid ""
13356
16813
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13357
16814
"slash)::"
13358
16815
msgstr ""
16816
"For example, if you have a directory named '/tmp/%2False' these are all "
16817
"valid\n"
16818
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
16819
"slash)::"
13359
16820
13360
16821
#: en/help_topics/url-special-chars.txt:27
13361
16822
msgid ""
13366
16827
" bzr log file://localhost/tmp/%252False\n"
13367
16828
" bzr log file:%252False"
13368
16829
msgstr ""
16830
" cd /tmp\n"
16831
" bzr log /tmp/%2False\n"
16832
" bzr log %2False\n"
16833
" bzr log file:///tmp/%252False\n"
16834
" bzr log file://localhost/tmp/%252False\n"
16835
" bzr log file:%252False"
13369
16836
13370
16837
#: en/help_topics/url-special-chars.txt:34
13371
16838
msgid "These are valid but do not refer to the same file::"
13372
msgstr ""
16839
msgstr "These are valid but do not refer to the same file::"
13373
16840
13374
16841
#: en/help_topics/url-special-chars.txt:36
13375
16842
msgid ""
13376
16843
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13377
16844
" bzr log %252False (refers to a file called /tmp/%252False)"
13378
16845
msgstr ""
16846
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
16847
" bzr log %252False (refers to a file called /tmp/%252False)"
13379
16848
13380
16849
#: en/help_topics/url-special-chars.txt:39
13381
16850
msgid ""
13382
16851
"Comma also has special meaning in URLs, because it denotes `segment "
13383
16852
"parameters`_"
13384
16853
msgstr ""
16854
"Comma also has special meaning in URLs, because it denotes `segment "
16855
"parameters`_"
13385
16856
13386
16857
#: en/help_topics/url-special-chars.txt:41
13387
16858
msgid ""
13388
16859
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13389
16860
msgstr ""
16861
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13390
16862
13391
16863
#: en/help_topics/url-special-chars.txt:43
13392
16864
msgid ""
13394
16866
"literal\n"
13395
16867
"comma in a file system path, specify a URL and URL encode the comma::"
13396
16868
msgstr ""
16869
"Comma is also special in any file system paths that are specified. To use a "
16870
"literal\n"
16871
"comma in a file system path, specify a URL and URL encode the comma::"
13397
16872
13398
16873
#: en/help_topics/url-special-chars.txt:46
13399
16874
msgid ""
13403
16878
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13404
16879
"\"branch\" set to \"bla\"\n"
13405
16880
msgstr ""
16881
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
16882
"\"branch\" set to \"bla\"\n"
16883
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
16884
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
16885
"\"branch\" set to \"bla\"\n"
13406
16886
13407
16887
#: en/help_topics/urlspec.txt:1
13408
16888
msgid "URL Identifiers"
13409
msgstr ""
16889
msgstr "URL Identifiers"
13410
16890
13411
16891
#: en/help_topics/urlspec.txt:3
13412
16892
msgid "Supported URL prefixes::"
13413
msgstr ""
16893
msgstr "Supported URL prefixes::"
13414
16894
13415
16895
#: en/help_topics/urlspec.txt:5
13416
16896
msgid ""
13424
16904
"SSL.\n"
13425
16905
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13426
16906
msgstr ""
16907
" aftp:// Access using active FTP.\n"
16908
" bzr:// Fast access using the Bazaar smart server.\n"
16909
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
16910
" file:// Access using the standard filesystem (default)\n"
16911
" ftp:// Access using passive FTP.\n"
16912
" http:// Read-only access of branches exported on the web.\n"
16913
" https:// Read-only access of branches exported on the web using "
16914
"SSL.\n"
16915
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13427
16916
13428
16917
#: en/help_topics/urlspec.txt:14
13429
16918
msgid "Supported modifiers::"
13430
msgstr ""
16919
msgstr "Supported modifiers::"
13431
16920
13432
16921
#: en/help_topics/urlspec.txt:16
13433
16922
msgid " gio+ Access using any GIO supported protocols."
13434
msgstr ""
16923
msgstr " gio+ Access using any GIO supported protocols."
13435
16924
13436
16925
#: en/help_topics/urlspec.txt:18
13437
16926
msgid "Bazaar supports all of the standard parts within the URL::"
13438
msgstr ""
16927
msgstr "Bazaar supports all of the standard parts within the URL::"
13439
16928
13440
16929
#: en/help_topics/urlspec.txt:20
13441
16930
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13442
msgstr ""
16931
msgstr " <protocol>://[user[:password]@]host[:port]/[path]"
13443
16932
13444
16933
#: en/help_topics/urlspec.txt:22
13445
16934
msgid "allowing URLs such as::"
13446
msgstr ""
16935
msgstr "allowing URLs such as::"
13447
16936
13448
16937
#: en/help_topics/urlspec.txt:24
13449
16938
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13450
msgstr ""
16939
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13451
16940
13452
16941
#: en/help_topics/urlspec.txt:26
13453
16942
msgid ""
13457
16946
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13458
16947
"shell.example.com, then::"
13459
16948
msgstr ""
16949
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
16950
"with '~' as meaning that the rest of the path should be interpreted\n"
16951
"relative to the remote user's home directory. For example if the user\n"
16952
"``remote`` has a home directory of ``/home/remote`` on the server\n"
16953
"shell.example.com, then::"
13460
16954
13461
16955
#: en/help_topics/urlspec.txt:32
13462
16956
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13463
msgstr ""
16957
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13464
16958
13465
16959
#: en/help_topics/urlspec.txt:34
13466
16960
msgid "would refer to ``/home/remote/myproject/trunk``."
13467
msgstr ""
16961
msgstr "would refer to ``/home/remote/myproject/trunk``."
13468
16962
13469
16963
#: en/help_topics/urlspec.txt:36
13470
16964
msgid ""
13471
16965
"Many commands that accept URLs also accept location aliases too.\n"
13472
16966
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13473
16967
msgstr ""
16968
"Many commands that accept URLs also accept location aliases too.\n"
16969
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
16970
16971
#~ msgid ""
16972
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
16973
#~ "delete them if they can easily be recovered using revert otherwise they\n"
16974
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
16975
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
16976
#~ "Bazaar but missing in your tree and stop tracking them for you."
16977
#~ msgstr ""
16978
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
16979
#~ "delete them if they can easily be recovered using revert otherwise they\n"
16980
#~ "will be backed up (adding an extension of the form .~#~). If no options or\n"
16981
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
16982
#~ "Bazaar but missing in your tree and stop tracking them for you."
16983
16984
#~ msgid ""
16985
#~ "If unset, the tree root directory name is used as the nickname.\n"
16986
#~ "To print the current nickname, execute with no argument."
16987
#~ msgstr ""
16988
#~ "If unset, the tree root directory name is used as the nickname.\n"
16989
#~ "To print the current nickname, execute with no argument."
16990
16991
#~ msgid ""
16992
#~ "To remove only some changes, without reverting to a prior version, use\n"
16993
#~ "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
16994
#~ "will remove the changes introduced by the second last commit (-2), without\n"
16995
#~ "affecting the changes introduced by the last commit (-1). To remove\n"
16996
#~ "certain changes on a hunk-by-hunk basis, see the shelve command."
16997
#~ msgstr ""
16998
#~ "To remove only some changes, without reverting to a prior version, use\n"
16999
#~ "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
17000
#~ "will remove the changes introduced by the second last commit (-2), without\n"
17001
#~ "affecting the changes introduced by the last commit (-1). To remove\n"
17002
#~ "certain changes on a hunk-by-hunk basis, see the shelve command."
17003
17004
#~ msgid ""
17005
#~ "By default, any files that have been manually changed will be backed up\n"
17006
#~ "first. (Files changed only by merge are not backed up.) Backup files have\n"
17007
#~ "'.~#~' appended to their name, where # is a number."
17008
#~ msgstr ""
17009
#~ "By default, any files that have been manually changed will be backed up\n"
17010
#~ "first. (Files changed only by merge are not backed up.) Backup files have\n"
17011
#~ "'.~#~' appended to their name, where # is a number."
17012
17013
#~ msgid "Revert files to a previous revision."
17014
#~ msgstr "Revert files to a previous revision."
17015
17016
#~ msgid ""
17017
#~ "Giving a list of files will revert only those files. Otherwise, all files\n"
17018
#~ "will be reverted. If the revision is not specified with '--revision', the\n"
17019
#~ "last committed revision is used."
17020
#~ msgstr ""
17021
#~ "Giving a list of files will revert only those files. Otherwise, all files\n"
17022
#~ "will be reverted. If the revision is not specified with '--revision', the\n"
17023
#~ "last committed revision is used."
17024
17025
#~ msgid ""
17026
#~ "Listen for connections on nominated port of the form [hostname:]portnumber. "
17027
#~ "Passing 0 as the port number will result in a dynamically allocated port. "
17028
#~ "The default port depends on the protocol."
17029
#~ msgstr ""
17030
#~ "Listen for connections on nominated port of the form [hostname:]portnumber. "
17031
#~ "Passing 0 as the port number will result in a dynamically allocated port. "
17032
#~ "The default port depends on the protocol."
17033
17034
#~ msgid "Unknown mail client: %(mail_client)s"
17035
#~ msgstr "Unknown mail client: %(mail_client)s"
17036
17037
#~ msgid ""
17038
#~ "add Add specified files or directories.\n"
17039
#~ "alias Set/unset and display aliases.\n"
17040
#~ "annotate Show the origin of each line in a file.\n"
17041
#~ "bash-completion Generate a shell function for bash command line "
17042
#~ "completion.\n"
17043
#~ " [bash_completion]\n"
17044
#~ "bind Convert the current branch into a checkout of the "
17045
#~ "supplied\n"
17046
#~ " branch.\n"
17047
#~ "branch Create a new branch that is a copy of an existing branch.\n"
17048
#~ "branches List the branches available at the current location.\n"
17049
#~ "break-lock Break a dead lock.\n"
17050
#~ "cat Write the contents of a file as of a given revision to\n"
17051
#~ " standard output.\n"
17052
#~ "check Validate working tree structure, branch consistency and\n"
17053
#~ " repository history.\n"
17054
#~ "checkout Create a new checkout of an existing branch.\n"
17055
#~ "clean-tree Remove unwanted files from working tree.\n"
17056
#~ "commit Commit changes into a new revision.\n"
17057
#~ "config Display, set or remove a configuration option.\n"
17058
#~ "conflicts List files with conflicts.\n"
17059
#~ "deleted List files deleted in the working tree.\n"
17060
#~ "diff Show differences in the working tree, between revisions "
17061
#~ "or\n"
17062
#~ " branches.\n"
17063
#~ "dpush Push into a different VCS without any custom bzr "
17064
#~ "metadata.\n"
17065
#~ "export Export current or past revision to a destination directory "
17066
#~ "or\n"
17067
#~ " archive.\n"
17068
#~ "help Show help on a command or other topic.\n"
17069
#~ "ignore Ignore specified files or patterns.\n"
17070
#~ "ignored List ignored files and the patterns that matched them.\n"
17071
#~ "info Show information about a working tree, branch or "
17072
#~ "repository.\n"
17073
#~ "init Make a directory into a versioned branch.\n"
17074
#~ "init-repository Create a shared repository for branches to share storage\n"
17075
#~ " space.\n"
17076
#~ "join Combine a tree into its containing tree.\n"
17077
#~ "launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
17078
#~ "launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
17079
#~ "launchpad-open Open a Launchpad branch page in your web browser. "
17080
#~ "[launchpad]\n"
17081
#~ "log Show historical log for a branch or subset of a branch.\n"
17082
#~ "lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
17083
#~ "lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
17084
#~ "ls List files in a tree.\n"
17085
#~ "merge Perform a three-way merge.\n"
17086
#~ "missing Show unmerged/unpulled revisions between two branches.\n"
17087
#~ "mkdir Create a new versioned directory.\n"
17088
#~ "mv Move or rename a file.\n"
17089
#~ "nick Print or set the branch nickname.\n"
17090
#~ "pack Compress the data within a repository.\n"
17091
#~ "plugins List the installed plugins.\n"
17092
#~ "pull Turn this branch into a mirror of another branch.\n"
17093
#~ "push Update a mirror of this branch.\n"
17094
#~ "reconcile Reconcile bzr metadata in a branch.\n"
17095
#~ "reconfigure Reconfigure the type of a bzr directory.\n"
17096
#~ "register-branch Register a branch with launchpad.net. [launchpad]\n"
17097
#~ "remerge Redo a merge.\n"
17098
#~ "remove Remove files or directories.\n"
17099
#~ "remove-branch Remove a branch.\n"
17100
#~ "remove-tree Remove the working tree from a given branch/checkout.\n"
17101
#~ "renames Show list of renamed files.\n"
17102
#~ "resolve Mark a conflict as resolved.\n"
17103
#~ "revert Revert files to a previous revision.\n"
17104
#~ "revno Show current revision number.\n"
17105
#~ "root Show the tree root directory.\n"
17106
#~ "send Mail or create a merge-directive for submitting changes.\n"
17107
#~ "serve Run the bzr server.\n"
17108
#~ "shelve Temporarily set aside some changes from the current tree.\n"
17109
#~ "sign-my-commits Sign all commits by a given committer.\n"
17110
#~ "split Split a subdirectory of a tree into a separate tree.\n"
17111
#~ "status Display status summary.\n"
17112
#~ "switch Set the branch of a checkout and update.\n"
17113
#~ "tag Create, remove or modify a tag naming a revision.\n"
17114
#~ "tags List tags.\n"
17115
#~ "testament Show testament (signing-form) of a revision.\n"
17116
#~ "unbind Convert the current checkout into a regular branch.\n"
17117
#~ "uncommit Remove the last committed revision.\n"
17118
#~ "unshelve Restore shelved changes.\n"
17119
#~ "update Update a working tree to a new revision.\n"
17120
#~ "upgrade Upgrade a repository, branch or working tree to a newer\n"
17121
#~ " format.\n"
17122
#~ "verify-signatures Verify all commit signatures.\n"
17123
#~ "version Show version of bzr.\n"
17124
#~ "version-info Show version information about this tree.\n"
17125
#~ "view Manage filtered views.\n"
17126
#~ "whoami Show or set bzr user id.\n"
17127
#~ msgstr ""
17128
#~ "add Add specified files or directories.\n"
17129
#~ "alias Set/unset and display aliases.\n"
17130
#~ "annotate Show the origin of each line in a file.\n"
17131
#~ "bash-completion Generate a shell function for bash command line "
17132
#~ "completion.\n"
17133
#~ " [bash_completion]\n"
17134
#~ "bind Convert the current branch into a checkout of the "
17135
#~ "supplied\n"
17136
#~ " branch.\n"
17137
#~ "branch Create a new branch that is a copy of an existing branch.\n"
17138
#~ "branches List the branches available at the current location.\n"
17139
#~ "break-lock Break a dead lock.\n"
17140
#~ "cat Write the contents of a file as of a given revision to\n"
17141
#~ " standard output.\n"
17142
#~ "check Validate working tree structure, branch consistency and\n"
17143
#~ " repository history.\n"
17144
#~ "checkout Create a new checkout of an existing branch.\n"
17145
#~ "clean-tree Remove unwanted files from working tree.\n"
17146
#~ "commit Commit changes into a new revision.\n"
17147
#~ "config Display, set or remove a configuration option.\n"
17148
#~ "conflicts List files with conflicts.\n"
17149
#~ "deleted List files deleted in the working tree.\n"
17150
#~ "diff Show differences in the working tree, between revisions "
17151
#~ "or\n"
17152
#~ " branches.\n"
17153
#~ "dpush Push into a different VCS without any custom bzr "
17154
#~ "metadata.\n"
17155
#~ "export Export current or past revision to a destination directory "
17156
#~ "or\n"
17157
#~ " archive.\n"
17158
#~ "help Show help on a command or other topic.\n"
17159
#~ "ignore Ignore specified files or patterns.\n"
17160
#~ "ignored List ignored files and the patterns that matched them.\n"
17161
#~ "info Show information about a working tree, branch or "
17162
#~ "repository.\n"
17163
#~ "init Make a directory into a versioned branch.\n"
17164
#~ "init-repository Create a shared repository for branches to share storage\n"
17165
#~ " space.\n"
17166
#~ "join Combine a tree into its containing tree.\n"
17167
#~ "launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
17168
#~ "launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
17169
#~ "launchpad-open Open a Launchpad branch page in your web browser. "
17170
#~ "[launchpad]\n"
17171
#~ "log Show historical log for a branch or subset of a branch.\n"
17172
#~ "lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
17173
#~ "lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
17174
#~ "ls List files in a tree.\n"
17175
#~ "merge Perform a three-way merge.\n"
17176
#~ "missing Show unmerged/unpulled revisions between two branches.\n"
17177
#~ "mkdir Create a new versioned directory.\n"
17178
#~ "mv Move or rename a file.\n"
17179
#~ "nick Print or set the branch nickname.\n"
17180
#~ "pack Compress the data within a repository.\n"
17181
#~ "plugins List the installed plugins.\n"
17182
#~ "pull Turn this branch into a mirror of another branch.\n"
17183
#~ "push Update a mirror of this branch.\n"
17184
#~ "reconcile Reconcile bzr metadata in a branch.\n"
17185
#~ "reconfigure Reconfigure the type of a bzr directory.\n"
17186
#~ "register-branch Register a branch with launchpad.net. [launchpad]\n"
17187
#~ "remerge Redo a merge.\n"
17188
#~ "remove Remove files or directories.\n"
17189
#~ "remove-branch Remove a branch.\n"
17190
#~ "remove-tree Remove the working tree from a given branch/checkout.\n"
17191
#~ "renames Show list of renamed files.\n"
17192
#~ "resolve Mark a conflict as resolved.\n"
17193
#~ "revert Revert files to a previous revision.\n"
17194
#~ "revno Show current revision number.\n"
17195
#~ "root Show the tree root directory.\n"
17196
#~ "send Mail or create a merge-directive for submitting changes.\n"
17197
#~ "serve Run the bzr server.\n"
17198
#~ "shelve Temporarily set aside some changes from the current tree.\n"
17199
#~ "sign-my-commits Sign all commits by a given committer.\n"
17200
#~ "split Split a subdirectory of a tree into a separate tree.\n"
17201
#~ "status Display status summary.\n"
17202
#~ "switch Set the branch of a checkout and update.\n"
17203
#~ "tag Create, remove or modify a tag naming a revision.\n"
17204
#~ "tags List tags.\n"
17205
#~ "testament Show testament (signing-form) of a revision.\n"
17206
#~ "unbind Convert the current checkout into a regular branch.\n"
17207
#~ "uncommit Remove the last committed revision.\n"
17208
#~ "unshelve Restore shelved changes.\n"
17209
#~ "update Update a working tree to a new revision.\n"
17210
#~ "upgrade Upgrade a repository, branch or working tree to a newer\n"
17211
#~ " format.\n"
17212
#~ "verify-signatures Verify all commit signatures.\n"
17213
#~ "version Show version of bzr.\n"
17214
#~ "version-info Show version information about this tree.\n"
17215
#~ "view Manage filtered views.\n"
17216
#~ "whoami Show or set bzr user id.\n"
17217
17218
#~ msgid ""
17219
#~ "set_rh\n"
17220
#~ "~~~~~~"
17221
#~ msgstr ""
17222
#~ "set_rh\n"
17223
#~ "~~~~~~"
17224
17225
#~ msgid ""
17226
#~ "Invoked whenever the revision history has been set via\n"
17227
#~ "set_revision_history. The api signature is (branch, revision_history),\n"
17228
#~ "and the branch will be write-locked. The set_rh hook can be expensive\n"
17229
#~ "for bzr to trigger, a better hook to use is\n"
17230
#~ "Branch.post_change_branch_tip."
17231
#~ msgstr ""
17232
#~ "Invoked whenever the revision history has been set via\n"
17233
#~ "set_revision_history. The api signature is (branch, revision_history),\n"
17234
#~ "and the branch will be write-locked. The set_rh hook can be expensive\n"
17235
#~ "for bzr to trigger, a better hook to use is\n"
17236
#~ "Branch.post_change_branch_tip."
13474
17237
13475
17238
#~ msgid ""
13476
17239
#~ "Bazaar 2.5b6 -- a free distributed version-control tool\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1