« back to all changes in this revision
Viewing changes to po/en_AU.po
- browse files at revision 6437.68.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6437.68.1
- Committer: Ross Lagerwall
- Date: 2012-08-07 06:32:51 UTC
- mto: (6437.63.5 2.5)
- mto: This revision was merged to the branch mainline in revision 6558.
- Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore
bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build
bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build
- files added:
- bzrlib/tests/per_branch/test_bound_sftp.py
- files removed:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- files modified:
- INSTALL
added
removed
po/en_AU.po
1
1
# English (Australia) translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
5
#
6
6
msgid ""
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2012-07-20 14:35+0000\n"
12
"Last-Translator: Rafael Neri <Unknown>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-21 04:30+0000\n"
19
"X-Generator: Launchpad (build 15654)\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:22+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
20
21
#: bzrlib/add.py:93
21
#: bzrlib/add.py:95
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr "skipping {0} (larger than {1} of {2} bytes)"
24
24
25
#: bzrlib/branch.py:854
25
#: bzrlib/branch.py:872
26
26
msgid "Unstacking"
27
27
msgstr "Unstacking"
28
28
29
#: bzrlib/branch.py:2955
29
#: bzrlib/branch.py:3205
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr "Pushed up to revision %d."
33
33
34
#: bzrlib/branch.py:2957
34
#: bzrlib/branch.py:3207
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d tag updated."
39
msgstr[1] "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
40
41
#: bzrlib/branch.py:2960
41
#: bzrlib/branch.py:3210
42
42
msgid "No new revisions or tags to push."
43
43
msgstr "No new revisions or tags to push."
44
44
45
#: bzrlib/branch.py:2962
45
#: bzrlib/branch.py:3212
46
46
msgid "No new revisions to push."
47
47
msgstr "No new revisions to push."
48
48
49
#: bzrlib/branch.py:2982
49
#: bzrlib/branch.py:3232
50
50
msgid "checked branch {0} format {1}"
51
msgstr "checked branch {0} format {1}"
51
msgstr ""
52
52
53
#: bzrlib/branch.py:2985
53
#: bzrlib/branch.py:3235
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr "found error:%s"
57
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr "Ignoring files outside view. View is %s"
62
62
63
#: bzrlib/builtins.py:260
63
#: bzrlib/builtins.py:218
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr "bzr %s --revision takes exactly one revision identifier"
67
67
68
#: bzrlib/builtins.py:315
68
#: bzrlib/builtins.py:303
69
69
msgid "Display status summary."
70
70
msgstr "Display status summary."
71
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
72
#: bzrlib/builtins.py:305
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
79
80
#: bzrlib/builtins.py:308
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"added\n"
86
" Versioned in the working copy but not in the previous revision."
87
88
#: bzrlib/builtins.py:311
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
97
98
#: bzrlib/builtins.py:315
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renamed\n"
106
" Path of this file changed from the previous revision;\n"
107
" the text may also have changed. This includes files whose\n"
108
" parent directory was renamed."
79
109
80
110
#: bzrlib/builtins.py:320
81
111
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
112
"modified\n"
113
" Text has changed since the previous revision."
84
114
msgstr ""
85
"added\n"
86
" Versioned in the working copy but not in the previous revision."
115
"modified\n"
116
" Text has changed since the previous revision."
87
117
88
118
#: bzrlib/builtins.py:323
89
119
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
97
98
#: bzrlib/builtins.py:327
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renamed\n"
106
" Path of this file changed from the previous revision;\n"
107
" the text may also have changed. This includes files whose\n"
108
" parent directory was renamed."
109
110
#: bzrlib/builtins.py:332
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
118
#: bzrlib/builtins.py:335
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"kind changed\n"
124
" File kind has been changed (e.g. from file to directory)."
125
126
#: bzrlib/builtins.py:338
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"kind changed\n"
124
" File kind has been changed (e.g. from file to directory)."
125
126
#: bzrlib/builtins.py:326
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
134
#: bzrlib/builtins.py:329
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Additionally for directories, symlinks and files with a changed\n"
142
"executable bit, Bazaar indicates their type using a trailing\n"
143
"character: '/', '@' or '*' respectively. These decorations can be\n"
144
"disabled using the '--no-classify' option."
145
146
#: bzrlib/builtins.py:334
147
msgid ""
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
"changes to file texts, use 'bzr diff'."
150
msgstr ""
151
"To see ignored files use 'bzr ignored'. For details on the\n"
152
"changes to file texts, use 'bzr diff'."
153
154
#: bzrlib/builtins.py:337
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note that --short or -S gives status flags for each item, similar\n"
161
"to Subversion's status command. To get output similar to svn -q,\n"
162
"use bzr status -SV."
133
163
134
164
#: bzrlib/builtins.py:341
135
165
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
140
170
msgstr ""
141
"Additionally for directories, symlinks and files with a changed\n"
142
"executable bit, Bazaar indicates their type using a trailing\n"
143
"character: '/', '@' or '*' respectively. These decorations can be\n"
144
"disabled using the '--no-classify' option."
171
"If no arguments are specified, the status of the entire working\n"
172
"directory is shown. Otherwise, only the status of the specified\n"
173
"files or directories is reported. If a directory is given, status\n"
174
"is reported for everything inside that directory."
145
175
146
176
#: bzrlib/builtins.py:346
147
177
msgid ""
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
"changes to file texts, use 'bzr diff'."
150
msgstr ""
151
"To see ignored files use 'bzr ignored'. For details on the\n"
152
"changes to file texts, use 'bzr diff'."
153
154
#: bzrlib/builtins.py:349
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note that --short or -S gives status flags for each item, similar\n"
161
"to Subversion's status command. To get output similar to svn -q,\n"
162
"use bzr status -SV."
163
164
#: bzrlib/builtins.py:353
165
msgid ""
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
170
msgstr ""
171
"If no arguments are specified, the status of the entire working\n"
172
"directory is shown. Otherwise, only the status of the specified\n"
173
"files or directories is reported. If a directory is given, status\n"
174
"is reported for everything inside that directory."
175
176
#: bzrlib/builtins.py:358
177
msgid ""
178
"Before merges are committed, the pending merge tip revisions are\n"
179
"shown. To see all pending merge revisions, use the -v option.\n"
180
"To skip the display of pending merge information altogether, use\n"
181
"the no-pending option or specify a file/directory."
182
msgstr ""
183
"Before merges are committed, the pending merge tip revisions are\n"
184
"shown. To see all pending merge revisions, use the -v option.\n"
185
"To skip the display of pending merge information altogether, use\n"
186
"the no-pending option or specify a file/directory."
178
"Before merges are committed, the pending merge tip revisions are\n"
179
"shown. To see all pending merge revisions, use the -v option.\n"
180
"To skip the display of pending merge information altogether, use\n"
181
"the no-pending option or specify a file/directory."
182
msgstr ""
183
"Before merges are committed, the pending merge tip revisions are\n"
184
"shown. To see all pending merge revisions, use the -v option.\n"
185
"To skip the display of pending merge information altogether, use\n"
186
"the no-pending option or specify a file/directory."
187
188
#: bzrlib/builtins.py:351
189
msgid ""
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
192
msgstr ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
196
#: bzrlib/builtins.py:354
197
msgid ""
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
201
msgstr ""
202
"To see which files have changed in a specific revision, or between\n"
203
"two revisions, pass a revision range to the revision argument.\n"
204
"This will produce the same results as calling 'bzr diff --summarize'."
187
205
188
206
#: bzrlib/builtins.py:363
189
msgid ""
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
192
msgstr ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
196
#: bzrlib/builtins.py:366
197
msgid ""
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
201
msgstr ""
202
"To see which files have changed in a specific revision, or between\n"
203
"two revisions, pass a revision range to the revision argument.\n"
204
"This will produce the same results as calling 'bzr diff --summarize'."
205
206
#: bzrlib/builtins.py:375
207
207
msgid "Use short status indicators."
208
208
msgstr "Use short status indicators."
209
209
210
#: bzrlib/builtins.py:377
210
#: bzrlib/builtins.py:365
211
211
msgid "Only show versioned files."
212
212
msgstr "Only show versioned files."
213
213
214
#: bzrlib/builtins.py:379
214
#: bzrlib/builtins.py:367
215
215
msgid "Don't show pending merges."
216
216
msgstr "Don't show pending merges."
217
217
218
#: bzrlib/builtins.py:382
218
#: bzrlib/builtins.py:370
219
219
msgid "Do not mark object type using indicator."
220
220
msgstr "Do not mark object type using indicator."
221
221
222
#: bzrlib/builtins.py:397
222
#: bzrlib/builtins.py:385
223
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
224
msgstr "bzr status --revision takes exactly one or two revision specifiers"
225
225
226
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
226
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
227
227
msgid "You can only supply one of revision_id or --revision"
228
228
msgstr "You can only supply one of revision_id or --revision"
229
229
230
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
230
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
231
231
msgid "You must supply either --revision or a revision_id"
232
232
msgstr "You must supply either --revision or a revision_id"
233
233
234
#: bzrlib/builtins.py:451
234
#: bzrlib/builtins.py:439
235
235
#, python-format
236
236
msgid "Repository %r does not support access to raw revision texts"
237
237
msgstr "Repository %r does not support access to raw revision texts"
238
238
239
#: bzrlib/builtins.py:462
239
#: bzrlib/builtins.py:450
240
240
msgid "The repository {0} contains no revision {1}."
241
241
msgstr "The repository {0} contains no revision {1}."
242
242
243
#: bzrlib/builtins.py:469
243
#: bzrlib/builtins.py:457
244
244
msgid "You cannot specify a NULL revision."
245
245
msgstr "You cannot specify a NULL revision."
246
246
247
#: bzrlib/builtins.py:561
247
#: bzrlib/builtins.py:549
248
248
msgid "Remove the working tree from a given branch/checkout."
249
249
msgstr "Remove the working tree from a given branch/checkout."
250
250
251
#: bzrlib/builtins.py:563
251
#: bzrlib/builtins.py:551
252
252
msgid ""
253
253
"Since a lightweight checkout is little more than a working tree\n"
254
254
"this will refuse to run against one."
256
256
"Since a lightweight checkout is little more than a working tree\n"
257
257
"this will refuse to run against one."
258
258
259
#: bzrlib/builtins.py:566
259
#: bzrlib/builtins.py:554
260
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
261
msgstr "To re-create the working tree, use \"bzr checkout\"."
262
262
263
#: bzrlib/builtins.py:572
263
#: bzrlib/builtins.py:560
264
264
msgid ""
265
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
266
msgstr ""
267
267
"Remove the working tree even if it has uncommitted or shelved changes."
268
268
269
#: bzrlib/builtins.py:586
269
#: bzrlib/builtins.py:574
270
270
msgid "No working tree to remove"
271
271
msgstr "No working tree to remove"
272
272
273
#: bzrlib/builtins.py:588
273
#: bzrlib/builtins.py:576
274
274
msgid "You cannot remove the working tree of a remote path"
275
275
msgstr "You cannot remove the working tree of a remote path"
276
276
277
#: bzrlib/builtins.py:597
277
#: bzrlib/builtins.py:585
278
278
msgid "You cannot remove the working tree from a lightweight checkout"
279
279
msgstr "You cannot remove the working tree from a lightweight checkout"
280
280
281
#: bzrlib/builtins.py:637
282
msgid ""
283
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
284
"instead. Use \"--force\" if you are sure you want to reset the working tree."
285
msgstr ""
286
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
287
"instead. Use \"--force\" if you are sure you want to reset the working tree."
288
289
#: bzrlib/builtins.py:648
290
msgid ""
291
", the header appears corrupt, try passing -r -1 to set the state to the last "
292
"commit"
293
msgstr ""
294
", the header appears corrupt, try passing -r -1 to set the state to the last "
295
"commit"
296
297
#: bzrlib/builtins.py:652
281
#: bzrlib/builtins.py:625
282
msgid ""
283
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
284
"instead. Use \"--force\" if you are sure you want to reset the working tree."
285
msgstr ""
286
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
287
"instead. Use \"--force\" if you are sure you want to reset the working tree."
288
289
#: bzrlib/builtins.py:636
290
msgid ""
291
", the header appears corrupt, try passing -r -1 to set the state to the last "
292
"commit"
293
msgstr ""
294
", the header appears corrupt, try passing -r -1 to set the state to the last "
295
"commit"
296
297
#: bzrlib/builtins.py:640
298
298
msgid "failed to reset the tree state{0}"
299
299
msgstr "failed to reset the tree state{0}"
300
300
301
#: bzrlib/builtins.py:656
301
#: bzrlib/builtins.py:644
302
302
msgid "Show current revision number."
303
303
msgstr "Show current revision number."
304
304
305
#: bzrlib/builtins.py:658
305
#: bzrlib/builtins.py:646
306
306
msgid "This is equal to the number of revisions on this branch."
307
307
msgstr "This is equal to the number of revisions on this branch."
308
308
309
#: bzrlib/builtins.py:671
309
#: bzrlib/builtins.py:659
310
310
msgid "--tree and --revision can not be used together"
311
msgstr "--tree and --revision can not be used together"
311
msgstr ""
312
312
313
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
313
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
314
314
msgid "Tags can only be placed on a single revision, not on a range"
315
msgstr "Tags can only be placed on a single revision, not on a range"
315
msgstr ""
316
316
317
#: bzrlib/builtins.py:712
317
#: bzrlib/builtins.py:700
318
318
msgid "Show revno of working tree."
319
msgstr "Show revno of working tree."
319
msgstr ""
320
320
321
#: bzrlib/builtins.py:760
321
#: bzrlib/builtins.py:748
322
322
msgid "Add specified files or directories."
323
323
msgstr "Add specified files or directories."
324
324
325
#: bzrlib/builtins.py:750
326
msgid ""
327
"In non-recursive mode, all the named items are added, regardless\n"
328
"of whether they were previously ignored. A warning is given if\n"
329
"any of the named files are already versioned."
330
msgstr ""
331
"In non-recursive mode, all the named items are added, regardless\n"
332
"of whether they were previously ignored. A warning is given if\n"
333
"any of the named files are already versioned."
334
335
#: bzrlib/builtins.py:754
336
msgid ""
337
"In recursive mode (the default), files are treated the same way\n"
338
"but the behaviour for directories is different. Directories that\n"
339
"are already versioned do not give a warning. All directories,\n"
340
"whether already versioned or not, are searched for files or\n"
341
"subdirectories that are neither versioned or ignored, and these\n"
342
"are added. This search proceeds recursively into versioned\n"
343
"directories. If no names are given '.' is assumed."
344
msgstr ""
345
"In recursive mode (the default), files are treated the same way\n"
346
"but the behaviour for directories is different. Directories that\n"
347
"are already versioned do not give a warning. All directories,\n"
348
"whether already versioned or not, are searched for files or\n"
349
"subdirectories that are neither versioned or ignored, and these\n"
350
"are added. This search proceeds recursively into versioned\n"
351
"directories. If no names are given '.' is assumed."
352
325
353
#: bzrlib/builtins.py:762
326
354
msgid ""
327
"In non-recursive mode, all the named items are added, regardless\n"
328
"of whether they were previously ignored. A warning is given if\n"
329
"any of the named files are already versioned."
330
msgstr ""
331
"In non-recursive mode, all the named items are added, regardless\n"
332
"of whether they were previously ignored. A warning is given if\n"
333
"any of the named files are already versioned."
334
335
#: bzrlib/builtins.py:766
336
msgid ""
337
"In recursive mode (the default), files are treated the same way\n"
338
"but the behaviour for directories is different. Directories that\n"
339
"are already versioned do not give a warning. All directories,\n"
340
"whether already versioned or not, are searched for files or\n"
341
"subdirectories that are neither versioned or ignored, and these\n"
342
"are added. This search proceeds recursively into versioned\n"
343
"directories. If no names are given '.' is assumed."
344
msgstr ""
345
"In recursive mode (the default), files are treated the same way\n"
346
"but the behaviour for directories is different. Directories that\n"
347
"are already versioned do not give a warning. All directories,\n"
348
"whether already versioned or not, are searched for files or\n"
349
"subdirectories that are neither versioned or ignored, and these\n"
350
"are added. This search proceeds recursively into versioned\n"
351
"directories. If no names are given '.' is assumed."
352
353
#: bzrlib/builtins.py:774
354
msgid ""
355
"A warning will be printed when nested trees are encountered,\n"
356
"unless they are explicitly ignored."
357
msgstr ""
358
"A warning will be printed when nested trees are encountered,\n"
359
"unless they are explicitly ignored."
360
361
#: bzrlib/builtins.py:777
362
msgid ""
363
"Therefore simply saying 'bzr add' will version all files that\n"
364
"are currently unknown."
365
msgstr ""
366
"Therefore simply saying 'bzr add' will version all files that\n"
367
"are currently unknown."
368
369
#: bzrlib/builtins.py:780
370
msgid ""
371
"Adding a file whose parent directory is not versioned will\n"
372
"implicitly add the parent, and so on up to the root. This means\n"
373
"you should never need to explicitly add a directory, they'll just\n"
374
"get added when you add a file in the directory."
375
msgstr ""
376
"Adding a file whose parent directory is not versioned will\n"
377
"implicitly add the parent, and so on up to the root. This means\n"
378
"you should never need to explicitly add a directory, they'll just\n"
379
"get added when you add a file in the directory."
380
381
#: bzrlib/builtins.py:785
382
msgid ""
383
"--dry-run will show which files would be added, but not actually\n"
384
"add them."
385
msgstr ""
386
"--dry-run will show which files would be added, but not actually\n"
387
"add them."
388
389
#: bzrlib/builtins.py:788
390
msgid ""
391
"--file-ids-from will try to use the file ids from the supplied path.\n"
392
"It looks up ids trying to find a matching parent directory with the\n"
393
"same filename, and then by pure path. This option is rarely needed\n"
394
"but can be useful when adding the same logical file into two\n"
395
"branches that will be merged later (without showing the two different\n"
396
"adds as a conflict). It is also useful when merging another project\n"
397
"into a subdirectory of this one."
398
msgstr ""
399
"--file-ids-from will try to use the file ids from the supplied path.\n"
400
"It looks up ids trying to find a matching parent directory with the\n"
401
"same filename, and then by pure path. This option is rarely needed\n"
402
"but can be useful when adding the same logical file into two\n"
403
"branches that will be merged later (without showing the two different\n"
404
"adds as a conflict). It is also useful when merging another project\n"
405
"into a subdirectory of this one."
406
407
#: bzrlib/builtins.py:796
408
msgid ""
409
"Any files matching patterns in the ignore list will not be added\n"
410
"unless they are explicitly mentioned."
411
msgstr ""
412
"Any files matching patterns in the ignore list will not be added\n"
413
"unless they are explicitly mentioned."
414
415
#: bzrlib/builtins.py:799
416
msgid ""
417
"In recursive mode, files larger than the configuration option \n"
418
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
419
"to file size."
420
msgstr ""
421
"In recursive mode, files larger than the configuration option \n"
422
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
423
"to file size."
424
425
#: bzrlib/builtins.py:806
355
"A warning will be printed when nested trees are encountered,\n"
356
"unless they are explicitly ignored."
357
msgstr ""
358
359
#: bzrlib/builtins.py:765
360
msgid ""
361
"Therefore simply saying 'bzr add' will version all files that\n"
362
"are currently unknown."
363
msgstr ""
364
"Therefore simply saying 'bzr add' will version all files that\n"
365
"are currently unknown."
366
367
#: bzrlib/builtins.py:768
368
msgid ""
369
"Adding a file whose parent directory is not versioned will\n"
370
"implicitly add the parent, and so on up to the root. This means\n"
371
"you should never need to explicitly add a directory, they'll just\n"
372
"get added when you add a file in the directory."
373
msgstr ""
374
"Adding a file whose parent directory is not versioned will\n"
375
"implicitly add the parent, and so on up to the root. This means\n"
376
"you should never need to explicitly add a directory, they'll just\n"
377
"get added when you add a file in the directory."
378
379
#: bzrlib/builtins.py:773
380
msgid ""
381
"--dry-run will show which files would be added, but not actually\n"
382
"add them."
383
msgstr ""
384
"--dry-run will show which files would be added, but not actually\n"
385
"add them."
386
387
#: bzrlib/builtins.py:776
388
msgid ""
389
"--file-ids-from will try to use the file ids from the supplied path.\n"
390
"It looks up ids trying to find a matching parent directory with the\n"
391
"same filename, and then by pure path. This option is rarely needed\n"
392
"but can be useful when adding the same logical file into two\n"
393
"branches that will be merged later (without showing the two different\n"
394
"adds as a conflict). It is also useful when merging another project\n"
395
"into a subdirectory of this one."
396
msgstr ""
397
"--file-ids-from will try to use the file ids from the supplied path.\n"
398
"It looks up ids trying to find a matching parent directory with the\n"
399
"same filename, and then by pure path. This option is rarely needed\n"
400
"but can be useful when adding the same logical file into two\n"
401
"branches that will be merged later (without showing the two different\n"
402
"adds as a conflict). It is also useful when merging another project\n"
403
"into a subdirectory of this one."
404
405
#: bzrlib/builtins.py:784
406
msgid ""
407
"Any files matching patterns in the ignore list will not be added\n"
408
"unless they are explicitly mentioned."
409
msgstr ""
410
"Any files matching patterns in the ignore list will not be added\n"
411
"unless they are explicitly mentioned."
412
413
#: bzrlib/builtins.py:787
414
msgid ""
415
"In recursive mode, files larger than the configuration option \n"
416
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
417
"to file size."
418
msgstr ""
419
"In recursive mode, files larger than the configuration option \n"
420
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
421
"to file size."
422
423
#: bzrlib/builtins.py:794
426
424
msgid "Don't recursively add the contents of directories."
427
425
msgstr "Don't recursively add the contents of directories."
428
426
429
#: bzrlib/builtins.py:813
427
#: bzrlib/builtins.py:800
430
428
msgid "Lookup file ids from this tree."
431
429
msgstr "Lookup file ids from this tree."
432
430
433
#: bzrlib/builtins.py:849
431
#: bzrlib/builtins.py:836
434
432
msgid "ignored {0} matching \"{1}\"\n"
435
433
msgstr "ignored {0} matching \"{1}\"\n"
436
434
437
#: bzrlib/builtins.py:854
435
#: bzrlib/builtins.py:841
438
436
msgid "Create a new versioned directory."
439
437
msgstr "Create a new versioned directory."
440
438
441
#: bzrlib/builtins.py:856
439
#: bzrlib/builtins.py:843
442
440
msgid "This is equivalent to creating the directory and then adding it."
443
441
msgstr "This is equivalent to creating the directory and then adding it."
444
442
445
#: bzrlib/builtins.py:863
443
#: bzrlib/builtins.py:850
446
444
msgid "No error if existing, make parent directories as needed."
447
445
msgstr "No error if existing, make parent directories as needed."
448
446
449
#: bzrlib/builtins.py:897
447
#: bzrlib/builtins.py:884
450
448
#, python-format
451
449
msgid "added %s\n"
452
450
msgstr "added %s\n"
453
451
454
#: bzrlib/builtins.py:939
452
#: bzrlib/builtins.py:926
455
453
#, python-format
456
454
msgid "invalid kind %r specified"
457
455
msgstr "invalid kind %r specified"
458
456
459
#: bzrlib/builtins.py:976
457
#: bzrlib/builtins.py:963
460
458
msgid "Move or rename a file."
461
459
msgstr "Move or rename a file."
462
460
463
#: bzrlib/builtins.py:978
461
#: bzrlib/builtins.py:965
464
462
msgid " bzr mv SOURCE... DESTINATION"
465
463
msgstr " bzr mv SOURCE... DESTINATION"
466
464
467
#: bzrlib/builtins.py:980
468
msgid ""
469
"If the last argument is a versioned directory, all the other names\n"
470
"are moved into it. Otherwise, there must be exactly two arguments\n"
471
"and the file is changed to a new name."
472
msgstr ""
473
"If the last argument is a versioned directory, all the other names\n"
474
"are moved into it. Otherwise, there must be exactly two arguments\n"
475
"and the file is changed to a new name."
476
477
#: bzrlib/builtins.py:984
478
msgid ""
479
"If OLDNAME does not exist on the filesystem but is versioned and\n"
480
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
481
"assumes that the file has been manually moved and only updates\n"
482
"its internal inventory to reflect that change.\n"
483
"The same is valid when moving many SOURCE files to a DESTINATION."
484
msgstr ""
485
"If OLDNAME does not exist on the filesystem but is versioned and\n"
486
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
487
"assumes that the file has been manually moved and only updates\n"
488
"its internal inventory to reflect that change.\n"
489
"The same is valid when moving many SOURCE files to a DESTINATION."
490
491
#: bzrlib/builtins.py:990
465
#: bzrlib/builtins.py:967
466
msgid ""
467
"If the last argument is a versioned directory, all the other names\n"
468
"are moved into it. Otherwise, there must be exactly two arguments\n"
469
"and the file is changed to a new name."
470
msgstr ""
471
"If the last argument is a versioned directory, all the other names\n"
472
"are moved into it. Otherwise, there must be exactly two arguments\n"
473
"and the file is changed to a new name."
474
475
#: bzrlib/builtins.py:971
476
msgid ""
477
"If OLDNAME does not exist on the filesystem but is versioned and\n"
478
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
479
"assumes that the file has been manually moved and only updates\n"
480
"its internal inventory to reflect that change.\n"
481
"The same is valid when moving many SOURCE files to a DESTINATION."
482
msgstr ""
483
"If OLDNAME does not exist on the filesystem but is versioned and\n"
484
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
485
"assumes that the file has been manually moved and only updates\n"
486
"its internal inventory to reflect that change.\n"
487
"The same is valid when moving many SOURCE files to a DESTINATION."
488
489
#: bzrlib/builtins.py:977
492
490
msgid "Files cannot be moved between branches."
493
491
msgstr "Files cannot be moved between branches."
494
492
495
#: bzrlib/builtins.py:997
493
#: bzrlib/builtins.py:984
496
494
msgid ""
497
495
"Move only the bzr identifier of the file, because the file has already been "
498
496
"moved."
500
498
"Move only the bzr identifier of the file, because the file has already been "
501
499
"moved."
502
500
503
#: bzrlib/builtins.py:999
501
#: bzrlib/builtins.py:986
504
502
msgid "Automatically guess renames."
505
503
msgstr "Automatically guess renames."
506
504
507
#: bzrlib/builtins.py:1000
505
#: bzrlib/builtins.py:987
508
506
msgid "Avoid making changes when guessing renames."
509
507
msgstr "Avoid making changes when guessing renames."
510
508
511
#: bzrlib/builtins.py:1009
509
#: bzrlib/builtins.py:996
512
510
msgid "--dry-run requires --auto."
513
511
msgstr "--dry-run requires --auto."
514
512
515
#: bzrlib/builtins.py:1013
513
#: bzrlib/builtins.py:1000
516
514
msgid "missing file argument"
517
515
msgstr "missing file argument"
518
516
519
#: bzrlib/builtins.py:1017
517
#: bzrlib/builtins.py:1004
520
518
msgid "can not move root of branch"
521
msgstr "can not move root of branch"
519
msgstr ""
522
520
523
#: bzrlib/builtins.py:1023
521
#: bzrlib/builtins.py:1010
524
522
msgid "Only one path may be specified to --auto."
525
523
msgstr "Only one path may be specified to --auto."
526
524
527
#: bzrlib/builtins.py:1026
525
#: bzrlib/builtins.py:1013
528
526
msgid "--after cannot be specified with --auto."
529
527
msgstr "--after cannot be specified with --auto."
530
528
531
#: bzrlib/builtins.py:1062
529
#: bzrlib/builtins.py:1050
532
530
msgid "to mv multiple files the destination must be a versioned directory"
533
531
msgstr "to mv multiple files the destination must be a versioned directory"
534
532
535
#: bzrlib/builtins.py:1114
533
#: bzrlib/builtins.py:1102
536
534
msgid "Turn this branch into a mirror of another branch."
537
535
msgstr "Turn this branch into a mirror of another branch."
538
536
539
#: bzrlib/builtins.py:1116
540
msgid ""
541
"By default, this command only works on branches that have not diverged.\n"
542
"Branches are considered diverged if the destination branch's most recent \n"
543
"commit is one that has not been merged (directly or indirectly) into the \n"
544
"parent."
545
msgstr ""
546
"By default, this command only works on branches that have not diverged.\n"
547
"Branches are considered diverged if the destination branch's most recent \n"
548
"commit is one that has not been merged (directly or indirectly) into the \n"
549
"parent."
550
551
#: bzrlib/builtins.py:1121
552
msgid ""
553
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
554
"from one into the other. Once one branch has merged, the other should\n"
555
"be able to pull it again."
556
msgstr ""
557
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
558
"from one into the other. Once one branch has merged, the other should\n"
559
"be able to pull it again."
560
561
#: bzrlib/builtins.py:1125
562
msgid ""
563
"If you want to replace your local changes and just want your branch to\n"
564
"match the remote one, use pull --overwrite. This will work even if the two\n"
565
"branches have diverged."
566
msgstr ""
567
"If you want to replace your local changes and just want your branch to\n"
568
"match the remote one, use pull --overwrite. This will work even if the two\n"
569
"branches have diverged."
570
571
#: bzrlib/builtins.py:1129
572
msgid ""
573
"If there is no default location set, the first pull will set it (use\n"
574
"--no-remember to avoid setting it). After that, you can omit the\n"
575
"location to use the default. To change the default, use --remember. The\n"
576
"value will only be saved if the remote location can be accessed."
577
msgstr ""
578
"If there is no default location set, the first pull will set it (use\n"
579
"--no-remember to avoid setting it). After that, you can omit the\n"
580
"location to use the default. To change the default, use --remember. The\n"
581
"value will only be saved if the remote location can be accessed."
537
#: bzrlib/builtins.py:1104
538
msgid ""
539
"By default, this command only works on branches that have not diverged.\n"
540
"Branches are considered diverged if the destination branch's most recent \n"
541
"commit is one that has not been merged (directly or indirectly) into the \n"
542
"parent."
543
msgstr ""
544
"By default, this command only works on branches that have not diverged.\n"
545
"Branches are considered diverged if the destination branch's most recent \n"
546
"commit is one that has not been merged (directly or indirectly) into the \n"
547
"parent."
548
549
#: bzrlib/builtins.py:1109
550
msgid ""
551
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
552
"from one into the other. Once one branch has merged, the other should\n"
553
"be able to pull it again."
554
msgstr ""
555
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
556
"from one into the other. Once one branch has merged, the other should\n"
557
"be able to pull it again."
558
559
#: bzrlib/builtins.py:1113
560
msgid ""
561
"If you want to replace your local changes and just want your branch to\n"
562
"match the remote one, use pull --overwrite. This will work even if the two\n"
563
"branches have diverged."
564
msgstr ""
565
"If you want to replace your local changes and just want your branch to\n"
566
"match the remote one, use pull --overwrite. This will work even if the two\n"
567
"branches have diverged."
568
569
#: bzrlib/builtins.py:1117
570
msgid ""
571
"If there is no default location set, the first pull will set it (use\n"
572
"--no-remember to avoid setting it). After that, you can omit the\n"
573
"location to use the default. To change the default, use --remember. The\n"
574
"value will only be saved if the remote location can be accessed."
575
msgstr ""
576
"If there is no default location set, the first pull will set it (use\n"
577
"--no-remember to avoid setting it). After that, you can omit the\n"
578
"location to use the default. To change the default, use --remember. The\n"
579
"value will only be saved if the remote location can be accessed."
580
581
#: bzrlib/builtins.py:1122
582
msgid ""
583
"The --verbose option will display the revisions pulled using the log_format\n"
584
"configuration option. You can use a different format by overriding it with\n"
585
"-Olog_format=<other_format>."
586
msgstr ""
587
588
#: bzrlib/builtins.py:1126
589
msgid ""
590
"Note: The location can be specified either in the form of a branch,\n"
591
"or in the form of a path to a file containing a merge directive generated\n"
592
"with bzr send."
593
msgstr ""
594
"Note: The location can be specified either in the form of a branch,\n"
595
"or in the form of a path to a file containing a merge directive generated\n"
596
"with bzr send."
582
597
583
598
#: bzrlib/builtins.py:1134
584
msgid ""
585
"The --verbose option will display the revisions pulled using the log_format\n"
586
"configuration option. You can use a different format by overriding it with\n"
587
"-Olog_format=<other_format>."
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>."
592
593
#: bzrlib/builtins.py:1138
594
msgid ""
595
"Note: The location can be specified either in the form of a branch,\n"
596
"or in the form of a path to a file containing a merge directive generated\n"
597
"with bzr send."
598
msgstr ""
599
"Note: The location can be specified either in the form of a branch,\n"
600
"or in the form of a path to a file containing a merge directive generated\n"
601
"with bzr send."
602
603
#: bzrlib/builtins.py:1146
604
599
msgid "Show logs of pulled revisions."
605
600
msgstr "Show logs of pulled revisions."
606
601
607
#: bzrlib/builtins.py:1148
608
msgid ""
609
"Branch to pull into, rather than the one containing the working directory."
610
msgstr ""
611
"Branch to pull into, rather than the one containing the working directory."
612
613
#: bzrlib/builtins.py:1151
614
msgid ""
615
"Perform a local pull in a bound branch. Local pulls are not applied to the "
616
"master branch."
617
msgstr ""
618
"Perform a local pull in a bound branch. Local pulls are not applied to the "
619
"master branch."
620
621
#: bzrlib/builtins.py:1189
602
#: bzrlib/builtins.py:1136
603
msgid ""
604
"Branch to pull into, rather than the one containing the working directory."
605
msgstr ""
606
"Branch to pull into, rather than the one containing the working directory."
607
608
#: bzrlib/builtins.py:1139
609
msgid ""
610
"Perform a local pull in a bound branch. Local pulls are not applied to the "
611
"master branch."
612
msgstr ""
613
"Perform a local pull in a bound branch. Local pulls are not applied to the "
614
"master branch."
615
616
#: bzrlib/builtins.py:1168
622
617
msgid "Need working tree for --show-base."
623
618
msgstr "Need working tree for --show-base."
624
619
625
#: bzrlib/builtins.py:1205
620
#: bzrlib/builtins.py:1184
626
621
msgid "No pull location known or specified."
627
622
msgstr "No pull location known or specified."
628
623
629
#: bzrlib/builtins.py:1211
624
#: bzrlib/builtins.py:1190
630
625
#, python-format
631
626
msgid "Using saved parent location: %s\n"
632
627
msgstr "Using saved parent location: %s\n"
633
628
634
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
629
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
635
630
msgid "Cannot use -r with merge directives or bundles"
636
631
msgstr "Cannot use -r with merge directives or bundles"
637
632
638
#: bzrlib/builtins.py:1261
633
#: bzrlib/builtins.py:1238
639
634
msgid "Update a mirror of this branch."
640
635
msgstr "Update a mirror of this branch."
641
636
642
#: bzrlib/builtins.py:1263
637
#: bzrlib/builtins.py:1240
643
638
msgid ""
644
639
"The target branch will not have its working tree populated because this\n"
645
640
"is both expensive, and is not supported on remote file systems."
647
642
"The target branch will not have its working tree populated because this\n"
648
643
"is both expensive and is not supported on remote file systems."
649
644
650
#: bzrlib/builtins.py:1266
651
msgid ""
652
"Some smart servers or protocols *may* put the working tree in place in\n"
653
"the future."
654
msgstr ""
655
"Some smart servers or protocols *may* put the working tree in place in\n"
656
"the future."
657
658
#: bzrlib/builtins.py:1269
659
msgid ""
660
"This command only works on branches that have not diverged. Branches are\n"
661
"considered diverged if the destination branch's most recent commit is one\n"
662
"that has not been merged (directly or indirectly) by the source branch."
663
msgstr ""
664
"This command only works on branches that have not diverged. Branches are\n"
665
"considered diverged if the destination branch's most recent commit is one\n"
666
"that has not been merged (directly or indirectly) by the source branch."
667
668
#: bzrlib/builtins.py:1273
669
msgid ""
670
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
671
"the other branch completely, discarding its unmerged changes."
672
msgstr ""
673
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
674
"the other branch completely, discarding its unmerged changes."
645
#: bzrlib/builtins.py:1243
646
msgid ""
647
"Some smart servers or protocols *may* put the working tree in place in\n"
648
"the future."
649
msgstr ""
650
"Some smart servers or protocols *may* put the working tree in place in\n"
651
"the future."
652
653
#: bzrlib/builtins.py:1246
654
msgid ""
655
"This command only works on branches that have not diverged. Branches are\n"
656
"considered diverged if the destination branch's most recent commit is one\n"
657
"that has not been merged (directly or indirectly) by the source branch."
658
msgstr ""
659
"This command only works on branches that have not diverged. Branches are\n"
660
"considered diverged if the destination branch's most recent commit is one\n"
661
"that has not been merged (directly or indirectly) by the source branch."
662
663
#: bzrlib/builtins.py:1250
664
msgid ""
665
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
666
"the other branch completely, discarding its unmerged changes."
667
msgstr ""
668
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
669
"the other branch completely, discarding its unmerged changes."
670
671
#: bzrlib/builtins.py:1253
672
msgid ""
673
"If you want to ensure you have the different changes in the other branch,\n"
674
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
675
"After that you will be able to do a push without '--overwrite'."
676
msgstr ""
677
"If you want to ensure you have the different changes in the other branch,\n"
678
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
679
"After that you will be able to do a push without '--overwrite'."
680
681
#: bzrlib/builtins.py:1257
682
msgid ""
683
"If there is no default push location set, the first push will set it (use\n"
684
"--no-remember to avoid setting it). After that, you can omit the\n"
685
"location to use the default. To change the default, use --remember. The\n"
686
"value will only be saved if the remote location can be accessed."
687
msgstr ""
688
"If there is no default push location set, the first push will set it (use\n"
689
"--no-remember to avoid setting it). After that, you can omit the\n"
690
"location to use the default. To change the default, use --remember. The\n"
691
"value will only be saved if the remote location can be accessed."
692
693
#: bzrlib/builtins.py:1262
694
msgid ""
695
"The --verbose option will display the revisions pushed using the log_format\n"
696
"configuration option. You can use a different format by overriding it with\n"
697
"-Olog_format=<other_format>."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
701
msgid ""
702
"Branch to push from, rather than the one containing the working directory."
703
msgstr ""
704
"Branch to push from, rather than the one containing the working directory."
675
705
676
706
#: bzrlib/builtins.py:1276
677
707
msgid ""
678
"If you want to ensure you have the different changes in the other branch,\n"
679
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
680
"After that you will be able to do a push without '--overwrite'."
681
msgstr ""
682
"If you want to ensure you have the different changes in the other branch,\n"
683
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
684
"After that you will be able to do a push without '--overwrite'."
685
686
#: bzrlib/builtins.py:1280
687
msgid ""
688
"If there is no default push location set, the first push will set it (use\n"
689
"--no-remember to avoid setting it). After that, you can omit the\n"
690
"location to use the default. To change the default, use --remember. The\n"
691
"value will only be saved if the remote location can be accessed."
692
msgstr ""
693
"If there is no default push location set, the first push will set it (use\n"
694
"--no-remember to avoid setting it). After that, you can omit the\n"
695
"location to use the default. To change the default, use --remember. The\n"
696
"value will only be saved if the remote location can be accessed."
697
698
#: bzrlib/builtins.py:1285
699
msgid ""
700
"The --verbose option will display the revisions pushed using the log_format\n"
701
"configuration option. You can use a different format by overriding it with\n"
702
"-Olog_format=<other_format>."
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>."
707
708
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
709
msgid ""
710
"Branch to push from, rather than the one containing the working directory."
711
msgstr ""
712
"Branch to push from, rather than the one containing the working directory."
713
714
#: bzrlib/builtins.py:1299
715
msgid ""
716
"By default push will fail if the target directory exists, but does not "
717
"already have a control directory. This flag will allow push to proceed."
718
msgstr ""
719
"By default push will fail if the target directory exists, but does not "
720
"already have a control directory. This flag will allow push to proceed."
721
722
#: bzrlib/builtins.py:1304
723
msgid ""
724
"Create a stacked branch that references the public location of the parent "
725
"branch."
726
msgstr ""
727
"Create a stacked branch that references the public location of the parent "
728
"branch."
729
730
#: bzrlib/builtins.py:1307
731
msgid ""
732
"Create a stacked branch that refers to another branch for the commit "
733
"history. Only the work not present in the referenced branch is included in "
734
"the branch created."
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."
739
740
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
741
msgid ""
742
"Refuse to push if there are uncommitted changes in the working tree, --no-"
743
"strict disables the check."
744
msgstr ""
745
"Refuse to push if there are uncommitted changes in the working tree, --no-"
746
"strict disables the check."
747
748
#: bzrlib/builtins.py:1315
708
"By default push will fail if the target directory exists, but does not "
709
"already have a control directory. This flag will allow push to proceed."
710
msgstr ""
711
"By default push will fail if the target directory exists, but does not "
712
"already have a control directory. This flag will allow push to proceed."
713
714
#: bzrlib/builtins.py:1281
715
msgid ""
716
"Create a stacked branch that references the public location of the parent "
717
"branch."
718
msgstr ""
719
"Create a stacked branch that references the public location of the parent "
720
"branch."
721
722
#: bzrlib/builtins.py:1284
723
msgid ""
724
"Create a stacked branch that refers to another branch for the commit "
725
"history. Only the work not present in the referenced branch is included in "
726
"the branch created."
727
msgstr ""
728
729
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
730
msgid ""
731
"Refuse to push if there are uncommitted changes in the working tree, --no-"
732
"strict disables the check."
733
msgstr ""
734
735
#: bzrlib/builtins.py:1292
749
736
msgid "Don't populate the working tree, even for protocols that support it."
750
msgstr "Don't populate the working tree, even for protocols that support it."
751
752
#: bzrlib/builtins.py:1318
753
msgid "Overwrite tags only."
754
msgstr "Overwrite tags only."
755
756
#: bzrlib/builtins.py:1369
737
msgstr ""
738
739
#: bzrlib/builtins.py:1336
757
740
msgid "Could not determine branch to refer to."
758
msgstr "Could not determine branch to refer to."
741
msgstr ""
759
742
760
#: bzrlib/builtins.py:1378
743
#: bzrlib/builtins.py:1345
761
744
#, python-format
762
745
msgid ""
763
746
"No push location known or specified. To push to the parent branch (at %s), "
766
749
"No push location known or specified. To push to the parent branch (at %s), "
767
750
"use 'bzr push :parent'."
768
751
769
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
752
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
770
753
msgid "No push location known or specified."
771
msgstr "No push location known or specified."
754
msgstr ""
772
755
773
#: bzrlib/builtins.py:1388
756
#: bzrlib/builtins.py:1355
774
757
#, python-format
775
758
msgid "Using saved push location: %s"
776
msgstr "Using saved push location: %s"
759
msgstr ""
777
760
778
#: bzrlib/builtins.py:1398
761
#: bzrlib/builtins.py:1365
779
762
msgid "Create a new branch that is a copy of an existing branch."
780
msgstr "Create a new branch that is a copy of an existing branch."
781
782
#: bzrlib/builtins.py:1400
783
msgid ""
784
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
785
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
786
"./bar.\n"
787
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
788
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
789
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
790
"create ./foo-bar."
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."
799
800
#: bzrlib/builtins.py:1407
801
msgid ""
802
"To retrieve the branch as of a particular revision, supply the --revision\n"
803
"parameter, as in \"branch foo/bar -r 5\"."
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\"."
807
808
#: bzrlib/builtins.py:1410
763
msgstr ""
764
765
#: bzrlib/builtins.py:1367
766
msgid ""
767
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
768
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
769
"./bar.\n"
770
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
771
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
772
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
773
"create ./foo-bar."
774
msgstr ""
775
776
#: bzrlib/builtins.py:1374
777
msgid ""
778
"To retrieve the branch as of a particular revision, supply the --revision\n"
779
"parameter, as in \"branch foo/bar -r 5\"."
780
msgstr ""
781
782
#: bzrlib/builtins.py:1377
809
783
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
810
msgstr "The synonyms 'clone' and 'get' for this command are deprecated."
784
msgstr ""
811
785
812
#: bzrlib/builtins.py:1420
786
#: bzrlib/builtins.py:1387
813
787
msgid "Create a branch without a working-tree."
814
msgstr "Create a branch without a working-tree."
788
msgstr ""
815
789
816
#: bzrlib/builtins.py:1422
790
#: bzrlib/builtins.py:1389
817
791
msgid "Switch the checkout in the current directory to the new branch."
818
msgstr "Switch the checkout in the current directory to the new branch."
792
msgstr ""
819
793
820
#: bzrlib/builtins.py:1425
794
#: bzrlib/builtins.py:1392
821
795
msgid ""
822
796
"Create a stacked branch referring to the source branch. The new branch will "
823
797
"depend on the availability of the source branch for all operations."
824
798
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."
827
799
828
#: bzrlib/builtins.py:1429
800
#: bzrlib/builtins.py:1396
829
801
msgid "Do not use a shared repository, even if available."
830
msgstr "Do not use a shared repository, even if available."
802
msgstr ""
831
803
832
#: bzrlib/builtins.py:1431
804
#: bzrlib/builtins.py:1398
833
805
msgid ""
834
806
"By default branch will fail if the target directory exists, but does not "
835
807
"already have a control directory. This flag will allow branch to proceed."
836
808
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."
839
809
840
#: bzrlib/builtins.py:1436
810
#: bzrlib/builtins.py:1403
841
811
msgid "Bind new branch to from location."
842
msgstr "Bind new branch to from location."
812
msgstr ""
843
813
844
#: bzrlib/builtins.py:1483
814
#: bzrlib/builtins.py:1450
845
815
#, python-format
846
816
msgid "Target directory \"%s\" already exists."
847
msgstr "Target directory \"%s\" already exists."
817
msgstr ""
848
818
849
#: bzrlib/builtins.py:1495
819
#: bzrlib/builtins.py:1462
850
820
#, python-format
851
821
msgid "Parent of \"%s\" does not exist."
852
msgstr "Parent of \"%s\" does not exist."
822
msgstr ""
853
823
854
#: bzrlib/builtins.py:1514
824
#: bzrlib/builtins.py:1481
855
825
msgid "The branch {0} has no revision {1}."
856
msgstr "The branch {0} has no revision {1}."
826
msgstr ""
857
827
858
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
828
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
859
829
#, python-format
860
830
msgid "Created new stacked branch referring to %s."
861
msgstr "Created new stacked branch referring to %s."
831
msgstr ""
862
832
863
#: bzrlib/builtins.py:1533
833
#: bzrlib/builtins.py:1500
864
834
#, python-format
865
835
msgid "Branched %d revision."
866
836
msgid_plural "Branched %d revisions."
867
msgstr[0] "Branched %d revision."
868
msgstr[1] "Branched %d revisions."
837
msgstr[0] ""
838
msgstr[1] ""
869
839
870
#: bzrlib/builtins.py:1538
840
#: bzrlib/builtins.py:1505
871
841
#, python-format
872
842
msgid "New branch bound to %s"
873
msgstr "New branch bound to %s"
843
msgstr ""
874
844
875
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
845
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
876
846
#, python-format
877
847
msgid "Switched to branch: %s"
878
msgstr "Switched to branch: %s"
848
msgstr ""
879
849
880
#: bzrlib/builtins.py:1548
850
#: bzrlib/builtins.py:1515
881
851
msgid "List the branches available at the current location."
882
msgstr "List the branches available at the current location."
883
884
#: bzrlib/builtins.py:1550
885
msgid ""
886
"This command will print the names of all the branches at the current\n"
887
"location."
888
msgstr ""
889
"This command will print the names of all the branches at the current\n"
890
"location."
891
892
#: bzrlib/builtins.py:1557
893
msgid ""
894
"Recursively scan for branches rather than just looking in the specified "
895
"location."
896
msgstr ""
897
"Recursively scan for branches rather than just looking in the specified "
898
"location."
899
900
#: bzrlib/builtins.py:1586
852
msgstr ""
853
854
#: bzrlib/builtins.py:1517
855
msgid ""
856
"This command will print the names of all the branches at the current\n"
857
"location."
858
msgstr ""
859
860
#: bzrlib/builtins.py:1524
861
msgid ""
862
"Recursively scan for branches rather than just looking in the specified "
863
"location."
864
msgstr ""
865
866
#: bzrlib/builtins.py:1554
901
867
msgid "(default)"
902
868
msgstr "(default)"
903
869
904
#: bzrlib/builtins.py:1598
870
#: bzrlib/builtins.py:1566
905
871
msgid "Create a new checkout of an existing branch."
906
msgstr "Create a new checkout of an existing branch."
907
908
#: bzrlib/builtins.py:1600
909
msgid ""
910
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
911
"for\n"
912
"the branch found in '.'. This is useful if you have removed the working "
913
"tree\n"
914
"or if it was never created - i.e. if you pushed the branch to its current\n"
915
"location using SFTP."
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."
923
924
#: bzrlib/builtins.py:1605
925
msgid ""
926
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
927
"will\n"
928
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
929
"./bar.\n"
930
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
931
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
932
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
933
"create ./foo-bar."
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."
943
944
#: bzrlib/builtins.py:1612
945
msgid ""
946
"To retrieve the branch as of a particular revision, supply the --revision\n"
947
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
948
"immediately\n"
949
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
950
"old\n"
951
"code.)"
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.)"
959
960
#: bzrlib/builtins.py:1622
961
msgid ""
962
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
963
"the branch for every operation. Normal checkouts can perform common "
964
"operations like diff and status without such access, and also support local "
965
"commits."
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."
971
972
#: bzrlib/builtins.py:1629
872
msgstr ""
873
874
#: bzrlib/builtins.py:1568
875
msgid ""
876
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
877
"for\n"
878
"the branch found in '.'. This is useful if you have removed the working "
879
"tree\n"
880
"or if it was never created - i.e. if you pushed the branch to its current\n"
881
"location using SFTP."
882
msgstr ""
883
884
#: bzrlib/builtins.py:1573
885
msgid ""
886
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
887
"will\n"
888
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
889
"./bar.\n"
890
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
891
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
892
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
893
"create ./foo-bar."
894
msgstr ""
895
896
#: bzrlib/builtins.py:1580
897
msgid ""
898
"To retrieve the branch as of a particular revision, supply the --revision\n"
899
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
900
"immediately\n"
901
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
902
"old\n"
903
"code.)"
904
msgstr ""
905
906
#: bzrlib/builtins.py:1590
907
msgid ""
908
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
909
"the branch for every operation. Normal checkouts can perform common "
910
"operations like diff and status without such access, and also support local "
911
"commits."
912
msgstr ""
913
914
#: bzrlib/builtins.py:1597
973
915
msgid "Get file contents from this tree."
974
msgstr "Get file contents from this tree."
916
msgstr ""
975
917
976
#: bzrlib/builtins.py:1631
918
#: bzrlib/builtins.py:1599
977
919
msgid "Hard-link working tree files where possible."
978
msgstr "Hard-link working tree files where possible."
920
msgstr ""
921
922
#: bzrlib/builtins.py:1640
923
msgid ""
924
"Show list of renamed files.\n"
925
" "
926
msgstr ""
927
928
#: bzrlib/builtins.py:1670
929
msgid "Update a working tree to a new revision."
930
msgstr ""
979
931
980
932
#: bzrlib/builtins.py:1672
981
933
msgid ""
982
"Show list of renamed files.\n"
983
" "
984
msgstr ""
985
"Show list of renamed files.\n"
986
" "
987
988
#: bzrlib/builtins.py:1700
989
msgid "Update a working tree to a new revision."
990
msgstr "Update a working tree to a new revision."
991
992
#: bzrlib/builtins.py:1702
993
msgid ""
994
"This will perform a merge of the destination revision (the tip of the\n"
995
"branch, or the specified revision) into the working tree, and then make\n"
996
"that revision the basis revision for the working tree. "
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. "
1001
1002
#: bzrlib/builtins.py:1706
1003
msgid ""
1004
"You can use this to visit an older revision, or to update a working tree\n"
1005
"that is out of date from its branch."
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."
1009
1010
#: bzrlib/builtins.py:1709
1011
msgid ""
1012
"If there are any uncommitted changes in the tree, they will be carried\n"
1013
"across and remain as uncommitted changes after the update. To discard\n"
1014
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1015
"with the changes brought in by the change in basis revision."
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."
1021
1022
#: bzrlib/builtins.py:1714
1023
msgid ""
1024
"If the tree's branch is bound to a master branch, bzr will also update\n"
1025
"the branch from the master."
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."
1029
1030
#: bzrlib/builtins.py:1717
1031
msgid ""
1032
"You cannot update just a single file or directory, because each Bazaar\n"
1033
"working tree has just a single basis revision. If you want to restore a\n"
1034
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1035
"update'. If you want to restore a file to its state in a previous\n"
1036
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1037
"out the old content of that file to a new location."
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."
1045
1046
#: bzrlib/builtins.py:1724
1047
msgid ""
1048
"The 'dir' argument, if given, must be the location of the root of a\n"
1049
"working tree to update. By default, the working tree that contains the \n"
1050
"current working directory is used."
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."
1055
1056
#: bzrlib/builtins.py:1740
934
"This will perform a merge of the destination revision (the tip of the\n"
935
"branch, or the specified revision) into the working tree, and then make\n"
936
"that revision the basis revision for the working tree. "
937
msgstr ""
938
939
#: bzrlib/builtins.py:1676
940
msgid ""
941
"You can use this to visit an older revision, or to update a working tree\n"
942
"that is out of date from its branch."
943
msgstr ""
944
945
#: bzrlib/builtins.py:1679
946
msgid ""
947
"If there are any uncommitted changes in the tree, they will be carried\n"
948
"across and remain as uncommitted changes after the update. To discard\n"
949
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
950
"with the changes brought in by the change in basis revision."
951
msgstr ""
952
953
#: bzrlib/builtins.py:1684
954
msgid ""
955
"If the tree's branch is bound to a master branch, bzr will also update\n"
956
"the branch from the master."
957
msgstr ""
958
959
#: bzrlib/builtins.py:1687
960
msgid ""
961
"You cannot update just a single file or directory, because each Bazaar\n"
962
"working tree has just a single basis revision. If you want to restore a\n"
963
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
964
"update'. If you want to restore a file to its state in a previous\n"
965
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
966
"out the old content of that file to a new location."
967
msgstr ""
968
969
#: bzrlib/builtins.py:1694
970
msgid ""
971
"The 'dir' argument, if given, must be the location of the root of a\n"
972
"working tree to update. By default, the working tree that contains the \n"
973
"current working directory is used."
974
msgstr ""
975
976
#: bzrlib/builtins.py:1710
1057
977
msgid "bzr update --revision takes exactly one revision"
1058
msgstr "bzr update --revision takes exactly one revision"
978
msgstr ""
1059
979
1060
#: bzrlib/builtins.py:1748
980
#: bzrlib/builtins.py:1718
1061
981
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1062
msgstr "bzr update can only update a whole tree, not a file or subdirectory"
982
msgstr ""
1063
983
1064
#: bzrlib/builtins.py:1779
984
#: bzrlib/builtins.py:1749
1065
985
msgid "Tree is up to date at revision {0} of branch {1}"
1066
msgstr "Tree is up to date at revision {0} of branch {1}"
986
msgstr ""
1067
987
1068
#: bzrlib/builtins.py:1795
988
#: bzrlib/builtins.py:1765
1069
989
#, python-format
1070
990
msgid ""
1071
991
"branch has no revision %s\n"
1072
992
"bzr update --revision only works for a revision in the branch history"
1073
993
msgstr ""
1074
"branch has no revision %s\n"
1075
"bzr update --revision only works for a revision in the branch history"
1076
994
1077
#: bzrlib/builtins.py:1801
995
#: bzrlib/builtins.py:1771
1078
996
msgid "Updated to revision {0} of branch {1}"
1079
msgstr "Updated to revision {0} of branch {1}"
997
msgstr ""
1080
998
1081
#: bzrlib/builtins.py:1805
999
#: bzrlib/builtins.py:1775
1082
1000
msgid ""
1083
1001
"Your local commits will now show as pending merges with 'bzr status', and "
1084
1002
"can be committed with 'bzr commit'."
1085
1003
msgstr ""
1086
"Your local commits will now show as pending merges with 'bzr status', and "
1087
"can be committed with 'bzr commit'."
1088
1004
1089
#: bzrlib/builtins.py:1814
1005
#: bzrlib/builtins.py:1784
1090
1006
msgid "Show information about a working tree, branch or repository."
1091
msgstr "Show information about a working tree, branch or repository."
1092
1093
#: bzrlib/builtins.py:1816
1094
msgid ""
1095
"This command will show all known locations and formats associated to the\n"
1096
"tree, branch or repository."
1097
msgstr ""
1098
"This command will show all known locations and formats associated to the\n"
1099
"tree, branch or repository."
1100
1101
#: bzrlib/builtins.py:1819
1102
msgid ""
1103
"In verbose mode, statistical information is included with each report.\n"
1104
"To see extended statistic information, use a verbosity level of 2 or\n"
1105
"higher by specifying the verbose option multiple times, e.g. -vv."
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."
1110
1111
#: bzrlib/builtins.py:1823
1007
msgstr ""
1008
1009
#: bzrlib/builtins.py:1786
1010
msgid ""
1011
"This command will show all known locations and formats associated to the\n"
1012
"tree, branch or repository."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:1789
1016
msgid ""
1017
"In verbose mode, statistical information is included with each report.\n"
1018
"To see extended statistic information, use a verbosity level of 2 or\n"
1019
"higher by specifying the verbose option multiple times, e.g. -vv."
1020
msgstr ""
1021
1022
#: bzrlib/builtins.py:1793
1112
1023
msgid "Branches and working trees will also report any missing revisions."
1113
msgstr "Branches and working trees will also report any missing revisions."
1024
msgstr ""
1114
1025
1115
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1116
#: bzrlib/builtins.py:6466
1026
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1027
#: bzrlib/builtins.py:6442
1117
1028
msgid ":Examples:"
1118
msgstr ":Examples:"
1029
msgstr ""
1119
1030
1120
#: bzrlib/builtins.py:1827
1031
#: bzrlib/builtins.py:1797
1121
1032
msgid " Display information on the format and related locations:"
1122
msgstr " Display information on the format and related locations:"
1033
msgstr ""
1123
1034
1124
#: bzrlib/builtins.py:1829
1035
#: bzrlib/builtins.py:1799
1125
1036
msgid " bzr info"
1126
msgstr " bzr info"
1037
msgstr ""
1127
1038
1128
#: bzrlib/builtins.py:1831
1039
#: bzrlib/builtins.py:1801
1129
1040
msgid ""
1130
1041
" Display the above together with extended format information and\n"
1131
1042
" basic statistics (like the number of files in the working tree and\n"
1132
1043
" number of revisions in the branch and repository):"
1133
1044
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):"
1137
1045
1138
#: bzrlib/builtins.py:1835
1046
#: bzrlib/builtins.py:1805
1139
1047
msgid " bzr info -v"
1140
msgstr " bzr info -v"
1048
msgstr ""
1141
1049
1142
#: bzrlib/builtins.py:1837
1050
#: bzrlib/builtins.py:1807
1143
1051
msgid " Display the above together with number of committers to the branch:"
1144
1052
msgstr ""
1145
" Display the above together with number of committers to the branch:"
1146
1053
1147
#: bzrlib/builtins.py:1839
1054
#: bzrlib/builtins.py:1809
1148
1055
msgid " bzr info -vv"
1149
msgstr " bzr info -vv"
1056
msgstr ""
1150
1057
1151
#: bzrlib/builtins.py:1858
1058
#: bzrlib/builtins.py:1828
1152
1059
msgid "Remove files or directories."
1153
msgstr "Remove files or directories."
1060
msgstr ""
1154
1061
1155
#: bzrlib/builtins.py:1860
1062
#: bzrlib/builtins.py:1830
1156
1063
msgid ""
1157
1064
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1158
1065
"delete them if they can easily be recovered using revert otherwise they\n"
1159
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1066
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1160
1067
"parameters are given Bazaar will scan for files that are being tracked by\n"
1161
1068
"Bazaar but missing in your tree and stop tracking them for you."
1162
1069
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."
1168
1070
1169
#: bzrlib/builtins.py:1868
1071
#: bzrlib/builtins.py:1838
1170
1072
msgid "Only remove files that have never been committed."
1171
msgstr "Only remove files that have never been committed."
1073
msgstr ""
1172
1074
1173
#: bzrlib/builtins.py:1870
1075
#: bzrlib/builtins.py:1840
1174
1076
msgid "The file deletion mode to be used."
1175
msgstr "The file deletion mode to be used."
1077
msgstr ""
1176
1078
1177
#: bzrlib/builtins.py:1871
1079
#: bzrlib/builtins.py:1841
1178
1080
msgid "Deletion Strategy"
1179
msgstr "Deletion Strategy"
1081
msgstr ""
1180
1082
1181
#: bzrlib/builtins.py:1872
1083
#: bzrlib/builtins.py:1842
1182
1084
msgid "Backup changed files (default)."
1183
msgstr "Backup changed files (default)."
1085
msgstr ""
1184
1086
1185
#: bzrlib/builtins.py:1873
1087
#: bzrlib/builtins.py:1843
1186
1088
msgid "Delete from bzr but leave the working copy."
1187
msgstr "Delete from bzr but leave the working copy."
1089
msgstr ""
1188
1090
1189
#: bzrlib/builtins.py:1874
1091
#: bzrlib/builtins.py:1844
1190
1092
msgid "Don't backup changed files."
1191
msgstr "Don't backup changed files."
1093
msgstr ""
1192
1094
1193
#: bzrlib/builtins.py:1875
1095
#: bzrlib/builtins.py:1845
1194
1096
msgid ""
1195
1097
"Delete all the specified files, even if they can not be recovered and even "
1196
1098
"if they are non-empty directories. (deprecated, use no-backup)"
1197
1099
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)"
1200
1100
1201
#: bzrlib/builtins.py:1884
1101
#: bzrlib/builtins.py:1854
1202
1102
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1203
1103
msgstr ""
1204
"(The --force option is deprecated, rather use --no-backup in future.)"
1205
1104
1206
#: bzrlib/builtins.py:1901
1105
#: bzrlib/builtins.py:1871
1207
1106
msgid "No matching files."
1208
msgstr "No matching files."
1107
msgstr ""
1209
1108
1210
#: bzrlib/builtins.py:1962
1109
#: bzrlib/builtins.py:1932
1211
1110
msgid "Reconcile bzr metadata in a branch."
1212
msgstr "Reconcile bzr metadata in a branch."
1213
1214
#: bzrlib/builtins.py:1964
1215
msgid ""
1216
"This can correct data mismatches that may have been caused by\n"
1217
"previous ghost operations or bzr upgrades. You should only\n"
1218
"need to run this command if 'bzr check' or a bzr developer\n"
1219
"advises you to run it."
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."
1225
1226
#: bzrlib/builtins.py:1969
1227
msgid ""
1228
"If a second branch is provided, cross-branch reconciliation is\n"
1229
"also attempted, which will check that data like the tree root\n"
1230
"id which was not present in very early bzr versions is represented\n"
1231
"correctly in both branches."
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."
1237
1238
#: bzrlib/builtins.py:1974
1239
msgid ""
1240
"At the same time it is run it may recompress data resulting in\n"
1241
"a potential saving in disk space or performance gain."
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."
1245
1246
#: bzrlib/builtins.py:1977
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:1934
1114
msgid ""
1115
"This can correct data mismatches that may have been caused by\n"
1116
"previous ghost operations or bzr upgrades. You should only\n"
1117
"need to run this command if 'bzr check' or a bzr developer\n"
1118
"advises you to run it."
1119
msgstr ""
1120
1121
#: bzrlib/builtins.py:1939
1122
msgid ""
1123
"If a second branch is provided, cross-branch reconciliation is\n"
1124
"also attempted, which will check that data like the tree root\n"
1125
"id which was not present in very early bzr versions is represented\n"
1126
"correctly in both branches."
1127
msgstr ""
1128
1129
#: bzrlib/builtins.py:1944
1130
msgid ""
1131
"At the same time it is run it may recompress data resulting in\n"
1132
"a potential saving in disk space or performance gain."
1133
msgstr ""
1134
1135
#: bzrlib/builtins.py:1947
1247
1136
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1248
1137
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. "
1268
1269
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1138
1139
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1140
msgid ""
1141
"Format for the bzr 2.0 series.\n"
1142
"Uses group-compress storage.\n"
1143
"Provides rich roots which are a one-way transition.\n"
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1147
msgid ""
1148
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1149
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1150
msgstr ""
1151
1152
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1270
1153
msgid "The 2a format with experimental support for colocated branches.\n"
1271
msgstr "The 2a format with experimental support for collocated branches.\n"
1154
msgstr ""
1272
1155
1273
#: bzrlib/builtins.py:2045
1156
#: bzrlib/builtins.py:2015
1274
1157
msgid "Make a directory into a versioned branch."
1275
msgstr "Make a directory into a versioned branch."
1276
1277
#: bzrlib/builtins.py:2047
1278
msgid ""
1279
"Use this to create an empty branch, or before importing an\n"
1280
"existing project."
1281
msgstr ""
1282
"Use this to create an empty branch, or before importing an\n"
1283
"existing project."
1284
1285
#: bzrlib/builtins.py:2050
1286
msgid ""
1287
"If there is a repository in a parent directory of the location, then\n"
1288
"the history of the branch will be stored in the repository. Otherwise\n"
1289
"init creates a standalone branch which carries its own history\n"
1290
"in the .bzr directory."
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."
1296
1297
#: bzrlib/builtins.py:2055
1298
msgid ""
1299
"If there is already a branch at the location but it has no working tree,\n"
1300
"the tree can be populated with 'bzr checkout'."
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'."
1304
1305
#: bzrlib/builtins.py:2058
1158
msgstr ""
1159
1160
#: bzrlib/builtins.py:2017
1161
msgid ""
1162
"Use this to create an empty branch, or before importing an\n"
1163
"existing project."
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2020
1167
msgid ""
1168
"If there is a repository in a parent directory of the location, then\n"
1169
"the history of the branch will be stored in the repository. Otherwise\n"
1170
"init creates a standalone branch which carries its own history\n"
1171
"in the .bzr directory."
1172
msgstr ""
1173
1174
#: bzrlib/builtins.py:2025
1175
msgid ""
1176
"If there is already a branch at the location but it has no working tree,\n"
1177
"the tree can be populated with 'bzr checkout'."
1178
msgstr ""
1179
1180
#: bzrlib/builtins.py:2028
1306
1181
msgid "Recipe for importing a tree of files::"
1307
msgstr "Recipe for importing a tree of files::"
1308
1309
#: bzrlib/builtins.py:2060
1310
msgid ""
1311
" cd ~/project\n"
1312
" bzr init\n"
1313
" bzr add .\n"
1314
" bzr status\n"
1315
" bzr commit -m \"imported project\""
1316
msgstr ""
1317
" cd ~/project\n"
1318
" bzr init\n"
1319
" bzr add .\n"
1320
" bzr status\n"
1321
" bzr commit -m \"imported project\""
1322
1323
#: bzrlib/builtins.py:2071
1324
msgid ""
1325
"Create the path leading up to the branch if it does not already exist."
1326
msgstr ""
1327
"Create the path leading up to the branch if it does not already exist."
1328
1329
#: bzrlib/builtins.py:2074
1182
msgstr ""
1183
1184
#: bzrlib/builtins.py:2030
1185
msgid ""
1186
" cd ~/project\n"
1187
" bzr init\n"
1188
" bzr add .\n"
1189
" bzr status\n"
1190
" bzr commit -m \"imported project\""
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:2041
1194
msgid ""
1195
"Create the path leading up to the branch if it does not already exist."
1196
msgstr ""
1197
1198
#: bzrlib/builtins.py:2044
1330
1199
msgid "Specify a format for this branch. See \"help formats\"."
1331
msgstr "Specify a format for this branch. See \"help formats\"."
1200
msgstr ""
1332
1201
1333
#: bzrlib/builtins.py:2082
1202
#: bzrlib/builtins.py:2052
1334
1203
msgid ""
1335
1204
"Never change revnos or the existing log. Append revisions to it only."
1336
1205
msgstr ""
1337
"Never change revnos or the existing log. Append revisions to it only."
1338
1206
1339
#: bzrlib/builtins.py:2085
1207
#: bzrlib/builtins.py:2055
1340
1208
msgid "Create a branch without a working tree."
1341
msgstr "Create a branch without a working tree."
1209
msgstr ""
1342
1210
1343
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1211
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1344
1212
#, python-format
1345
1213
msgid ""
1346
1214
"Parent directory of %s does not exist.\n"
1347
1215
"You may supply --create-prefix to create all leading parent directories."
1348
1216
msgstr ""
1349
"Parent directory of %s does not exist.\n"
1350
"You may supply --create-prefix to create all leading parent directories."
1351
1217
1352
#: bzrlib/builtins.py:2139
1218
#: bzrlib/builtins.py:2109
1353
1219
msgid ""
1354
1220
"This branch format cannot be set to append-revisions-only. Try --default."
1355
1221
msgstr ""
1356
"This branch format cannot be set to append-revisions-only. Try --default."
1357
1222
1358
#: bzrlib/builtins.py:2150
1223
#: bzrlib/builtins.py:2120
1359
1224
msgid "Created a {0} (format: {1})\n"
1360
msgstr "Created a {0} (format: {1})\n"
1225
msgstr ""
1361
1226
1362
#: bzrlib/builtins.py:2159
1227
#: bzrlib/builtins.py:2129
1363
1228
#, python-format
1364
1229
msgid "Using shared repository: %s\n"
1365
msgstr "Using shared repository: %s\n"
1230
msgstr ""
1366
1231
1367
#: bzrlib/builtins.py:2163
1232
#: bzrlib/builtins.py:2133
1368
1233
msgid "Create a shared repository for branches to share storage space."
1369
msgstr "Create a shared repository for branches to share storage space."
1370
1371
#: bzrlib/builtins.py:2165
1372
msgid ""
1373
"New branches created under the repository directory will store their\n"
1374
"revisions in the repository, not in the branch directory. For branches\n"
1375
"with shared history, this reduces the amount of storage needed and \n"
1376
"speeds up the creation of new branches."
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."
1382
1383
#: bzrlib/builtins.py:2170
1384
msgid ""
1385
"If the --no-trees option is given then the branches in the repository\n"
1386
"will not have working trees by default. They will still exist as \n"
1387
"directories on disk, but they will not have separate copies of the \n"
1388
"files at a certain revision. This can be useful for repositories that\n"
1389
"store branches which are interacted with through checkouts or remote\n"
1390
"branches, such as on a server."
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."
1398
1399
#: bzrlib/builtins.py:2177
1400
msgid ""
1401
":Examples:\n"
1402
" Create a shared repository holding just branches::"
1403
msgstr ""
1404
":Examples:\n"
1405
" Create a shared repository holding just branches::"
1406
1407
#: bzrlib/builtins.py:2180
1408
msgid ""
1409
" bzr init-repo --no-trees repo\n"
1410
" bzr init repo/trunk"
1411
msgstr ""
1412
" bzr init-repo --no-trees repo\n"
1413
" bzr init repo/trunk"
1414
1415
#: bzrlib/builtins.py:2183
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2135
1237
msgid ""
1238
"New branches created under the repository directory will store their\n"
1239
"revisions in the repository, not in the branch directory. For branches\n"
1240
"with shared history, this reduces the amount of storage needed and \n"
1241
"speeds up the creation of new branches."
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2140
1245
msgid ""
1246
"If the --no-trees option is given then the branches in the repository\n"
1247
"will not have working trees by default. They will still exist as \n"
1248
"directories on disk, but they will not have separate copies of the \n"
1249
"files at a certain revision. This can be useful for repositories that\n"
1250
"store branches which are interacted with through checkouts or remote\n"
1251
"branches, such as on a server."
1252
msgstr ""
1253
1254
#: bzrlib/builtins.py:2147
1255
msgid ""
1256
":Examples:\n"
1257
" Create a shared repository holding just branches::"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2150
1261
msgid ""
1262
" bzr init-repo --no-trees repo\n"
1263
" bzr init repo/trunk"
1264
msgstr ""
1265
1266
#: bzrlib/builtins.py:2153
1416
1267
msgid " Make a lightweight checkout elsewhere::"
1417
msgstr " Make a lightweight checkout elsewhere::"
1418
1419
#: bzrlib/builtins.py:2185
1420
msgid ""
1421
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1422
" cd trunk-checkout\n"
1423
" (add files here)"
1424
msgstr ""
1425
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1426
" cd trunk-checkout\n"
1427
" (add files here)"
1428
1429
#: bzrlib/builtins.py:2193
1430
msgid ""
1431
"Specify a format for this repository. See \"bzr help formats\" for details."
1432
msgstr ""
1433
"Specify a format for this repository. See \"bzr help formats\" for details."
1434
1435
#: bzrlib/builtins.py:2197
1268
msgstr ""
1269
1270
#: bzrlib/builtins.py:2155
1271
msgid ""
1272
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1273
" cd trunk-checkout\n"
1274
" (add files here)"
1275
msgstr ""
1276
1277
#: bzrlib/builtins.py:2163
1278
msgid ""
1279
"Specify a format for this repository. See \"bzr help formats\" for details."
1280
msgstr ""
1281
1282
#: bzrlib/builtins.py:2167
1436
1283
msgid "Repository format"
1437
msgstr "Repository format"
1284
msgstr ""
1438
1285
1439
#: bzrlib/builtins.py:2199
1286
#: bzrlib/builtins.py:2169
1440
1287
msgid "Branches in the repository will default to not having a working tree."
1441
1288
msgstr ""
1442
"Branches in the repository will default to not having a working tree."
1443
1289
1444
#: bzrlib/builtins.py:2225
1290
#: bzrlib/builtins.py:2195
1445
1291
msgid "Show differences in the working tree, between revisions or branches."
1446
msgstr "Show differences in the working tree, between revisions or branches."
1447
1448
#: bzrlib/builtins.py:2227
1449
msgid ""
1450
"If no arguments are given, all changes for the current tree are listed.\n"
1451
"If files are given, only the changes in those files are listed.\n"
1452
"Remote and multiple branches can be compared by using the --old and\n"
1453
"--new options. If not provided, the default for both is derived from\n"
1454
"the first argument, if any, or the current tree if no arguments are\n"
1455
"given."
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."
1463
1464
#: bzrlib/builtins.py:2234
1465
msgid ""
1466
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1467
"produces patches suitable for \"patch -p1\"."
1468
msgstr ""
1469
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1470
"produces patches suitable for \"patch -p1\"."
1471
1472
#: bzrlib/builtins.py:2237
1473
msgid ""
1474
"Note that when using the -r argument with a range of revisions, the\n"
1475
"differences are computed between the two specified revisions. That\n"
1476
"is, the command does not show the changes introduced by the first \n"
1477
"revision in the range. This differs from the interpretation of \n"
1478
"revision ranges used by \"bzr log\" which includes the first revision\n"
1479
"in the range."
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."
1487
1488
#: bzrlib/builtins.py:2244
1489
msgid ""
1490
":Exit values:\n"
1491
" 1 - changed\n"
1492
" 2 - unrepresentable changes\n"
1493
" 3 - error\n"
1494
" 0 - no change"
1495
msgstr ""
1496
":Exit values:\n"
1497
" 1 - changed\n"
1498
" 2 - unrepresentable changes\n"
1499
" 3 - error\n"
1500
" 0 - no change"
1501
1502
#: bzrlib/builtins.py:2250
1503
msgid ""
1504
":Examples:\n"
1505
" Shows the difference in the working tree versus the last commit::"
1506
msgstr ""
1507
":Examples:\n"
1508
" Shows the difference in the working tree versus the last commit::"
1509
1510
#: bzrlib/builtins.py:2253
1292
msgstr ""
1293
1294
#: bzrlib/builtins.py:2197
1295
msgid ""
1296
"If no arguments are given, all changes for the current tree are listed.\n"
1297
"If files are given, only the changes in those files are listed.\n"
1298
"Remote and multiple branches can be compared by using the --old and\n"
1299
"--new options. If not provided, the default for both is derived from\n"
1300
"the first argument, if any, or the current tree if no arguments are\n"
1301
"given."
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2204
1305
msgid ""
1306
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1307
"produces patches suitable for \"patch -p1\"."
1308
msgstr ""
1309
1310
#: bzrlib/builtins.py:2207
1311
msgid ""
1312
"Note that when using the -r argument with a range of revisions, the\n"
1313
"differences are computed between the two specified revisions. That\n"
1314
"is, the command does not show the changes introduced by the first \n"
1315
"revision in the range. This differs from the interpretation of \n"
1316
"revision ranges used by \"bzr log\" which includes the first revision\n"
1317
"in the range."
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2214
1321
msgid ""
1322
":Exit values:\n"
1323
" 1 - changed\n"
1324
" 2 - unrepresentable changes\n"
1325
" 3 - error\n"
1326
" 0 - no change"
1327
msgstr ""
1328
1329
#: bzrlib/builtins.py:2220
1330
msgid ""
1331
":Examples:\n"
1332
" Shows the difference in the working tree versus the last commit::"
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2223
1511
1336
msgid " bzr diff"
1512
msgstr " bzr diff"
1337
msgstr ""
1513
1338
1514
#: bzrlib/builtins.py:2255
1339
#: bzrlib/builtins.py:2225
1515
1340
msgid " Difference between the working tree and revision 1::"
1516
msgstr " Difference between the working tree and revision 1::"
1341
msgstr ""
1517
1342
1518
#: bzrlib/builtins.py:2257
1343
#: bzrlib/builtins.py:2227
1519
1344
msgid " bzr diff -r1"
1520
msgstr " bzr diff -r1"
1345
msgstr ""
1521
1346
1522
#: bzrlib/builtins.py:2259
1347
#: bzrlib/builtins.py:2229
1523
1348
msgid " Difference between revision 3 and revision 1::"
1524
msgstr " Difference between revision 3 and revision 1::"
1349
msgstr ""
1525
1350
1526
#: bzrlib/builtins.py:2261
1351
#: bzrlib/builtins.py:2231
1527
1352
msgid " bzr diff -r1..3"
1528
msgstr " bzr diff -r1..3"
1353
msgstr ""
1529
1354
1530
#: bzrlib/builtins.py:2263
1355
#: bzrlib/builtins.py:2233
1531
1356
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1532
msgstr " Difference between revision 3 and revision 1 for branch xxx::"
1357
msgstr ""
1533
1358
1534
#: bzrlib/builtins.py:2265
1359
#: bzrlib/builtins.py:2235
1535
1360
msgid " bzr diff -r1..3 xxx"
1536
msgstr " bzr diff -r1..3 xxx"
1361
msgstr ""
1537
1362
1538
#: bzrlib/builtins.py:2267
1363
#: bzrlib/builtins.py:2237
1539
1364
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1540
msgstr " The changes introduced by revision 2 (equivalent to -r1..2)::"
1365
msgstr ""
1541
1366
1542
#: bzrlib/builtins.py:2269
1367
#: bzrlib/builtins.py:2239
1543
1368
msgid " bzr diff -c2"
1544
msgstr " bzr diff -c2"
1545
1546
#: bzrlib/builtins.py:2271
1547
msgid ""
1548
" To see the changes introduced by revision X::\n"
1549
" \n"
1550
" bzr diff -cX"
1551
msgstr ""
1552
" To see the changes introduced by revision X::\n"
1553
" \n"
1554
" bzr diff -cX"
1555
1556
#: bzrlib/builtins.py:2275
1557
msgid ""
1558
" Note that in the case of a merge, the -c option shows the changes\n"
1559
" compared to the left hand parent. To see the changes against\n"
1560
" another parent, use::"
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::"
1565
1566
#: bzrlib/builtins.py:2279
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2241
1372
msgid ""
1373
" To see the changes introduced by revision X::\n"
1374
" \n"
1375
" bzr diff -cX"
1376
msgstr ""
1377
1378
#: bzrlib/builtins.py:2245
1379
msgid ""
1380
" Note that in the case of a merge, the -c option shows the changes\n"
1381
" compared to the left hand parent. To see the changes against\n"
1382
" another parent, use::"
1383
msgstr ""
1384
1385
#: bzrlib/builtins.py:2249
1567
1386
msgid " bzr diff -r<chosen_parent>..X"
1568
msgstr " bzr diff -r<chosen_parent>..X"
1387
msgstr ""
1569
1388
1570
#: bzrlib/builtins.py:2281
1389
#: bzrlib/builtins.py:2251
1571
1390
msgid ""
1572
1391
" The changes between the current revision and the previous revision\n"
1573
1392
" (equivalent to -c-1 and -r-2..-1)"
1574
1393
msgstr ""
1575
" The changes between the current revision and the previous revision\n"
1576
" (equivalent to -c-1 and -r-2..-1)"
1577
1394
1578
#: bzrlib/builtins.py:2284
1395
#: bzrlib/builtins.py:2254
1579
1396
msgid " bzr diff -r-2.."
1580
msgstr " bzr diff -r-2.."
1397
msgstr ""
1581
1398
1582
#: bzrlib/builtins.py:2286
1399
#: bzrlib/builtins.py:2256
1583
1400
msgid " Show just the differences for file NEWS::"
1584
msgstr " Show just the differences for file NEWS::"
1401
msgstr ""
1585
1402
1586
#: bzrlib/builtins.py:2288
1403
#: bzrlib/builtins.py:2258
1587
1404
msgid " bzr diff NEWS"
1588
msgstr " bzr diff NEWS"
1405
msgstr ""
1589
1406
1590
#: bzrlib/builtins.py:2290
1407
#: bzrlib/builtins.py:2260
1591
1408
msgid " Show the differences in working tree xxx for file NEWS::"
1592
msgstr " Show the differences in working tree xxx for file NEWS::"
1409
msgstr ""
1593
1410
1594
#: bzrlib/builtins.py:2292
1411
#: bzrlib/builtins.py:2262
1595
1412
msgid " bzr diff xxx/NEWS"
1596
msgstr " bzr diff xxx/NEWS"
1413
msgstr ""
1597
1414
1598
#: bzrlib/builtins.py:2294
1415
#: bzrlib/builtins.py:2264
1599
1416
msgid " Show the differences from branch xxx to this working tree:"
1600
msgstr " Show the differences from branch xxx to this working tree:"
1417
msgstr ""
1601
1418
1602
#: bzrlib/builtins.py:2296
1419
#: bzrlib/builtins.py:2266
1603
1420
msgid " bzr diff --old xxx"
1604
msgstr " bzr diff --old xxx"
1421
msgstr ""
1605
1422
1606
#: bzrlib/builtins.py:2298
1423
#: bzrlib/builtins.py:2268
1607
1424
msgid " Show the differences between two branches for file NEWS::"
1608
msgstr " Show the differences between two branches for file NEWS::"
1425
msgstr ""
1609
1426
1610
#: bzrlib/builtins.py:2300
1427
#: bzrlib/builtins.py:2270
1611
1428
msgid " bzr diff --old xxx --new yyy NEWS"
1612
msgstr " bzr diff --old xxx --new yyy NEWS"
1429
msgstr ""
1613
1430
1614
#: bzrlib/builtins.py:2302
1431
#: bzrlib/builtins.py:2272
1615
1432
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1616
msgstr " Same as 'bzr diff' but prefix paths with old/ and new/::"
1433
msgstr ""
1617
1434
1618
#: bzrlib/builtins.py:2304
1435
#: bzrlib/builtins.py:2274
1619
1436
msgid ""
1620
1437
" bzr diff --prefix old/:new/\n"
1621
1438
" \n"
1623
1440
" \n"
1624
1441
" bzr diff --using /usr/bin/diff --diff-options -wu"
1625
1442
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"
1631
1443
1632
#: bzrlib/builtins.py:2314
1444
#: bzrlib/builtins.py:2284
1633
1445
msgid "Pass these options to the external diff program."
1634
msgstr "Pass these options to the external diff program."
1446
msgstr ""
1635
1447
1636
#: bzrlib/builtins.py:2317
1448
#: bzrlib/builtins.py:2287
1637
1449
msgid ""
1638
1450
"Set prefixes added to old and new filenames, as two values separated by a "
1639
1451
"colon. (eg \"old/:new/\")."
1640
1452
msgstr ""
1641
"Set prefixes added to old and new filenames, as two values separated by a "
1642
"colon. (eg \"old/:new/\")."
1643
1453
1644
#: bzrlib/builtins.py:2320
1454
#: bzrlib/builtins.py:2290
1645
1455
msgid "Branch/tree to compare from."
1646
msgstr "Branch/tree to compare from."
1456
msgstr ""
1647
1457
1648
#: bzrlib/builtins.py:2324
1458
#: bzrlib/builtins.py:2294
1649
1459
msgid "Branch/tree to compare to."
1650
msgstr "Branch/tree to compare to."
1460
msgstr ""
1651
1461
1652
#: bzrlib/builtins.py:2330
1462
#: bzrlib/builtins.py:2300
1653
1463
msgid "Use this command to compare files."
1654
msgstr "Use this command to compare files."
1464
msgstr ""
1655
1465
1656
#: bzrlib/builtins.py:2335
1466
#: bzrlib/builtins.py:2305
1657
1467
msgid "Diff format to use."
1658
msgstr "Diff format to use."
1468
msgstr ""
1659
1469
1660
#: bzrlib/builtins.py:2337
1470
#: bzrlib/builtins.py:2307
1661
1471
msgid "Diff format"
1662
msgstr "Diff format"
1472
msgstr ""
1663
1473
1664
#: bzrlib/builtins.py:2359
1474
#: bzrlib/builtins.py:2329
1665
1475
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1666
msgstr "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1476
msgstr ""
1667
1477
1668
#: bzrlib/builtins.py:2363
1478
#: bzrlib/builtins.py:2333
1669
1479
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1670
msgstr "bzr diff --revision takes exactly one or two revision specifiers"
1480
msgstr ""
1671
1481
1672
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1673
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1482
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1483
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1674
1484
msgid "{0} and {1} are mutually exclusive"
1675
msgstr "{0} and {1} are mutually exclusive"
1485
msgstr ""
1676
1486
1677
#: bzrlib/builtins.py:2388
1487
#: bzrlib/builtins.py:2358
1678
1488
msgid ""
1679
1489
"List files deleted in the working tree.\n"
1680
1490
" "
1681
1491
msgstr ""
1682
"List files deleted in the working tree.\n"
1683
" "
1684
1492
1685
#: bzrlib/builtins.py:2465
1493
#: bzrlib/builtins.py:2436
1686
1494
msgid "Show the tree root directory."
1687
msgstr "Show the tree root directory."
1495
msgstr ""
1688
1496
1689
#: bzrlib/builtins.py:2467
1497
#: bzrlib/builtins.py:2438
1690
1498
msgid ""
1691
1499
"The root is the nearest enclosing directory with a .bzr control\n"
1692
1500
"directory."
1693
1501
msgstr ""
1694
"The root is the nearest enclosing directory with a .bzr control\n"
1695
"directory."
1696
1502
1697
#: bzrlib/builtins.py:2482
1503
#: bzrlib/builtins.py:2453
1698
1504
msgid "The limit argument must be an integer."
1699
msgstr "The limit argument must be an integer."
1505
msgstr ""
1700
1506
1701
#: bzrlib/builtins.py:2490
1507
#: bzrlib/builtins.py:2461
1702
1508
msgid "The levels argument must be an integer."
1703
msgstr "The levels argument must be an integer."
1509
msgstr ""
1704
1510
1705
#: bzrlib/builtins.py:2495
1511
#: bzrlib/builtins.py:2466
1706
1512
msgid "Show historical log for a branch or subset of a branch."
1707
msgstr "Show historical log for a branch or subset of a branch."
1708
1709
#: bzrlib/builtins.py:2497
1710
msgid ""
1711
"log is bzr's default tool for exploring the history of a branch.\n"
1712
"The branch to use is taken from the first parameter. If no parameters\n"
1713
"are given, the branch containing the working directory is logged.\n"
1714
"Here are some simple examples::"
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::"
1720
1721
#: bzrlib/builtins.py:2502
1722
msgid ""
1723
" bzr log log the current branch\n"
1724
" bzr log foo.py log a file in its branch\n"
1725
" bzr log http://server/branch log a branch on a server"
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"
1730
1731
#: bzrlib/builtins.py:2506
1732
msgid ""
1733
"The filtering, ordering and information shown for each revision can\n"
1734
"be controlled as explained below. By default, all revisions are\n"
1735
"shown sorted (topologically) so that newer revisions appear before\n"
1736
"older ones and descendants always appear before ancestors. If displayed,\n"
1737
"merged revisions are shown indented under the revision in which they\n"
1738
"were merged."
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."
1746
1747
#: bzrlib/builtins.py:2513
1513
msgstr ""
1514
1515
#: bzrlib/builtins.py:2468
1516
msgid ""
1517
"log is bzr's default tool for exploring the history of a branch.\n"
1518
"The branch to use is taken from the first parameter. If no parameters\n"
1519
"are given, the branch containing the working directory is logged.\n"
1520
"Here are some simple examples::"
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2473
1524
msgid ""
1525
" bzr log log the current branch\n"
1526
" bzr log foo.py log a file in its branch\n"
1527
" bzr log http://server/branch log a branch on a server"
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2477
1531
msgid ""
1532
"The filtering, ordering and information shown for each revision can\n"
1533
"be controlled as explained below. By default, all revisions are\n"
1534
"shown sorted (topologically) so that newer revisions appear before\n"
1535
"older ones and descendants always appear before ancestors. If displayed,\n"
1536
"merged revisions are shown indented under the revision in which they\n"
1537
"were merged."
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2484
1748
1541
msgid ":Output control:"
1749
msgstr ":Output control:"
1542
msgstr ""
1543
1544
#: bzrlib/builtins.py:2486
1545
msgid ""
1546
" The log format controls how information about each revision is\n"
1547
" displayed. The standard log formats are called ``long``, ``short``\n"
1548
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1549
" for more details on log formats."
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2491
1553
msgid ""
1554
" The following options can be used to control what information is\n"
1555
" displayed::"
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2494
1559
msgid ""
1560
" -l N display a maximum of N revisions\n"
1561
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1562
" -v display a status summary (delta) for each revision\n"
1563
" -p display a diff (patch) for each revision\n"
1564
" --show-ids display revision-ids (and file-ids), not just revnos"
1565
msgstr ""
1566
1567
#: bzrlib/builtins.py:2500
1568
msgid ""
1569
" Note that the default number of levels to display is a function of the\n"
1570
" log format. If the -n option is not used, the standard log formats show\n"
1571
" just the top level (mainline)."
1572
msgstr ""
1573
1574
#: bzrlib/builtins.py:2504
1575
msgid ""
1576
" Status summaries are shown using status flags like A, M, etc. To see\n"
1577
" the changes explained using words like ``added`` and ``modified``\n"
1578
" instead, use the -vv option."
1579
msgstr ""
1580
1581
#: bzrlib/builtins.py:2508
1582
msgid ":Ordering control:"
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2510
1586
msgid ""
1587
" To display revisions from oldest to newest, use the --forward option.\n"
1588
" In most cases, using this option will have little impact on the total\n"
1589
" time taken to produce a log, though --forward does not incrementally\n"
1590
" display revisions like --reverse does when it can."
1591
msgstr ""
1750
1592
1751
1593
#: bzrlib/builtins.py:2515
1594
msgid ":Revision filtering:"
1595
msgstr ""
1596
1597
#: bzrlib/builtins.py:2517
1752
1598
msgid ""
1753
" The log format controls how information about each revision is\n"
1754
" displayed. The standard log formats are called ``long``, ``short``\n"
1755
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1756
" for more details on log formats."
1599
" The -r option can be used to specify what revision or range of revisions\n"
1600
" to filter against. The various forms are shown below::"
1757
1601
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."
1762
1602
1763
1603
#: bzrlib/builtins.py:2520
1764
1604
msgid ""
1765
" The following options can be used to control what information is\n"
1766
" displayed::"
1767
msgstr ""
1768
" The following options can be used to control what information is\n"
1769
" displayed::"
1770
1771
#: bzrlib/builtins.py:2523
1772
msgid ""
1773
" -l N display a maximum of N revisions\n"
1774
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1775
" -v display a status summary (delta) for each revision\n"
1776
" -p display a diff (patch) for each revision\n"
1777
" --show-ids display revision-ids (and file-ids), not just revnos"
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"
1784
1785
#: bzrlib/builtins.py:2529
1786
msgid ""
1787
" Note that the default number of levels to display is a function of the\n"
1788
" log format. If the -n option is not used, the standard log formats show\n"
1789
" just the top level (mainline)."
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)."
1794
1795
#: bzrlib/builtins.py:2533
1796
msgid ""
1797
" Status summaries are shown using status flags like A, M, etc. To see\n"
1798
" the changes explained using words like ``added`` and ``modified``\n"
1799
" instead, use the -vv option."
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."
1804
1805
#: bzrlib/builtins.py:2537
1806
msgid ":Ordering control:"
1807
msgstr ":Ordering control:"
1808
1809
#: bzrlib/builtins.py:2539
1810
msgid ""
1811
" To display revisions from oldest to newest, use the --forward option.\n"
1812
" In most cases, using this option will have little impact on the total\n"
1813
" time taken to produce a log, though --forward does not incrementally\n"
1814
" display revisions like --reverse does when it can."
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."
1605
" -rX display revision X\n"
1606
" -rX.. display revision X and later\n"
1607
" -r..Y display up to and including revision Y\n"
1608
" -rX..Y display from X to Y inclusive"
1609
msgstr ""
1610
1611
#: bzrlib/builtins.py:2525
1612
msgid ""
1613
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1614
" Some common examples are given below::"
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2528
1618
msgid ""
1619
" -r-1 show just the tip\n"
1620
" -r-10.. show the last 10 mainline revisions\n"
1621
" -rsubmit:.. show what's new on this branch\n"
1622
" -rancestor:path.. show changes since the common ancestor of this\n"
1623
" branch and the one at location path\n"
1624
" -rdate:yesterday.. show changes since yesterday"
1625
msgstr ""
1626
1627
#: bzrlib/builtins.py:2535
1628
msgid ""
1629
" When logging a range of revisions using -rX..Y, log starts at\n"
1630
" revision Y and searches back in history through the primary\n"
1631
" (\"left-hand\") parents until it finds X. When logging just the\n"
1632
" top level (using -n1), an error is reported if X is not found\n"
1633
" along the way. If multi-level logging is used (-n0), X may be\n"
1634
" a nested merge revision and the log will be truncated accordingly."
1635
msgstr ""
1636
1637
#: bzrlib/builtins.py:2542
1638
msgid ":Path filtering:"
1639
msgstr ""
1820
1640
1821
1641
#: bzrlib/builtins.py:2544
1822
msgid ":Revision filtering:"
1823
msgstr ":Revision filtering:"
1824
1825
#: bzrlib/builtins.py:2546
1826
msgid ""
1827
" The -r option can be used to specify what revision or range of revisions\n"
1828
" to filter against. The various forms are shown below::"
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::"
1832
1833
#: bzrlib/builtins.py:2549
1834
msgid ""
1835
" -rX display revision X\n"
1836
" -rX.. display revision X and later\n"
1837
" -r..Y display up to and including revision Y\n"
1838
" -rX..Y display from X to Y inclusive"
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"
1844
1845
#: bzrlib/builtins.py:2554
1846
msgid ""
1847
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1848
" Some common examples are given below::"
1849
msgstr ""
1850
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1851
" Some common examples are given below::"
1852
1853
#: bzrlib/builtins.py:2557
1854
msgid ""
1855
" -r-1 show just the tip\n"
1856
" -r-10.. show the last 10 mainline revisions\n"
1857
" -rsubmit:.. show what's new on this branch\n"
1858
" -rancestor:path.. show changes since the common ancestor of this\n"
1859
" branch and the one at location path\n"
1860
" -rdate:yesterday.. show changes since yesterday"
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"
1868
1869
#: bzrlib/builtins.py:2564
1870
msgid ""
1871
" When logging a range of revisions using -rX..Y, log starts at\n"
1872
" revision Y and searches back in history through the primary\n"
1873
" (\"left-hand\") parents until it finds X. When logging just the\n"
1874
" top level (using -n1), an error is reported if X is not found\n"
1875
" along the way. If multi-level logging is used (-n0), X may be\n"
1876
" a nested merge revision and the log will be truncated accordingly."
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."
1884
1885
#: bzrlib/builtins.py:2571
1886
msgid ":Path filtering:"
1887
msgstr ":Path filtering:"
1888
1889
#: bzrlib/builtins.py:2573
1890
msgid ""
1891
" If parameters are given and the first one is not a branch, the log\n"
1892
" will be filtered to show only those revisions that changed the\n"
1893
" nominated files or directories."
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."
1898
1899
#: bzrlib/builtins.py:2577
1900
msgid ""
1901
" Filenames are interpreted within their historical context. To log a\n"
1902
" deleted file, specify a revision range so that the file existed at\n"
1903
" the end or start of the range."
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."
1908
1909
#: bzrlib/builtins.py:2581
1910
msgid ""
1911
" Historical context is also important when interpreting pathnames of\n"
1912
" renamed files/directories. Consider the following example:"
1913
msgstr ""
1914
" Historical context is also important when interpreting pathnames of\n"
1915
" renamed files/directories. Consider the following example:"
1916
1917
#: bzrlib/builtins.py:2584
1918
msgid ""
1919
" * revision 1: add tutorial.txt\n"
1920
" * revision 2: modify tutorial.txt\n"
1921
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
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"
1926
1927
#: bzrlib/builtins.py:2588
1642
msgid ""
1643
" If parameters are given and the first one is not a branch, the log\n"
1644
" will be filtered to show only those revisions that changed the\n"
1645
" nominated files or directories."
1646
msgstr ""
1647
1648
#: bzrlib/builtins.py:2548
1649
msgid ""
1650
" Filenames are interpreted within their historical context. To log a\n"
1651
" deleted file, specify a revision range so that the file existed at\n"
1652
" the end or start of the range."
1653
msgstr ""
1654
1655
#: bzrlib/builtins.py:2552
1656
msgid ""
1657
" Historical context is also important when interpreting pathnames of\n"
1658
" renamed files/directories. Consider the following example:"
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2555
1662
msgid ""
1663
" * revision 1: add tutorial.txt\n"
1664
" * revision 2: modify tutorial.txt\n"
1665
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2559
1928
1669
msgid " In this case:"
1929
msgstr " In this case:"
1670
msgstr ""
1930
1671
1931
#: bzrlib/builtins.py:2590
1672
#: bzrlib/builtins.py:2561
1932
1673
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1933
msgstr " * ``bzr log guide.txt`` will log the file added in revision 1"
1934
1935
#: bzrlib/builtins.py:2592
1936
msgid ""
1937
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1938
msgstr ""
1939
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1940
1941
#: bzrlib/builtins.py:2594
1942
msgid ""
1943
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1944
" the original file in revision 2."
1945
msgstr ""
1946
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1947
" the original file in revision 2."
1948
1949
#: bzrlib/builtins.py:2597
1950
msgid ""
1951
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1952
" was no file called guide.txt in revision 2."
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."
1956
1957
#: bzrlib/builtins.py:2600
1958
msgid ""
1959
" Renames are always followed by log. By design, there is no need to\n"
1960
" explicitly ask for this (and no way to stop logging a file back\n"
1961
" until it was last renamed)."
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)."
1966
1967
#: bzrlib/builtins.py:2604
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2563
1677
msgid ""
1678
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2565
1682
msgid ""
1683
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1684
" the original file in revision 2."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2568
1688
msgid ""
1689
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1690
" was no file called guide.txt in revision 2."
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2571
1694
msgid ""
1695
" Renames are always followed by log. By design, there is no need to\n"
1696
" explicitly ask for this (and no way to stop logging a file back\n"
1697
" until it was last renamed)."
1698
msgstr ""
1699
1700
#: bzrlib/builtins.py:2575
1968
1701
msgid ":Other filtering:"
1969
msgstr ":Other filtering:"
1702
msgstr ""
1970
1703
1971
#: bzrlib/builtins.py:2606
1704
#: bzrlib/builtins.py:2577
1972
1705
msgid ""
1973
1706
" The --match option can be used for finding revisions that match a\n"
1974
1707
" regular expression in a commit message, committer, author or bug.\n"
1976
1709
" expressions. --match-author, --match-bugs, --match-committer and\n"
1977
1710
" --match-message can be used to only match a specific field."
1978
1711
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."
1984
1712
1985
#: bzrlib/builtins.py:2612
1713
#: bzrlib/builtins.py:2583
1986
1714
msgid ":Tips & tricks:"
1987
msgstr ":Tips & tricks:"
1988
1989
#: bzrlib/builtins.py:2614
1990
msgid ""
1991
" GUI tools and IDEs are often better at exploring history than command\n"
1992
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1993
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1994
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1995
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
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>. "
2002
2003
#: bzrlib/builtins.py:2620
2004
msgid ""
2005
" You may find it useful to add the aliases below to ``bazaar.conf``::"
2006
msgstr ""
2007
" You may find it useful to add the aliases below to ``bazaar.conf``::"
2008
2009
#: bzrlib/builtins.py:2622
2010
msgid ""
2011
" [ALIASES]\n"
2012
" tip = log -r-1\n"
2013
" top = log -l10 --line\n"
2014
" show = log -v -p"
2015
msgstr ""
2016
" [ALIASES]\n"
2017
" tip = log -r-1\n"
2018
" top = log -l10 --line\n"
2019
" show = log -v -p"
1715
msgstr ""
1716
1717
#: bzrlib/builtins.py:2585
1718
msgid ""
1719
" GUI tools and IDEs are often better at exploring history than command\n"
1720
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1721
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1722
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1723
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2591
1727
msgid ""
1728
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2593
1732
msgid ""
1733
" [ALIASES]\n"
1734
" tip = log -r-1\n"
1735
" top = log -l10 --line\n"
1736
" show = log -v -p"
1737
msgstr ""
1738
1739
#: bzrlib/builtins.py:2598
1740
msgid ""
1741
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1742
" will show the last 10 mainline revisions. To see the details of a\n"
1743
" particular revision X, ``bzr show -rX``."
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2602
1747
msgid ""
1748
" If you are interested in looking deeper into a particular merge X,\n"
1749
" use ``bzr log -n0 -rX``."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2605
1753
msgid ""
1754
" ``bzr log -v`` on a branch with lots of history is currently\n"
1755
" very slow. A fix for this issue is currently under development.\n"
1756
" With or without that fix, it is recommended that a revision range\n"
1757
" be given when using the -v option."
1758
msgstr ""
1759
1760
#: bzrlib/builtins.py:2610
1761
msgid ""
1762
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1763
" used to find revisions matching user names, commit messages, etc.\n"
1764
" Among other features, this plugin can find all revisions containing\n"
1765
" a list of words but not others."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2615
1769
msgid ""
1770
" When exploring non-mainline history on large projects with deep\n"
1771
" history, the performance of log can be greatly improved by installing\n"
1772
" the historycache plugin. This plugin buffers historical information\n"
1773
" trading disk space for faster speed."
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2624
1777
msgid "Show from oldest to newest."
1778
msgstr ""
2020
1779
2021
1780
#: bzrlib/builtins.py:2627
2022
msgid ""
2023
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2024
" will show the last 10 mainline revisions. To see the details of a\n"
2025
" particular revision X, ``bzr show -rX``."
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``."
2030
2031
#: bzrlib/builtins.py:2631
2032
msgid ""
2033
" If you are interested in looking deeper into a particular merge X,\n"
2034
" use ``bzr log -n0 -rX``."
2035
msgstr ""
2036
" If you are interested in looking deeper into a particular merge X,\n"
2037
" use ``bzr log -n0 -rX``."
2038
2039
#: bzrlib/builtins.py:2634
2040
msgid ""
2041
" ``bzr log -v`` on a branch with lots of history is currently\n"
2042
" very slow. A fix for this issue is currently under development.\n"
2043
" With or without that fix, it is recommended that a revision range\n"
2044
" be given when using the -v option."
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."
2050
2051
#: bzrlib/builtins.py:2639
2052
msgid ""
2053
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2054
" used to find revisions matching user names, commit messages, etc.\n"
2055
" Among other features, this plugin can find all revisions containing\n"
2056
" a list of words but not others."
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."
2062
2063
#: bzrlib/builtins.py:2644
2064
msgid ""
2065
" When exploring non-mainline history on large projects with deep\n"
2066
" history, the performance of log can be greatly improved by installing\n"
2067
" the historycache plugin. This plugin buffers historical information\n"
2068
" trading disk space for faster speed."
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."
2074
2075
#: bzrlib/builtins.py:2653
2076
msgid "Show from oldest to newest."
2077
msgstr "Show from oldest to newest."
2078
2079
#: bzrlib/builtins.py:2656
2080
1781
msgid "Show files changed in each revision."
2081
msgstr "Show files changed in each revision."
1782
msgstr ""
2082
1783
2083
#: bzrlib/builtins.py:2662
1784
#: bzrlib/builtins.py:2633
2084
1785
msgid "Show just the specified revision. See also \"help revisionspec\"."
2085
msgstr "Show just the specified revision. See also \"help revisionspec\"."
1786
msgstr ""
2086
1787
2087
#: bzrlib/builtins.py:2666
1788
#: bzrlib/builtins.py:2637
2088
1789
msgid "What names to list as authors - first, all or committer."
2089
msgstr "What names to list as authors - first, all or committer."
1790
msgstr ""
2090
1791
2091
#: bzrlib/builtins.py:2667
1792
#: bzrlib/builtins.py:2638
2092
1793
msgid "Authors"
2093
msgstr "Authors"
1794
msgstr ""
2094
1795
2095
#: bzrlib/builtins.py:2672
1796
#: bzrlib/builtins.py:2643
2096
1797
msgid "Number of levels to display - 0 for all, 1 for flat."
2097
msgstr "Number of levels to display - 0 for all, 1 for flat."
1798
msgstr ""
2098
1799
2099
#: bzrlib/builtins.py:2682
1800
#: bzrlib/builtins.py:2653
2100
1801
msgid "Limit the output to the first N revisions."
2101
msgstr "Limit the output to the first N revisions."
1802
msgstr ""
2102
1803
2103
#: bzrlib/builtins.py:2687
1804
#: bzrlib/builtins.py:2658
2104
1805
msgid "Show changes made in each revision as a patch."
2105
msgstr "Show changes made in each revision as a patch."
1806
msgstr ""
2106
1807
2107
#: bzrlib/builtins.py:2689
1808
#: bzrlib/builtins.py:2660
2108
1809
msgid "Show merged revisions like --levels 0 does."
2109
msgstr "Show merged revisions like --levels 0 does."
1810
msgstr ""
2110
1811
2111
#: bzrlib/builtins.py:2693
1812
#: bzrlib/builtins.py:2664
2112
1813
msgid "Do not report commits with more than one parent."
2113
msgstr "Do not report commits with more than one parent."
1814
msgstr ""
2114
1815
2115
#: bzrlib/builtins.py:2695
1816
#: bzrlib/builtins.py:2666
2116
1817
msgid ""
2117
1818
"Display only the revisions that are not part of both ancestries (require -"
2118
1819
"rX..Y)."
2119
1820
msgstr ""
2120
"Display only the revisions that are not part of both ancestries (require -"
2121
"rX..Y)."
2122
1821
2123
#: bzrlib/builtins.py:2699
1822
#: bzrlib/builtins.py:2670
2124
1823
msgid "Show digital signature validity."
2125
msgstr "Show digital signature validity."
1824
msgstr ""
2126
1825
2127
#: bzrlib/builtins.py:2702
1826
#: bzrlib/builtins.py:2673
2128
1827
msgid "Show revisions whose properties match this expression."
2129
msgstr "Show revisions whose properties match this expression."
1828
msgstr ""
2130
1829
2131
#: bzrlib/builtins.py:2706
1830
#: bzrlib/builtins.py:2677
2132
1831
msgid "Show revisions whose message matches this expression."
2133
msgstr "Show revisions whose message matches this expression."
1832
msgstr ""
2134
1833
2135
#: bzrlib/builtins.py:2710
1834
#: bzrlib/builtins.py:2681
2136
1835
msgid "Show revisions whose committer matches this expression."
2137
msgstr "Show revisions whose committer matches this expression."
1836
msgstr ""
2138
1837
2139
#: bzrlib/builtins.py:2714
1838
#: bzrlib/builtins.py:2685
2140
1839
msgid "Show revisions whose authors match this expression."
2141
msgstr "Show revisions whose authors match this expression."
1840
msgstr ""
2142
1841
2143
#: bzrlib/builtins.py:2718
1842
#: bzrlib/builtins.py:2689
2144
1843
msgid "Show revisions whose bugs match this expression."
2145
msgstr "Show revisions whose bugs match this expression."
1844
msgstr ""
2146
1845
2147
#: bzrlib/builtins.py:2772
1846
#: bzrlib/builtins.py:2743
2148
1847
msgid "--exclude-common-ancestry requires -r with two revisions"
2149
msgstr "--exclude-common-ancestry requires -r with two revisions"
1848
msgstr ""
2150
1849
2151
#: bzrlib/builtins.py:2800
1850
#: bzrlib/builtins.py:2771
2152
1851
#, python-format
2153
1852
msgid "Path unknown at end or start of revision range: %s"
2154
msgstr "Path unknown at end or start of revision range: %s"
1853
msgstr ""
2155
1854
2156
#: bzrlib/builtins.py:2917
1855
#: bzrlib/builtins.py:2888
2157
1856
#, python-format
2158
1857
msgid "bzr %s doesn't accept two revisions in different branches."
2159
msgstr "bzr %s doesn't accept two revisions in different branches."
1858
msgstr ""
2160
1859
2161
#: bzrlib/builtins.py:2933
1860
#: bzrlib/builtins.py:2904
2162
1861
#, python-format
2163
1862
msgid "bzr %s --revision takes one or two values."
2164
msgstr "bzr %s --revision takes one or two values."
1863
msgstr ""
2165
1864
2166
#: bzrlib/builtins.py:2978
1865
#: bzrlib/builtins.py:2949
2167
1866
msgid ""
2168
1867
"List files in a tree.\n"
2169
1868
" "
2170
1869
msgstr ""
2171
"List files in a tree.\n"
2172
" "
2173
1870
2174
#: bzrlib/builtins.py:2987
1871
#: bzrlib/builtins.py:2958
2175
1872
msgid "Recurse into subdirectories."
2176
msgstr "Recurse into subdirectories."
1873
msgstr ""
2177
1874
2178
#: bzrlib/builtins.py:2989
1875
#: bzrlib/builtins.py:2960
2179
1876
msgid "Print paths relative to the root of the branch."
2180
msgstr "Print paths relative to the root of the branch."
1877
msgstr ""
2181
1878
2182
#: bzrlib/builtins.py:2991
1879
#: bzrlib/builtins.py:2962
2183
1880
msgid "Print unknown files."
2184
msgstr "Print unknown files."
1881
msgstr ""
2185
1882
2186
#: bzrlib/builtins.py:2992
1883
#: bzrlib/builtins.py:2963
2187
1884
msgid "Print versioned files."
2188
msgstr "Print versioned files."
1885
msgstr ""
2189
1886
2190
#: bzrlib/builtins.py:2995
1887
#: bzrlib/builtins.py:2966
2191
1888
msgid "Print ignored files."
2192
msgstr "Print ignored files."
1889
msgstr ""
2193
1890
2194
#: bzrlib/builtins.py:2997
1891
#: bzrlib/builtins.py:2968
2195
1892
msgid "List entries of a particular kind: file, directory, symlink."
2196
msgstr "List entries of a particular kind: file, directory, symlink."
1893
msgstr ""
2197
1894
2198
#: bzrlib/builtins.py:3010
1895
#: bzrlib/builtins.py:2981
2199
1896
msgid "invalid kind specified"
2200
msgstr "invalid kind specified"
1897
msgstr ""
2201
1898
2202
#: bzrlib/builtins.py:3013
1899
#: bzrlib/builtins.py:2984
2203
1900
msgid "Cannot set both --verbose and --null"
2204
msgstr "Cannot set both --verbose and --null"
1901
msgstr ""
2205
1902
2206
#: bzrlib/builtins.py:3022
1903
#: bzrlib/builtins.py:2993
2207
1904
msgid "cannot specify both --from-root and PATH"
2208
msgstr "cannot specify both --from-root and PATH"
1905
msgstr ""
2209
1906
2210
#: bzrlib/builtins.py:3109
1907
#: bzrlib/builtins.py:3080
2211
1908
msgid "Ignore specified files or patterns."
2212
msgstr "Ignore specified files or patterns."
1909
msgstr ""
2213
1910
2214
#: bzrlib/builtins.py:3111
1911
#: bzrlib/builtins.py:3082
2215
1912
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2216
msgstr "See ``bzr help patterns`` for details on the syntax of patterns."
1913
msgstr ""
1914
1915
#: bzrlib/builtins.py:3084
1916
msgid ""
1917
"If a .bzrignore file does not exist, the ignore command\n"
1918
"will create one and add the specified files or patterns to the newly\n"
1919
"created file. The ignore command will also automatically add the \n"
1920
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1921
"the use of the ignore command will require an explicit add command."
1922
msgstr ""
1923
1924
#: bzrlib/builtins.py:3090
1925
msgid ""
1926
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1927
"After adding, editing or deleting that file either indirectly by\n"
1928
"using this command or directly by using an editor, be sure to commit\n"
1929
"it."
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:3095
1933
msgid ""
1934
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1935
"the global ignore file can be found in the application data directory as\n"
1936
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1937
"Global ignores are not touched by this command. The global ignore file\n"
1938
"can be edited directly using an editor."
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:3101
1942
msgid ""
1943
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1944
"precedence over regular ignores. Such exceptions are used to specify\n"
1945
"files that should be versioned which would otherwise be ignored."
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:3105
1949
msgid ""
1950
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1951
"precedence over the '!' exception patterns."
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:3108
1955
msgid ""
1956
":Notes: \n"
1957
" \n"
1958
"* Ignore patterns containing shell wildcards must be quoted from\n"
1959
" the shell on Unix."
1960
msgstr ""
2217
1961
2218
1962
#: bzrlib/builtins.py:3113
2219
1963
msgid ""
2220
"If a .bzrignore file does not exist, the ignore command\n"
2221
"will create one and add the specified files or patterns to the newly\n"
2222
"created file. The ignore command will also automatically add the \n"
2223
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2224
"the use of the ignore command will require an explicit add command."
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."
1964
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1965
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3116
1969
msgid ""
1970
":Examples:\n"
1971
" Ignore the top level Makefile::"
1972
msgstr ""
2231
1973
2232
1974
#: bzrlib/builtins.py:3119
2233
msgid ""
2234
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2235
"After adding, editing or deleting that file either indirectly by\n"
2236
"using this command or directly by using an editor, be sure to commit\n"
2237
"it."
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."
2243
2244
#: bzrlib/builtins.py:3124
2245
msgid ""
2246
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2247
"the global ignore file can be found in the application data directory as\n"
2248
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2249
"Global ignores are not touched by this command. The global ignore file\n"
2250
"can be edited directly using an editor."
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."
2257
2258
#: bzrlib/builtins.py:3130
2259
msgid ""
2260
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2261
"precedence over regular ignores. Such exceptions are used to specify\n"
2262
"files that should be versioned which would otherwise be ignored."
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."
2267
2268
#: bzrlib/builtins.py:3134
2269
msgid ""
2270
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2271
"precedence over the '!' exception patterns."
2272
msgstr ""
2273
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2274
"precedence over the '!' exception patterns."
2275
2276
#: bzrlib/builtins.py:3137
2277
msgid ""
2278
":Notes: \n"
2279
" \n"
2280
"* Ignore patterns containing shell wildcards must be quoted from\n"
2281
" the shell on Unix."
2282
msgstr ""
2283
":Notes: \n"
2284
" \n"
2285
"* Ignore patterns containing shell wildcards must be quoted from\n"
2286
" the shell on Unix."
2287
2288
#: bzrlib/builtins.py:3142
2289
msgid ""
2290
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2291
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
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."
2295
2296
#: bzrlib/builtins.py:3145
2297
msgid ""
2298
":Examples:\n"
2299
" Ignore the top level Makefile::"
2300
msgstr ""
2301
":Examples:\n"
2302
" Ignore the top level Makefile::"
2303
2304
#: bzrlib/builtins.py:3148
2305
1975
msgid " bzr ignore ./Makefile"
2306
msgstr " bzr ignore ./Makefile"
1976
msgstr ""
2307
1977
2308
#: bzrlib/builtins.py:3150
1978
#: bzrlib/builtins.py:3121
2309
1979
msgid " Ignore .class files in all directories...::"
2310
msgstr " Ignore .class files in all directories...::"
1980
msgstr ""
2311
1981
2312
#: bzrlib/builtins.py:3152
1982
#: bzrlib/builtins.py:3123
2313
1983
msgid " bzr ignore \"*.class\""
2314
msgstr " bzr ignore \"*.class\""
1984
msgstr ""
2315
1985
2316
#: bzrlib/builtins.py:3154
1986
#: bzrlib/builtins.py:3125
2317
1987
msgid " ...but do not ignore \"special.class\"::"
2318
msgstr " ...but do not ignore \"special.class\"::"
1988
msgstr ""
2319
1989
2320
#: bzrlib/builtins.py:3156
1990
#: bzrlib/builtins.py:3127
2321
1991
msgid " bzr ignore \"!special.class\""
2322
msgstr " bzr ignore \"!special.class\""
1992
msgstr ""
2323
1993
2324
#: bzrlib/builtins.py:3158
1994
#: bzrlib/builtins.py:3129
2325
1995
msgid " Ignore files whose name begins with the \"#\" character::"
2326
msgstr " Ignore files whose name begins with the \"#\" character::"
1996
msgstr ""
2327
1997
2328
#: bzrlib/builtins.py:3160
1998
#: bzrlib/builtins.py:3131
2329
1999
msgid " bzr ignore \"RE:^#\""
2330
msgstr " bzr ignore \"RE:^#\""
2000
msgstr ""
2331
2001
2332
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2002
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2333
2003
msgid " Ignore .o files under the lib directory::"
2334
msgstr " Ignore .o files under the lib directory::"
2004
msgstr ""
2335
2005
2336
#: bzrlib/builtins.py:3164
2006
#: bzrlib/builtins.py:3135
2337
2007
msgid " bzr ignore \"lib/**/*.o\""
2338
msgstr " bzr ignore \"lib/**/*.o\""
2008
msgstr ""
2339
2009
2340
#: bzrlib/builtins.py:3168
2010
#: bzrlib/builtins.py:3139
2341
2011
msgid " bzr ignore \"RE:lib/.*\\.o\""
2342
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2012
msgstr ""
2343
2013
2344
#: bzrlib/builtins.py:3170
2014
#: bzrlib/builtins.py:3141
2345
2015
msgid " Ignore everything but the \"debian\" toplevel directory::"
2346
msgstr " Ignore everything but the \"debian\" top-level directory::"
2016
msgstr ""
2347
2017
2348
#: bzrlib/builtins.py:3172
2018
#: bzrlib/builtins.py:3143
2349
2019
msgid ""
2350
2020
" bzr ignore \"RE:(?!debian/).*\"\n"
2351
2021
" \n"
2356
2026
" bzr ignore \"!./local\"\n"
2357
2027
" bzr ignore \"!!*~\""
2358
2028
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 \"!!*~\""
2367
2029
2368
#: bzrlib/builtins.py:3186
2030
#: bzrlib/builtins.py:3157
2369
2031
msgid "Display the default ignore rules that bzr uses."
2370
msgstr "Display the default ignore rules that bzr uses."
2032
msgstr ""
2371
2033
2372
#: bzrlib/builtins.py:3198
2034
#: bzrlib/builtins.py:3169
2373
2035
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2374
msgstr "ignore requires at least one NAME_PATTERN or --default-rules."
2036
msgstr ""
2375
2037
2376
#: bzrlib/builtins.py:3209
2038
#: bzrlib/builtins.py:3180
2377
2039
#, python-format
2378
2040
msgid "Invalid ignore pattern found. %s"
2379
2041
msgid_plural "Invalid ignore patterns found. %s"
2380
msgstr[0] "Invalid ignore pattern found. %s"
2381
msgstr[1] "Invalid ignore patterns found. %s"
2042
msgstr[0] ""
2043
msgstr[1] ""
2382
2044
2383
#: bzrlib/builtins.py:3218
2045
#: bzrlib/builtins.py:3189
2384
2046
msgid "NAME_PATTERN should not be an absolute path"
2385
msgstr "NAME_PATTERN should not be an absolute path"
2047
msgstr ""
2386
2048
2387
#: bzrlib/builtins.py:3231
2049
#: bzrlib/builtins.py:3202
2388
2050
#, python-format
2389
2051
msgid ""
2390
2052
"Warning: the following files are version controlled and match your ignore "
2393
2055
"These files will continue to be version controlled unless you 'bzr remove' "
2394
2056
"them.\n"
2395
2057
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"
2401
2058
2402
#: bzrlib/builtins.py:3238
2059
#: bzrlib/builtins.py:3209
2403
2060
msgid "List ignored files and the patterns that matched them."
2404
msgstr "List ignored files and the patterns that matched them."
2061
msgstr ""
2405
2062
2406
#: bzrlib/builtins.py:3240
2063
#: bzrlib/builtins.py:3211
2407
2064
msgid ""
2408
2065
"List all the ignored files and the ignore pattern that caused the file to\n"
2409
2066
"be ignored."
2410
2067
msgstr ""
2411
"List all the ignored files and the ignore pattern that caused the file to\n"
2412
"be ignored."
2413
2068
2414
#: bzrlib/builtins.py:3243
2069
#: bzrlib/builtins.py:3214
2415
2070
msgid "Alternatively, to list just the files::"
2416
msgstr "Alternatively, to list just the files::"
2071
msgstr ""
2417
2072
2418
#: bzrlib/builtins.py:3245
2073
#: bzrlib/builtins.py:3216
2419
2074
msgid " bzr ls --ignored"
2420
msgstr " bzr ls --ignored"
2075
msgstr ""
2421
2076
2422
#: bzrlib/builtins.py:3279
2077
#: bzrlib/builtins.py:3250
2423
2078
#, python-format
2424
2079
msgid "not a valid revision-number: %r"
2425
msgstr "not a valid revision-number: %r"
2426
2427
#: bzrlib/builtins.py:3286
2428
msgid ""
2429
"Export current or past revision to a destination directory or archive."
2430
msgstr ""
2431
"Export current or past revision to a destination directory or archive."
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3257
2083
msgid ""
2084
"Export current or past revision to a destination directory or archive."
2085
msgstr ""
2086
2087
#: bzrlib/builtins.py:3259
2088
msgid "If no revision is specified this exports the last committed revision."
2089
msgstr ""
2090
2091
#: bzrlib/builtins.py:3261
2092
msgid ""
2093
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2094
"given, try to find the format with the extension. If no extension\n"
2095
"is found exports to a directory (equivalent to --format=dir)."
2096
msgstr ""
2097
2098
#: bzrlib/builtins.py:3265
2099
msgid ""
2100
"If root is supplied, it will be used as the root directory inside\n"
2101
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2102
"to the exported filename. The root option has no effect for 'dir' format."
2103
msgstr ""
2104
2105
#: bzrlib/builtins.py:3269
2106
msgid ""
2107
"If branch is omitted then the branch containing the current working\n"
2108
"directory will be used."
2109
msgstr ""
2110
2111
#: bzrlib/builtins.py:3272
2112
msgid ""
2113
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2114
msgstr ""
2115
2116
#: bzrlib/builtins.py:3274
2117
msgid ""
2118
" ================= =========================\n"
2119
" Supported formats Autodetected by extension\n"
2120
" ================= =========================\n"
2121
" dir (none)\n"
2122
" tar .tar\n"
2123
" tbz2 .tar.bz2, .tbz2\n"
2124
" tgz .tar.gz, .tgz\n"
2125
" zip .zip\n"
2126
" ================= ========================="
2127
msgstr ""
2432
2128
2433
2129
#: bzrlib/builtins.py:3288
2434
msgid "If no revision is specified this exports the last committed revision."
2435
msgstr ""
2436
"If no revision is specified this exports the last committed revision."
2437
2438
#: bzrlib/builtins.py:3290
2439
msgid ""
2440
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2441
"given, try to find the format with the extension. If no extension\n"
2442
"is found exports to a directory (equivalent to --format=dir)."
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)."
2447
2448
#: bzrlib/builtins.py:3294
2449
msgid ""
2450
"If root is supplied, it will be used as the root directory inside\n"
2451
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2452
"to the exported filename. The root option has no effect for 'dir' format."
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."
2457
2458
#: bzrlib/builtins.py:3298
2459
msgid ""
2460
"If branch is omitted then the branch containing the current working\n"
2461
"directory will be used."
2462
msgstr ""
2463
"If branch is omitted then the branch containing the current working\n"
2464
"directory will be used."
2465
2466
#: bzrlib/builtins.py:3301
2467
msgid ""
2468
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2469
msgstr ""
2470
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2471
2472
#: bzrlib/builtins.py:3303
2473
msgid ""
2474
" ================= =========================\n"
2475
" Supported formats Autodetected by extension\n"
2476
" ================= =========================\n"
2477
" dir (none)\n"
2478
" tar .tar\n"
2479
" tbz2 .tar.bz2, .tbz2\n"
2480
" tgz .tar.gz, .tgz\n"
2481
" zip .zip\n"
2482
" ================= ========================="
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
" ================= ========================="
2493
2494
#: bzrlib/builtins.py:3317
2495
2130
msgid "Type of file to export to."
2496
msgstr "Type of file to export to."
2131
msgstr ""
2497
2132
2498
#: bzrlib/builtins.py:3320
2133
#: bzrlib/builtins.py:3291
2499
2134
msgid "Apply content filters to export the convenient form."
2500
msgstr "Apply content filters to export the convenient form."
2135
msgstr ""
2501
2136
2502
#: bzrlib/builtins.py:3324
2137
#: bzrlib/builtins.py:3295
2503
2138
msgid "Name of the root directory inside the exported file."
2504
msgstr "Name of the root directory inside the exported file."
2505
2506
#: bzrlib/builtins.py:3326
2507
msgid ""
2508
"Set modification time of files to that of the last revision in which it was "
2509
"changed."
2510
msgstr ""
2511
"Set modification time of files to that of the last revision in which it was "
2512
"changed."
2513
2514
#: bzrlib/builtins.py:3329
2515
msgid ""
2516
"Export the working tree contents rather than that of the last revision."
2517
msgstr ""
2518
"Export the working tree contents rather than that of the last revision."
2519
2520
#: bzrlib/builtins.py:3348
2139
msgstr ""
2140
2141
#: bzrlib/builtins.py:3297
2142
msgid ""
2143
"Set modification time of files to that of the last revision in which it was "
2144
"changed."
2145
msgstr ""
2146
2147
#: bzrlib/builtins.py:3300
2148
msgid ""
2149
"Export the working tree contents rather than that of the last revision."
2150
msgstr ""
2151
2152
#: bzrlib/builtins.py:3319
2521
2153
msgid "--uncommitted requires a working tree"
2522
msgstr "--uncommitted requires a working tree"
2154
msgstr ""
2523
2155
2524
#: bzrlib/builtins.py:3357
2156
#: bzrlib/builtins.py:3328
2525
2157
#, python-format
2526
2158
msgid "Unsupported export format: %s"
2527
msgstr "Unsupported export format: %s"
2159
msgstr ""
2528
2160
2529
#: bzrlib/builtins.py:3361
2161
#: bzrlib/builtins.py:3332
2530
2162
msgid ""
2531
2163
"Write the contents of a file as of a given revision to standard output."
2532
2164
msgstr ""
2533
"Write the contents of a file as of a given revision to standard output."
2534
2165
2535
#: bzrlib/builtins.py:3363
2166
#: bzrlib/builtins.py:3334
2536
2167
msgid "If no revision is nominated, the last revision is used."
2537
msgstr "If no revision is nominated, the last revision is used."
2168
msgstr ""
2538
2169
2539
#: bzrlib/builtins.py:3365
2170
#: bzrlib/builtins.py:3336
2540
2171
msgid ""
2541
2172
"Note: Take care to redirect standard output when using this command on a\n"
2542
2173
"binary file."
2543
2174
msgstr ""
2544
"Note: Take care to redirect standard output when using this command on a\n"
2545
"binary file."
2546
2175
2547
#: bzrlib/builtins.py:3371
2176
#: bzrlib/builtins.py:3342
2548
2177
msgid "The path name in the old tree."
2549
msgstr "The path name in the old tree."
2178
msgstr ""
2550
2179
2551
#: bzrlib/builtins.py:3372
2180
#: bzrlib/builtins.py:3343
2552
2181
msgid "Apply content filters to display the convenience form."
2553
msgstr "Apply content filters to display the convenience form."
2182
msgstr ""
2554
2183
2555
#: bzrlib/builtins.py:3383
2184
#: bzrlib/builtins.py:3354
2556
2185
msgid "bzr cat --revision takes exactly one revision specifier"
2557
msgstr "bzr cat --revision takes exactly one revision specifier"
2186
msgstr ""
2558
2187
2559
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2188
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2560
2189
msgid "{0!r} is not present in revision {1}"
2561
msgstr "{0!r} is not present in revision {1}"
2190
msgstr ""
2562
2191
2563
#: bzrlib/builtins.py:3443
2192
#: bzrlib/builtins.py:3414
2564
2193
msgid "Commit changes into a new revision."
2565
msgstr "Commit changes into a new revision."
2566
2567
#: bzrlib/builtins.py:3445
2568
msgid ""
2569
"An explanatory message needs to be given for each commit. This is\n"
2570
"often done by using the --message option (getting the message from the\n"
2571
"command line) or by using the --file option (getting the message from\n"
2572
"a file). If neither of these options is given, an editor is opened for\n"
2573
"the user to enter the message. To see the changed files in the\n"
2574
"boilerplate text loaded into the editor, use the --show-diff option."
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."
2582
2583
#: bzrlib/builtins.py:3452
2584
msgid ""
2585
"By default, the entire tree is committed and the person doing the\n"
2586
"commit is assumed to be the author. These defaults can be overridden\n"
2587
"as explained below."
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."
2592
2593
#: bzrlib/builtins.py:3456
2194
msgstr ""
2195
2196
#: bzrlib/builtins.py:3416
2197
msgid ""
2198
"An explanatory message needs to be given for each commit. This is\n"
2199
"often done by using the --message option (getting the message from the\n"
2200
"command line) or by using the --file option (getting the message from\n"
2201
"a file). If neither of these options is given, an editor is opened for\n"
2202
"the user to enter the message. To see the changed files in the\n"
2203
"boilerplate text loaded into the editor, use the --show-diff option."
2204
msgstr ""
2205
2206
#: bzrlib/builtins.py:3423
2207
msgid ""
2208
"By default, the entire tree is committed and the person doing the\n"
2209
"commit is assumed to be the author. These defaults can be overridden\n"
2210
"as explained below."
2211
msgstr ""
2212
2213
#: bzrlib/builtins.py:3427
2594
2214
msgid ":Selective commits:"
2595
msgstr ":Selective commits:"
2596
2597
#: bzrlib/builtins.py:3458
2598
msgid ""
2599
" If selected files are specified, only changes to those files are\n"
2600
" committed. If a directory is specified then the directory and\n"
2601
" everything within it is committed."
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."
2606
2607
#: bzrlib/builtins.py:3462
2608
msgid ""
2609
" When excludes are given, they take precedence over selected files.\n"
2610
" For example, to commit only changes within foo, but not changes\n"
2611
" within foo/bar::"
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::"
2616
2617
#: bzrlib/builtins.py:3466
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3429
2218
msgid ""
2219
" If selected files are specified, only changes to those files are\n"
2220
" committed. If a directory is specified then the directory and\n"
2221
" everything within it is committed."
2222
msgstr ""
2223
2224
#: bzrlib/builtins.py:3433
2225
msgid ""
2226
" When excludes are given, they take precedence over selected files.\n"
2227
" For example, to commit only changes within foo, but not changes\n"
2228
" within foo/bar::"
2229
msgstr ""
2230
2231
#: bzrlib/builtins.py:3437
2618
2232
msgid " bzr commit foo -x foo/bar"
2619
msgstr " bzr commit foo -x foo/bar"
2233
msgstr ""
2620
2234
2621
#: bzrlib/builtins.py:3468
2235
#: bzrlib/builtins.py:3439
2622
2236
msgid " A selective commit after a merge is not yet supported."
2623
msgstr " A selective commit after a merge is not yet supported."
2237
msgstr ""
2624
2238
2625
#: bzrlib/builtins.py:3470
2239
#: bzrlib/builtins.py:3441
2626
2240
msgid ":Custom authors:"
2627
msgstr ":Custom authors:"
2241
msgstr ""
2628
2242
2629
#: bzrlib/builtins.py:3472
2243
#: bzrlib/builtins.py:3443
2630
2244
msgid ""
2631
2245
" If the author of the change is not the same person as the committer,\n"
2632
2246
" you can specify the author's name using the --author option. The\n"
2635
2249
" the change you can specify the option multiple times, once for each\n"
2636
2250
" author."
2637
2251
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."
2644
2252
2645
#: bzrlib/builtins.py:3479
2253
#: bzrlib/builtins.py:3450
2646
2254
msgid ":Checks:"
2647
msgstr ":Checks:"
2255
msgstr ""
2648
2256
2649
#: bzrlib/builtins.py:3481
2257
#: bzrlib/builtins.py:3452
2650
2258
msgid ""
2651
2259
" A common mistake is to forget to add a new file or directory before\n"
2652
2260
" running the commit command. The --strict option checks for unknown\n"
2654
2262
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2655
2263
" for details."
2656
2264
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."
2662
2265
2663
#: bzrlib/builtins.py:3487
2266
#: bzrlib/builtins.py:3458
2664
2267
msgid ":Things to note:"
2665
msgstr ":Things to note:"
2268
msgstr ""
2666
2269
2667
#: bzrlib/builtins.py:3489
2270
#: bzrlib/builtins.py:3460
2668
2271
msgid ""
2669
2272
" If you accidentially commit the wrong changes or make a spelling\n"
2670
2273
" mistake in the commit message say, you can use the uncommit command\n"
2671
2274
" to undo it. See ``bzr help uncommit`` for details."
2672
2275
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."
2676
2276
2677
#: bzrlib/builtins.py:3493
2277
#: bzrlib/builtins.py:3464
2678
2278
msgid ""
2679
2279
" Hooks can also be configured to run after a commit. This allows you\n"
2680
2280
" to trigger updates to external systems like bug trackers. The --fixes\n"
2681
2281
" option can be used to record the association between a revision and\n"
2682
2282
" one or more bugs. See ``bzr help bugs`` for details."
2683
2283
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."
2688
2284
2689
#: bzrlib/builtins.py:3503
2285
#: bzrlib/builtins.py:3474
2690
2286
msgid "Do not consider changes made to a given path."
2691
msgstr "Do not consider changes made to a given path."
2287
msgstr ""
2692
2288
2693
#: bzrlib/builtins.py:3506
2289
#: bzrlib/builtins.py:3477
2694
2290
msgid "Description of the new revision."
2695
msgstr "Description of the new revision."
2291
msgstr ""
2696
2292
2697
#: bzrlib/builtins.py:3509
2293
#: bzrlib/builtins.py:3480
2698
2294
msgid "Commit even if nothing has changed."
2699
msgstr "Commit even if nothing has changed."
2295
msgstr ""
2700
2296
2701
#: bzrlib/builtins.py:3513
2297
#: bzrlib/builtins.py:3484
2702
2298
msgid "Take commit message from this file."
2703
msgstr "Take commit message from this file."
2299
msgstr ""
2704
2300
2705
#: bzrlib/builtins.py:3515
2301
#: bzrlib/builtins.py:3486
2706
2302
msgid "Refuse to commit if there are unknown files in the working tree."
2707
msgstr "Refuse to commit if there are unknown files in the working tree."
2303
msgstr ""
2708
2304
2709
#: bzrlib/builtins.py:3518
2305
#: bzrlib/builtins.py:3489
2710
2306
msgid ""
2711
2307
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2712
2308
"08:00:00 +0100'."
2713
2309
msgstr ""
2714
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2715
"08:00:00 +0100'."
2716
2310
2717
#: bzrlib/builtins.py:3521
2311
#: bzrlib/builtins.py:3492
2718
2312
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2719
msgstr "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2313
msgstr ""
2720
2314
2721
#: bzrlib/builtins.py:3524
2315
#: bzrlib/builtins.py:3495
2722
2316
msgid "Set the author's name, if it's different from the committer."
2723
msgstr "Set the author's name, if it's different from the committer."
2724
2725
#: bzrlib/builtins.py:3527
2726
msgid ""
2727
"Perform a local commit in a bound branch. Local commits are not pushed to "
2728
"the master branch until a normal commit is performed."
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."
2732
2733
#: bzrlib/builtins.py:3533
2734
msgid ""
2735
"When no message is supplied, show the diff along with the status summary in "
2736
"the message editor."
2737
msgstr ""
2738
"When no message is supplied, show the diff along with the status summary in "
2739
"the message editor."
2740
2741
#: bzrlib/builtins.py:3536
2742
msgid ""
2743
"When committing to a foreign version control system do not push data that "
2744
"can not be natively represented."
2745
msgstr ""
2746
"When committing to a foreign version control system do not push data that "
2747
"can not be natively represented."
2748
2749
#: bzrlib/builtins.py:3554
2750
#, python-format
2751
msgid ""
2752
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2753
"default bug tracker using the `bugtracker` option.\n"
2754
"See \"bzr help bugs\" for more information on this feature. Commit refused."
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."
2759
2760
#: bzrlib/builtins.py:3563
2761
#, python-format
2762
msgid ""
2763
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2764
"for more information on this feature.\n"
2765
"Commit refused."
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."
2770
2771
#: bzrlib/builtins.py:3572
2317
msgstr ""
2318
2319
#: bzrlib/builtins.py:3498
2320
msgid ""
2321
"Perform a local commit in a bound branch. Local commits are not pushed to "
2322
"the master branch until a normal commit is performed."
2323
msgstr ""
2324
2325
#: bzrlib/builtins.py:3504
2326
msgid ""
2327
"When no message is supplied, show the diff along with the status summary in "
2328
"the message editor."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3507
2332
msgid ""
2333
"When committing to a foreign version control system do not push data that "
2334
"can not be natively represented."
2335
msgstr ""
2336
2337
#: bzrlib/builtins.py:3525
2338
#, python-format
2339
msgid ""
2340
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2341
"default bug tracker using the `bugtracker` option.\n"
2342
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2343
msgstr ""
2344
2345
#: bzrlib/builtins.py:3534
2346
#, python-format
2347
msgid ""
2348
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2349
"for more information on this feature.\n"
2350
"Commit refused."
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3543
2772
2354
#, python-format
2773
2355
msgid "Unrecognized bug %s. Commit refused."
2774
msgstr "Unrecognised bug %s. Commit refused."
2356
msgstr ""
2775
2357
2776
#: bzrlib/builtins.py:3575
2358
#: bzrlib/builtins.py:3546
2777
2359
#, python-format
2778
2360
msgid ""
2779
2361
"%s\n"
2780
2362
"Commit refused."
2781
2363
msgstr ""
2782
"%s\n"
2783
"Commit refused."
2784
2364
2785
#: bzrlib/builtins.py:3599
2365
#: bzrlib/builtins.py:3570
2786
2366
msgid "Could not parse --commit-time: "
2787
msgstr "Could not parse --commit-time: "
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3610
2370
msgid "please specify either --message or --file"
2371
msgstr ""
2788
2372
2789
2373
#: bzrlib/builtins.py:3639
2790
msgid "please specify either --message or --file"
2791
msgstr "please specify either --message or --file"
2792
2793
#: bzrlib/builtins.py:3668
2794
2374
msgid "please specify a commit message with either --message or --file"
2795
msgstr "please specify a commit message with either --message or --file"
2796
2797
#: bzrlib/builtins.py:3671
2798
msgid ""
2799
"Empty commit message specified. Please specify a commit message with either -"
2800
"-message or --file or leave a blank message with --message \"\"."
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 \"\"."
2804
2805
#: bzrlib/builtins.py:3691
2806
msgid ""
2807
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2808
"-unchanged to force an empty commit."
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."
2812
2813
#: bzrlib/builtins.py:3695
2814
msgid ""
2815
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2816
"resolve FILE\" to resolve."
2817
msgstr ""
2818
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2819
"resolve FILE\" to resolve."
2820
2821
#: bzrlib/builtins.py:3699
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3642
2378
msgid ""
2379
"Empty commit message specified. Please specify a commit message with either -"
2380
"-message or --file or leave a blank message with --message \"\"."
2381
msgstr ""
2382
2383
#: bzrlib/builtins.py:3662
2384
msgid ""
2385
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2386
"-unchanged to force an empty commit."
2387
msgstr ""
2388
2389
#: bzrlib/builtins.py:3666
2390
msgid ""
2391
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2392
"resolve FILE\" to resolve."
2393
msgstr ""
2394
2395
#: bzrlib/builtins.py:3670
2822
2396
msgid "Commit refused because there are unknown files in the working tree."
2823
msgstr "Commit refused because there are unknown files in the working tree."
2397
msgstr ""
2398
2399
#: bzrlib/builtins.py:3673
2400
msgid ""
2401
"\n"
2402
"To commit to master branch, run update and then commit.\n"
2403
"You can also pass --local to commit to continue working disconnected."
2404
msgstr ""
2405
2406
#: bzrlib/builtins.py:3681
2407
msgid ""
2408
"Validate working tree structure, branch consistency and repository history."
2409
msgstr ""
2410
2411
#: bzrlib/builtins.py:3683
2412
msgid ""
2413
"This command checks various invariants about branch and repository storage\n"
2414
"to detect data corruption or bzr bugs."
2415
msgstr ""
2416
2417
#: bzrlib/builtins.py:3686
2418
msgid ""
2419
"The working tree and branch checks will only give output if a problem is\n"
2420
"detected. The output fields of the repository check are:"
2421
msgstr ""
2422
2423
#: bzrlib/builtins.py:3689
2424
msgid ""
2425
"revisions\n"
2426
" This is just the number of revisions checked. It doesn't\n"
2427
" indicate a problem."
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3693
2431
msgid ""
2432
"versionedfiles\n"
2433
" This is just the number of versionedfiles checked. It\n"
2434
" doesn't indicate a problem."
2435
msgstr ""
2436
2437
#: bzrlib/builtins.py:3697
2438
msgid ""
2439
"unreferenced ancestors\n"
2440
" Texts that are ancestors of other texts, but\n"
2441
" are not properly referenced by the revision ancestry. This is a\n"
2442
" subtle problem that Bazaar can work around."
2443
msgstr ""
2824
2444
2825
2445
#: bzrlib/builtins.py:3702
2826
2446
msgid ""
2827
"\n"
2828
"To commit to master branch, run update and then commit.\n"
2829
"You can also pass --local to commit to continue working disconnected."
2447
"unique file texts\n"
2448
" This is the total number of unique file contents\n"
2449
" seen in the checked revisions. It does not indicate a problem."
2830
2450
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."
2834
2451
2835
#: bzrlib/builtins.py:3710
2452
#: bzrlib/builtins.py:3706
2836
2453
msgid ""
2837
"Validate working tree structure, branch consistency and repository history."
2454
"repeated file texts\n"
2455
" This is the total number of repeated texts seen\n"
2456
" in the checked revisions. Texts can be repeated when their file\n"
2457
" entries are modified, but the file contents are not. It does not\n"
2458
" indicate a problem."
2838
2459
msgstr ""
2839
"Validate working tree structure, branch consistency and repository history."
2840
2460
2841
2461
#: bzrlib/builtins.py:3712
2842
2462
msgid ""
2843
"This command checks various invariants about branch and repository storage\n"
2844
"to detect data corruption or bzr bugs."
2845
msgstr ""
2846
"This command checks various invariants about branch and repository storage\n"
2847
"to detect data corruption or bzr bugs."
2848
2849
#: bzrlib/builtins.py:3715
2850
msgid ""
2851
"The working tree and branch checks will only give output if a problem is\n"
2852
"detected. The output fields of the repository check are:"
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:"
2856
2857
#: bzrlib/builtins.py:3718
2858
msgid ""
2859
"revisions\n"
2860
" This is just the number of revisions checked. It doesn't\n"
2861
" indicate a problem."
2862
msgstr ""
2863
"revisions\n"
2864
" This is just the number of revisions checked. It doesn't\n"
2865
" indicate a problem."
2866
2867
#: bzrlib/builtins.py:3722
2868
msgid ""
2869
"versionedfiles\n"
2870
" This is just the number of versionedfiles checked. It\n"
2871
" doesn't indicate a problem."
2872
msgstr ""
2873
"versionedfiles\n"
2874
" This is just the number of versionedfiles checked. It\n"
2875
" doesn't indicate a problem."
2876
2877
#: bzrlib/builtins.py:3726
2878
msgid ""
2879
"unreferenced ancestors\n"
2880
" Texts that are ancestors of other texts, but\n"
2881
" are not properly referenced by the revision ancestry. This is a\n"
2882
" subtle problem that Bazaar can work around."
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."
2888
2889
#: bzrlib/builtins.py:3731
2890
msgid ""
2891
"unique file texts\n"
2892
" This is the total number of unique file contents\n"
2893
" seen in the checked revisions. It does not indicate a problem."
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."
2898
2899
#: bzrlib/builtins.py:3735
2900
msgid ""
2901
"repeated file texts\n"
2902
" This is the total number of repeated texts seen\n"
2903
" in the checked revisions. Texts can be repeated when their file\n"
2904
" entries are modified, but the file contents are not. It does not\n"
2905
" indicate a problem."
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."
2912
2913
#: bzrlib/builtins.py:3741
2914
msgid ""
2915
"If no restrictions are specified, all Bazaar data that is found at the "
2916
"given\n"
2917
"location will be checked."
2918
msgstr ""
2919
"If no restrictions are specified, all Bazaar data that is found at the "
2920
"given\n"
2921
"location will be checked."
2922
2923
#: bzrlib/builtins.py:3746
2463
"If no restrictions are specified, all Bazaar data that is found at the "
2464
"given\n"
2465
"location will be checked."
2466
msgstr ""
2467
2468
#: bzrlib/builtins.py:3717
2924
2469
msgid " Check the tree and branch at 'foo'::"
2925
msgstr " Check the tree and branch at 'foo'::"
2470
msgstr ""
2926
2471
2927
#: bzrlib/builtins.py:3748
2472
#: bzrlib/builtins.py:3719
2928
2473
msgid " bzr check --tree --branch foo"
2929
msgstr " bzr check --tree --branch foo"
2474
msgstr ""
2930
2475
2931
#: bzrlib/builtins.py:3750
2476
#: bzrlib/builtins.py:3721
2932
2477
msgid " Check only the repository at 'bar'::"
2933
msgstr " Check only the repository at 'bar'::"
2478
msgstr ""
2934
2479
2935
#: bzrlib/builtins.py:3752
2480
#: bzrlib/builtins.py:3723
2936
2481
msgid " bzr check --repo bar"
2937
msgstr " bzr check --repo bar"
2482
msgstr ""
2938
2483
2939
#: bzrlib/builtins.py:3754
2484
#: bzrlib/builtins.py:3725
2940
2485
msgid " Check everything at 'baz'::"
2941
msgstr " Check everything at 'baz'::"
2486
msgstr ""
2942
2487
2943
#: bzrlib/builtins.py:3756
2488
#: bzrlib/builtins.py:3727
2944
2489
msgid " bzr check baz"
2945
msgstr " bzr check baz"
2490
msgstr ""
2946
2491
2947
#: bzrlib/builtins.py:3762
2492
#: bzrlib/builtins.py:3733
2948
2493
msgid "Check the branch related to the current directory."
2949
msgstr "Check the branch related to the current directory."
2494
msgstr ""
2950
2495
2951
#: bzrlib/builtins.py:3764
2496
#: bzrlib/builtins.py:3735
2952
2497
msgid "Check the repository related to the current directory."
2953
msgstr "Check the repository related to the current directory."
2498
msgstr ""
2954
2499
2955
#: bzrlib/builtins.py:3766
2500
#: bzrlib/builtins.py:3737
2956
2501
msgid "Check the working tree related to the current directory."
2957
msgstr "Check the working tree related to the current directory."
2502
msgstr ""
2958
2503
2959
#: bzrlib/builtins.py:3780
2504
#: bzrlib/builtins.py:3751
2960
2505
msgid "Upgrade a repository, branch or working tree to a newer format."
2961
msgstr "Upgrade a repository, branch or working tree to a newer format."
2962
2963
#: bzrlib/builtins.py:3782
2964
msgid ""
2965
"When the default format has changed after a major new release of\n"
2966
"Bazaar, you may be informed during certain operations that you\n"
2967
"should upgrade. Upgrading to a newer format may improve performance\n"
2968
"or make new features available. It may however limit interoperability\n"
2969
"with older repositories or with older versions of Bazaar."
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."
2976
2977
#: bzrlib/builtins.py:3788
2978
msgid ""
2979
"If you wish to upgrade to a particular format rather than the\n"
2980
"current default, that can be specified using the --format option.\n"
2981
"As a consequence, you can use the upgrade command this way to\n"
2982
"\"downgrade\" to an earlier format, though some conversions are\n"
2983
"a one way process (e.g. changing from the 1.x default to the\n"
2984
"2.x default) so downgrading is not always possible."
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."
2992
2993
#: bzrlib/builtins.py:3795
2994
msgid ""
2995
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2996
"process (where # is a number). By default, this is left there on\n"
2997
"completion. If the conversion fails, delete the new .bzr directory\n"
2998
"and rename this one back in its place. Use the --clean option to ask\n"
2999
"for the backup.bzr directory to be removed on successful conversion.\n"
3000
"Alternatively, you can delete it by hand if everything looks good\n"
3001
"afterwards."
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."
3010
3011
#: bzrlib/builtins.py:3803
3012
msgid ""
3013
"If the location given is a shared repository, dependent branches\n"
3014
"are also converted provided the repository converts successfully.\n"
3015
"If the conversion of a branch fails, remaining branches are still\n"
3016
"tried."
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."
3022
3023
#: bzrlib/builtins.py:3808
3024
msgid ""
3025
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
3026
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
3027
msgstr ""
3028
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
3029
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
3030
3031
#: bzrlib/builtins.py:3816
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3753
2509
msgid ""
2510
"When the default format has changed after a major new release of\n"
2511
"Bazaar, you may be informed during certain operations that you\n"
2512
"should upgrade. Upgrading to a newer format may improve performance\n"
2513
"or make new features available. It may however limit interoperability\n"
2514
"with older repositories or with older versions of Bazaar."
2515
msgstr ""
2516
2517
#: bzrlib/builtins.py:3759
2518
msgid ""
2519
"If you wish to upgrade to a particular format rather than the\n"
2520
"current default, that can be specified using the --format option.\n"
2521
"As a consequence, you can use the upgrade command this way to\n"
2522
"\"downgrade\" to an earlier format, though some conversions are\n"
2523
"a one way process (e.g. changing from the 1.x default to the\n"
2524
"2.x default) so downgrading is not always possible."
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3766
2528
msgid ""
2529
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2530
"process (where # is a number). By default, this is left there on\n"
2531
"completion. If the conversion fails, delete the new .bzr directory\n"
2532
"and rename this one back in its place. Use the --clean option to ask\n"
2533
"for the backup.bzr directory to be removed on successful conversion.\n"
2534
"Alternatively, you can delete it by hand if everything looks good\n"
2535
"afterwards."
2536
msgstr ""
2537
2538
#: bzrlib/builtins.py:3774
2539
msgid ""
2540
"If the location given is a shared repository, dependent branches\n"
2541
"are also converted provided the repository converts successfully.\n"
2542
"If the conversion of a branch fails, remaining branches are still\n"
2543
"tried."
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:3779
2547
msgid ""
2548
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2549
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2550
msgstr ""
2551
2552
#: bzrlib/builtins.py:3787
3032
2553
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
3033
msgstr "Upgrade to a specific format. See \"bzr help formats\" for details."
2554
msgstr ""
3034
2555
3035
#: bzrlib/builtins.py:3820
2556
#: bzrlib/builtins.py:3791
3036
2557
msgid "Branch format"
3037
msgstr "Branch format"
2558
msgstr ""
3038
2559
3039
#: bzrlib/builtins.py:3822
2560
#: bzrlib/builtins.py:3793
3040
2561
msgid "Remove the backup.bzr directory if successful."
3041
msgstr "Remove the backup.bzr directory if successful."
2562
msgstr ""
3042
2563
3043
#: bzrlib/builtins.py:3824
2564
#: bzrlib/builtins.py:3795
3044
2565
msgid "Show what would be done, but don't actually do anything."
3045
msgstr "Show what would be done, but don't actually do anything."
2566
msgstr ""
3046
2567
3047
#: bzrlib/builtins.py:3839
2568
#: bzrlib/builtins.py:3810
3048
2569
msgid "Show or set bzr user id."
3049
msgstr "Show or set bzr user id."
2570
msgstr ""
3050
2571
3051
#: bzrlib/builtins.py:3841
2572
#: bzrlib/builtins.py:3812
3052
2573
msgid ""
3053
2574
":Examples:\n"
3054
2575
" Show the email of the current user::"
3055
2576
msgstr ""
3056
":Examples:\n"
3057
" Show the email of the current user::"
3058
2577
3059
#: bzrlib/builtins.py:3844
2578
#: bzrlib/builtins.py:3815
3060
2579
msgid " bzr whoami --email"
3061
msgstr " bzr whoami --email"
2580
msgstr ""
3062
2581
3063
#: bzrlib/builtins.py:3846
2582
#: bzrlib/builtins.py:3817
3064
2583
msgid " Set the current user::"
3065
msgstr " Set the current user::"
2584
msgstr ""
3066
2585
3067
#: bzrlib/builtins.py:3848
2586
#: bzrlib/builtins.py:3819
3068
2587
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
3069
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2588
msgstr ""
3070
2589
3071
#: bzrlib/builtins.py:3852
2590
#: bzrlib/builtins.py:3823
3072
2591
msgid "Display email address only."
3073
msgstr "Display email address only."
2592
msgstr ""
3074
2593
3075
#: bzrlib/builtins.py:3854
2594
#: bzrlib/builtins.py:3825
3076
2595
msgid "Set identity for the current branch instead of globally."
3077
msgstr "Set identity for the current branch instead of globally."
2596
msgstr ""
3078
2597
3079
#: bzrlib/builtins.py:3880
2598
#: bzrlib/builtins.py:3851
3080
2599
msgid "--email can only be used to display existing identity"
3081
msgstr "--email can only be used to display existing identity"
2600
msgstr ""
3082
2601
3083
#: bzrlib/builtins.py:3904
2602
#: bzrlib/builtins.py:3873
3084
2603
msgid "Print or set the branch nickname."
3085
msgstr "Print or set the branch nickname."
3086
3087
#: bzrlib/builtins.py:3906
3088
msgid ""
3089
"If unset, the colocated branch name is used for colocated branches, and\n"
3090
"the branch directory name is used for other branches. To print the\n"
3091
"current nickname, execute with no argument."
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."
3096
3097
#: bzrlib/builtins.py:3910
3098
msgid ""
3099
"Bound branches use the nickname of its master branch unless it is set\n"
3100
"locally."
3101
msgstr ""
3102
"Bound branches use the nickname of its master branch unless it is set\n"
3103
"locally."
3104
3105
#: bzrlib/builtins.py:3930
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:3875
2607
msgid ""
2608
"If unset, the tree root directory name is used as the nickname.\n"
2609
"To print the current nickname, execute with no argument."
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:3878
2613
msgid ""
2614
"Bound branches use the nickname of its master branch unless it is set\n"
2615
"locally."
2616
msgstr ""
2617
2618
#: bzrlib/builtins.py:3898
3106
2619
msgid "Set/unset and display aliases."
3107
msgstr "Set/unset and display aliases."
2620
msgstr ""
3108
2621
3109
#: bzrlib/builtins.py:3932
2622
#: bzrlib/builtins.py:3900
3110
2623
msgid ""
3111
2624
":Examples:\n"
3112
2625
" Show the current aliases::"
3113
2626
msgstr ""
3114
":Examples:\n"
3115
" Show the current aliases::"
3116
2627
3117
#: bzrlib/builtins.py:3935
2628
#: bzrlib/builtins.py:3903
3118
2629
msgid " bzr alias"
3119
msgstr " bzr alias"
2630
msgstr ""
3120
2631
3121
#: bzrlib/builtins.py:3937
2632
#: bzrlib/builtins.py:3905
3122
2633
msgid " Show the alias specified for 'll'::"
3123
msgstr " Show the alias specified for 'll'::"
2634
msgstr ""
3124
2635
3125
#: bzrlib/builtins.py:3939
2636
#: bzrlib/builtins.py:3907
3126
2637
msgid " bzr alias ll"
3127
msgstr " bzr alias ll"
2638
msgstr ""
3128
2639
3129
#: bzrlib/builtins.py:3941
2640
#: bzrlib/builtins.py:3909
3130
2641
msgid " Set an alias for 'll'::"
3131
msgstr " Set an alias for 'll'::"
2642
msgstr ""
3132
2643
3133
#: bzrlib/builtins.py:3943
2644
#: bzrlib/builtins.py:3911
3134
2645
msgid " bzr alias ll=\"log --line -r-10..-1\""
3135
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2646
msgstr ""
3136
2647
3137
#: bzrlib/builtins.py:3945
2648
#: bzrlib/builtins.py:3913
3138
2649
msgid " To remove an alias for 'll'::"
3139
msgstr " To remove an alias for 'll'::"
2650
msgstr ""
3140
2651
3141
#: bzrlib/builtins.py:3947
2652
#: bzrlib/builtins.py:3915
3142
2653
msgid " bzr alias --remove ll"
3143
msgstr " bzr alias --remove ll"
2654
msgstr ""
3144
2655
3145
#: bzrlib/builtins.py:3952
2656
#: bzrlib/builtins.py:3920
3146
2657
msgid "Remove the alias."
3147
msgstr "Remove the alias."
2658
msgstr ""
3148
2659
3149
#: bzrlib/builtins.py:3970
2660
#: bzrlib/builtins.py:3938
3150
2661
msgid "bzr alias --remove expects an alias to remove."
3151
msgstr "bzr alias --remove expects an alias to remove."
3152
3153
#: bzrlib/builtins.py:4151
3154
msgid ""
3155
"subunit not available. subunit needs to be installed to use --subunit."
3156
msgstr ""
3157
"subunit not available. subunit needs to be installed to use --subunit."
3158
3159
#: bzrlib/builtins.py:4168
3160
msgid ""
3161
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3162
msgstr ""
3163
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3164
3165
#: bzrlib/builtins.py:4215
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:4119
2665
msgid ""
2666
"subunit not available. subunit needs to be installed to use --subunit."
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:4136
2670
msgid ""
2671
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4183
3166
2675
msgid "Show version of bzr."
3167
msgstr "Show version of bzr."
2676
msgstr ""
3168
2677
3169
#: bzrlib/builtins.py:4219
2678
#: bzrlib/builtins.py:4187
3170
2679
msgid "Print just the version number."
3171
msgstr "Print just the version number."
2680
msgstr ""
3172
2681
3173
#: bzrlib/builtins.py:4238
2682
#: bzrlib/builtins.py:4206
3174
2683
msgid "It sure does!\n"
3175
msgstr "It sure does!\n"
2684
msgstr ""
3176
2685
3177
#: bzrlib/builtins.py:4262
2686
#: bzrlib/builtins.py:4230
3178
2687
#, python-format
3179
2688
msgid "merge base is revision %s\n"
3180
msgstr "merge base is revision %s\n"
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:4234
2692
msgid "Perform a three-way merge."
2693
msgstr ""
2694
2695
#: bzrlib/builtins.py:4236
2696
msgid ""
2697
"The source of the merge can be specified either in the form of a branch,\n"
2698
"or in the form of a path to a file containing a merge directive generated\n"
2699
"with bzr send. If neither is specified, the default is the upstream branch\n"
2700
"or the branch most recently merged using --remember. The source of the\n"
2701
"merge may also be specified in the form of a path to a file in another\n"
2702
"branch: in this case, only the modifications to that file are merged into\n"
2703
"the current working tree."
2704
msgstr ""
2705
2706
#: bzrlib/builtins.py:4244
2707
msgid ""
2708
"When merging from a branch, by default bzr will try to merge in all new\n"
2709
"work from the other branch, automatically determining an appropriate base\n"
2710
"revision. If this fails, you may need to give an explicit base."
2711
msgstr ""
2712
2713
#: bzrlib/builtins.py:4248
2714
msgid ""
2715
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2716
"try to merge in all new work up to and including revision OTHER."
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4251
2720
msgid ""
2721
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2722
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2723
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2724
"not already contain revision BASE, such a merge is commonly referred to as\n"
2725
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2726
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2727
"changes from the other branch is not stored in the commit."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:4259
2731
msgid "Revision numbers are always relative to the source branch."
2732
msgstr ""
2733
2734
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2735
msgid ""
2736
"Merge will do its best to combine the changes in two branches, but there\n"
2737
"are some kinds of problems only a human can fix. When it encounters those,\n"
2738
"it will mark a conflict. A conflict means that you need to fix something,\n"
2739
"before you can commit."
2740
msgstr ""
3181
2741
3182
2742
#: bzrlib/builtins.py:4266
3183
msgid "Perform a three-way merge."
3184
msgstr "Perform a three-way merge."
2743
msgid ""
2744
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2745
msgstr ""
3185
2746
3186
2747
#: bzrlib/builtins.py:4268
3187
2748
msgid ""
3188
"The source of the merge can be specified either in the form of a branch,\n"
3189
"or in the form of a path to a file containing a merge directive generated\n"
3190
"with bzr send. If neither is specified, the default is the upstream branch\n"
3191
"or the branch most recently merged using --remember. The source of the\n"
3192
"merge may also be specified in the form of a path to a file in another\n"
3193
"branch: in this case, only the modifications to that file are merged into\n"
3194
"the current working tree."
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."
3203
3204
#: bzrlib/builtins.py:4276
3205
msgid ""
3206
"When merging from a branch, by default bzr will try to merge in all new\n"
3207
"work from the other branch, automatically determining an appropriate base\n"
3208
"revision. If this fails, you may need to give an explicit base."
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."
3213
3214
#: bzrlib/builtins.py:4280
3215
msgid ""
3216
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3217
"try to merge in all new work up to and including revision OTHER."
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."
2749
"If there is no default branch set, the first merge will set it (use\n"
2750
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2751
"to use the default. To change the default, use --remember. The value will\n"
2752
"only be saved if the remote location can be accessed."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4273
2756
msgid ""
2757
"The results of the merge are placed into the destination working\n"
2758
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2759
"committed to record the result of the merge."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4277
2763
msgid ""
2764
"merge refuses to run if there are any uncommitted changes, unless\n"
2765
"--force is given. If --force is given, then the changes from the source \n"
2766
"will be merged with the current working tree, including any uncommitted\n"
2767
"changes in the tree. The --force option can also be used to create a\n"
2768
"merge revision which has more than two parents."
2769
msgstr ""
3221
2770
3222
2771
#: bzrlib/builtins.py:4283
3223
2772
msgid ""
3224
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3225
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3226
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3227
"not already contain revision BASE, such a merge is commonly referred to as\n"
3228
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3229
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3230
"changes from the other branch is not stored in the commit."
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."
3239
3240
#: bzrlib/builtins.py:4291
3241
msgid "Revision numbers are always relative to the source branch."
3242
msgstr "Revision numbers are always relative to the source branch."
3243
3244
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3245
msgid ""
3246
"Merge will do its best to combine the changes in two branches, but there\n"
3247
"are some kinds of problems only a human can fix. When it encounters those,\n"
3248
"it will mark a conflict. A conflict means that you need to fix something,\n"
3249
"before you can commit."
3250
msgstr ""
3251
"Merge will do its best to combine the changes in two branches, but there\n"
3252
"are some kinds of problems only a human can fix. When it encounters those,\n"
3253
"it will mark a conflict. A conflict means that you need to fix something,\n"
3254
"before you can commit."
3255
3256
#: bzrlib/builtins.py:4298
3257
msgid ""
3258
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3259
msgstr ""
3260
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3261
3262
#: bzrlib/builtins.py:4300
3263
msgid ""
3264
"If there is no default branch set, the first merge will set it (use\n"
3265
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3266
"to use the default. To change the default, use --remember. The value will\n"
3267
"only be saved if the remote location can be accessed."
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."
3273
3274
#: bzrlib/builtins.py:4305
3275
msgid ""
3276
"The results of the merge are placed into the destination working\n"
3277
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3278
"committed to record the result of the merge."
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."
3283
3284
#: bzrlib/builtins.py:4309
3285
msgid ""
3286
"merge refuses to run if there are any uncommitted changes, unless\n"
3287
"--force is given. If --force is given, then the changes from the source \n"
3288
"will be merged with the current working tree, including any uncommitted\n"
3289
"changes in the tree. The --force option can also be used to create a\n"
3290
"merge revision which has more than two parents."
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."
3297
3298
#: bzrlib/builtins.py:4315
3299
msgid ""
3300
"If one would like to merge changes from the working tree of the other\n"
3301
"branch without merging any committed revisions, the --uncommitted option\n"
3302
"can be given."
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."
3307
3308
#: bzrlib/builtins.py:4319
3309
msgid ""
3310
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3311
"you to apply each diff hunk and file change, similar to \"shelve\"."
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\"."
3315
3316
#: bzrlib/builtins.py:4322
3317
msgid ""
3318
":Examples:\n"
3319
" To merge all new revisions from bzr.dev::"
3320
msgstr ""
3321
":Examples:\n"
3322
" To merge all new revisions from bzr.dev::"
3323
3324
#: bzrlib/builtins.py:4325
2773
"If one would like to merge changes from the working tree of the other\n"
2774
"branch without merging any committed revisions, the --uncommitted option\n"
2775
"can be given."
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4287
2779
msgid ""
2780
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2781
"you to apply each diff hunk and file change, similar to \"shelve\"."
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4290
2785
msgid ""
2786
":Examples:\n"
2787
" To merge all new revisions from bzr.dev::"
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4293
3325
2791
msgid " bzr merge ../bzr.dev"
3326
msgstr " bzr merge ../bzr.dev"
2792
msgstr ""
3327
2793
3328
#: bzrlib/builtins.py:4327
2794
#: bzrlib/builtins.py:4295
3329
2795
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3330
msgstr " To merge changes up to and including revision 82 from bzr.dev::"
2796
msgstr ""
3331
2797
3332
#: bzrlib/builtins.py:4329
2798
#: bzrlib/builtins.py:4297
3333
2799
msgid " bzr merge -r 82 ../bzr.dev"
3334
msgstr " bzr merge -r 82 ../bzr.dev"
2800
msgstr ""
3335
2801
3336
#: bzrlib/builtins.py:4331
2802
#: bzrlib/builtins.py:4299
3337
2803
msgid " To merge the changes introduced by 82, without previous changes::"
3338
2804
msgstr ""
3339
" To merge the changes introduced by 82, without previous changes::"
3340
2805
3341
#: bzrlib/builtins.py:4333
2806
#: bzrlib/builtins.py:4301
3342
2807
msgid " bzr merge -r 81..82 ../bzr.dev"
3343
msgstr " bzr merge -r 81..82 ../bzr.dev"
2808
msgstr ""
3344
2809
3345
#: bzrlib/builtins.py:4335
2810
#: bzrlib/builtins.py:4303
3346
2811
msgid " To apply a merge directive contained in /tmp/merge::"
3347
msgstr " To apply a merge directive contained in /tmp/merge::"
2812
msgstr ""
3348
2813
3349
#: bzrlib/builtins.py:4337
2814
#: bzrlib/builtins.py:4305
3350
2815
msgid " bzr merge /tmp/merge"
3351
msgstr " bzr merge /tmp/merge"
3352
3353
#: bzrlib/builtins.py:4339
3354
msgid ""
3355
" To create a merge revision with three parents from two branches\n"
3356
" feature1a and feature1b:"
3357
msgstr ""
3358
" To create a merge revision with three parents from two branches\n"
3359
" feature1a and feature1b:"
3360
3361
#: bzrlib/builtins.py:4342
3362
msgid ""
3363
" bzr merge ../feature1a\n"
3364
" bzr merge ../feature1b --force\n"
3365
" bzr commit -m 'revision with three parents'"
3366
msgstr ""
3367
" bzr merge ../feature1a\n"
3368
" bzr merge ../feature1b --force\n"
3369
" bzr commit -m 'revision with three parents'"
3370
3371
#: bzrlib/builtins.py:4354
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:4307
2819
msgid ""
2820
" To create a merge revision with three parents from two branches\n"
2821
" feature1a and feature1b:"
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:4310
2825
msgid ""
2826
" bzr merge ../feature1a\n"
2827
" bzr merge ../feature1b --force\n"
2828
" bzr commit -m 'revision with three parents'"
2829
msgstr ""
2830
2831
#: bzrlib/builtins.py:4322
3372
2832
msgid "Merge even if the destination tree has uncommitted changes."
3373
msgstr "Merge even if the destination tree has uncommitted changes."
3374
3375
#: bzrlib/builtins.py:4360
3376
msgid ""
3377
"Apply uncommitted changes from a working copy, instead of branch changes."
3378
msgstr ""
3379
"Apply uncommitted changes from a working copy, instead of branch changes."
3380
3381
#: bzrlib/builtins.py:4362
3382
msgid ""
3383
"If the destination is already completely merged into the source, pull from "
3384
"the source rather than merging. When this happens, you do not need to "
3385
"commit the result."
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."
3390
3391
#: bzrlib/builtins.py:4367
3392
msgid ""
3393
"Branch to merge into, rather than the one containing the working directory."
3394
msgstr ""
3395
"Branch to merge into, rather than the one containing the working directory."
3396
3397
#: bzrlib/builtins.py:4369
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:4328
2836
msgid ""
2837
"Apply uncommitted changes from a working copy, instead of branch changes."
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4330
2841
msgid ""
2842
"If the destination is already completely merged into the source, pull from "
2843
"the source rather than merging. When this happens, you do not need to "
2844
"commit the result."
2845
msgstr ""
2846
2847
#: bzrlib/builtins.py:4335
2848
msgid ""
2849
"Branch to merge into, rather than the one containing the working directory."
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4337
3398
2853
msgid "Instead of merging, show a diff of the merge."
3399
msgstr "Instead of merging, show a diff of the merge."
2854
msgstr ""
3400
2855
3401
#: bzrlib/builtins.py:4371
2856
#: bzrlib/builtins.py:4339
3402
2857
msgid "Select changes interactively."
3403
msgstr "Select changes interactively."
2858
msgstr ""
3404
2859
3405
#: bzrlib/builtins.py:4393
2860
#: bzrlib/builtins.py:4361
3406
2861
msgid ""
3407
2862
"Merging into empty branches not currently supported, "
3408
2863
"https://bugs.launchpad.net/bzr/+bug/308562"
3409
2864
msgstr ""
3410
"Merging into empty branches not currently supported, "
3411
"https://bugs.launchpad.net/bzr/+bug/308562"
3412
2865
3413
#: bzrlib/builtins.py:4420
2866
#: bzrlib/builtins.py:4388
3414
2867
msgid "Cannot use --uncommitted with bundles or merge directives."
3415
msgstr "Cannot use --uncommitted with bundles or merge directives."
2868
msgstr ""
3416
2869
3417
#: bzrlib/builtins.py:4431
2870
#: bzrlib/builtins.py:4399
3418
2871
msgid "Cannot use --uncommitted and --revision at the same time."
3419
msgstr "Cannot use --uncommitted and --revision at the same time."
2872
msgstr ""
3420
2873
3421
#: bzrlib/builtins.py:4451
2874
#: bzrlib/builtins.py:4419
3422
2875
msgid "merger: "
3423
msgstr "merger: "
2876
msgstr ""
3424
2877
3425
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2878
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3426
2879
msgid "Nothing to do."
3427
msgstr "Nothing to do."
2880
msgstr ""
3428
2881
3429
#: bzrlib/builtins.py:4457
2882
#: bzrlib/builtins.py:4425
3430
2883
msgid "Cannot pull individual files"
3431
msgstr "Cannot pull individual files"
2884
msgstr ""
3432
2885
3433
#: bzrlib/builtins.py:4465
2886
#: bzrlib/builtins.py:4433
3434
2887
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3435
msgstr "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2888
msgstr ""
3436
2889
3437
#: bzrlib/builtins.py:4523
2890
#: bzrlib/builtins.py:4491
3438
2891
#, python-format
3439
2892
msgid "Show-base is not supported for this merge type. %s"
3440
msgstr "Show-base is not supported for this merge type. %s"
2893
msgstr ""
3441
2894
3442
#: bzrlib/builtins.py:4532
2895
#: bzrlib/builtins.py:4500
3443
2896
#, python-format
3444
2897
msgid "Conflict reduction is not supported for merge type %s."
3445
msgstr "Conflict reduction is not supported for merge type %s."
2898
msgstr ""
3446
2899
3447
#: bzrlib/builtins.py:4536
2900
#: bzrlib/builtins.py:4504
3448
2901
msgid "Cannot do conflict reduction and show base."
3449
msgstr "Cannot do conflict reduction and show base."
2902
msgstr ""
3450
2903
3451
#: bzrlib/builtins.py:4647
2904
#: bzrlib/builtins.py:4615
3452
2905
msgid "No location specified or remembered"
3453
msgstr "No location specified or remembered"
2906
msgstr ""
3454
2907
3455
#: bzrlib/builtins.py:4649
2908
#: bzrlib/builtins.py:4617
3456
2909
msgid "{0} remembered {1} location {2}"
3457
msgstr "{0} remembered {1} location {2}"
2910
msgstr ""
3458
2911
3459
#: bzrlib/builtins.py:4655
2912
#: bzrlib/builtins.py:4623
3460
2913
msgid "Redo a merge."
3461
msgstr "Redo a merge."
2914
msgstr ""
3462
2915
3463
#: bzrlib/builtins.py:4657
2916
#: bzrlib/builtins.py:4625
3464
2917
msgid ""
3465
2918
"Use this if you want to try a different merge technique while resolving\n"
3466
2919
"conflicts. Some merge techniques are better than others, and remerge\n"
3467
2920
"lets you try different ones on different files."
3468
2921
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."
3472
2922
3473
#: bzrlib/builtins.py:4661
2923
#: bzrlib/builtins.py:4629
3474
2924
msgid ""
3475
2925
"The options for remerge have the same meaning and defaults as the ones for\n"
3476
2926
"merge. The difference is that remerge can (only) be run when there is a\n"
3477
2927
"pending merge, and it lets you specify particular files."
3478
2928
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."
3482
2929
3483
#: bzrlib/builtins.py:4665
2930
#: bzrlib/builtins.py:4633
3484
2931
msgid ""
3485
2932
":Examples:\n"
3486
2933
" Re-do the merge of all conflicted files, and show the base text in\n"
3487
2934
" conflict regions, in addition to the usual THIS and OTHER texts::"
3488
2935
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::"
3492
2936
3493
#: bzrlib/builtins.py:4669
2937
#: bzrlib/builtins.py:4637
3494
2938
msgid " bzr remerge --show-base"
3495
msgstr " bzr remerge --show-base"
2939
msgstr ""
3496
2940
3497
#: bzrlib/builtins.py:4671
2941
#: bzrlib/builtins.py:4639
3498
2942
msgid ""
3499
2943
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3500
2944
" additional processing to reduce the size of conflict regions::"
3501
2945
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::"
3504
2946
3505
#: bzrlib/builtins.py:4674
2947
#: bzrlib/builtins.py:4642
3506
2948
msgid " bzr remerge --merge-type weave --reprocess foobar"
3507
msgstr " bzr remerge --merge-type weave --reprocess foobar"
2949
msgstr ""
3508
2950
3509
#: bzrlib/builtins.py:4681
2951
#: bzrlib/builtins.py:4649
3510
2952
msgid "Show base revision text in conflicts."
3511
msgstr "Show base revision text in conflicts."
2953
msgstr ""
3512
2954
3513
#: bzrlib/builtins.py:4693
2955
#: bzrlib/builtins.py:4661
3514
2956
msgid ""
3515
2957
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3516
2958
"merges."
3517
2959
msgstr ""
3518
"Sorry, re-merge only works after normal merges. Not cherrypicking or multi-"
3519
"merges."
3520
3521
#: bzrlib/builtins.py:4751
3522
msgid ""
3523
"Set files in the working tree back to the contents of a previous revision."
3524
msgstr ""
3525
"Set files in the working tree back to the contents of a previous revision."
3526
3527
#: bzrlib/builtins.py:4753
3528
msgid ""
3529
"Giving a list of files will revert only those files. Otherwise, all files\n"
3530
"will be reverted. If the revision is not specified with '--revision', the\n"
3531
"working tree basis revision is used. A revert operation affects only the\n"
3532
"working tree, not any revision history like the branch and repository or\n"
3533
"the working tree basis revision."
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."
3540
3541
#: bzrlib/builtins.py:4759
3542
msgid ""
3543
"To remove only some changes, without reverting to a prior version, use\n"
3544
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3545
"will remove the changes introduced by the second last commit (-2), without\n"
3546
"affecting the changes introduced by the last commit (-1). To remove\n"
3547
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3548
"To update the branch to a specific revision or the latest revision and\n"
3549
"update the working tree accordingly while preserving local changes, see the\n"
3550
"update command."
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."
2960
2961
#: bzrlib/builtins.py:4717
2962
msgid "Revert files to a previous revision."
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4719
2966
msgid ""
2967
"Giving a list of files will revert only those files. Otherwise, all files\n"
2968
"will be reverted. If the revision is not specified with '--revision', the\n"
2969
"last committed revision is used."
2970
msgstr ""
2971
2972
#: bzrlib/builtins.py:4723
2973
msgid ""
2974
"To remove only some changes, without reverting to a prior version, use\n"
2975
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2976
"will remove the changes introduced by the second last commit (-2), without\n"
2977
"affecting the changes introduced by the last commit (-1). To remove\n"
2978
"certain changes on a hunk-by-hunk basis, see the shelve command."
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4729
2982
msgid ""
2983
"By default, any files that have been manually changed will be backed up\n"
2984
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2985
"'.~#~' appended to their name, where # is a number."
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4733
2989
msgid ""
2990
"When you provide files, you can use their current pathname or the pathname\n"
2991
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2992
"name. If you name a directory, all the contents of that directory will be\n"
2993
"reverted."
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4738
2997
msgid ""
2998
"If you have newly added files since the target revision, they will be\n"
2999
"removed. If the files to be removed have been changed, backups will be\n"
3000
"created as above. Directories containing unknown files will not be\n"
3001
"deleted."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4743
3005
msgid ""
3006
"The working tree contains a list of revisions that have been merged but\n"
3007
"not yet committed. These revisions will be included as additional parents\n"
3008
"of the next commit. Normally, using revert clears that list as well as\n"
3009
"reverting the files. If any files are specified, revert leaves the list\n"
3010
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3011
".`` in the tree root to revert all files but keep the recorded merges,\n"
3012
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3013
"reverting any files."
3014
msgstr ""
3015
3016
#: bzrlib/builtins.py:4752
3017
msgid ""
3018
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3019
"changes from a branch in a single revision. To do this, perform the merge\n"
3020
"as desired. Then doing revert with the \"--forget-merges\" option will "
3021
"keep\n"
3022
"the content of the tree as it was, but it will clear the list of pending\n"
3023
"merges. The next commit will then contain all of the changes that are\n"
3024
"present in the other branch, but without any other parent revisions.\n"
3025
"Because this technique forgets where these changes originated, it may\n"
3026
"cause additional conflicts on later merges involving the same source and\n"
3027
"target branches."
3028
msgstr ""
3029
3030
#: bzrlib/builtins.py:4766
3031
msgid "Do not save backups of reverted files."
3032
msgstr ""
3560
3033
3561
3034
#: bzrlib/builtins.py:4768
3562
msgid ""
3563
"Uncommitted changes to files that are reverted will be discarded.\n"
3564
"Howver, by default, any files that have been manually changed will be\n"
3565
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3566
"files have '.~#~' appended to their name, where # is a number."
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."
3572
3573
#: bzrlib/builtins.py:4773
3574
msgid ""
3575
"When you provide files, you can use their current pathname or the pathname\n"
3576
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3577
"name. If you name a directory, all the contents of that directory will be\n"
3578
"reverted."
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."
3584
3585
#: bzrlib/builtins.py:4778
3586
msgid ""
3587
"If you have newly added files since the target revision, they will be\n"
3588
"removed. If the files to be removed have been changed, backups will be\n"
3589
"created as above. Directories containing unknown files will not be\n"
3590
"deleted."
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."
3596
3597
#: bzrlib/builtins.py:4783
3598
msgid ""
3599
"The working tree contains a list of revisions that have been merged but\n"
3600
"not yet committed. These revisions will be included as additional parents\n"
3601
"of the next commit. Normally, using revert clears that list as well as\n"
3602
"reverting the files. If any files are specified, revert leaves the list\n"
3603
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3604
".`` in the tree root to revert all files but keep the recorded merges,\n"
3605
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3606
"reverting any files."
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."
3616
3617
#: bzrlib/builtins.py:4792
3618
msgid ""
3619
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3620
"changes from a branch in a single revision. To do this, perform the merge\n"
3621
"as desired. Then doing revert with the \"--forget-merges\" option will "
3622
"keep\n"
3623
"the content of the tree as it was, but it will clear the list of pending\n"
3624
"merges. The next commit will then contain all of the changes that are\n"
3625
"present in the other branch, but without any other parent revisions.\n"
3626
"Because this technique forgets where these changes originated, it may\n"
3627
"cause additional conflicts on later merges involving the same source and\n"
3628
"target branches."
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."
3640
3641
#: bzrlib/builtins.py:4806
3642
msgid "Do not save backups of reverted files."
3643
msgstr "Do not save backups of reverted files."
3644
3645
#: bzrlib/builtins.py:4808
3646
3035
msgid "Remove pending merge marker, without changing any files."
3647
msgstr "Remove pending merge marker, without changing any files."
3036
msgstr ""
3648
3037
3649
#: bzrlib/builtins.py:4839
3038
#: bzrlib/builtins.py:4799
3650
3039
msgid ""
3651
3040
"Show help on a command or other topic.\n"
3652
3041
" "
3653
3042
msgstr ""
3654
"Show help on a command or other topic.\n"
3655
" "
3656
3043
3657
#: bzrlib/builtins.py:4844
3044
#: bzrlib/builtins.py:4804
3658
3045
msgid "Show help on all commands."
3659
msgstr "Show help on all commands."
3046
msgstr ""
3660
3047
3661
#: bzrlib/builtins.py:4873
3048
#: bzrlib/builtins.py:4833
3662
3049
msgid "Show unmerged/unpulled revisions between two branches."
3663
msgstr "Show unmerged/unpulled revisions between two branches."
3050
msgstr ""
3664
3051
3665
#: bzrlib/builtins.py:4875
3052
#: bzrlib/builtins.py:4835
3666
3053
msgid "OTHER_BRANCH may be local or remote."
3667
msgstr "OTHER_BRANCH may be local or remote."
3668
3669
#: bzrlib/builtins.py:4877
3670
msgid ""
3671
"To filter on a range of revisions, you can use the command -r begin..end\n"
3672
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3673
"also valid.\n"
3674
" \n"
3675
":Exit values:\n"
3676
" 1 - some missing revisions\n"
3677
" 0 - no missing revisions"
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"
3686
3687
#: bzrlib/builtins.py:4887
3688
msgid ""
3689
" Determine the missing revisions between this and the branch at the\n"
3690
" remembered pull location::"
3691
msgstr ""
3692
" Determine the missing revisions between this and the branch at the\n"
3693
" remembered pull location::"
3694
3695
#: bzrlib/builtins.py:4890
3054
msgstr ""
3055
3056
#: bzrlib/builtins.py:4837
3057
msgid ""
3058
"To filter on a range of revisions, you can use the command -r begin..end\n"
3059
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3060
"also valid.\n"
3061
" \n"
3062
":Exit values:\n"
3063
" 1 - some missing revisions\n"
3064
" 0 - no missing revisions"
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:4847
3068
msgid ""
3069
" Determine the missing revisions between this and the branch at the\n"
3070
" remembered pull location::"
3071
msgstr ""
3072
3073
#: bzrlib/builtins.py:4850
3696
3074
msgid " bzr missing"
3697
msgstr " bzr missing"
3075
msgstr ""
3698
3076
3699
#: bzrlib/builtins.py:4892
3077
#: bzrlib/builtins.py:4852
3700
3078
msgid " Determine the missing revisions between this and another branch::"
3701
3079
msgstr ""
3702
" Determine the missing revisions between this and another branch::"
3703
3080
3704
#: bzrlib/builtins.py:4894
3081
#: bzrlib/builtins.py:4854
3705
3082
msgid " bzr missing http://server/branch"
3706
msgstr " bzr missing http://server/branch"
3083
msgstr ""
3707
3084
3708
#: bzrlib/builtins.py:4896
3085
#: bzrlib/builtins.py:4856
3709
3086
msgid ""
3710
3087
" Determine the missing revisions up to a specific revision on the other\n"
3711
3088
" branch::"
3712
3089
msgstr ""
3713
" Determine the missing revisions up to a specific revision on the other\n"
3714
" branch::"
3715
3090
3716
#: bzrlib/builtins.py:4899
3091
#: bzrlib/builtins.py:4859
3717
3092
msgid " bzr missing -r ..-10"
3718
msgstr " bzr missing -r ..-10"
3093
msgstr ""
3719
3094
3720
#: bzrlib/builtins.py:4901
3095
#: bzrlib/builtins.py:4861
3721
3096
msgid ""
3722
3097
" Determine the missing revisions up to a specific revision on this\n"
3723
3098
" branch::"
3724
3099
msgstr ""
3725
" Determine the missing revisions up to a specific revision on this\n"
3726
" branch::"
3727
3100
3728
#: bzrlib/builtins.py:4904
3101
#: bzrlib/builtins.py:4864
3729
3102
msgid " bzr missing --my-revision ..-10"
3730
msgstr " bzr missing --my-revision ..-10"
3103
msgstr ""
3731
3104
3732
#: bzrlib/builtins.py:4911
3105
#: bzrlib/builtins.py:4871
3733
3106
msgid "Reverse the order of revisions."
3734
msgstr "Reverse the order of revisions."
3107
msgstr ""
3735
3108
3736
#: bzrlib/builtins.py:4913
3109
#: bzrlib/builtins.py:4873
3737
3110
msgid "Display changes in the local branch only."
3738
msgstr "Display changes in the local branch only."
3111
msgstr ""
3739
3112
3740
#: bzrlib/builtins.py:4914
3113
#: bzrlib/builtins.py:4874
3741
3114
msgid "Same as --mine-only."
3742
msgstr "Same as --mine-only."
3115
msgstr ""
3743
3116
3744
#: bzrlib/builtins.py:4916
3117
#: bzrlib/builtins.py:4876
3745
3118
msgid "Display changes in the remote branch only."
3746
msgstr "Display changes in the remote branch only."
3119
msgstr ""
3747
3120
3748
#: bzrlib/builtins.py:4917
3121
#: bzrlib/builtins.py:4877
3749
3122
msgid "Same as --theirs-only."
3750
msgstr "Same as --theirs-only."
3751
3752
#: bzrlib/builtins.py:4922
3753
msgid ""
3754
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3755
"details."
3756
msgstr ""
3757
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3758
"details."
3759
3760
#: bzrlib/builtins.py:4926
3761
msgid ""
3762
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3763
"details."
3764
msgstr ""
3765
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3766
"details."
3767
3768
#: bzrlib/builtins.py:4929
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:4882
3126
msgid ""
3127
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3128
"details."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:4886
3132
msgid ""
3133
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3134
"details."
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:4889
3769
3138
msgid "Show all revisions in addition to the mainline ones."
3770
msgstr "Show all revisions in addition to the mainline ones."
3139
msgstr ""
3771
3140
3772
#: bzrlib/builtins.py:4983
3141
#: bzrlib/builtins.py:4943
3773
3142
msgid "No peer location known or specified."
3774
msgstr "No peer location known or specified."
3143
msgstr ""
3775
3144
3776
#: bzrlib/builtins.py:4987
3145
#: bzrlib/builtins.py:4947
3777
3146
msgid "Using saved parent location: {0}\n"
3778
msgstr "Using saved parent location: {0}\n"
3147
msgstr ""
3779
3148
3780
#: bzrlib/builtins.py:5020
3149
#: bzrlib/builtins.py:4980
3781
3150
#, python-format
3782
3151
msgid "You have %d extra revision:\n"
3783
3152
msgid_plural "You have %d extra revisions:\n"
3784
msgstr[0] "You have %d extra revision:\n"
3785
msgstr[1] "You have %d extra revisions:\n"
3153
msgstr[0] ""
3154
msgstr[1] ""
3786
3155
3787
#: bzrlib/builtins.py:5040
3156
#: bzrlib/builtins.py:4996
3788
3157
#, python-format
3789
3158
msgid "You are missing %d revision:\n"
3790
3159
msgid_plural "You are missing %d revisions:\n"
3791
msgstr[0] "You are missing %d revision:\n"
3792
msgstr[1] "You are missing %d revisions:\n"
3160
msgstr[0] ""
3161
msgstr[1] ""
3793
3162
3794
#: bzrlib/builtins.py:5055
3163
#: bzrlib/builtins.py:5008
3795
3164
msgid "This branch has no new revisions.\n"
3796
msgstr "This branch has no new revisions.\n"
3165
msgstr ""
3797
3166
3798
#: bzrlib/builtins.py:5058
3167
#: bzrlib/builtins.py:5011
3799
3168
msgid "Other branch has no new revisions.\n"
3800
msgstr "Other branch has no new revisions.\n"
3169
msgstr ""
3801
3170
3802
#: bzrlib/builtins.py:5063
3171
#: bzrlib/builtins.py:5016
3803
3172
msgid "Branches are up to date.\n"
3804
msgstr "Branches are up to date.\n"
3173
msgstr ""
3805
3174
3806
#: bzrlib/builtins.py:5074
3175
#: bzrlib/builtins.py:5027
3807
3176
msgid "Compress the data within a repository."
3808
msgstr "Compress the data within a repository."
3809
3810
#: bzrlib/builtins.py:5076
3811
msgid ""
3812
"This operation compresses the data within a bazaar repository. As\n"
3813
"bazaar supports automatic packing of repository, this operation is\n"
3814
"normally not required to be done manually."
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."
3819
3820
#: bzrlib/builtins.py:5080
3821
msgid ""
3822
"During the pack operation, bazaar takes a backup of existing repository\n"
3823
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3824
"automatically when it is safe to do so. To save disk space by removing\n"
3825
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3826
"used."
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."
3833
3834
#: bzrlib/builtins.py:5086
3835
msgid ""
3836
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3837
"during or immediately after repacking, you may be left with a state\n"
3838
"where the deletion has been written to disk but the new packs have not\n"
3839
"been. In this case the repository may be unusable."
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."
3845
3846
#: bzrlib/builtins.py:5095
3177
msgstr ""
3178
3179
#: bzrlib/builtins.py:5029
3180
msgid ""
3181
"This operation compresses the data within a bazaar repository. As\n"
3182
"bazaar supports automatic packing of repository, this operation is\n"
3183
"normally not required to be done manually."
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5033
3187
msgid ""
3188
"During the pack operation, bazaar takes a backup of existing repository\n"
3189
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3190
"automatically when it is safe to do so. To save disk space by removing\n"
3191
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3192
"used."
3193
msgstr ""
3194
3195
#: bzrlib/builtins.py:5039
3196
msgid ""
3197
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3198
"during or immediately after repacking, you may be left with a state\n"
3199
"where the deletion has been written to disk but the new packs have not\n"
3200
"been. In this case the repository may be unusable."
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5048
3847
3204
msgid "Delete obsolete packs to save disk space."
3848
msgstr "Delete obsolete packs to save disk space."
3205
msgstr ""
3849
3206
3850
#: bzrlib/builtins.py:5109
3207
#: bzrlib/builtins.py:5062
3851
3208
msgid "List the installed plugins."
3852
msgstr "List the installed plugins."
3209
msgstr ""
3853
3210
3854
#: bzrlib/builtins.py:5111
3211
#: bzrlib/builtins.py:5064
3855
3212
msgid ""
3856
3213
"This command displays the list of installed plugins including\n"
3857
3214
"version of plugin and a short description of each."
3858
3215
msgstr ""
3859
"This command displays the list of installed plugins including\n"
3860
"version of plugin and a short description of each."
3861
3216
3862
#: bzrlib/builtins.py:5114
3217
#: bzrlib/builtins.py:5067
3863
3218
msgid "--verbose shows the path where each plugin is located."
3864
msgstr "--verbose shows the path where each plugin is located."
3219
msgstr ""
3865
3220
3866
#: bzrlib/builtins.py:5116
3221
#: bzrlib/builtins.py:5069
3867
3222
msgid ""
3868
3223
"A plugin is an external component for Bazaar that extends the\n"
3869
3224
"revision control system, by adding or replacing code in Bazaar.\n"
3871
3226
"adding new commands, providing additional network transports and\n"
3872
3227
"customizing log output."
3873
3228
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."
3879
3229
3880
#: bzrlib/builtins.py:5122
3230
#: bzrlib/builtins.py:5075
3881
3231
msgid ""
3882
3232
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3883
3233
"for further information on plugins including where to find them and how to\n"
3884
3234
"install them. Instructions are also provided there on how to write new\n"
3885
3235
"plugins using the Python programming language."
3886
3236
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."
3891
3237
3892
#: bzrlib/builtins.py:5138
3238
#: bzrlib/builtins.py:5091
3893
3239
msgid "Show testament (signing-form) of a revision."
3894
msgstr "Show testament (signing-form) of a revision."
3240
msgstr ""
3895
3241
3896
#: bzrlib/builtins.py:5141
3242
#: bzrlib/builtins.py:5094
3897
3243
msgid "Produce long-format testament."
3898
msgstr "Produce long-format testament."
3244
msgstr ""
3899
3245
3900
#: bzrlib/builtins.py:5143
3246
#: bzrlib/builtins.py:5096
3901
3247
msgid "Produce a strict-format testament."
3902
msgstr "Produce a strict-format testament."
3248
msgstr ""
3903
3249
3904
#: bzrlib/builtins.py:5169
3250
#: bzrlib/builtins.py:5122
3905
3251
msgid "Show the origin of each line in a file."
3906
msgstr "Show the origin of each line in a file."
3907
3908
#: bzrlib/builtins.py:5171
3909
msgid ""
3910
"This prints out the given file with an annotation on the left side\n"
3911
"indicating which revision, author and date introduced the change."
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."
3915
3916
#: bzrlib/builtins.py:5174
3917
msgid ""
3918
"If the origin is the same for a run of consecutive lines, it is\n"
3919
"shown only at the top, unless the --all option is given."
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."
3923
3924
#: bzrlib/builtins.py:5182
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:5124
3255
msgid ""
3256
"This prints out the given file with an annotation on the left side\n"
3257
"indicating which revision, author and date introduced the change."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5127
3261
msgid ""
3262
"If the origin is the same for a run of consecutive lines, it is\n"
3263
"shown only at the top, unless the --all option is given."
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5135
3925
3267
msgid "Show annotations on all lines."
3926
msgstr "Show annotations on all lines."
3268
msgstr ""
3927
3269
3928
#: bzrlib/builtins.py:5183
3270
#: bzrlib/builtins.py:5136
3929
3271
msgid "Show commit date in annotations."
3930
msgstr "Show commit date in annotations."
3272
msgstr ""
3931
3273
3932
#: bzrlib/builtins.py:5270
3274
#: bzrlib/builtins.py:5223
3933
3275
msgid "Cannot sign a range of non-revision-history revisions"
3934
msgstr "Cannot sign a range of non-revision-history revisions"
3276
msgstr ""
3935
3277
3936
#: bzrlib/builtins.py:5282
3278
#: bzrlib/builtins.py:5235
3937
3279
msgid "Please supply either one revision, or a range."
3938
msgstr "Please supply either one revision, or a range."
3939
3940
#: bzrlib/builtins.py:5286
3941
msgid ""
3942
"Convert the current branch into a checkout of the supplied branch.\n"
3943
"If no branch is supplied, rebind to the last bound location."
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."
3947
3948
#: bzrlib/builtins.py:5289
3949
msgid ""
3950
"Once converted into a checkout, commits must succeed on the master branch\n"
3951
"before they will be applied to the local branch."
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."
3955
3956
#: bzrlib/builtins.py:5292
3957
msgid ""
3958
"Bound branches use the nickname of its master branch unless it is set\n"
3959
"locally, in which case binding will update the local nickname to be\n"
3960
"that of the master."
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."
3965
3966
#: bzrlib/builtins.py:5307
3280
msgstr ""
3281
3282
#: bzrlib/builtins.py:5239
3283
msgid ""
3284
"Convert the current branch into a checkout of the supplied branch.\n"
3285
"If no branch is supplied, rebind to the last bound location."
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5242
3289
msgid ""
3290
"Once converted into a checkout, commits must succeed on the master branch\n"
3291
"before they will be applied to the local branch."
3292
msgstr ""
3293
3294
#: bzrlib/builtins.py:5245
3295
msgid ""
3296
"Bound branches use the nickname of its master branch unless it is set\n"
3297
"locally, in which case binding will update the local nickname to be\n"
3298
"that of the master."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5260
3967
3302
msgid "No location supplied. This format does not remember old locations."
3968
msgstr "No location supplied. This format does not remember old locations."
3303
msgstr ""
3969
3304
3970
#: bzrlib/builtins.py:5313
3305
#: bzrlib/builtins.py:5265
3971
3306
msgid "Branch is already bound"
3972
msgstr "Branch is already bound"
3307
msgstr ""
3973
3308
3974
#: bzrlib/builtins.py:5316
3309
#: bzrlib/builtins.py:5267
3975
3310
msgid "No location supplied and no previous location known"
3976
msgstr "No location supplied and no previous location known"
3311
msgstr ""
3977
3312
3978
#: bzrlib/builtins.py:5322
3313
#: bzrlib/builtins.py:5273
3979
3314
msgid "These branches have diverged. Try merging, and then bind again."
3980
msgstr "These branches have diverged. Try merging, and then bind again."
3315
msgstr ""
3981
3316
3982
#: bzrlib/builtins.py:5329
3317
#: bzrlib/builtins.py:5280
3983
3318
msgid "Convert the current checkout into a regular branch."
3984
msgstr "Convert the current checkout into a regular branch."
3319
msgstr ""
3985
3320
3986
#: bzrlib/builtins.py:5331
3321
#: bzrlib/builtins.py:5282
3987
3322
msgid ""
3988
3323
"After unbinding, the local branch is considered independent and subsequent\n"
3989
3324
"commits will be local only."
3990
3325
msgstr ""
3991
"After unbinding, the local branch is considered independent and subsequent\n"
3992
"commits will be local only."
3993
3326
3994
#: bzrlib/builtins.py:5342
3327
#: bzrlib/builtins.py:5293
3995
3328
msgid "Local branch is not bound"
3996
msgstr "Local branch is not bound"
3329
msgstr ""
3997
3330
3998
#: bzrlib/builtins.py:5346
3331
#: bzrlib/builtins.py:5297
3999
3332
msgid "Remove the last committed revision."
4000
msgstr "Remove the last committed revision."
4001
4002
#: bzrlib/builtins.py:5348
4003
msgid ""
4004
"--verbose will print out what is being removed.\n"
4005
"--dry-run will go through all the motions, but not actually\n"
4006
"remove anything."
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."
4011
4012
#: bzrlib/builtins.py:5352
4013
msgid ""
4014
"If --revision is specified, uncommit revisions to leave the branch at the\n"
4015
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
4016
"branch at revision 15."
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."
4021
4022
#: bzrlib/builtins.py:5356
4023
msgid ""
4024
"Uncommit leaves the working tree ready for a new commit. The only change\n"
4025
"it may make is to restore any pending merges that were present before\n"
4026
"the commit."
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."
4031
4032
#: bzrlib/builtins.py:5367
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:5299
3336
msgid ""
3337
"--verbose will print out what is being removed.\n"
3338
"--dry-run will go through all the motions, but not actually\n"
3339
"remove anything."
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5303
3343
msgid ""
3344
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3345
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3346
"branch at revision 15."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5307
3350
msgid ""
3351
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3352
"it may make is to restore any pending merges that were present before\n"
3353
"the commit."
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:5318
4033
3357
msgid "Don't actually make changes."
4034
msgstr "Don't actually make changes."
3358
msgstr ""
4035
3359
4036
#: bzrlib/builtins.py:5368
3360
#: bzrlib/builtins.py:5319
4037
3361
msgid "Say yes to all questions."
4038
msgstr "Say yes to all questions."
3362
msgstr ""
4039
3363
4040
#: bzrlib/builtins.py:5370
3364
#: bzrlib/builtins.py:5321
4041
3365
msgid "Keep tags that point to removed revisions."
4042
msgstr "Keep tags that point to removed revisions."
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:5323
3369
msgid "Only remove the commits from the local branch when in a checkout."
3370
msgstr ""
4043
3371
4044
3372
#: bzrlib/builtins.py:5372
4045
msgid "Only remove the commits from the local branch when in a checkout."
4046
msgstr "Only remove the commits from the local branch when in a checkout."
4047
4048
#: bzrlib/builtins.py:5421
4049
3373
msgid "No revisions to uncommit.\n"
4050
msgstr "No revisions to uncommit.\n"
3374
msgstr ""
4051
3375
4052
#: bzrlib/builtins.py:5436
3376
#: bzrlib/builtins.py:5387
4053
3377
msgid "Dry-run, pretending to remove the above revisions.\n"
4054
msgstr "Dry-run, pretending to remove the above revisions.\n"
3378
msgstr ""
4055
3379
4056
#: bzrlib/builtins.py:5439
3380
#: bzrlib/builtins.py:5390
4057
3381
msgid "The above revision(s) will be removed.\n"
4058
msgstr "The above revision(s) will be removed.\n"
3382
msgstr ""
4059
3383
4060
#: bzrlib/builtins.py:5443
3384
#: bzrlib/builtins.py:5394
4061
3385
msgid "Uncommit these revisions"
4062
msgstr "Uncommit these revisions"
3386
msgstr ""
4063
3387
4064
#: bzrlib/builtins.py:5446
3388
#: bzrlib/builtins.py:5397
4065
3389
msgid "Canceled\n"
4066
msgstr "Cancelled\n"
3390
msgstr ""
4067
3391
4068
#: bzrlib/builtins.py:5453
3392
#: bzrlib/builtins.py:5404
4069
3393
#, python-format
4070
3394
msgid ""
4071
3395
"You can restore the old tip by running:\n"
4072
3396
" bzr pull . -r revid:%s\n"
4073
3397
msgstr ""
4074
"You can restore the old tip by running:\n"
4075
" bzr pull . -r revid:%s\n"
4076
3398
4077
#: bzrlib/builtins.py:5458
3399
#: bzrlib/builtins.py:5409
4078
3400
msgid "Break a dead lock."
4079
msgstr "Break a dead lock."
4080
4081
#: bzrlib/builtins.py:5460
4082
msgid ""
4083
"This command breaks a lock on a repository, branch, working directory or\n"
4084
"config file."
4085
msgstr ""
4086
"This command breaks a lock on a repository, branch, working directory or\n"
4087
"config file."
4088
4089
#: bzrlib/builtins.py:5463
4090
msgid ""
4091
"CAUTION: Locks should only be broken when you are sure that the process\n"
4092
"holding the lock has been stopped."
4093
msgstr ""
4094
"CAUTION: Locks should only be broken when you are sure that the process\n"
4095
"holding the lock has been stopped."
4096
4097
#: bzrlib/builtins.py:5466
4098
msgid ""
4099
"You can get information on what locks are open via the 'bzr info\n"
4100
"[location]' command."
4101
msgstr ""
4102
"You can get information on what locks are open via the 'bzr info\n"
4103
"[location]' command."
4104
4105
#: bzrlib/builtins.py:5469
4106
msgid ""
4107
":Examples:\n"
4108
" bzr break-lock\n"
4109
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
4110
" bzr break-lock --conf ~/.bazaar"
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"
4116
4117
#: bzrlib/builtins.py:5478
3401
msgstr ""
3402
3403
#: bzrlib/builtins.py:5411
3404
msgid ""
3405
"This command breaks a lock on a repository, branch, working directory or\n"
3406
"config file."
3407
msgstr ""
3408
3409
#: bzrlib/builtins.py:5414
3410
msgid ""
3411
"CAUTION: Locks should only be broken when you are sure that the process\n"
3412
"holding the lock has been stopped."
3413
msgstr ""
3414
3415
#: bzrlib/builtins.py:5417
3416
msgid ""
3417
"You can get information on what locks are open via the 'bzr info\n"
3418
"[location]' command."
3419
msgstr ""
3420
3421
#: bzrlib/builtins.py:5420
3422
msgid ""
3423
":Examples:\n"
3424
" bzr break-lock\n"
3425
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3426
" bzr break-lock --conf ~/.bazaar"
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5429
4118
3430
msgid "LOCATION is the directory where the config lock is."
4119
msgstr "LOCATION is the directory where the config lock is."
3431
msgstr ""
4120
3432
4121
#: bzrlib/builtins.py:5480
3433
#: bzrlib/builtins.py:5431
4122
3434
msgid "Do not ask for confirmation before breaking the lock."
4123
msgstr "Do not ask for confirmation before breaking the lock."
3435
msgstr ""
4124
3436
4125
#: bzrlib/builtins.py:5515
3437
#: bzrlib/builtins.py:5466
4126
3438
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
4127
msgstr "The Bazaar smart server protocol over TCP. (default port: 4155)"
3439
msgstr ""
4128
3440
4129
#: bzrlib/builtins.py:5516
3441
#: bzrlib/builtins.py:5467
4130
3442
msgid "Run the bzr server."
4131
msgstr "Run the bzr server."
3443
msgstr ""
4132
3444
4133
#: bzrlib/builtins.py:5522
3445
#: bzrlib/builtins.py:5473
4134
3446
msgid "Serve on stdin/out for use from inetd or sshd."
4135
msgstr "Serve on stdin/out for use from inetd or sshd."
3447
msgstr ""
4136
3448
4137
#: bzrlib/builtins.py:5523
3449
#: bzrlib/builtins.py:5474
4138
3450
msgid "protocol"
4139
msgstr "protocol"
3451
msgstr ""
4140
3452
4141
#: bzrlib/builtins.py:5524
3453
#: bzrlib/builtins.py:5475
4142
3454
msgid "Protocol to serve."
4143
msgstr "Protocol to serve."
4144
4145
#: bzrlib/builtins.py:5528
4146
msgid "Listen for connections on nominated address."
4147
msgstr "Listen for connections on nominated address."
4148
4149
#: bzrlib/builtins.py:5530
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5479
4150
3458
msgid ""
4151
"Listen for connections on nominated port. Passing 0 as the port number will "
4152
"result in a dynamically allocated port. The default port depends on the "
4153
"protocol."
3459
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3460
"Passing 0 as the port number will result in a dynamically allocated port. "
3461
"The default port depends on the protocol."
4154
3462
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."
4158
3463
4159
#: bzrlib/builtins.py:5535
3464
#: bzrlib/builtins.py:5485
4160
3465
msgid "Serve contents of this directory."
4161
msgstr "Serve contents of this directory."
3466
msgstr ""
4162
3467
4163
#: bzrlib/builtins.py:5537
3468
#: bzrlib/builtins.py:5487
4164
3469
msgid ""
4165
3470
"By default the server is a readonly server. Supplying --allow-writes "
4166
3471
"enables write access to the contents of the served directory and below. "
4168
3473
"of external authentication is arranged supplying this option leads to global "
4169
3474
"uncontrolled write access to your file system."
4170
3475
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."
3476
3477
#: bzrlib/builtins.py:5496
3478
msgid "Override the default idle client timeout (5min)."
3479
msgstr ""
4176
3480
4177
3481
#: bzrlib/builtins.py:5546
4178
msgid "Override the default idle client timeout (5min)."
4179
msgstr "Override the default idle client timeout (5min)."
4180
4181
#: bzrlib/builtins.py:5564
4182
3482
msgid "Combine a tree into its containing tree."
4183
msgstr "Combine a tree into its containing tree."
3483
msgstr ""
4184
3484
4185
#: bzrlib/builtins.py:5566
3485
#: bzrlib/builtins.py:5548
4186
3486
msgid "This command requires the target tree to be in a rich-root format."
4187
msgstr "This command requires the target tree to be in a rich-root format."
4188
4189
#: bzrlib/builtins.py:5568
4190
msgid ""
4191
"The TREE argument should be an independent tree, inside another tree, but\n"
4192
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
4193
"running \"bzr branch\" with the target inside a tree.)"
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.)"
3487
msgstr ""
3488
3489
#: bzrlib/builtins.py:5550
3490
msgid ""
3491
"The TREE argument should be an independent tree, inside another tree, but\n"
3492
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3493
"running \"bzr branch\" with the target inside a tree.)"
3494
msgstr ""
3495
3496
#: bzrlib/builtins.py:5554
3497
msgid ""
3498
"The result is a combined tree, with the subtree no longer an independent\n"
3499
"part. This is marked as a merge of the subtree into the containing tree,\n"
3500
"and all history is preserved."
3501
msgstr ""
4198
3502
4199
3503
#: bzrlib/builtins.py:5572
4200
msgid ""
4201
"The result is a combined tree, with the subtree no longer an independent\n"
4202
"part. This is marked as a merge of the subtree into the containing tree,\n"
4203
"and all history is preserved."
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."
4208
4209
#: bzrlib/builtins.py:5590
4210
3504
#, python-format
4211
3505
msgid ""
4212
3506
"Can't join trees because %s doesn't support rich root data.\n"
4213
3507
"You can use bzr upgrade on the repository."
4214
3508
msgstr ""
4215
"Can't join trees because %s doesn't support rich root data.\n"
4216
"You can use bzr upgrade on the repository."
4217
3509
4218
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3510
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
4219
3511
msgid "Cannot join {0}. {1}"
4220
msgstr "Cannot join {0}. {1}"
3512
msgstr ""
4221
3513
4222
#: bzrlib/builtins.py:5610
3514
#: bzrlib/builtins.py:5592
4223
3515
msgid "Split a subdirectory of a tree into a separate tree."
4224
msgstr "Split a subdirectory of a tree into a separate tree."
4225
4226
#: bzrlib/builtins.py:5612
4227
msgid ""
4228
"This command will produce a target tree in a format that supports\n"
4229
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
4230
"converted into earlier formats like 'dirstate-tags'."
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'."
4235
4236
#: bzrlib/builtins.py:5616
4237
msgid ""
4238
"The TREE argument should be a subdirectory of a working tree. That\n"
4239
"subdirectory will be converted into an independent tree, with its own\n"
4240
"branch. Commits in the top-level tree will not apply to the new subtree."
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."
4245
4246
#: bzrlib/builtins.py:5696
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5594
3519
msgid ""
3520
"This command will produce a target tree in a format that supports\n"
3521
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3522
"converted into earlier formats like 'dirstate-tags'."
3523
msgstr ""
3524
3525
#: bzrlib/builtins.py:5598
3526
msgid ""
3527
"The TREE argument should be a subdirectory of a working tree. That\n"
3528
"subdirectory will be converted into an independent tree, with its own\n"
3529
"branch. Commits in the top-level tree will not apply to the new subtree."
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:5678
4247
3533
msgid "No submit branch specified or known"
4248
msgstr "No submit branch specified or known"
3534
msgstr ""
4249
3535
4250
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3536
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
4251
3537
msgid "No public branch specified or known"
4252
msgstr "No public branch specified or known"
3538
msgstr ""
4253
3539
4254
#: bzrlib/builtins.py:5710
3540
#: bzrlib/builtins.py:5691
4255
3541
msgid "bzr merge-directive takes at most two one revision identifiers"
4256
msgstr "bzr merge-directive takes at most two one revision identifiers"
3542
msgstr ""
3543
3544
#: bzrlib/builtins.py:5700
3545
msgid "No revisions to bundle."
3546
msgstr ""
4257
3547
4258
3548
#: bzrlib/builtins.py:5719
4259
msgid "No revisions to bundle."
4260
msgstr "No revisions to bundle."
4261
4262
#: bzrlib/builtins.py:5738
4263
3549
msgid "Mail or create a merge-directive for submitting changes."
4264
msgstr "Mail or create a merge-directive for submitting changes."
3550
msgstr ""
4265
3551
4266
#: bzrlib/builtins.py:5740
3552
#: bzrlib/builtins.py:5721
4267
3553
msgid "A merge directive provides many things needed for requesting merges:"
4268
msgstr "A merge directive provides many things needed for requesting merges:"
3554
msgstr ""
4269
3555
4270
#: bzrlib/builtins.py:5742
3556
#: bzrlib/builtins.py:5723
4271
3557
msgid "* A machine-readable description of the merge to perform"
4272
msgstr "* A machine-readable description of the merge to perform"
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5725
3561
msgid "* An optional patch that is a preview of the changes requested"
3562
msgstr ""
3563
3564
#: bzrlib/builtins.py:5727
3565
msgid ""
3566
"* An optional bundle of revision data, so that the changes can be applied\n"
3567
" directly from the merge directive, without retrieving data from a\n"
3568
" branch."
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:5731
3572
msgid ""
3573
"`bzr send` creates a compact data set that, when applied using bzr\n"
3574
"merge, has the same effect as merging from the source branch. "
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5734
3578
msgid ""
3579
"By default the merge directive is self-contained and can be applied to any\n"
3580
"branch containing submit_branch in its ancestory without needing access to\n"
3581
"the source branch."
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5738
3585
msgid ""
3586
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3587
"revisions, but only a structured request to merge from the\n"
3588
"public_location. In that case the public_branch is needed and it must be\n"
3589
"up-to-date and accessible to the recipient. The public_branch is always\n"
3590
"included if known, so that people can check it later."
3591
msgstr ""
4273
3592
4274
3593
#: bzrlib/builtins.py:5744
4275
msgid "* An optional patch that is a preview of the changes requested"
4276
msgstr "* An optional patch that is a preview of the changes requested"
4277
4278
#: bzrlib/builtins.py:5746
4279
3594
msgid ""
4280
"* An optional bundle of revision data, so that the changes can be applied\n"
4281
" directly from the merge directive, without retrieving data from a\n"
4282
" branch."
3595
"The submit branch defaults to the parent of the source branch, but can be\n"
3596
"overridden. Both submit branch and public branch will be remembered in\n"
3597
"branch.conf the first time they are used for a particular branch. The\n"
3598
"source branch defaults to that containing the working directory, but can\n"
3599
"be changed using --from."
4283
3600
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."
4287
3601
4288
3602
#: bzrlib/builtins.py:5750
4289
3603
msgid ""
4290
"`bzr send` creates a compact data set that, when applied using bzr\n"
4291
"merge, has the same effect as merging from the source branch. "
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. "
4295
4296
#: bzrlib/builtins.py:5753
4297
msgid ""
4298
"By default the merge directive is self-contained and can be applied to any\n"
4299
"branch containing submit_branch in its ancestory without needing access to\n"
4300
"the source branch."
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."
4305
4306
#: bzrlib/builtins.py:5757
4307
msgid ""
4308
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4309
"revisions, but only a structured request to merge from the\n"
4310
"public_location. In that case the public_branch is needed and it must be\n"
4311
"up-to-date and accessible to the recipient. The public_branch is always\n"
4312
"included if known, so that people can check it later."
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."
4319
4320
#: bzrlib/builtins.py:5763
4321
msgid ""
4322
"The submit branch defaults to the parent of the source branch, but can be\n"
4323
"overridden. Both submit branch and public branch will be remembered in\n"
4324
"branch.conf the first time they are used for a particular branch. The\n"
4325
"source branch defaults to that containing the working directory, but can\n"
4326
"be changed using --from."
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."
4333
4334
#: bzrlib/builtins.py:5769
4335
msgid ""
4336
3604
"Both the submit branch and the public branch follow the usual behavior with\n"
4337
3605
"respect to --remember: If there is no default location set, the first send\n"
4338
3606
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4339
3607
"omit the location to use the default. To change the default, use\n"
4340
3608
"--remember. The value will only be saved if the location can be accessed."
4341
3609
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."
3610
3611
#: bzrlib/builtins.py:5756
3612
msgid ""
3613
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3614
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3615
"If a public location is known for the submit_branch, that location is used\n"
3616
"in the merge directive."
3617
msgstr ""
3618
3619
#: bzrlib/builtins.py:5761
3620
msgid ""
3621
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3622
"given, in which case it is sent to a file."
3623
msgstr ""
3624
3625
#: bzrlib/builtins.py:5764
3626
msgid ""
3627
"Mail is sent using your preferred mail program. This should be transparent\n"
3628
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3629
"If the preferred client can't be found (or used), your editor will be used."
3630
msgstr ""
3631
3632
#: bzrlib/builtins.py:5768
3633
msgid ""
3634
"To use a specific mail program, set the mail_client configuration option.\n"
3635
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3636
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3637
"(MacOS X's\n"
3638
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3639
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3640
"add\n"
3641
"supported clients."
3642
msgstr ""
4348
3643
4349
3644
#: bzrlib/builtins.py:5775
4350
3645
msgid ""
4351
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4352
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4353
"If a public location is known for the submit_branch, that location is used\n"
4354
"in the merge directive."
3646
"If mail is being sent, a to address is required. This can be supplied\n"
3647
"either on the commandline, by setting the submit_to configuration\n"
3648
"option in the branch itself or the child_submit_to configuration option\n"
3649
"in the submit branch."
4355
3650
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."
4360
3651
4361
3652
#: bzrlib/builtins.py:5780
4362
3653
msgid ""
4363
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4364
"given, in which case it is sent to a file."
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."
4368
4369
#: bzrlib/builtins.py:5783
4370
msgid ""
4371
"Mail is sent using your preferred mail program. This should be transparent\n"
4372
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4373
"If the preferred client can't be found (or used), your editor will be used."
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."
4378
4379
#: bzrlib/builtins.py:5787
4380
msgid ""
4381
"To use a specific mail program, set the mail_client configuration option.\n"
4382
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4383
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4384
"(MacOS X's\n"
4385
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4386
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4387
"add\n"
4388
"supported clients."
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."
4398
4399
#: bzrlib/builtins.py:5794
4400
msgid ""
4401
"If mail is being sent, a to address is required. This can be supplied\n"
4402
"either on the commandline, by setting the submit_to configuration\n"
4403
"option in the branch itself or the child_submit_to configuration option\n"
4404
"in the submit branch."
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."
4410
4411
#: bzrlib/builtins.py:5799
4412
msgid ""
4413
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4414
"and\n"
4415
"merge directive format 2. It is significantly faster and smaller than\n"
4416
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4417
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4418
"format 1. It is compatible with Bazaar 0.12 - 0.18."
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."
4426
4427
#: bzrlib/builtins.py:5805
4428
msgid ""
4429
"The merge directives created by bzr send may be applied using bzr merge or\n"
4430
"bzr pull by specifying a file containing a merge directive as the location."
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."
4434
4435
#: bzrlib/builtins.py:5808
4436
msgid ""
4437
"bzr send makes extensive use of public locations to map local locations "
4438
"into\n"
4439
"URLs that can be used by other people. See `bzr help configuration` to\n"
4440
"set them, and use `bzr info` to display them."
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."
4446
4447
#: bzrlib/builtins.py:5832
3654
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3655
"and\n"
3656
"merge directive format 2. It is significantly faster and smaller than\n"
3657
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3658
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3659
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5786
3663
msgid ""
3664
"The merge directives created by bzr send may be applied using bzr merge or\n"
3665
"bzr pull by specifying a file containing a merge directive as the location."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5789
3669
msgid ""
3670
"bzr send makes extensive use of public locations to map local locations "
3671
"into\n"
3672
"URLs that can be used by other people. See `bzr help configuration` to\n"
3673
"set them, and use `bzr info` to display them."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5813
4448
3677
msgid "Write merge directive to this file or directory; use - for stdout."
4449
msgstr "Write merge directive to this file or directory; use - for stdout."
3678
msgstr ""
4450
3679
4451
#: bzrlib/builtins.py:5836
3680
#: bzrlib/builtins.py:5817
4452
3681
msgid ""
4453
3682
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4454
3683
"strict disables the check."
4455
3684
msgstr ""
4456
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4457
"strict disables the check."
4458
3685
4459
#: bzrlib/builtins.py:5838
3686
#: bzrlib/builtins.py:5819
4460
3687
msgid "Mail the request to this address."
4461
msgstr "Mail the request to this address."
3688
msgstr ""
4462
3689
4463
#: bzrlib/builtins.py:5842
3690
#: bzrlib/builtins.py:5823
4464
3691
msgid "Body for the email."
4465
msgstr "Body for the email."
3692
msgstr ""
4466
3693
4467
#: bzrlib/builtins.py:5895
3694
#: bzrlib/builtins.py:5876
4468
3695
msgid "Do not include a bundle in the merge directive."
4469
msgstr "Do not include a bundle in the merge directive."
3696
msgstr ""
4470
3697
4471
#: bzrlib/builtins.py:5896
3698
#: bzrlib/builtins.py:5877
4472
3699
msgid "Do not include a preview patch in the merge directive."
4473
msgstr "Do not include a preview patch in the merge directive."
3700
msgstr ""
4474
3701
4475
#: bzrlib/builtins.py:5899
3702
#: bzrlib/builtins.py:5880
4476
3703
msgid "Remember submit and public branch."
4477
msgstr "Remember submit and public branch."
3704
msgstr ""
4478
3705
4479
#: bzrlib/builtins.py:5901
3706
#: bzrlib/builtins.py:5882
4480
3707
msgid ""
4481
3708
"Branch to generate the submission from, rather than the one containing the "
4482
3709
"working directory."
4483
3710
msgstr ""
4484
"Branch to generate the submission from, rather than the one containing the "
4485
"working directory."
4486
3711
4487
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3712
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4488
3713
msgid "format"
4489
msgstr "format"
3714
msgstr ""
4490
3715
4491
#: bzrlib/builtins.py:5912
3716
#: bzrlib/builtins.py:5893
4492
3717
msgid "Use the specified output format."
4493
msgstr "Use the specified output format."
3718
msgstr ""
4494
3719
4495
#: bzrlib/builtins.py:5934
3720
#: bzrlib/builtins.py:5915
4496
3721
msgid "Create, remove or modify a tag naming a revision."
4497
msgstr "Create, remove or modify a tag naming a revision."
4498
4499
#: bzrlib/builtins.py:5936
4500
msgid ""
4501
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4502
"(--revision) option can be given -rtag:X, where X is any previously\n"
4503
"created tag."
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."
3722
msgstr ""
3723
3724
#: bzrlib/builtins.py:5917
3725
msgid ""
3726
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3727
"(--revision) option can be given -rtag:X, where X is any previously\n"
3728
"created tag."
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:5921
3732
msgid ""
3733
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3734
"along when you branch, push, pull or merge."
3735
msgstr ""
3736
3737
#: bzrlib/builtins.py:5924
3738
msgid ""
3739
"It is an error to give a tag name that already exists unless you pass\n"
3740
"--force, in which case the tag is moved to point to the new revision."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:5927
3744
msgid ""
3745
"To rename a tag (change the name but keep it on the same revsion), run "
3746
"``bzr\n"
3747
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:5930
3751
msgid ""
3752
"If no tag name is specified it will be determined through the \n"
3753
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3754
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3755
"details."
3756
msgstr ""
4508
3757
4509
3758
#: bzrlib/builtins.py:5940
4510
msgid ""
4511
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4512
"along when you branch, push, pull or merge."
3759
msgid "Delete this tag rather than placing it."
4513
3760
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."
4516
3761
4517
3762
#: bzrlib/builtins.py:5943
4518
msgid ""
4519
"It is an error to give a tag name that already exists unless you pass\n"
4520
"--force, in which case the tag is moved to point to the new revision."
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."
4524
4525
#: bzrlib/builtins.py:5946
4526
msgid ""
4527
"To rename a tag (change the name but keep it on the same revsion), run "
4528
"``bzr\n"
4529
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
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``."
4534
4535
#: bzrlib/builtins.py:5949
4536
msgid ""
4537
"If no tag name is specified it will be determined through the \n"
4538
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4539
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4540
"details."
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."
4546
4547
#: bzrlib/builtins.py:5959
4548
msgid "Delete this tag rather than placing it."
4549
msgstr "Delete this tag rather than placing it."
4550
4551
#: bzrlib/builtins.py:5962
4552
3763
msgid "Branch in which to place the tag."
4553
msgstr "Branch in which to place the tag."
3764
msgstr ""
4554
3765
4555
#: bzrlib/builtins.py:5964
3766
#: bzrlib/builtins.py:5945
4556
3767
msgid "Replace existing tags."
4557
msgstr "Replace existing tags."
3768
msgstr ""
4558
3769
4559
#: bzrlib/builtins.py:5979
3770
#: bzrlib/builtins.py:5960
4560
3771
msgid "No tag specified to delete."
4561
msgstr "No tag specified to delete."
3772
msgstr ""
4562
3773
4563
#: bzrlib/builtins.py:5981
3774
#: bzrlib/builtins.py:5962
4564
3775
#, python-format
4565
3776
msgid "Deleted tag %s."
4566
msgstr "Deleted tag %s."
3777
msgstr ""
4567
3778
4568
#: bzrlib/builtins.py:5995
3779
#: bzrlib/builtins.py:5976
4569
3780
msgid "Please specify a tag name."
4570
msgstr "Please specify a tag name."
3781
msgstr ""
4571
3782
4572
#: bzrlib/builtins.py:6003
3783
#: bzrlib/builtins.py:5984
4573
3784
#, python-format
4574
3785
msgid "Tag %s already exists for that revision."
4575
msgstr "Tag %s already exists for that revision."
3786
msgstr ""
4576
3787
4577
#: bzrlib/builtins.py:6007
3788
#: bzrlib/builtins.py:5988
4578
3789
#, python-format
4579
3790
msgid "Created tag %s."
4580
msgstr "Created tag %s."
3791
msgstr ""
4581
3792
4582
#: bzrlib/builtins.py:6009
3793
#: bzrlib/builtins.py:5990
4583
3794
#, python-format
4584
3795
msgid "Updated tag %s."
4585
msgstr "Updated tag %s."
3796
msgstr ""
4586
3797
4587
#: bzrlib/builtins.py:6013
3798
#: bzrlib/builtins.py:5994
4588
3799
msgid "List tags."
4589
msgstr "List tags."
3800
msgstr ""
4590
3801
4591
#: bzrlib/builtins.py:6015
3802
#: bzrlib/builtins.py:5996
4592
3803
msgid ""
4593
3804
"This command shows a table of tag names and the revisions they reference."
4594
3805
msgstr ""
4595
"This command shows a table of tag names and the revisions they reference."
4596
3806
4597
#: bzrlib/builtins.py:6021
3807
#: bzrlib/builtins.py:6002
4598
3808
msgid "Branch whose tags should be displayed."
4599
msgstr "Branch whose tags should be displayed."
3809
msgstr ""
4600
3810
4601
#: bzrlib/builtins.py:6023
3811
#: bzrlib/builtins.py:6004
4602
3812
msgid "Sort tags by different criteria."
4603
msgstr "Sort tags by different criteria."
3813
msgstr ""
4604
3814
4605
#: bzrlib/builtins.py:6023
3815
#: bzrlib/builtins.py:6004
4606
3816
msgid "Sorting"
4607
msgstr "Sorting"
3817
msgstr ""
4608
3818
4609
#: bzrlib/builtins.py:6092
3819
#: bzrlib/builtins.py:6073
4610
3820
msgid "Reconfigure the type of a bzr directory."
4611
msgstr "Reconfigure the type of a bzr directory."
3821
msgstr ""
4612
3822
4613
#: bzrlib/builtins.py:6094
3823
#: bzrlib/builtins.py:6075
4614
3824
msgid "A target configuration must be specified."
4615
msgstr "A target configuration must be specified."
3825
msgstr ""
4616
3826
4617
#: bzrlib/builtins.py:6096
3827
#: bzrlib/builtins.py:6077
4618
3828
msgid ""
4619
3829
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4620
3830
"The order of preference is\n"
4624
3834
"4. The parent location.\n"
4625
3835
"If none of these is available, --bind-to must be specified."
4626
3836
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."
4634
3837
4635
#: bzrlib/builtins.py:6110
3838
#: bzrlib/builtins.py:6091
4636
3839
msgid "Tree type"
4637
msgstr "Tree type"
3840
msgstr ""
4638
3841
4639
#: bzrlib/builtins.py:6111
3842
#: bzrlib/builtins.py:6092
4640
3843
msgid "The relation between branch and tree."
4641
msgstr "The relation between branch and tree."
3844
msgstr ""
4642
3845
4643
#: bzrlib/builtins.py:6113
3846
#: bzrlib/builtins.py:6094
4644
3847
msgid "Reconfigure to be an unbound branch with no working tree."
4645
msgstr "Reconfigure to be an unbound branch with no working tree."
3848
msgstr ""
4646
3849
4647
#: bzrlib/builtins.py:6114
3850
#: bzrlib/builtins.py:6095
4648
3851
msgid "Reconfigure to be an unbound branch with a working tree."
4649
msgstr "Reconfigure to be an unbound branch with a working tree."
3852
msgstr ""
4650
3853
4651
#: bzrlib/builtins.py:6115
3854
#: bzrlib/builtins.py:6096
4652
3855
msgid "Reconfigure to be a bound branch with a working tree."
4653
msgstr "Reconfigure to be a bound branch with a working tree."
3856
msgstr ""
4654
3857
4655
#: bzrlib/builtins.py:6116
3858
#: bzrlib/builtins.py:6097
4656
3859
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4657
msgstr "Reconfigure to be a lightweight checkout (with no local history)."
3860
msgstr ""
4658
3861
4659
#: bzrlib/builtins.py:6121
3862
#: bzrlib/builtins.py:6102
4660
3863
msgid "Repository type"
4661
msgstr "Repository type"
3864
msgstr ""
4662
3865
4663
#: bzrlib/builtins.py:6122
3866
#: bzrlib/builtins.py:6103
4664
3867
msgid "Location fo the repository."
4665
msgstr "Location fo the repository."
3868
msgstr ""
4666
3869
4667
#: bzrlib/builtins.py:6124
3870
#: bzrlib/builtins.py:6105
4668
3871
msgid ""
4669
3872
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4670
3873
msgstr ""
4671
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4672
3874
4673
#: bzrlib/builtins.py:6126
3875
#: bzrlib/builtins.py:6107
4674
3876
msgid "Reconfigure to use a shared repository."
4675
msgstr "Reconfigure to use a shared repository."
3877
msgstr ""
4676
3878
4677
#: bzrlib/builtins.py:6130
3879
#: bzrlib/builtins.py:6111
4678
3880
msgid "Trees in Repository"
4679
msgstr "Trees in Repository"
3881
msgstr ""
4680
3882
4681
#: bzrlib/builtins.py:6131
3883
#: bzrlib/builtins.py:6112
4682
3884
msgid "Whether new branches in the repository have trees."
4683
msgstr "Whether new branches in the repository have trees."
4684
4685
#: bzrlib/builtins.py:6133
4686
msgid ""
4687
"Reconfigure repository to create working trees on branches by default."
4688
msgstr ""
4689
"Reconfigure repository to create working trees on branches by default."
4690
4691
#: bzrlib/builtins.py:6135
4692
msgid ""
4693
"Reconfigure repository to not create working trees on branches by default."
4694
msgstr ""
4695
"Reconfigure repository to not create working trees on branches by default."
4696
4697
#: bzrlib/builtins.py:6138
3885
msgstr ""
3886
3887
#: bzrlib/builtins.py:6114
3888
msgid ""
3889
"Reconfigure repository to create working trees on branches by default."
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6116
3893
msgid ""
3894
"Reconfigure repository to not create working trees on branches by default."
3895
msgstr ""
3896
3897
#: bzrlib/builtins.py:6119
4698
3898
msgid "Branch to bind checkout to."
4699
msgstr "Branch to bind checkout to."
3899
msgstr ""
4700
3900
4701
#: bzrlib/builtins.py:6140
3901
#: bzrlib/builtins.py:6121
4702
3902
msgid "Perform reconfiguration even if local changes will be lost."
4703
msgstr "Perform reconfiguration even if local changes will be lost."
3903
msgstr ""
4704
3904
4705
#: bzrlib/builtins.py:6143
3905
#: bzrlib/builtins.py:6124
4706
3906
msgid "Reconfigure a branch to be stacked on another branch."
4707
msgstr "Reconfigure a branch to be stacked on another branch."
3907
msgstr ""
4708
3908
4709
#: bzrlib/builtins.py:6147
3909
#: bzrlib/builtins.py:6128
4710
3910
msgid ""
4711
3911
"Reconfigure a branch to be unstacked. This may require copying substantial "
4712
3912
"data into it."
4713
3913
msgstr ""
4714
"Reconfigure a branch to be unstacked. This may require copying substantial "
4715
"data into it."
4716
3914
4717
#: bzrlib/builtins.py:6157
3915
#: bzrlib/builtins.py:6138
4718
3916
msgid "Can't use both --stacked-on and --unstacked"
4719
msgstr "Can't use both --stacked-on and --unstacked"
3917
msgstr ""
4720
3918
4721
#: bzrlib/builtins.py:6171
3919
#: bzrlib/builtins.py:6152
4722
3920
msgid "No target configuration specified"
4723
msgstr "No target configuration specified"
3921
msgstr ""
4724
3922
4725
#: bzrlib/builtins.py:6206
3923
#: bzrlib/builtins.py:6187
4726
3924
msgid "Set the branch of a checkout and update."
4727
msgstr "Set the branch of a checkout and update."
4728
4729
#: bzrlib/builtins.py:6208
4730
msgid ""
4731
"For lightweight checkouts, this changes the branch being referenced.\n"
4732
"For heavyweight checkouts, this checks that there are no local commits\n"
4733
"versus the current bound branch, then it makes the local branch a mirror\n"
4734
"of the new location and binds to it."
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."
4740
4741
#: bzrlib/builtins.py:6213
4742
msgid ""
4743
"In both cases, the working tree is updated and uncommitted changes\n"
4744
"are merged. The user can commit or revert these as they desire."
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."
4748
4749
#: bzrlib/builtins.py:6216
3925
msgstr ""
3926
3927
#: bzrlib/builtins.py:6189
3928
msgid ""
3929
"For lightweight checkouts, this changes the branch being referenced.\n"
3930
"For heavyweight checkouts, this checks that there are no local commits\n"
3931
"versus the current bound branch, then it makes the local branch a mirror\n"
3932
"of the new location and binds to it."
3933
msgstr ""
3934
3935
#: bzrlib/builtins.py:6194
3936
msgid ""
3937
"In both cases, the working tree is updated and uncommitted changes\n"
3938
"are merged. The user can commit or revert these as they desire."
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6197
4750
3942
msgid "Pending merges need to be committed or reverted before using switch."
4751
msgstr "Pending merges need to be committed or reverted before using switch."
4752
4753
#: bzrlib/builtins.py:6218
4754
msgid ""
4755
"The path to the branch to switch to can be specified relative to the parent\n"
4756
"directory of the current branch. For example, if you are currently in a\n"
4757
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4758
"/path/to/newbranch."
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."
4764
4765
#: bzrlib/builtins.py:6223
4766
msgid ""
4767
"Bound branches use the nickname of its master branch unless it is set\n"
4768
"locally, in which case switching will update the local nickname to be\n"
4769
"that of the master."
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."
4774
4775
#: bzrlib/builtins.py:6231
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6199
3946
msgid ""
3947
"The path to the branch to switch to can be specified relative to the parent\n"
3948
"directory of the current branch. For example, if you are currently in a\n"
3949
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3950
"/path/to/newbranch."
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6204
3954
msgid ""
3955
"Bound branches use the nickname of its master branch unless it is set\n"
3956
"locally, in which case switching will update the local nickname to be\n"
3957
"that of the master."
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6212
4776
3961
msgid "Switch even if local commits will be lost."
4777
msgstr "Switch even if local commits will be lost."
3962
msgstr ""
4778
3963
4779
#: bzrlib/builtins.py:6234
3964
#: bzrlib/builtins.py:6215
4780
3965
msgid "Create the target branch from this one before switching to it."
4781
msgstr "Create the target branch from this one before switching to it."
3966
msgstr ""
4782
3967
4783
#: bzrlib/builtins.py:6248
3968
#: bzrlib/builtins.py:6229
4784
3969
msgid "You must supply either a revision or a location"
4785
msgstr "You must supply either a revision or a location"
3970
msgstr ""
4786
3971
4787
#: bzrlib/builtins.py:6261
3972
#: bzrlib/builtins.py:6242
4788
3973
msgid "cannot create branch without source branch"
4789
msgstr "cannot create branch without source branch"
3974
msgstr ""
4790
3975
4791
#: bzrlib/builtins.py:6286
3976
#: bzrlib/builtins.py:6262
4792
3977
msgid "Manage filtered views."
4793
msgstr "Manage filtered views."
4794
4795
#: bzrlib/builtins.py:6288
4796
msgid ""
4797
"Views provide a mask over the tree so that users can focus on\n"
4798
"a subset of a tree when doing their work. After creating a view,\n"
4799
"commands that support a list of files - status, diff, commit, etc -\n"
4800
"effectively have that list of files implicitly given each time.\n"
4801
"An explicit list of files can still be given but those files\n"
4802
"must be within the current view."
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."
4810
4811
#: bzrlib/builtins.py:6295
4812
msgid ""
4813
"In most cases, a view has a short life-span: it is created to make\n"
4814
"a selected change and is deleted once that change is committed.\n"
4815
"At other times, you may wish to create one or more named views\n"
4816
"and switch between them."
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."
4822
4823
#: bzrlib/builtins.py:6300
4824
msgid ""
4825
"To disable the current view without deleting it, you can switch to\n"
4826
"the pseudo view called ``off``. This can be useful when you need\n"
4827
"to see the whole tree for an operation or two (e.g. merge) but\n"
4828
"want to switch back to your view after that."
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."
4834
4835
#: bzrlib/builtins.py:6305
4836
msgid ""
4837
":Examples:\n"
4838
" To define the current view::"
4839
msgstr ""
4840
":Examples:\n"
4841
" To define the current view::"
4842
4843
#: bzrlib/builtins.py:6308
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6264
3981
msgid ""
3982
"Views provide a mask over the tree so that users can focus on\n"
3983
"a subset of a tree when doing their work. After creating a view,\n"
3984
"commands that support a list of files - status, diff, commit, etc -\n"
3985
"effectively have that list of files implicitly given each time.\n"
3986
"An explicit list of files can still be given but those files\n"
3987
"must be within the current view."
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:6271
3991
msgid ""
3992
"In most cases, a view has a short life-span: it is created to make\n"
3993
"a selected change and is deleted once that change is committed.\n"
3994
"At other times, you may wish to create one or more named views\n"
3995
"and switch between them."
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6276
3999
msgid ""
4000
"To disable the current view without deleting it, you can switch to\n"
4001
"the pseudo view called ``off``. This can be useful when you need\n"
4002
"to see the whole tree for an operation or two (e.g. merge) but\n"
4003
"want to switch back to your view after that."
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6281
4007
msgid ""
4008
":Examples:\n"
4009
" To define the current view::"
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6284
4844
4013
msgid " bzr view file1 dir1 ..."
4845
msgstr " bzr view file1 dir1 ..."
4014
msgstr ""
4846
4015
4847
#: bzrlib/builtins.py:6310
4016
#: bzrlib/builtins.py:6286
4848
4017
msgid " To list the current view::"
4849
msgstr " To list the current view::"
4018
msgstr ""
4850
4019
4851
#: bzrlib/builtins.py:6312
4020
#: bzrlib/builtins.py:6288
4852
4021
msgid " bzr view"
4853
msgstr " bzr view"
4022
msgstr ""
4854
4023
4855
#: bzrlib/builtins.py:6314
4024
#: bzrlib/builtins.py:6290
4856
4025
msgid " To delete the current view::"
4857
msgstr " To delete the current view::"
4026
msgstr ""
4858
4027
4859
#: bzrlib/builtins.py:6316
4028
#: bzrlib/builtins.py:6292
4860
4029
msgid " bzr view --delete"
4861
msgstr " bzr view --delete"
4030
msgstr ""
4862
4031
4863
#: bzrlib/builtins.py:6318
4032
#: bzrlib/builtins.py:6294
4864
4033
msgid " To disable the current view without deleting it::"
4865
msgstr " To disable the current view without deleting it::"
4034
msgstr ""
4866
4035
4867
#: bzrlib/builtins.py:6320
4036
#: bzrlib/builtins.py:6296
4868
4037
msgid " bzr view --switch off"
4869
msgstr " bzr view --switch off"
4038
msgstr ""
4870
4039
4871
#: bzrlib/builtins.py:6322
4040
#: bzrlib/builtins.py:6298
4872
4041
msgid " To define a named view and switch to it::"
4873
msgstr " To define a named view and switch to it::"
4042
msgstr ""
4874
4043
4875
#: bzrlib/builtins.py:6324
4044
#: bzrlib/builtins.py:6300
4876
4045
msgid " bzr view --name view-name file1 dir1 ..."
4877
msgstr " bzr view --name view-name file1 dir1 ..."
4046
msgstr ""
4878
4047
4879
#: bzrlib/builtins.py:6326
4048
#: bzrlib/builtins.py:6302
4880
4049
msgid " To list a named view::"
4881
msgstr " To list a named view::"
4050
msgstr ""
4882
4051
4883
#: bzrlib/builtins.py:6328
4052
#: bzrlib/builtins.py:6304
4884
4053
msgid " bzr view --name view-name"
4885
msgstr " bzr view --name view-name"
4054
msgstr ""
4886
4055
4887
#: bzrlib/builtins.py:6330
4056
#: bzrlib/builtins.py:6306
4888
4057
msgid " To delete a named view::"
4889
msgstr " To delete a named view::"
4058
msgstr ""
4890
4059
4891
#: bzrlib/builtins.py:6332
4060
#: bzrlib/builtins.py:6308
4892
4061
msgid " bzr view --name view-name --delete"
4893
msgstr " bzr view --name view-name --delete"
4062
msgstr ""
4894
4063
4895
#: bzrlib/builtins.py:6334
4064
#: bzrlib/builtins.py:6310
4896
4065
msgid " To switch to a named view::"
4897
msgstr " To switch to a named view::"
4066
msgstr ""
4898
4067
4899
#: bzrlib/builtins.py:6336
4068
#: bzrlib/builtins.py:6312
4900
4069
msgid " bzr view --switch view-name"
4901
msgstr " bzr view --switch view-name"
4070
msgstr ""
4902
4071
4903
#: bzrlib/builtins.py:6338
4072
#: bzrlib/builtins.py:6314
4904
4073
msgid " To list all views defined::"
4905
msgstr " To list all views defined::"
4074
msgstr ""
4906
4075
4907
#: bzrlib/builtins.py:6340
4076
#: bzrlib/builtins.py:6316
4908
4077
msgid " bzr view --all"
4909
msgstr " bzr view --all"
4078
msgstr ""
4910
4079
4911
#: bzrlib/builtins.py:6342
4080
#: bzrlib/builtins.py:6318
4912
4081
msgid " To delete all views::"
4913
msgstr " To delete all views::"
4082
msgstr ""
4914
4083
4915
#: bzrlib/builtins.py:6344
4084
#: bzrlib/builtins.py:6320
4916
4085
msgid " bzr view --delete --all"
4917
msgstr " bzr view --delete --all"
4086
msgstr ""
4918
4087
4919
#: bzrlib/builtins.py:6351
4088
#: bzrlib/builtins.py:6327
4920
4089
msgid "Apply list or delete action to all views."
4921
msgstr "Apply list or delete action to all views."
4090
msgstr ""
4922
4091
4923
#: bzrlib/builtins.py:6354
4092
#: bzrlib/builtins.py:6330
4924
4093
msgid "Delete the view."
4925
msgstr "Delete the view."
4094
msgstr ""
4926
4095
4927
#: bzrlib/builtins.py:6357
4096
#: bzrlib/builtins.py:6333
4928
4097
msgid "Name of the view to define, list or delete."
4929
msgstr "Name of the view to define, list or delete."
4098
msgstr ""
4930
4099
4931
#: bzrlib/builtins.py:6361
4100
#: bzrlib/builtins.py:6337
4932
4101
msgid "Name of the view to switch to."
4933
msgstr "Name of the view to switch to."
4102
msgstr ""
4934
4103
4935
#: bzrlib/builtins.py:6380
4104
#: bzrlib/builtins.py:6356
4936
4105
msgid "Both --delete and a file list specified"
4937
msgstr "Both --delete and a file list specified"
4106
msgstr ""
4938
4107
4939
#: bzrlib/builtins.py:6383
4108
#: bzrlib/builtins.py:6359
4940
4109
msgid "Both --delete and --switch specified"
4941
msgstr "Both --delete and --switch specified"
4110
msgstr ""
4942
4111
4943
#: bzrlib/builtins.py:6386
4112
#: bzrlib/builtins.py:6362
4944
4113
msgid "Deleted all views.\n"
4945
msgstr "Deleted all views.\n"
4114
msgstr ""
4946
4115
4947
#: bzrlib/builtins.py:6388
4116
#: bzrlib/builtins.py:6364
4948
4117
msgid "No current view to delete"
4949
msgstr "No current view to delete"
4118
msgstr ""
4950
4119
4951
#: bzrlib/builtins.py:6391
4120
#: bzrlib/builtins.py:6367
4952
4121
#, python-format
4953
4122
msgid "Deleted '%s' view.\n"
4954
msgstr "Deleted '%s' view.\n"
4123
msgstr ""
4955
4124
4956
#: bzrlib/builtins.py:6395
4125
#: bzrlib/builtins.py:6371
4957
4126
msgid "Both --switch and a file list specified"
4958
msgstr "Both --switch and a file list specified"
4127
msgstr ""
4959
4128
4960
#: bzrlib/builtins.py:6398
4129
#: bzrlib/builtins.py:6374
4961
4130
msgid "Both --switch and --all specified"
4962
msgstr "Both --switch and --all specified"
4131
msgstr ""
4963
4132
4964
#: bzrlib/builtins.py:6401
4133
#: bzrlib/builtins.py:6377
4965
4134
msgid "No current view to disable"
4966
msgstr "No current view to disable"
4135
msgstr ""
4967
4136
4968
#: bzrlib/builtins.py:6403
4137
#: bzrlib/builtins.py:6379
4969
4138
#, python-format
4970
4139
msgid "Disabled '%s' view.\n"
4971
msgstr "Disabled '%s' view.\n"
4140
msgstr ""
4972
4141
4973
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4142
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4974
4143
msgid "Using '{0}' view: {1}\n"
4975
msgstr "Using '{0}' view: {1}\n"
4144
msgstr ""
4976
4145
4977
#: bzrlib/builtins.py:6410
4146
#: bzrlib/builtins.py:6386
4978
4147
msgid "Views defined:\n"
4979
msgstr "Views defined:\n"
4148
msgstr ""
4980
4149
4981
#: bzrlib/builtins.py:6419
4150
#: bzrlib/builtins.py:6395
4982
4151
msgid "No views defined.\n"
4983
msgstr "No views defined.\n"
4152
msgstr ""
4984
4153
4985
#: bzrlib/builtins.py:6426
4154
#: bzrlib/builtins.py:6402
4986
4155
msgid "Cannot change the 'off' pseudo view"
4987
msgstr "Cannot change the 'off' pseudo view"
4156
msgstr ""
4988
4157
4989
#: bzrlib/builtins.py:6434
4158
#: bzrlib/builtins.py:6410
4990
4159
msgid "No current view.\n"
4991
msgstr "No current view.\n"
4160
msgstr ""
4992
4161
4993
#: bzrlib/builtins.py:6437
4162
#: bzrlib/builtins.py:6413
4994
4163
msgid "'{0}' view is: {1}\n"
4995
msgstr "'{0}' view is: {1}\n"
4164
msgstr ""
4996
4165
4997
#: bzrlib/builtins.py:6457
4166
#: bzrlib/builtins.py:6433
4998
4167
msgid " <no hooks installed>\n"
4999
msgstr " <no hooks installed>\n"
4168
msgstr ""
5000
4169
5001
#: bzrlib/builtins.py:6461
4170
#: bzrlib/builtins.py:6437
5002
4171
msgid "Remove a branch."
5003
msgstr "Remove a branch."
4172
msgstr ""
5004
4173
5005
#: bzrlib/builtins.py:6463
4174
#: bzrlib/builtins.py:6439
5006
4175
msgid ""
5007
4176
"This will remove the branch from the specified location but \n"
5008
4177
"will keep any working tree or repository in place."
5009
4178
msgstr ""
5010
"This will remove the branch from the specified location but \n"
5011
"will keep any working tree or repository in place."
5012
4179
5013
#: bzrlib/builtins.py:6468
4180
#: bzrlib/builtins.py:6444
5014
4181
msgid " Remove the branch at repo/trunk::"
5015
msgstr " Remove the branch at repo/trunk::"
4182
msgstr ""
5016
4183
5017
#: bzrlib/builtins.py:6470
4184
#: bzrlib/builtins.py:6446
5018
4185
msgid " bzr remove-branch repo/trunk"
5019
msgstr " bzr remove-branch repo/trunk"
5020
5021
#: bzrlib/builtins.py:6477
5022
msgid "Remove branch even if it is the active branch."
5023
msgstr "Remove branch even if it is the active branch."
5024
5025
#: bzrlib/builtins.py:6491
5026
msgid "Branch is active. Use --force to remove it."
5027
msgstr "Branch is active. Use --force to remove it."
5028
5029
#: bzrlib/builtins.py:6495
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6461
5030
4189
msgid "Plaintext diff output."
5031
msgstr "Plaintext diff output."
4190
msgstr ""
5032
4191
5033
#: bzrlib/builtins.py:6496
4192
#: bzrlib/builtins.py:6462
5034
4193
msgid "Temporarily set aside some changes from the current tree."
5035
msgstr "Temporarily set aside some changes from the current tree."
4194
msgstr ""
5036
4195
5037
#: bzrlib/builtins.py:6498
4196
#: bzrlib/builtins.py:6464
5038
4197
msgid ""
5039
4198
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
5040
4199
"ie. out of the way, until a later time when you can bring them back from\n"
5042
4201
"your working tree, and so they aren't propagated along with your branch nor\n"
5043
4202
"will they survive its deletion."
5044
4203
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."
5050
4204
5051
#: bzrlib/builtins.py:6504
4205
#: bzrlib/builtins.py:6470
5052
4206
msgid "If shelve --list is specified, previously-shelved changes are listed."
5053
4207
msgstr ""
5054
"If shelve --list is specified, previously-shelved changes are listed."
5055
5056
#: bzrlib/builtins.py:6506
5057
msgid ""
5058
"Shelve is intended to help separate several sets of changes that have\n"
5059
"been inappropriately mingled. If you just want to get rid of all changes\n"
5060
"and you don't need to restore them later, use revert. If you want to\n"
5061
"shelve all text changes at once, use shelve --all."
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."
5067
5068
#: bzrlib/builtins.py:6511
5069
msgid ""
5070
"If filenames are specified, only the changes to those files will be\n"
5071
"shelved. Other files will be left untouched."
5072
msgstr ""
5073
"If filenames are specified, only the changes to those files will be\n"
5074
"shelved. Other files will be left untouched."
5075
5076
#: bzrlib/builtins.py:6514
5077
msgid ""
5078
"If a revision is specified, changes since that revision will be shelved."
5079
msgstr ""
5080
"If a revision is specified, changes since that revision will be shelved."
5081
5082
#: bzrlib/builtins.py:6516
5083
msgid ""
5084
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
5085
"restore the most recently shelved changes."
5086
msgstr ""
5087
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
5088
"restore the most recently shelved changes."
5089
5090
#: bzrlib/builtins.py:6519
5091
msgid ""
5092
"For complicated changes, it is possible to edit the changes in a separate\n"
5093
"editor program to decide what the file remaining in the working copy\n"
5094
"should look like. To do this, add the configuration option"
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"
5099
5100
#: bzrlib/builtins.py:6523
4208
4209
#: bzrlib/builtins.py:6472
4210
msgid ""
4211
"Shelve is intended to help separate several sets of changes that have\n"
4212
"been inappropriately mingled. If you just want to get rid of all changes\n"
4213
"and you don't need to restore them later, use revert. If you want to\n"
4214
"shelve all text changes at once, use shelve --all."
4215
msgstr ""
4216
4217
#: bzrlib/builtins.py:6477
4218
msgid ""
4219
"If filenames are specified, only the changes to those files will be\n"
4220
"shelved. Other files will be left untouched."
4221
msgstr ""
4222
4223
#: bzrlib/builtins.py:6480
4224
msgid ""
4225
"If a revision is specified, changes since that revision will be shelved."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6482
4229
msgid ""
4230
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4231
"restore the most recently shelved changes."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6485
4235
msgid ""
4236
"For complicated changes, it is possible to edit the changes in a separate\n"
4237
"editor program to decide what the file remaining in the working copy\n"
4238
"should look like. To do this, add the configuration option"
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6489
5101
4242
msgid " change_editor = PROGRAM @new_path @old_path"
5102
msgstr " change_editor = PROGRAM @new_path @old_path"
4243
msgstr ""
5103
4244
5104
#: bzrlib/builtins.py:6525
4245
#: bzrlib/builtins.py:6491
5105
4246
msgid ""
5106
4247
"where @new_path is replaced with the path of the new version of the \n"
5107
4248
"file and @old_path is replaced with the path of the old version of \n"
5109
4250
"contents of the file in the working tree.\n"
5110
4251
" "
5111
4252
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
" "
5117
4253
5118
#: bzrlib/builtins.py:6537
4254
#: bzrlib/builtins.py:6503
5119
4255
msgid "Shelve all changes."
5120
msgstr "Shelve all changes."
4256
msgstr ""
5121
4257
5122
#: bzrlib/builtins.py:6539
4258
#: bzrlib/builtins.py:6505
5123
4259
msgid "Method to use for writing diffs."
5124
msgstr "Method to use for writing diffs."
4260
msgstr ""
5125
4261
5126
#: bzrlib/builtins.py:6539
4262
#: bzrlib/builtins.py:6505
5127
4263
msgid "writer"
5128
msgstr "writer"
4264
msgstr ""
5129
4265
5130
#: bzrlib/builtins.py:6543
4266
#: bzrlib/builtins.py:6509
5131
4267
msgid "List shelved changes."
5132
msgstr "List shelved changes."
4268
msgstr ""
5133
4269
5134
#: bzrlib/builtins.py:6545
4270
#: bzrlib/builtins.py:6511
5135
4271
msgid "Destroy removed changes instead of shelving them."
5136
msgstr "Destroy removed changes instead of shelving them."
4272
msgstr ""
5137
4273
5138
#: bzrlib/builtins.py:6574
4274
#: bzrlib/builtins.py:6540
5139
4275
msgid "No shelved changes."
5140
msgstr "No shelved changes."
4276
msgstr ""
5141
4277
5142
#: bzrlib/builtins.py:6585
4278
#: bzrlib/builtins.py:6551
5143
4279
msgid "Restore shelved changes."
5144
msgstr "Restore shelved changes."
4280
msgstr ""
5145
4281
5146
#: bzrlib/builtins.py:6587
4282
#: bzrlib/builtins.py:6553
5147
4283
msgid ""
5148
4284
"By default, the most recently shelved changes are restored. However if you\n"
5149
4285
"specify a shelf by id those changes will be restored instead. This works\n"
5150
4286
"best when the changes don't depend on each other."
5151
4287
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."
5155
4288
5156
#: bzrlib/builtins.py:6596
4289
#: bzrlib/builtins.py:6562
5157
4290
msgid "The action to perform."
5158
msgstr "The action to perform."
4291
msgstr ""
5159
4292
5160
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4293
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
5161
4294
msgid "action"
5162
msgstr "action"
4295
msgstr ""
5163
4296
5164
#: bzrlib/builtins.py:6598
4297
#: bzrlib/builtins.py:6564
5165
4298
msgid "Apply changes and remove from the shelf."
5166
msgstr "Apply changes and remove from the shelf."
4299
msgstr ""
5167
4300
5168
#: bzrlib/builtins.py:6599
4301
#: bzrlib/builtins.py:6565
5169
4302
msgid "Show changes, but do not apply or remove them."
5170
msgstr "Show changes, but do not apply or remove them."
4303
msgstr ""
5171
4304
5172
#: bzrlib/builtins.py:6600
4305
#: bzrlib/builtins.py:6566
5173
4306
msgid ""
5174
4307
"Instead of unshelving the changes, show the diff that would result from "
5175
4308
"unshelving."
5176
4309
msgstr ""
5177
"Instead of unshelving the changes, show the diff that would result from "
5178
"unshelving."
5179
4310
5180
#: bzrlib/builtins.py:6602
4311
#: bzrlib/builtins.py:6568
5181
4312
msgid "Delete changes without applying them."
5182
msgstr "Delete changes without applying them."
4313
msgstr ""
5183
4314
5184
#: bzrlib/builtins.py:6603
4315
#: bzrlib/builtins.py:6569
5185
4316
msgid "Apply changes but don't delete them."
5186
msgstr "Apply changes but don't delete them."
4317
msgstr ""
5187
4318
5188
#: bzrlib/builtins.py:6618
4319
#: bzrlib/builtins.py:6584
5189
4320
msgid "Remove unwanted files from working tree."
5190
msgstr "Remove unwanted files from working tree."
5191
5192
#: bzrlib/builtins.py:6620
5193
msgid ""
5194
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
5195
"files are never deleted."
5196
msgstr ""
5197
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
5198
"files are never deleted."
5199
5200
#: bzrlib/builtins.py:6623
5201
msgid ""
5202
"Another class is 'detritus', which includes files emitted by bzr during\n"
5203
"normal operations and selftests. (The value of these files decreases with\n"
5204
"time.)"
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.)"
5209
5210
#: bzrlib/builtins.py:6627
5211
msgid ""
5212
"If no options are specified, unknown files are deleted. Otherwise, option\n"
5213
"flags are respected, and may be combined."
5214
msgstr ""
5215
"If no options are specified, unknown files are deleted. Otherwise, option\n"
5216
"flags are respected, and may be combined."
5217
5218
#: bzrlib/builtins.py:6630
4321
msgstr ""
4322
4323
#: bzrlib/builtins.py:6586
4324
msgid ""
4325
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4326
"files are never deleted."
4327
msgstr ""
4328
4329
#: bzrlib/builtins.py:6589
4330
msgid ""
4331
"Another class is 'detritus', which includes files emitted by bzr during\n"
4332
"normal operations and selftests. (The value of these files decreases with\n"
4333
"time.)"
4334
msgstr ""
4335
4336
#: bzrlib/builtins.py:6593
4337
msgid ""
4338
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4339
"flags are respected, and may be combined."
4340
msgstr ""
4341
4342
#: bzrlib/builtins.py:6596
5219
4343
msgid "To check what clean-tree will do, use --dry-run."
5220
msgstr "To check what clean-tree will do, use --dry-run."
4344
msgstr ""
5221
4345
5222
#: bzrlib/builtins.py:6633
4346
#: bzrlib/builtins.py:6599
5223
4347
msgid "Delete all ignored files."
5224
msgstr "Delete all ignored files."
4348
msgstr ""
5225
4349
5226
#: bzrlib/builtins.py:6634
4350
#: bzrlib/builtins.py:6600
5227
4351
msgid ""
5228
4352
"Delete conflict files, merge and revert backups, and failed selftest dirs."
5229
4353
msgstr ""
5230
"Delete conflict files, merge and revert backups, and failed selftest dirs."
5231
4354
5232
#: bzrlib/builtins.py:6637
4355
#: bzrlib/builtins.py:6603
5233
4356
msgid "Delete files unknown to bzr (default)."
5234
msgstr "Delete files unknown to bzr (default)."
4357
msgstr ""
5235
4358
5236
#: bzrlib/builtins.py:6638
4359
#: bzrlib/builtins.py:6604
5237
4360
msgid "Show files to delete instead of deleting them."
5238
msgstr "Show files to delete instead of deleting them."
4361
msgstr ""
5239
4362
5240
#: bzrlib/builtins.py:6640
4363
#: bzrlib/builtins.py:6606
5241
4364
msgid "Do not prompt before deleting."
5242
msgstr "Do not prompt before deleting."
4365
msgstr ""
5243
4366
5244
4367
#: bzrlib/bundle/__init__.py:59
5245
4368
msgid "A directory cannot be a bundle"
5246
msgstr "A directory cannot be a bundle"
4369
msgstr ""
5247
4370
5248
4371
#: bzrlib/bundle/apply_bundle.py:40
5249
4372
msgid "Install revisions"
5250
msgstr "Install revisions"
4373
msgstr ""
5251
4374
5252
4375
#: bzrlib/bundle/commands.py:64
5253
4376
msgid "--verbose requires a merge directive"
5254
msgstr "--verbose requires a merge directive"
4377
msgstr ""
5255
4378
5256
4379
#: bzrlib/bundle/commands.py:67
5257
4380
msgid "Bundle format not supported"
5258
msgstr "Bundle format not supported"
4381
msgstr ""
5259
4382
5260
4383
#: bzrlib/bundle/commands.py:77
5261
4384
msgid "Records\n"
5262
msgstr "Records\n"
4385
msgstr ""
5263
4386
5264
4387
#: bzrlib/bundle/commands.py:81
5265
4388
msgid "{0}: {1} ({2} multiparent)\n"
5266
msgstr "{0}: {1} ({2} multiparent)\n"
4389
msgstr ""
5267
4390
5268
4391
#: bzrlib/bundle/commands.py:83
5269
4392
#, python-format
5270
4393
msgid "unique files: %d\n"
5271
msgstr "unique files: %d\n"
4394
msgstr ""
5272
4395
5273
4396
#: bzrlib/bundle/commands.py:92
5274
4397
msgid "Revisions\n"
5275
msgstr "Revisions\n"
4398
msgstr ""
5276
4399
5277
4400
#: bzrlib/bundle/commands.py:93
5278
4401
#, python-format
5279
4402
msgid "nicks: %s\n"
5280
msgstr "nicks: %s\n"
4403
msgstr ""
5281
4404
5282
4405
#: bzrlib/bundle/commands.py:95
5283
4406
#, python-format
5285
4408
"committers: \n"
5286
4409
"%s\n"
5287
4410
msgstr ""
5288
"committers: \n"
5289
"%s\n"
5290
4411
5291
4412
#: bzrlib/bundle/commands.py:103
5292
4413
msgid "Decoded contents\n"
5293
msgstr "Decoded contents\n"
4414
msgstr ""
5294
4415
5295
4416
#: bzrlib/bundle/serializer/v4.py:327
5296
4417
#, python-format
5297
4418
msgid "Bundling %d revision."
5298
4419
msgid_plural "Bundling %d revisions."
5299
msgstr[0] "Bundling %d revision."
5300
msgstr[1] "Bundling %d revisions."
4420
msgstr[0] ""
4421
msgstr[1] ""
5301
4422
5302
#: bzrlib/bzrdir.py:487
4423
#: bzrlib/bzrdir.py:490
5303
4424
msgid ""
5304
4425
"making backup of {0}\n"
5305
4426
" to {1}"
5306
4427
msgstr ""
5307
"making backup of {0}\n"
5308
" to {1}"
5309
4428
5310
#: bzrlib/bzrdir.py:510
4429
#: bzrlib/bzrdir.py:513
5311
4430
msgid "renamed {0} to {1}"
5312
msgstr "renamed {0} to {1}"
5313
5314
#: bzrlib/bzrdir.py:1639
5315
#, python-format
5316
msgid ""
5317
"Source repository format does not support stacking, using format:\n"
5318
" %s"
5319
msgstr ""
5320
"Source repository format does not support stacking, using format:\n"
5321
" %s"
5322
5323
#: bzrlib/bzrdir.py:1659
5324
#, python-format
5325
msgid ""
5326
"Source branch format does not support stacking, using format:\n"
5327
" %s"
5328
msgstr ""
5329
"Source branch format does not support stacking, using format:\n"
5330
" %s"
5331
5332
#: bzrlib/bzrdir.py:1805
4431
msgstr ""
4432
4433
#: bzrlib/bzrdir.py:1652
4434
#, python-format
4435
msgid ""
4436
"Source repository format does not support stacking, using format:\n"
4437
" %s"
4438
msgstr ""
4439
4440
#: bzrlib/bzrdir.py:1672
4441
#, python-format
4442
msgid ""
4443
"Source branch format does not support stacking, using format:\n"
4444
" %s"
4445
msgstr ""
4446
4447
#: bzrlib/bzrdir.py:1818
5333
4448
msgid "starting repository conversion"
5334
msgstr "starting repository conversion"
4449
msgstr ""
5335
4450
5336
#: bzrlib/bzrdir.py:2026
4451
#: bzrlib/bzrdir.py:2039
5337
4452
msgid "Using default stacking branch {0} at {1}"
5338
msgstr "Using default stacking branch {0} at {1}"
4453
msgstr ""
5339
4454
5340
4455
#: bzrlib/check.py:108
5341
4456
msgid "check"
5342
msgstr "check"
4457
msgstr ""
5343
4458
5344
4459
#: bzrlib/check.py:110
5345
4460
msgid "checking revisions"
5346
msgstr "checking revisions"
4461
msgstr ""
5347
4462
5348
4463
#: bzrlib/check.py:112
5349
4464
msgid "checking commit contents"
5350
msgstr "checking commit contents"
4465
msgstr ""
5351
4466
5352
4467
#: bzrlib/check.py:114
5353
4468
msgid "checking file graphs"
5354
msgstr "checking file graphs"
4469
msgstr ""
5355
4470
5356
4471
#: bzrlib/check.py:118
5357
4472
msgid "checking branches and trees"
5358
msgstr "checking branches and trees"
4473
msgstr ""
5359
4474
5360
4475
#: bzrlib/check.py:205
5361
4476
msgid "checked repository {0} format {1}"
5362
msgstr "checked repository {0} format {1}"
4477
msgstr ""
5363
4478
5364
4479
#: bzrlib/check.py:208
5365
4480
#, python-format
5366
4481
msgid "%6d revisions"
5367
msgstr "%6d revisions"
4482
msgstr ""
5368
4483
5369
4484
#: bzrlib/check.py:209
5370
4485
#, python-format
5371
4486
msgid "%6d file-ids"
5372
msgstr "%6d file-ids"
4487
msgstr ""
5373
4488
5374
4489
#: bzrlib/check.py:211
5375
4490
#, python-format
5376
4491
msgid "%6d unreferenced text versions"
5377
msgstr "%6d unreferenced text versions"
4492
msgstr ""
5378
4493
5379
4494
#: bzrlib/check.py:215
5380
4495
msgid "unreferenced version: {{{0}}} in {1}"
5381
msgstr "unreferenced version: {{{0}}} in {1}"
4496
msgstr ""
5382
4497
5383
4498
#: bzrlib/check.py:218
5384
4499
#, python-format
5385
4500
msgid "%6d revisions are missing inventory_sha1"
5386
msgstr "%6d revisions are missing inventory_sha1"
4501
msgstr ""
5387
4502
5388
4503
#: bzrlib/check.py:221
5389
4504
#, python-format
5390
4505
msgid "%6d revisions are mentioned but not present"
5391
msgstr "%6d revisions are mentioned but not present"
4506
msgstr ""
5392
4507
5393
4508
#: bzrlib/check.py:224
5394
4509
#, python-format
5395
4510
msgid "%6d ghost revisions"
5396
msgstr "%6d ghost revisions"
4511
msgstr ""
5397
4512
5398
4513
#: bzrlib/check.py:229
5399
4514
#, python-format
5400
4515
msgid "%6d revisions missing parents in ancestry"
5401
msgstr "%6d revisions missing parents in ancestry"
4516
msgstr ""
5402
4517
5403
4518
#: bzrlib/check.py:233
5404
4519
#, python-format
5405
4520
msgid " %s should be in the ancestry for:"
5406
msgstr " %s should be in the ancestry for:"
4521
msgstr ""
5407
4522
5408
4523
#: bzrlib/check.py:237
5409
4524
#, python-format
5410
4525
msgid "%6d inconsistent parents"
5411
msgstr "%6d inconsistent parents"
4526
msgstr ""
5412
4527
5413
4528
#: bzrlib/check.py:241
5414
4529
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
5415
msgstr " * {0} version {1} has parents {2!r} but should have {3!r}"
4530
msgstr ""
5416
4531
5417
4532
#: bzrlib/check.py:247
5418
4533
#, python-format
5419
4534
msgid "%6d revisions have incorrect parents in the revision index"
5420
msgstr "%6d revisions have incorrect parents in the revision index"
4535
msgstr ""
5421
4536
5422
4537
#: bzrlib/check.py:253
5423
4538
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
5424
msgstr " {0} has wrong parents in index: {1!r} should be {2!r}"
4539
msgstr ""
5425
4540
5426
4541
#: bzrlib/check.py:267
5427
4542
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
5428
msgstr "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4543
msgstr ""
5429
4544
5430
4545
#: bzrlib/check.py:296
5431
4546
msgid ""
5432
4547
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5433
4548
"{{{4}}}"
5434
4549
msgstr ""
5435
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5436
"{{{4}}}"
5437
4550
5438
4551
#: bzrlib/check.py:354
5439
4552
#, python-format
5440
4553
msgid "Checking branch at '%s'."
5441
msgstr "Checking branch at '%s'."
4554
msgstr ""
5442
4555
5443
4556
#: bzrlib/check.py:374
5444
4557
#, python-format
5445
4558
msgid "Checking working tree at '%s'."
5446
msgstr "Checking working tree at '%s'."
4559
msgstr ""
5447
4560
5448
4561
#: bzrlib/check.py:427 bzrlib/check.py:441
5449
4562
msgid "No branch found at specified location."
5450
msgstr "No branch found at specified location."
4563
msgstr ""
5451
4564
5452
4565
#: bzrlib/check.py:429 bzrlib/check.py:439
5453
4566
msgid "No working tree found at specified location."
5454
msgstr "No working tree found at specified location."
4567
msgstr ""
5455
4568
5456
4569
#: bzrlib/check.py:432
5457
4570
#, python-format
5458
4571
msgid "Checking repository at '%s'."
5459
msgstr "Checking repository at '%s'."
4572
msgstr ""
5460
4573
5461
4574
#: bzrlib/check.py:443
5462
4575
msgid "No repository found at specified location."
5463
msgstr "No repository found at specified location."
4576
msgstr ""
5464
4577
5465
4578
#: bzrlib/clean_tree.py:63
5466
4579
msgid "Nothing to delete."
5467
msgstr "Nothing to delete."
4580
msgstr ""
5468
4581
5469
4582
#: bzrlib/clean_tree.py:68
5470
4583
msgid "Are you sure you wish to delete these"
5471
msgstr "Are you sure you wish to delete these"
4584
msgstr ""
5472
4585
5473
4586
#: bzrlib/clean_tree.py:70
5474
4587
msgid "Canceled"
5475
msgstr "Cancelled"
4588
msgstr ""
5476
4589
5477
4590
#: bzrlib/clean_tree.py:107
5478
4591
#, python-format
5479
4592
msgid "unable to remove %s"
5480
msgstr "unable to remove %s"
4593
msgstr ""
5481
4594
5482
4595
#: bzrlib/clean_tree.py:111
5483
4596
msgid "deleting paths:"
5484
msgstr "deleting paths:"
4597
msgstr ""
5485
4598
5486
4599
#: bzrlib/clean_tree.py:125
5487
4600
msgid "unable to remove \"{0}\": {1}."
5488
msgstr "unable to remove \"{0}\": {1}."
4601
msgstr ""
5489
4602
5490
4603
#: bzrlib/clean_tree.py:130
5491
4604
msgid "No files deleted."
5492
msgstr "No files deleted."
4605
msgstr ""
5493
4606
5494
4607
#: bzrlib/cmd_version_info.py:47
5495
4608
msgid "No known version info format {0}. Supported types are: {1}"
5496
msgstr "No known version info format {0}. Supported types are: {1}"
4609
msgstr ""
5497
4610
5498
4611
#: bzrlib/cmd_version_info.py:52
5499
4612
msgid "Version info in Custom template-based format."
5500
msgstr "Version info in Custom template-based format."
4613
msgstr ""
5501
4614
5502
4615
#: bzrlib/cmd_version_info.py:52
5503
4616
msgid "Version info in Python format."
5504
msgstr "Version info in Python format."
4617
msgstr ""
5505
4618
5506
4619
#: bzrlib/cmd_version_info.py:52
5507
4620
msgid "Version info in RIO (simple text) format (default)."
5508
msgstr "Version info in RIO (simple text) format (default)."
4621
msgstr ""
5509
4622
5510
4623
#: bzrlib/cmd_version_info.py:53
5511
4624
msgid "Show version information about this tree."
5512
msgstr "Show version information about this tree."
4625
msgstr ""
5513
4626
5514
4627
#: bzrlib/cmd_version_info.py:55
5515
4628
msgid ""
5517
4630
"source code of an application. The output can be in one of the\n"
5518
4631
"supported formats or in a custom format based on a template."
5519
4632
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."
5523
4633
5524
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5525
#: en/help_topics/configuration.txt:722
4634
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4635
#: en/help_topics/configuration.txt:710
5526
4636
msgid "For example::"
5527
msgstr "For example::"
4637
msgstr ""
5528
4638
5529
4639
#: bzrlib/cmd_version_info.py:61
5530
4640
msgid ""
5531
4641
" bzr version-info --custom \\\n"
5532
4642
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5533
4643
msgstr ""
5534
" bzr version-info --custom \\\n"
5535
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5536
4644
5537
4645
#: bzrlib/cmd_version_info.py:64
5538
4646
msgid ""
5539
4647
"will produce a C header file with formatted string containing the\n"
5540
4648
"current revision number. Other supported variables in templates are:"
5541
4649
msgstr ""
5542
"will produce a C header file with formatted string containing the\n"
5543
"current revision number. Other supported variables in templates are:"
5544
4650
5545
4651
#: bzrlib/cmd_version_info.py:67
5546
4652
msgid ""
5552
4658
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5553
4659
" otherwise 1"
5554
4660
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"
5562
4661
5563
4662
#: bzrlib/cmd_version_info.py:77
5564
4663
msgid "Select the output format."
5565
msgstr "Select the output format."
4664
msgstr ""
5566
4665
5567
4666
#: bzrlib/cmd_version_info.py:81
5568
4667
msgid "Include all possible information."
5569
msgstr "Include all possible information."
4668
msgstr ""
5570
4669
5571
4670
#: bzrlib/cmd_version_info.py:82
5572
4671
msgid "Check if tree is clean."
5573
msgstr "Check if tree is clean."
4672
msgstr ""
5574
4673
5575
4674
#: bzrlib/cmd_version_info.py:84
5576
4675
msgid "Include the revision-history."
5577
msgstr "Include the revision-history."
4676
msgstr ""
5578
4677
5579
4678
#: bzrlib/cmd_version_info.py:86
5580
4679
msgid "Include the last revision for each file."
5581
msgstr "Include the last revision for each file."
4680
msgstr ""
5582
4681
5583
4682
#: bzrlib/cmd_version_info.py:87
5584
4683
msgid "Template for the output."
5585
msgstr "Template for the output."
4684
msgstr ""
5586
4685
5587
4686
#: bzrlib/cmd_version_info.py:101
5588
4687
msgid "bzr version-info --revision takes exactly one revision specifier"
5589
msgstr "bzr version-info --revision takes exactly one revision specifier"
4688
msgstr ""
5590
4689
5591
4690
#: bzrlib/commands.py:229
5592
4691
#, python-format
5593
4692
msgid "unknown command \"%s\""
5594
msgstr "unknown command \"%s\""
4693
msgstr ""
5595
4694
5596
4695
#: bzrlib/commands.py:476
5597
4696
msgid "No help for this command."
5598
msgstr "No help for this command."
4697
msgstr ""
5599
4698
5600
4699
#: bzrlib/commands.py:489
5601
4700
#, python-format
5602
4701
msgid ":Purpose: %s\n"
5603
msgstr ":Purpose: %s\n"
4702
msgstr ""
5604
4703
5605
4704
#: bzrlib/commands.py:491
5606
4705
#, python-format
5608
4707
":Usage:\n"
5609
4708
"%s\n"
5610
4709
msgstr ""
5611
":Usage:\n"
5612
"%s\n"
5613
4710
5614
4711
#: bzrlib/commands.py:493
5615
4712
#, python-format
5616
4713
msgid ":Usage: %s\n"
5617
msgstr ":Usage: %s\n"
4714
msgstr ""
5618
4715
5619
4716
#: bzrlib/commands.py:512
5620
4717
#, python-format
5621
4718
msgid ":Options:%s"
5622
msgstr ":Options:%s"
4719
msgstr ""
5623
4720
5624
4721
#: bzrlib/commands.py:523
5625
4722
#, python-format
5628
4725
" %s\n"
5629
4726
"\n"
5630
4727
msgstr ""
5631
":Description:\n"
5632
" %s\n"
5633
"\n"
5634
4728
5635
4729
#: bzrlib/commands.py:533
5636
4730
#, python-format
5638
4732
"See bzr help %s for more details and examples.\n"
5639
4733
"\n"
5640
4734
msgstr ""
5641
"See bzr help %s for more details and examples.\n"
5642
"\n"
5643
4735
5644
4736
#: bzrlib/commands.py:538
5645
4737
msgid ":Aliases: "
5646
msgstr ":Aliases: "
4738
msgstr ""
5647
4739
5648
4740
#: bzrlib/commands.py:542
5649
4741
#, python-format
5650
4742
msgid ":From: plugin \"%s\"\n"
5651
msgstr ":From: plugin \"%s\"\n"
4743
msgstr ""
5652
4744
5653
4745
#: bzrlib/commands.py:554
5654
4746
msgid ":doc:`{0} <{1}-help>`"
5655
msgstr ":doc:`{0} <{1}-help>`"
4747
msgstr ""
5656
4748
5657
4749
#: bzrlib/commands.py:558
5658
4750
#, python-format
5659
4751
msgid ":See also: %s"
5660
msgstr ":See also: %s"
4752
msgstr ""
5661
4753
5662
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4754
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5663
4755
msgid "Only ASCII permitted in option names"
5664
msgstr "Only ASCII permitted in option names"
4756
msgstr ""
5665
4757
5666
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4758
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5667
4759
msgid "command {0!r} needs one or more {1}"
5668
msgstr "command {0!r} needs one or more {1}"
4760
msgstr ""
5669
4761
5670
#: bzrlib/commands.py:868
4762
#: bzrlib/commands.py:858
5671
4763
msgid "command {0!r} requires argument {1}"
5672
msgstr "command {0!r} requires argument {1}"
4764
msgstr ""
5673
4765
5674
#: bzrlib/commands.py:875
4766
#: bzrlib/commands.py:865
5675
4767
msgid "extra argument to command {0}: {1}"
5676
msgstr "extra argument to command {0}: {1}"
4768
msgstr ""
5677
4769
5678
#: bzrlib/commands.py:972
4770
#: bzrlib/commands.py:962
5679
4771
#, python-format
5680
4772
msgid "Profile data written to \"%s\"."
5681
msgstr "Profile data written to \"%s\"."
4773
msgstr ""
5682
4774
5683
4775
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5684
4776
msgid "added"
5685
msgstr "added"
4777
msgstr ""
5686
4778
5687
4779
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5688
4780
msgid "modified"
5689
msgstr "modified"
4781
msgstr ""
5690
4782
5691
4783
#: bzrlib/commit.py:131
5692
4784
#, python-format
5693
4785
msgid "Committing%s"
5694
msgstr "Committing%s"
4786
msgstr ""
5695
4787
5696
4788
#: bzrlib/commit.py:134
5697
4789
#, python-format
5698
4790
msgid "Committed revision %d."
5699
msgstr "Committed revision %d."
4791
msgstr ""
5700
4792
5701
4793
#: bzrlib/commit.py:143
5702
4794
#, python-format
5703
4795
msgid "deleted %s"
5704
msgstr "deleted %s"
4796
msgstr ""
5705
4797
5706
4798
#: bzrlib/commit.py:146
5707
4799
#, python-format
5708
4800
msgid "missing %s"
5709
msgstr "missing %s"
4801
msgstr ""
5710
4802
5711
4803
#: bzrlib/commit.py:511
5712
4804
msgid ""
5713
4805
"Conflicting tags in bound branch:\n"
5714
4806
"{0}"
5715
4807
msgstr ""
5716
"Conflicting tags in bound branch:\n"
5717
"{0}"
5718
4808
5719
4809
#: bzrlib/commit.py:742
5720
4810
msgid "renamed"
5721
msgstr "renamed"
4811
msgstr ""
5722
4812
5723
#: bzrlib/commit.py:976
4813
#: bzrlib/commit.py:977
5724
4814
msgid "unchanged"
5725
msgstr "unchanged"
4815
msgstr ""
5726
4816
5727
#: bzrlib/commit.py:998
4817
#: bzrlib/commit.py:999
5728
4818
msgid "{0} [{1}] - Stage"
5729
msgstr "{0} [{1}] - Stage"
4819
msgstr ""
5730
4820
5731
#: bzrlib/commit.py:1001
4821
#: bzrlib/commit.py:1002
5732
4822
#, python-format
5733
4823
msgid "%s - Stage"
5734
msgstr "%s - Stage"
4824
msgstr ""
5735
4825
5736
#: bzrlib/commit_signature_commands.py:34
4826
#: bzrlib/commit_signature_commands.py:36
5737
4827
msgid "Sign all commits by a given committer."
5738
msgstr "Sign all commits by a given committer."
4828
msgstr ""
5739
4829
5740
#: bzrlib/commit_signature_commands.py:36
4830
#: bzrlib/commit_signature_commands.py:38
5741
4831
msgid ""
5742
4832
"If location is not specified the local tree is used.\n"
5743
4833
"If committer is not specified the default committer is used."
5744
4834
msgstr ""
5745
"If location is not specified the local tree is used.\n"
5746
"If committer is not specified the default committer is used."
5747
4835
5748
#: bzrlib/commit_signature_commands.py:39
4836
#: bzrlib/commit_signature_commands.py:41
5749
4837
msgid "This does not sign commits that already have signatures."
5750
msgstr "This does not sign commits that already have signatures."
4838
msgstr ""
5751
4839
5752
#: bzrlib/commit_signature_commands.py:47
4840
#: bzrlib/commit_signature_commands.py:49
5753
4841
msgid ""
5754
4842
"Don't actually sign anything, just print the revisions that would be signed."
5755
4843
msgstr ""
5756
"Don't actually sign anything, just print the revisions that would be signed."
5757
5758
#: bzrlib/commit_signature_commands.py:98
5759
#, python-format
5760
msgid "Signed %d revision.\n"
5761
msgid_plural "Signed %d revisions.\n"
5762
msgstr[0] "Signed %d revision.\n"
5763
msgstr[1] "Signed %d revisions.\n"
5764
4844
5765
4845
#: bzrlib/commit_signature_commands.py:103
5766
4846
msgid "Verify all commit signatures."
5767
msgstr "Verify all commit signatures."
4847
msgstr ""
5768
4848
5769
4849
#: bzrlib/commit_signature_commands.py:105
5770
4850
msgid ""
5771
4851
"Verifies that all commits in the branch are signed by known GnuPG keys."
5772
4852
msgstr ""
5773
"Verifies that all commits in the branch are signed by known GnuPG keys."
5774
4853
5775
4854
#: bzrlib/commit_signature_commands.py:110
5776
4855
msgid ""
5777
4856
"Comma separated list of GPG key patterns which are acceptable for "
5778
4857
"verification."
5779
4858
msgstr ""
5780
"Comma separated list of GPG key patterns which are acceptable for "
5781
"verification."
5782
4859
5783
#: bzrlib/commit_signature_commands.py:148
4860
#: bzrlib/commit_signature_commands.py:147
5784
4861
msgid "Cannot verify a range of non-revision-history revisions"
5785
msgstr "Cannot verify a range of non-revision-history revisions"
4862
msgstr ""
5786
4863
5787
#: bzrlib/commit_signature_commands.py:166
4864
#: bzrlib/commit_signature_commands.py:168
5788
4865
msgid "All commits signed with verifiable keys"
5789
msgstr "All commits signed with verifiable keys"
4866
msgstr ""
5790
4867
5791
#: bzrlib/config.py:436
4868
#: bzrlib/config.py:475
5792
4869
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5793
msgstr "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4870
msgstr ""
5794
4871
5795
#: bzrlib/config.py:2452
4872
#: bzrlib/config.py:2485
5796
4873
msgid "{0} is not an SI unit."
5797
4874
msgstr "{0} is not an SI unit."
5798
4875
5799
#: bzrlib/config.py:2971
4876
#: bzrlib/config.py:2949
5800
4877
msgid ""
5801
4878
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5802
4879
"will be saved."
5804
4881
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5805
4882
"will be saved."
5806
4883
5807
#: bzrlib/config.py:3116
4884
#: bzrlib/config.py:3093
5808
4885
#, python-format
5809
4886
msgid "Invalid '%s', should be of the form 'name=value'"
5810
msgstr "Invalid '%s', should be of the form 'name=value'"
4887
msgstr ""
5811
4888
5812
#: bzrlib/config.py:4018
4889
#: bzrlib/config.py:3962
5813
4890
msgid "Display, set or remove a configuration option."
5814
msgstr "Display, set or remove a configuration option."
4891
msgstr ""
5815
4892
5816
#: bzrlib/config.py:4020
4893
#: bzrlib/config.py:3964
5817
4894
msgid "Display the active value for a given option."
5818
msgstr "Display the active value for a given option."
4895
msgstr ""
5819
4896
5820
#: bzrlib/config.py:4022
4897
#: bzrlib/config.py:3966
5821
4898
msgid ""
5822
4899
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5823
4900
"matching options are displayed mentioning their scope. The active value\n"
5824
4901
"that bzr will take into account is the first one displayed for each option."
5825
4902
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."
5829
4903
5830
#: bzrlib/config.py:4026
4904
#: bzrlib/config.py:3970
5831
4905
msgid "If no NAME is given, --all .* is implied."
5832
msgstr "If no NAME is given, --all .* is implied."
4906
msgstr ""
5833
4907
5834
#: bzrlib/config.py:4028
4908
#: bzrlib/config.py:3972
5835
4909
msgid ""
5836
4910
"Setting a value is achieved by using name=value without spaces. The value\n"
5837
4911
"is set in the most relevant scope and can be checked by displaying the\n"
5838
4912
"option again."
5839
4913
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."
5843
4914
5844
#: bzrlib/config.py:4040
4915
#: bzrlib/config.py:3984
5845
4916
msgid "Reduce the scope to the specified configuration file."
5846
msgstr "Reduce the scope to the specified configuration file."
4917
msgstr ""
5847
4918
5848
#: bzrlib/config.py:4044
4919
#: bzrlib/config.py:3988
5849
4920
msgid "Display all the defined values for the matching options."
5850
msgstr "Display all the defined values for the matching options."
4921
msgstr ""
5851
4922
5852
#: bzrlib/config.py:4046
4923
#: bzrlib/config.py:3990
5853
4924
msgid "Remove the option from the configuration file."
5854
msgstr "Remove the option from the configuration file."
4925
msgstr ""
5855
4926
5856
4927
#: bzrlib/conflicts.py:50
5857
4928
msgid "List files with conflicts."
5858
msgstr "List files with conflicts."
4929
msgstr ""
5859
4930
5860
4931
#: bzrlib/conflicts.py:57
5861
4932
msgid ""
5863
4934
"is supplied, the pathnames of files with text conflicts are listed,\n"
5864
4935
"instead. (This is useful for editing all files with text conflicts.)"
5865
4936
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.)"
5869
4937
5870
4938
#: bzrlib/conflicts.py:61
5871
4939
msgid "Use bzr resolve when you have fixed a problem."
5872
msgstr "Use bzr resolve when you have fixed a problem."
4940
msgstr ""
5873
4941
5874
4942
#: bzrlib/conflicts.py:66
5875
4943
msgid "List paths of files with text conflicts."
5876
msgstr "List paths of files with text conflicts."
4944
msgstr ""
5877
4945
5878
4946
#: bzrlib/conflicts.py:85
5879
4947
msgid "Marks the conflict as resolved."
5880
msgstr "Marks the conflict as resolved."
4948
msgstr ""
5881
4949
5882
4950
#: bzrlib/conflicts.py:88
5883
4951
msgid "Resolve the conflict preserving the version in the working tree."
5884
msgstr "Resolve the conflict preserving the version in the working tree."
4952
msgstr ""
5885
4953
5886
4954
#: bzrlib/conflicts.py:91
5887
4955
msgid "Resolve the conflict taking the merged version into account."
5888
msgstr "Resolve the conflict taking the merged version into account."
4956
msgstr ""
5889
4957
5890
4958
#: bzrlib/conflicts.py:98
5891
4959
msgid "How to resolve the conflict."
5892
msgstr "How to resolve the conflict."
4960
msgstr ""
5893
4961
5894
4962
#: bzrlib/conflicts.py:104
5895
4963
msgid "Mark a conflict as resolved."
5896
msgstr "Mark a conflict as resolved."
4964
msgstr ""
5897
4965
5898
4966
#: bzrlib/conflicts.py:111
5899
4967
msgid ""
5902
4970
"as\n"
5903
4971
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5904
4972
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."
5909
4973
5910
4974
#: bzrlib/conflicts.py:119
5911
4975
msgid "Resolve all conflicts in this tree."
5912
msgstr "Resolve all conflicts in this tree."
4976
msgstr ""
5913
4977
5914
4978
#: bzrlib/conflicts.py:126
5915
4979
msgid "If --all is specified, no FILE may be provided"
5916
msgstr "If --all is specified, no FILE may be provided"
4980
msgstr ""
5917
4981
5918
4982
#: bzrlib/conflicts.py:151
5919
4983
#, python-format
5920
4984
msgid "%d conflict auto-resolved."
5921
4985
msgid_plural "%d conflicts auto-resolved."
5922
msgstr[0] "%d conflict auto-resolved."
5923
msgstr[1] "%d conflicts auto-resolved."
4986
msgstr[0] ""
4987
msgstr[1] ""
5924
4988
5925
4989
#: bzrlib/conflicts.py:154
5926
4990
msgid "Remaining conflicts:"
5927
msgstr "Remaining conflicts:"
4991
msgstr ""
5928
4992
5929
4993
#: bzrlib/conflicts.py:159
5930
4994
msgid "All conflicts resolved."
5931
msgstr "All conflicts resolved."
4995
msgstr ""
5932
4996
5933
4997
#: bzrlib/conflicts.py:168
5934
4998
msgid "{0} conflict resolved, {1} remaining"
5935
4999
msgid_plural "{0} conflicts resolved, {1} remaining"
5936
msgstr[0] "{0} conflict resolved, {1} remaining"
5937
msgstr[1] "{0} conflicts resolved, {1} remaining"
5000
msgstr[0] ""
5001
msgstr[1] ""
5938
5002
5939
#: bzrlib/controldir.py:712
5003
#: bzrlib/controldir.py:710
5940
5004
msgid "{0} is{1} redirected to {2}"
5941
msgstr "{0} is{1} redirected to {2}"
5005
msgstr ""
5942
5006
5943
5007
#: bzrlib/diff.py:399
5944
5008
#, python-format
5945
5009
msgid "*** Ignoring files outside view. View is %s"
5946
msgstr "*** Ignoring files outside view. View is %s"
5010
msgstr ""
5947
5011
5948
5012
#: bzrlib/errors.py:157
5949
5013
msgid "The tree builder is already building a tree."
5950
msgstr "The tree builder is already building a tree."
5014
msgstr ""
5951
5015
5952
5016
#: bzrlib/errors.py:178
5953
5017
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5954
msgstr "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5018
msgstr ""
5955
5019
5956
5020
#: bzrlib/errors.py:197
5957
5021
msgid ""
5958
5022
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5959
5023
"versions \"%(minimum)s\" to \"%(current)s\"."
5960
5024
msgstr ""
5961
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5962
"versions \"%(minimum)s\" to \"%(current)s\"."
5963
5025
5964
5026
#: bzrlib/errors.py:209
5965
5027
msgid "The transport '%(transport)s' is only accessible within this process."
5966
5028
msgstr ""
5967
"The transport '%(transport)s' is only accessible within this process."
5968
5029
5969
5030
#: bzrlib/errors.py:227
5970
5031
msgid "Invalid revision number %(revno)s"
5971
msgstr "Invalid revision number %(revno)s"
5032
msgstr ""
5972
5033
5973
5034
#: bzrlib/errors.py:236
5974
5035
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5975
msgstr "Invalid revision-id {%(revision_id)s} in %(branch)s"
5036
msgstr ""
5976
5037
5977
5038
#: bzrlib/errors.py:247
5978
5039
msgid "Reserved revision-id {%(revision_id)s}"
5979
msgstr "Reserved revision-id {%(revision_id)s}"
5040
msgstr ""
5980
5041
5981
5042
#: bzrlib/errors.py:261
5982
5043
msgid "There is no public branch set for \"%(branch_url)s\"."
5983
msgstr "There is no public branch set for \"%(branch_url)s\"."
5044
msgstr ""
5984
5045
5985
5046
#: bzrlib/errors.py:271
5986
5047
msgid ""
5987
5048
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5988
5049
"obtain a list of topics."
5989
5050
msgstr ""
5990
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5991
"obtain a list of topics."
5992
5051
5993
5052
#: bzrlib/errors.py:280
5994
5053
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5995
msgstr "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5054
msgstr ""
5996
5055
5997
5056
#: bzrlib/errors.py:290
5998
5057
msgid ""
5999
5058
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
6000
5059
msgstr ""
6001
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
6002
5060
6003
5061
#: bzrlib/errors.py:299
6004
5062
msgid "The branch '%(branch)s' is not stacked."
6005
msgstr "The branch '%(branch)s' is not stacked."
5063
msgstr ""
6006
5064
6007
5065
#: bzrlib/errors.py:313
6008
5066
msgid "No WorkingTree exists for \"%(base)s\"."
6009
msgstr "No WorkingTree exists for \"%(base)s\"."
5067
msgstr ""
6010
5068
6011
5069
#: bzrlib/errors.py:322
6012
5070
msgid "Not currently building a tree."
6013
msgstr "Not currently building a tree."
5071
msgstr ""
6014
5072
6015
5073
#: bzrlib/errors.py:327
6016
5074
msgid "%(url)s is not a local path."
6017
msgstr "%(url)s is not a local path."
5075
msgstr ""
6018
5076
6019
5077
#: bzrlib/errors.py:355
6020
5078
msgid "%(not_locked)r is not write locked but needs to be."
6021
msgstr "%(not_locked)r is not write locked but needs to be."
5079
msgstr ""
6022
5080
6023
5081
#: bzrlib/errors.py:363
6024
5082
msgid "Error in command line options"
6025
msgstr "Error in command line options"
5083
msgstr ""
6026
5084
6027
5085
#: bzrlib/errors.py:368
6028
5086
msgid "%(value)s is not an index of type %(_type)s."
6029
msgstr "%(value)s is not an index of type %(_type)s."
5087
msgstr ""
6030
5088
6031
5089
#: bzrlib/errors.py:378
6032
5090
msgid "Error in data for index %(value)s."
6033
msgstr "Error in data for index %(value)s."
5091
msgstr ""
6034
5092
6035
5093
#: bzrlib/errors.py:387
6036
5094
msgid "The key '%(key)s' is already in index '%(index)s'."
6037
msgstr "The key '%(key)s' is already in index '%(index)s'."
5095
msgstr ""
6038
5096
6039
5097
#: bzrlib/errors.py:397
6040
5098
msgid "The key '%(key)s' is not a valid key."
6041
msgstr "The key '%(key)s' is not a valid key."
5099
msgstr ""
6042
5100
6043
5101
#: bzrlib/errors.py:406
6044
5102
msgid "Could not parse options for index %(value)s."
6045
msgstr "Could not parse options for index %(value)s."
5103
msgstr ""
6046
5104
6047
5105
#: bzrlib/errors.py:415
6048
5106
msgid "The value '%(value)s' is not a valid value."
6049
msgstr "The value '%(value)s' is not a valid value."
5107
msgstr ""
6050
5108
6051
5109
#: bzrlib/errors.py:424
6052
5110
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
6053
msgstr "Bad value \"%(value)s\" for option \"%(name)s\"."
5111
msgstr ""
6054
5112
6055
5113
#: bzrlib/errors.py:443
6056
5114
msgid "Generic path error: %(path)r%(extra)s)"
6057
msgstr "Generic path error: %(path)r%(extra)s)"
5115
msgstr ""
6058
5116
6059
5117
#: bzrlib/errors.py:456
6060
5118
msgid "No such file: %(path)r%(extra)s"
6061
msgstr "No such file: %(path)r%(extra)s"
5119
msgstr ""
6062
5120
6063
5121
#: bzrlib/errors.py:461
6064
5122
msgid "File exists: %(path)r%(extra)s"
6065
msgstr "File exists: %(path)r%(extra)s"
5123
msgstr ""
6066
5124
6067
5125
#: bzrlib/errors.py:467
6068
5126
msgid ""
6069
5127
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
6070
5128
"after to tell bzr about a rename that has already happened)%(extra)s"
6071
5129
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"
6074
5130
6075
5131
#: bzrlib/errors.py:483
6076
5132
msgid "\"%(path)s\" is not a directory %(extra)s"
6077
msgstr "\"%(path)s\" is not a directory %(extra)s"
5133
msgstr ""
6078
5134
6079
5135
#: bzrlib/errors.py:488
6080
5136
msgid "\"%(path)s\" is not in the working directory %(extra)s"
6081
msgstr "\"%(path)s\" is not in the working directory %(extra)s"
5137
msgstr ""
6082
5138
6083
5139
#: bzrlib/errors.py:493
6084
5140
msgid "Directory not empty: \"%(path)s\"%(extra)s"
6085
msgstr "Directory not empty: \"%(path)s\"%(extra)s"
5141
msgstr ""
6086
5142
6087
5143
#: bzrlib/errors.py:498
6088
5144
msgid "Hard-linking \"%(path)s\" is not supported"
6089
msgstr "Hard-linking \"%(path)s\" is not supported"
5145
msgstr ""
6090
5146
6091
5147
#: bzrlib/errors.py:513
6092
5148
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
6093
msgstr "Device or resource busy: \"%(path)s\"%(extra)s"
5149
msgstr ""
6094
5150
6095
5151
#: bzrlib/errors.py:518
6096
5152
msgid "Permission denied: \"%(path)s\"%(extra)s"
6097
msgstr "Permission denied: \"%(path)s\"%(extra)s"
5153
msgstr ""
6098
5154
6099
5155
#: bzrlib/errors.py:523
6100
5156
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
6101
msgstr "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5157
msgstr ""
6102
5158
6103
5159
#: bzrlib/errors.py:528
6104
5160
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
6105
msgstr "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5161
msgstr ""
6106
5162
6107
5163
#: bzrlib/errors.py:539
6108
5164
msgid "URLs differ by more than path: %(from_)r and %(to)r"
6109
msgstr "URLs differ by more than path: %(from_)r and %(to)r"
5165
msgstr ""
6110
5166
6111
5167
#: bzrlib/errors.py:561
6112
5168
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
6113
msgstr "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5169
msgstr ""
6114
5170
6115
5171
#: bzrlib/errors.py:571
6116
5172
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
6117
msgstr "Unsupported protocol for url \"%(path)s\"%(extra)s"
5173
msgstr ""
6118
5174
6119
5175
#: bzrlib/errors.py:579
6120
5176
msgid ""
6121
5177
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
6122
5178
"upgrade the branch to permit branch stacking."
6123
5179
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."
6126
5180
6127
5181
#: bzrlib/errors.py:590
6128
5182
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
6129
msgstr "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5183
msgstr ""
6130
5184
6131
5185
#: bzrlib/errors.py:600
6132
5186
msgid ""
6133
5187
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
6134
5188
"need to upgrade the repository to permit branch stacking."
6135
5189
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."
6138
5190
6139
5191
#: bzrlib/errors.py:611
6140
5192
msgid "Error reading from %(path)r."
6141
msgstr "Error reading from %(path)r."
5193
msgstr ""
6142
5194
6143
5195
#: bzrlib/errors.py:630
6144
5196
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
6145
msgstr "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5197
msgstr ""
6146
5198
6147
5199
#: bzrlib/errors.py:646
6148
5200
msgid "Path \"%(path)s\" is not unicode normalized"
6149
msgstr "Path \"%(path)s\" is not unicode normalised"
5201
msgstr ""
6150
5202
6151
5203
#: bzrlib/errors.py:654
6152
5204
msgid "Not a branch: \"%(path)s\"%(detail)s."
6153
msgstr "Not a branch: \"%(path)s\"%(detail)s."
5205
msgstr ""
6154
5206
6155
5207
#: bzrlib/errors.py:696
6156
5208
msgid "No submit branch available for branch \"%(path)s\""
6157
msgstr "No submit branch available for branch \"%(path)s\""
5209
msgstr ""
6158
5210
6159
5211
#: bzrlib/errors.py:705
6160
5212
msgid "A control directory already exists: \"%(path)s\"."
6161
msgstr "A control directory already exists: \"%(path)s\"."
5213
msgstr ""
6162
5214
6163
5215
#: bzrlib/errors.py:710
6164
5216
msgid "Already a branch: \"%(path)s\"."
6165
msgstr "Already a branch: \"%(path)s\"."
5217
msgstr ""
6166
5218
6167
5219
#: bzrlib/errors.py:715
6168
msgid "Invalid branch name: %(name)s"
6169
msgstr "Invalid branch name: %(name)s"
6170
6171
#: bzrlib/errors.py:724
6172
5220
msgid "Parent branch already exists: \"%(path)s\"."
6173
msgstr "Parent branch already exists: \"%(path)s\"."
6174
6175
#: bzrlib/errors.py:730
6176
msgid ""
6177
"Directory contains a branch, but no working tree (use bzr checkout if you "
6178
"wish to build a working tree): \"%(path)s\""
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\""
6182
6183
#: bzrlib/errors.py:735
6184
msgid ""
6185
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
6186
msgstr ""
6187
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
6188
6189
#: bzrlib/errors.py:745
6190
msgid ""
6191
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
6192
msgstr ""
6193
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
6194
6195
#: bzrlib/errors.py:755
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:721
5224
msgid ""
5225
"Directory contains a branch, but no working tree (use bzr checkout if you "
5226
"wish to build a working tree): \"%(path)s\""
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:726
5230
msgid ""
5231
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:736
5235
msgid ""
5236
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:746
6196
5240
msgid "No repository present: \"%(path)s\""
6197
msgstr "No repository present: \"%(path)s\""
5241
msgstr ""
6198
5242
6199
#: bzrlib/errors.py:762
5243
#: bzrlib/errors.py:753
6200
5244
msgid ""
6201
5245
"Unsupported branch format: %(format)s\n"
6202
5246
"Please run 'bzr upgrade'"
6203
5247
msgstr ""
6204
"Unsupported branch format: %(format)s\n"
6205
"Please run 'bzr upgrade'"
5248
5249
#: bzrlib/errors.py:759
5250
msgid "Unknown %(kind)s format: %(format)r"
5251
msgstr ""
6206
5252
6207
5253
#: bzrlib/errors.py:768
6208
msgid "Unknown %(kind)s format: %(format)r"
6209
msgstr "Unknown %(kind)s format: %(format)r"
6210
6211
#: bzrlib/errors.py:777
6212
5254
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
6213
msgstr "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5255
msgstr ""
6214
5256
6215
#: bzrlib/errors.py:787
5257
#: bzrlib/errors.py:778
6216
5258
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
6217
5259
msgstr "Parse error on line %(lineno)d of %(format)s format: %(line)s"
6218
5260
6219
#: bzrlib/errors.py:802
5261
#: bzrlib/errors.py:793
6220
5262
msgid ""
6221
5263
"%(target)s\n"
6222
5264
"is not compatible with\n"
6223
5265
"%(source)s\n"
6224
5266
"%(details)s"
6225
5267
msgstr ""
6226
"%(target)s\n"
6227
"is not compatible with\n"
6228
"%(source)s\n"
6229
"%(details)s"
6230
5268
6231
#: bzrlib/errors.py:818
5269
#: bzrlib/errors.py:809
6232
5270
msgid "Revision is not compatible with %(repo_format)s"
6233
msgstr "Revision is not compatible with %(repo_format)s"
5271
msgstr ""
6234
5272
6235
#: bzrlib/errors.py:828
5273
#: bzrlib/errors.py:819
6236
5274
msgid "%(context_info)s%(path)s is already versioned."
6237
msgstr "%(context_info)s%(path)s is already versioned."
5275
msgstr ""
6238
5276
6239
#: bzrlib/errors.py:849
5277
#: bzrlib/errors.py:840
6240
5278
msgid "%(context_info)s%(path)s is not versioned."
6241
msgstr "%(context_info)s%(path)s is not versioned."
5279
msgstr ""
6242
5280
6243
#: bzrlib/errors.py:870
5281
#: bzrlib/errors.py:861
6244
5282
msgid "Path(s) are not versioned: %(paths_as_string)s"
6245
msgstr "Path(s) are not versioned: %(paths_as_string)s"
5283
msgstr ""
6246
5284
6247
#: bzrlib/errors.py:881
5285
#: bzrlib/errors.py:872
6248
5286
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
6249
msgstr "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5287
msgstr ""
6250
5288
6251
#: bzrlib/errors.py:900
5289
#: bzrlib/errors.py:891
6252
5290
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
6253
msgstr "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5291
msgstr ""
6254
5292
6255
#: bzrlib/errors.py:908
5293
#: bzrlib/errors.py:899
6256
5294
msgid ""
6257
5295
"Filename %(filename)r is not valid in your current filesystem encoding "
6258
5296
"%(fs_encoding)s"
6259
5297
msgstr ""
6260
"Filename %(filename)r is not valid in your current filesystem encoding "
6261
"%(fs_encoding)s"
6262
5298
6263
#: bzrlib/errors.py:919
5299
#: bzrlib/errors.py:910
6264
5300
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
6265
msgstr "Cannot operate on \"%(filename)s\" because it is a control file"
5301
msgstr ""
6266
5302
6267
#: bzrlib/errors.py:937
5303
#: bzrlib/errors.py:928
6268
5304
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
6269
msgstr "The lock for '%(lock_description)s' is in use and cannot be broken."
5305
msgstr ""
6270
5306
6271
#: bzrlib/errors.py:976
5307
#: bzrlib/errors.py:967
6272
5308
msgid "Cannot lock %(lock)s: %(why)s"
6273
msgstr "Cannot lock %(lock)s: %(why)s"
5309
msgstr ""
6274
5310
6275
#: bzrlib/errors.py:986
5311
#: bzrlib/errors.py:977
6276
5312
msgid ""
6277
5313
"A transaction related operation was attempted after the transaction finished."
6278
5314
msgstr ""
6279
"A transaction related operation was attempted after the transaction finished."
6280
5315
6281
#: bzrlib/errors.py:1013
5316
#: bzrlib/errors.py:1004
6282
5317
msgid "Cannot lock: transport is read only: %(transport)s"
6283
msgstr "Cannot lock: transport is read only: %(transport)s"
5318
msgstr ""
6284
5319
6285
#: bzrlib/errors.py:1021
5320
#: bzrlib/errors.py:1012
6286
5321
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
6287
msgstr "Could not acquire lock \"%(lock)s\": %(msg)s"
6288
6289
#: bzrlib/errors.py:1032
6290
msgid ""
6291
"Lock was broken while still open: %(lock)s - check storage consistency!"
6292
msgstr ""
6293
"Lock was broken while still open: %(lock)s - check storage consistency!"
6294
6295
#: bzrlib/errors.py:1043
6296
msgid ""
6297
"Lock was released and re-acquired before being broken: %(lock)s: held by "
6298
"%(holder)r, wanted to break %(target)r"
6299
msgstr ""
6300
"Lock was released and re-acquired before being broken: %(lock)s: held by "
6301
"%(holder)r, wanted to break %(target)r"
6302
6303
#: bzrlib/errors.py:1055
6304
msgid ""
6305
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6306
"Use 'bzr break-lock' to clear it"
6307
msgstr ""
6308
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
6309
"Use 'bzr break-lock' to clear it"
6310
6311
#: bzrlib/errors.py:1068
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1023
5325
msgid ""
5326
"Lock was broken while still open: %(lock)s - check storage consistency!"
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:1034
5330
msgid ""
5331
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5332
"%(holder)r, wanted to break %(target)r"
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:1046
5336
msgid ""
5337
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5338
"Use 'bzr break-lock' to clear it"
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:1059
6312
5342
msgid "Lock not held: %(lock)s"
6313
msgstr "Lock not held: %(lock)s"
5343
msgstr ""
6314
5344
6315
#: bzrlib/errors.py:1097
5345
#: bzrlib/errors.py:1088
6316
5346
msgid "No changes to commit"
6317
msgstr "No changes to commit"
6318
6319
#: bzrlib/errors.py:1102
6320
msgid ""
6321
"Selected-file commit of merges is not supported yet: files %(files_str)s"
6322
msgstr ""
6323
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:1093
5350
msgid ""
5351
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1103
5355
msgid ""
5356
"Excluding paths during commit is not supported by repository at "
5357
"%(repository)r."
5358
msgstr ""
6324
5359
6325
5360
#: bzrlib/errors.py:1112
6326
5361
msgid ""
6327
"Excluding paths during commit is not supported by repository at "
6328
"%(repository)r."
6329
msgstr ""
6330
"Excluding paths during commit is not supported by repository at "
6331
"%(repository)r."
6332
6333
#: bzrlib/errors.py:1121
6334
msgid ""
6335
"The specified commit message contains characters unsupported by the current "
6336
"encoding."
6337
msgstr ""
6338
"The specified commit message contains characters unsupported by the current "
6339
"encoding."
6340
6341
#: bzrlib/errors.py:1127
5362
"The specified commit message contains characters unsupported by the current "
5363
"encoding."
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1118
6342
5367
msgid "Upgrade URL cannot work with readonly URLs."
6343
msgstr "Upgrade URL cannot work with readonly URLs."
5368
msgstr ""
6344
5369
6345
#: bzrlib/errors.py:1132
5370
#: bzrlib/errors.py:1123
6346
5371
msgid "The branch format %(format)s is already at the most recent format."
6347
msgstr "The branch format %(format)s is already at the most recent format."
5372
msgstr ""
6348
5373
6349
#: bzrlib/errors.py:1155
5374
#: bzrlib/errors.py:1146
6350
5375
msgid "Option --change does not accept revision ranges"
6351
msgstr "Option --change does not accept revision ranges"
5376
msgstr ""
6352
5377
6353
#: bzrlib/errors.py:1160
5378
#: bzrlib/errors.py:1151
6354
5379
msgid "No namespace registered for string: %(spec)r"
6355
msgstr "No namespace registered for string: %(spec)r"
6356
6357
#: bzrlib/errors.py:1179
6358
msgid ""
6359
"Requested revision: '%(spec)s' does not exist in branch: "
6360
"%(branch_url)s%(extra)s"
6361
msgstr ""
6362
"Requested revision: '%(spec)s' does not exist in branch: "
6363
"%(branch_url)s%(extra)s"
6364
6365
#: bzrlib/errors.py:1193
6366
msgid ""
6367
"Operation denied because it would change the main history, which is not "
6368
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
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\"."
6372
6373
#: bzrlib/errors.py:1204
6374
msgid ""
6375
"These branches have diverged. Use the missing command to see how.\n"
6376
"Use the merge command to reconcile them."
6377
msgstr ""
6378
"These branches have diverged. Use the missing command to see how.\n"
6379
"Use the merge command to reconcile them."
6380
6381
#: bzrlib/errors.py:1224
6382
msgid ""
6383
"Branches have no common ancestor, and no merge base revision was specified."
6384
msgstr ""
6385
"Branches have no common ancestor, and no merge base revision was specified."
6386
6387
#: bzrlib/errors.py:1230
6388
msgid ""
6389
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
6390
msgstr ""
6391
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:1170
5383
msgid ""
5384
"Requested revision: '%(spec)s' does not exist in branch: "
5385
"%(branch_url)s%(extra)s"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:1184
5389
msgid ""
5390
"Operation denied because it would change the main history, which is not "
5391
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1195
5395
msgid ""
5396
"These branches have diverged. Use the missing command to see how.\n"
5397
"Use the merge command to reconcile them."
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:1215
5401
msgid ""
5402
"Branches have no common ancestor, and no merge base revision was specified."
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1221
5406
msgid ""
5407
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5408
msgstr ""
5409
5410
#: bzrlib/errors.py:1227
5411
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5412
msgstr ""
6392
5413
6393
5414
#: bzrlib/errors.py:1236
6394
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
6395
msgstr "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5415
msgid ""
5416
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5417
msgstr ""
6396
5418
6397
5419
#: bzrlib/errors.py:1245
6398
msgid ""
6399
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5420
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
6400
5421
msgstr ""
6401
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
6402
5422
6403
5423
#: bzrlib/errors.py:1254
6404
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
6405
msgstr "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
6406
6407
#: bzrlib/errors.py:1263
6408
5424
msgid "Branch %(branch)s has no commits."
6409
msgstr "Branch %(branch)s has no commits."
6410
6411
#: bzrlib/errors.py:1281
6412
msgid ""
6413
"Bound branch %(branch)s is out of date with master branch "
6414
"%(master)s.%(extra_help)s"
6415
msgstr ""
6416
"Bound branch %(branch)s is out of date with master branch "
6417
"%(master)s.%(extra_help)s"
6418
6419
#: bzrlib/errors.py:1293
6420
msgid ""
6421
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
6422
"bound to %(remote)s."
6423
msgstr ""
6424
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
6425
"bound to %(remote)s."
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:1272
5428
msgid ""
5429
"Bound branch %(branch)s is out of date with master branch "
5430
"%(master)s.%(extra_help)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1284
5434
msgid ""
5435
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5436
"bound to %(remote)s."
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:1296
5440
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5441
msgstr ""
6426
5442
6427
5443
#: bzrlib/errors.py:1305
6428
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
6429
msgstr "Cannot pull --overwrite to a branch which is bound %(branch)s"
6430
6431
#: bzrlib/errors.py:1314
6432
5444
msgid ""
6433
5445
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
6434
5446
"%(error)s"
6435
5447
msgstr ""
6436
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
6437
"%(error)s"
5448
5449
#: bzrlib/errors.py:1317
5450
msgid "Error in processing weave: %(msg)s"
5451
msgstr ""
6438
5452
6439
5453
#: bzrlib/errors.py:1326
6440
msgid "Error in processing weave: %(msg)s"
6441
msgstr "Error in processing weave: %(msg)s"
6442
6443
#: bzrlib/errors.py:1335
6444
5454
msgid "Revision {%(revision_id)s} already present in %(weave)s"
6445
msgstr "Revision {%(revision_id)s} already present in %(weave)s"
5455
msgstr ""
6446
5456
6447
#: bzrlib/errors.py:1346
5457
#: bzrlib/errors.py:1337
6448
5458
msgid "Revision {%(revision_id)s} not present in %(weave)s"
6449
msgstr "Revision {%(revision_id)s} not present in %(weave)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1347
5462
msgid "Weave invariant violated: %(what)s"
5463
msgstr ""
6450
5464
6451
5465
#: bzrlib/errors.py:1356
6452
msgid "Weave invariant violated: %(what)s"
6453
msgstr "Weave invariant violated: %(what)s"
6454
6455
#: bzrlib/errors.py:1365
6456
5466
msgid "Parents are mismatched between two revisions. %(msg)s"
6457
msgstr "Parents are mismatched between two revisions. %(msg)s"
5467
msgstr ""
6458
5468
6459
#: bzrlib/errors.py:1387
5469
#: bzrlib/errors.py:1378
6460
5470
msgid ""
6461
5471
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
6462
5472
"%(weave_b)s"
6463
5473
msgstr ""
6464
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
6465
"%(weave_b)s"
6466
5474
6467
#: bzrlib/errors.py:1399
5475
#: bzrlib/errors.py:1390
6468
5476
msgid "Versioned file error"
6469
msgstr "Versioned file error"
5477
msgstr ""
6470
5478
6471
#: bzrlib/errors.py:1404
5479
#: bzrlib/errors.py:1395
6472
5480
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
6473
msgstr "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5481
msgstr ""
6474
5482
6475
#: bzrlib/errors.py:1414
5483
#: bzrlib/errors.py:1405
6476
5484
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
6477
msgstr "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5485
msgstr ""
6478
5486
6479
#: bzrlib/errors.py:1424
5487
#: bzrlib/errors.py:1415
6480
5488
msgid "Text did not match its checksum: %(msg)s"
6481
msgstr "Text did not match its checksum: %(msg)s"
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:1541
5492
msgid "Export format %(format)r not supported"
5493
msgstr ""
6482
5494
6483
5495
#: bzrlib/errors.py:1550
6484
msgid "Export format %(format)r not supported"
6485
msgstr "Export format %(format)r not supported"
6486
6487
#: bzrlib/errors.py:1559
6488
5496
msgid "Transport error: %(msg)s %(orig_error)s"
6489
msgstr "Transport error: %(msg)s %(orig_error)s"
5497
msgstr ""
6490
5498
6491
#: bzrlib/errors.py:1585
5499
#: bzrlib/errors.py:1576
6492
5500
msgid "Generic bzr smart protocol error: %(details)s"
6493
msgstr "Generic bzr smart protocol error: %(details)s"
5501
msgstr ""
6494
5502
6495
#: bzrlib/errors.py:1593
5503
#: bzrlib/errors.py:1584
6496
5504
msgid "Received bad protocol version marker: %(marker)r"
6497
msgstr "Received bad protocol version marker: %(marker)r"
5505
msgstr ""
6498
5506
6499
#: bzrlib/errors.py:1625
5507
#: bzrlib/errors.py:1616
6500
5508
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
6501
msgstr "Transport operation not possible: %(msg)s %(orig_error)s"
5509
msgstr ""
6502
5510
6503
#: bzrlib/errors.py:1630
5511
#: bzrlib/errors.py:1621
6504
5512
msgid "Connection error: %(msg)s %(orig_error)s"
6505
msgstr "Connection error: %(msg)s %(orig_error)s"
5513
msgstr ""
6506
5514
6507
#: bzrlib/errors.py:1635
5515
#: bzrlib/errors.py:1626
6508
5516
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
6509
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5517
msgstr ""
6510
5518
6511
#: bzrlib/errors.py:1656
5519
#: bzrlib/errors.py:1647
6512
5520
msgid "Connection closed: %(msg)s %(orig_error)s"
6513
msgstr "Connection closed: %(msg)s %(orig_error)s"
5521
msgstr ""
6514
5522
6515
#: bzrlib/errors.py:1661
5523
#: bzrlib/errors.py:1652
6516
5524
msgid "Connection Timeout: %(msg)s%(orig_error)s"
6517
msgstr "Connection Timeout: %(msg)s%(orig_error)s"
5525
msgstr ""
6518
5526
6519
#: bzrlib/errors.py:1666
5527
#: bzrlib/errors.py:1657
6520
5528
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6521
msgstr "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5529
msgstr ""
6522
5530
6523
#: bzrlib/errors.py:1676
5531
#: bzrlib/errors.py:1667
6524
5532
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6525
msgstr "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5533
msgstr ""
6526
5534
6527
#: bzrlib/errors.py:1691
5535
#: bzrlib/errors.py:1682
6528
5536
msgid "Certificate error: %(error)s"
6529
msgstr "Certificate error: %(error)s"
5537
msgstr ""
6530
5538
6531
#: bzrlib/errors.py:1699
5539
#: bzrlib/errors.py:1690
6532
5540
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
6533
msgstr "Invalid http range %(range)r for %(path)s: %(msg)s"
5541
msgstr ""
6534
5542
6535
#: bzrlib/errors.py:1713
5543
#: bzrlib/errors.py:1704
6536
5544
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6537
msgstr "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:1712
5548
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5549
msgstr ""
6538
5550
6539
5551
#: bzrlib/errors.py:1721
6540
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6541
msgstr "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6542
6543
#: bzrlib/errors.py:1730
6544
5552
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6545
msgstr "%(source)s is%(permanently)s redirected to %(target)s"
5553
msgstr ""
6546
5554
6547
#: bzrlib/errors.py:1744
5555
#: bzrlib/errors.py:1735
6548
5556
msgid "Too many redirections"
6549
msgstr "Too many redirections"
5557
msgstr ""
6550
5558
6551
#: bzrlib/errors.py:1749
5559
#: bzrlib/errors.py:1740
6552
5560
msgid "Working tree has conflicts."
6553
msgstr "Working tree has conflicts."
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:1744
5564
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5565
msgstr ""
6554
5566
6555
5567
#: bzrlib/errors.py:1753
6556
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6557
msgstr "Config file %(filename)s is not UTF-8 encoded\n"
6558
6559
#: bzrlib/errors.py:1762
6560
msgid ""
6561
"Error(s) parsing config file %(filename)s:\n"
6562
"%(errors)s"
6563
msgstr ""
6564
"Error(s) parsing config file %(filename)s:\n"
6565
"%(errors)s"
6566
6567
#: bzrlib/errors.py:1772
6568
msgid ""
6569
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6570
"See ``bzr help %(name)s``"
6571
msgstr ""
6572
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6573
"See ``bzr help %(name)s``"
5568
msgid ""
5569
"Error(s) parsing config file %(filename)s:\n"
5570
"%(errors)s"
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:1763
5574
msgid ""
5575
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5576
"See ``bzr help %(name)s``"
5577
msgstr ""
5578
5579
#: bzrlib/errors.py:1773
5580
msgid "%(username)r does not seem to contain a reasonable email address"
5581
msgstr ""
6574
5582
6575
5583
#: bzrlib/errors.py:1782
6576
msgid "%(username)r does not seem to contain a reasonable email address"
6577
msgstr "%(username)r does not seem to contain a reasonable email address"
6578
6579
#: bzrlib/errors.py:1791
6580
5584
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6581
msgstr "Failed to GPG sign data with command \"%(command_line)s\""
5585
msgstr ""
6582
5586
6583
#: bzrlib/errors.py:1799
5587
#: bzrlib/errors.py:1790
6584
5588
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6585
msgstr "Failed to verify GPG signature data with error \"%(error)s\""
5589
msgstr ""
6586
5590
6587
#: bzrlib/errors.py:1807
5591
#: bzrlib/errors.py:1798
6588
5592
msgid "Unable to import library \"%(library)s\": %(error)s"
6589
msgstr "Unable to import library \"%(library)s\": %(error)s"
5593
msgstr ""
6590
5594
6591
#: bzrlib/errors.py:1815
5595
#: bzrlib/errors.py:1806
6592
5596
msgid "python-gpgme is not installed, it is needed to verify signatures"
6593
msgstr "python-gpgme is not installed, it is needed to verify signatures"
6594
6595
#: bzrlib/errors.py:1823
6596
msgid ""
6597
"The working tree for %(basedir)s has changed since the last commit, but "
6598
"weave merge requires that it be unchanged"
6599
msgstr ""
6600
"The working tree for %(basedir)s has changed since the last commit, but "
6601
"weave merge requires that it be unchanged"
6602
6603
#: bzrlib/errors.py:1833
6604
msgid ""
6605
"Can't reprocess and show base, because reprocessing obscures the "
6606
"relationship of conflicting lines to the base"
6607
msgstr ""
6608
"Can't reprocess and show base, because reprocessing obscures the "
6609
"relationship of conflicting lines to the base"
6610
6611
#: bzrlib/errors.py:1839
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:1814
5600
msgid ""
5601
"The working tree for %(basedir)s has changed since the last commit, but "
5602
"weave merge requires that it be unchanged"
5603
msgstr ""
5604
5605
#: bzrlib/errors.py:1824
5606
msgid ""
5607
"Can't reprocess and show base, because reprocessing obscures the "
5608
"relationship of conflicting lines to the base"
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:1830
6612
5612
msgid "Cycle in graph %(graph)r"
6613
msgstr "Cycle in graph %(graph)r"
5613
msgstr ""
6614
5614
6615
#: bzrlib/errors.py:1867
5615
#: bzrlib/errors.py:1858
6616
5616
msgid "File %(filename)s is not conflicted."
6617
msgstr "File %(filename)s is not conflicted."
5617
msgstr ""
5618
5619
#: bzrlib/errors.py:1880
5620
msgid "No bundle was found in \"%(filename)s\"."
5621
msgstr ""
6618
5622
6619
5623
#: bzrlib/errors.py:1889
6620
msgid "No bundle was found in \"%(filename)s\"."
6621
msgstr "No bundle was found in \"%(filename)s\"."
6622
6623
#: bzrlib/errors.py:1898
6624
5624
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6625
msgstr "Unable to handle bundle version %(version)s: %(msg)s"
5625
msgstr ""
6626
5626
6627
#: bzrlib/errors.py:1908
5627
#: bzrlib/errors.py:1899
6628
5628
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6629
msgstr "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5629
msgstr ""
6630
5630
6631
#: bzrlib/errors.py:1921
5631
#: bzrlib/errors.py:1912
6632
5632
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6633
msgstr "File id {%(file_id)s} already exists in inventory as %(entry)s"
5633
msgstr ""
6634
5634
6635
#: bzrlib/errors.py:1931
5635
#: bzrlib/errors.py:1922
6636
5636
msgid "Key %(key)s is already present in map"
6637
msgstr "Key %(key)s is already present in map"
5637
msgstr ""
6638
5638
6639
#: bzrlib/errors.py:1936
5639
#: bzrlib/errors.py:1927
6640
5640
msgid "The prefix %(prefix)s is in the help search path twice."
6641
msgstr "The prefix %(prefix)s is in the help search path twice."
5641
msgstr ""
6642
5642
6643
#: bzrlib/errors.py:1946
5643
#: bzrlib/errors.py:1937
6644
5644
msgid ""
6645
5645
"No final name for trans_id %(trans_id)r\n"
6646
5646
"file-id: %(file_id)r\n"
6647
5647
"root trans-id: %(root_trans_id)r\n"
6648
5648
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"
6652
5649
6653
#: bzrlib/errors.py:1978
5650
#: bzrlib/errors.py:1969
6654
5651
msgid "Attempt to reuse a transform that has already been applied."
6655
msgstr "Attempt to reuse a transform that has already been applied."
5652
msgstr ""
6656
5653
6657
#: bzrlib/errors.py:1983
5654
#: bzrlib/errors.py:1974
6658
5655
msgid "Moving the root directory is not supported at this time"
6659
msgstr "Moving the root directory is not supported at this time"
5656
msgstr ""
6660
5657
6661
#: bzrlib/errors.py:1988
5658
#: bzrlib/errors.py:1979
6662
5659
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6663
msgstr "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6664
6665
#: bzrlib/errors.py:1999
6666
msgid ""
6667
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6668
msgstr ""
6669
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6670
6671
#: bzrlib/errors.py:2035
6672
msgid ""
6673
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6674
msgstr ""
6675
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6676
6677
#: bzrlib/errors.py:2065
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:1990
5663
msgid ""
5664
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:2026
5668
msgid ""
5669
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:2056
6678
5673
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6679
msgstr "Unable to import paramiko (required for sftp support): %(error)s"
5674
msgstr ""
6680
5675
6681
#: bzrlib/errors.py:2073
5676
#: bzrlib/errors.py:2064
6682
5677
msgid "Nothing to merge."
6683
msgstr "Nothing to merge."
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:2069
5681
msgid "Format %(format)s cannot be initialised by this version of bzr."
5682
msgstr ""
6684
5683
6685
5684
#: bzrlib/errors.py:2078
6686
msgid "Format %(format)s cannot be initialised by this version of bzr."
6687
msgstr "Format %(format)s cannot be initialised by this version of bzr."
6688
6689
#: bzrlib/errors.py:2087
6690
5685
msgid ""
6691
5686
"Cannot convert from format %(from_format)s to format %(format)s. "
6692
5687
"%(problem)s"
6693
5688
msgstr ""
6694
"Cannot convert from format %(from_format)s to format %(format)s. "
6695
"%(problem)s"
6696
5689
6697
#: bzrlib/errors.py:2099
5690
#: bzrlib/errors.py:2090
6698
5691
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6699
msgstr "Could not find an appropriate Differ for file \"%(path)s\""
5692
msgstr ""
6700
5693
6701
#: bzrlib/errors.py:2107
5694
#: bzrlib/errors.py:2098
6702
5695
msgid "%(exe_name)s could not be found on this machine"
6703
msgstr "%(exe_name)s could not be found on this machine"
5696
msgstr ""
6704
5697
6705
#: bzrlib/errors.py:2115
5698
#: bzrlib/errors.py:2106
6706
5699
msgid "Diff is not installed on this machine: %(msg)s"
6707
msgstr "Diff is not installed on this machine: %(msg)s"
5700
msgstr ""
6708
5701
6709
#: bzrlib/errors.py:2123
5702
#: bzrlib/errors.py:2114
6710
5703
msgid "Diff3 is not installed on this machine."
6711
msgstr "Diff3 is not installed on this machine."
5704
msgstr ""
6712
5705
6713
#: bzrlib/errors.py:2129
5706
#: bzrlib/errors.py:2120
6714
5707
msgid "The content being inserted is already present."
6715
msgstr "The content being inserted is already present."
6716
6717
#: bzrlib/errors.py:2134
6718
msgid ""
6719
"This tree contains left-over files from a failed operation.\n"
6720
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6721
"to\n"
6722
" keep, and delete it when you are done."
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."
6728
6729
#: bzrlib/errors.py:2145
6730
msgid ""
6731
"This tree contains left-over files from a failed operation.\n"
6732
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6733
" wish to keep, and delete it when you are done."
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."
6738
6739
#: bzrlib/errors.py:2155
6740
msgid ""
6741
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6742
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6743
"to\n"
6744
" keep, and delete it when you are done."
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."
6750
6751
#: bzrlib/errors.py:2166
6752
msgid ""
6753
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6754
"examine %(pending_deletion)s to see if it contains any files you wish to "
6755
"keep, and delete it when you are done."
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."
6760
6761
#: bzrlib/errors.py:2176
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:2125
5711
msgid ""
5712
"This tree contains left-over files from a failed operation.\n"
5713
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5714
"to\n"
5715
" keep, and delete it when you are done."
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:2136
5719
msgid ""
5720
"This tree contains left-over files from a failed operation.\n"
5721
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5722
" wish to keep, and delete it when you are done."
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2146
5726
msgid ""
5727
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5728
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5729
"to\n"
5730
" keep, and delete it when you are done."
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:2157
5734
msgid ""
5735
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5736
"examine %(pending_deletion)s to see if it contains any files you wish to "
5737
"keep, and delete it when you are done."
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:2167
6762
5741
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6763
msgstr "Working tree is out of date, please run 'bzr update'.%(more)s"
5742
msgstr ""
6764
5743
6765
#: bzrlib/errors.py:2190
5744
#: bzrlib/errors.py:2181
6766
5745
msgid ""
6767
5746
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6768
5747
msgstr ""
6769
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6770
5748
6771
#: bzrlib/errors.py:2203
5749
#: bzrlib/errors.py:2194
6772
5750
msgid "Error in merge modified format"
6773
msgstr "Error in merge modified format"
5751
msgstr ""
6774
5752
6775
#: bzrlib/errors.py:2208
5753
#: bzrlib/errors.py:2199
6776
5754
msgid "Format error in conflict listings"
6777
msgstr "Format error in conflict listings"
6778
6779
#: bzrlib/errors.py:2212
6780
msgid ""
6781
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6782
"Error: %(description)s"
6783
msgstr ""
6784
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6785
"Error: %(description)s"
6786
6787
#: bzrlib/errors.py:2223
6788
msgid ""
6789
"An error has been detected in the repository %(repo_path)s.\n"
6790
"Please run bzr reconcile on this repository."
6791
msgstr ""
6792
"An error has been detected in the repository %(repo_path)s.\n"
6793
"Please run bzr reconcile on this repository."
6794
6795
#: bzrlib/errors.py:2234
6796
msgid ""
6797
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6798
"reason: %(reason)s"
6799
msgstr ""
6800
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6801
"reason: %(reason)s"
6802
6803
#: bzrlib/errors.py:2247
6804
msgid ""
6805
"An inconsistent delta was supplied: %(delta)r\n"
6806
"reason: %(reason)s"
6807
msgstr ""
6808
"An inconsistent delta was supplied: %(delta)r\n"
6809
"reason: %(reason)s"
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:2203
5758
msgid ""
5759
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5760
"Error: %(description)s"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2214
5764
msgid ""
5765
"An error has been detected in the repository %(repo_path)s.\n"
5766
"Please run bzr reconcile on this repository."
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:2225
5770
msgid ""
5771
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5772
"reason: %(reason)s"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2238
5776
msgid ""
5777
"An inconsistent delta was supplied: %(delta)r\n"
5778
"reason: %(reason)s"
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2250
5782
msgid "To use this feature you must upgrade your branch at %(path)s."
5783
msgstr ""
6810
5784
6811
5785
#: bzrlib/errors.py:2259
6812
msgid "To use this feature you must upgrade your branch at %(path)s."
6813
msgstr "To use this feature you must upgrade your branch at %(path)s."
6814
6815
#: bzrlib/errors.py:2268
6816
5786
msgid "To use this feature you must upgrade your repository at %(path)s."
6817
msgstr "To use this feature you must upgrade your repository at %(path)s."
5787
msgstr ""
6818
5788
6819
#: bzrlib/errors.py:2273
5789
#: bzrlib/errors.py:2264
6820
5790
msgid ""
6821
5791
"To use this feature you must upgrade your branch at %(path)s to a format "
6822
5792
"which supports rich roots."
6823
5793
msgstr ""
6824
"To use this feature you must upgrade your branch at %(path)s to a format "
6825
"which supports rich roots."
6826
5794
6827
#: bzrlib/errors.py:2279
5795
#: bzrlib/errors.py:2270
6828
5796
msgid "Cannot perform local-only commits on unbound branches."
6829
msgstr "Cannot perform local-only commits on unbound branches."
5797
msgstr ""
6830
5798
6831
#: bzrlib/errors.py:2284
5799
#: bzrlib/errors.py:2275
6832
5800
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6833
msgstr "The method %(mname)s is not supported on objects of type %(tname)s."
5801
msgstr ""
6834
5802
6835
#: bzrlib/errors.py:2305
5803
#: bzrlib/errors.py:2296
6836
5804
msgid "Ghost tags not supported by format %(format)r."
6837
msgstr "Ghost tags not supported by format %(format)r."
5805
msgstr ""
6838
5806
6839
#: bzrlib/errors.py:2313
5807
#: bzrlib/errors.py:2304
6840
5808
msgid "File is binary but should be text."
6841
msgstr "File is binary but should be text."
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:2309
5812
msgid "The path %(path)s is not permitted on this platform"
5813
msgstr ""
6842
5814
6843
5815
#: bzrlib/errors.py:2318
6844
msgid "The path %(path)s is not permitted on this platform"
6845
msgstr "The path %(path)s is not permitted on this platform"
6846
6847
#: bzrlib/errors.py:2327
6848
5816
msgid ""
6849
5817
"Testament did not match expected value.\n"
6850
5818
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6851
5819
" {%(measured)s}"
6852
5820
msgstr ""
6853
"Testament did not match expected value.\n"
6854
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6855
" {%(measured)s}"
5821
5822
#: bzrlib/errors.py:2330
5823
msgid "Not a bzr revision-bundle: %(text)r"
5824
msgstr ""
6856
5825
6857
5826
#: bzrlib/errors.py:2339
6858
msgid "Not a bzr revision-bundle: %(text)r"
6859
msgstr "Not a bzr revision-bundle: %(text)r"
5827
msgid "Bad bzr revision-bundle: %(text)r"
5828
msgstr ""
6860
5829
6861
5830
#: bzrlib/errors.py:2348
6862
msgid "Bad bzr revision-bundle: %(text)r"
6863
msgstr "Bad bzr revision-bundle: %(text)r"
6864
6865
#: bzrlib/errors.py:2357
6866
5831
msgid "Malformed bzr revision-bundle header: %(text)r"
6867
msgstr "Malformed bzr revision-bundle header: %(text)r"
5832
msgstr ""
6868
5833
6869
#: bzrlib/errors.py:2362
5834
#: bzrlib/errors.py:2353
6870
5835
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6871
msgstr "Malformed patches in bzr revision-bundle: %(text)r"
5836
msgstr ""
6872
5837
6873
#: bzrlib/errors.py:2367
5838
#: bzrlib/errors.py:2358
6874
5839
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6875
msgstr "Malformed footer in bzr revision-bundle: %(text)r"
5840
msgstr ""
6876
5841
6877
#: bzrlib/errors.py:2372
5842
#: bzrlib/errors.py:2363
6878
5843
msgid "End of line marker was not \\n in bzr revision-bundle"
6879
msgstr "End of line marker was not \\n in bzr revision-bundle"
5844
msgstr ""
6880
5845
6881
#: bzrlib/errors.py:2382
5846
#: bzrlib/errors.py:2373
6882
5847
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6883
msgstr "Bundle format %(bundle_format)s is incompatible with %(other)s"
5848
msgstr ""
6884
5849
6885
#: bzrlib/errors.py:2392
5850
#: bzrlib/errors.py:2383
6886
5851
msgid "Root class for inventory serialization errors"
6887
msgstr "Root class for inventory serialisation errors"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2387
5855
msgid ""
5856
"The inventory was not in the expected format:\n"
5857
" %(msg)s"
5858
msgstr ""
6888
5859
6889
5860
#: bzrlib/errors.py:2396
6890
msgid ""
6891
"The inventory was not in the expected format:\n"
6892
" %(msg)s"
6893
msgstr ""
6894
"The inventory was not in the expected format:\n"
6895
" %(msg)s"
6896
6897
#: bzrlib/errors.py:2405
6898
5861
msgid "This operation requires rich root data storage"
6899
msgstr "This operation requires rich root data storage"
5862
msgstr ""
5863
5864
#: bzrlib/errors.py:2409
5865
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5866
msgstr ""
6900
5867
6901
5868
#: bzrlib/errors.py:2418
6902
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6903
msgstr "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6904
6905
#: bzrlib/errors.py:2427
6906
msgid ""
6907
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6908
"variable."
6909
msgstr ""
6910
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6911
"variable."
6912
6913
#: bzrlib/errors.py:2434
6914
msgid ""
6915
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6916
"ghost at {%(ghost_revision_id)s}"
6917
msgstr ""
6918
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6919
"ghost at {%(ghost_revision_id)s}"
6920
6921
#: bzrlib/errors.py:2444
5869
msgid ""
5870
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5871
"variable."
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2425
5875
msgid ""
5876
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5877
"ghost at {%(ghost_revision_id)s}"
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:2435
6922
5881
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6923
msgstr "Ghost revision {%(revision_id)s} cannot be used here."
5882
msgstr ""
6924
5883
6925
#: bzrlib/errors.py:2495
5884
#: bzrlib/errors.py:2486
6926
5885
msgid ""
6927
5886
"A merge directive must provide either a bundle or a public branch location."
6928
5887
msgstr ""
6929
"A merge directive must provide either a bundle or a public branch location."
6930
5888
6931
#: bzrlib/errors.py:2502
5889
#: bzrlib/errors.py:2493
6932
5890
msgid "Bad merge directive payload %(start)r"
6933
msgstr "Bad merge directive payload %(start)r"
5891
msgstr ""
6934
5892
6935
#: bzrlib/errors.py:2512
5893
#: bzrlib/errors.py:2503
6936
5894
msgid "Preview patch does not match requested changes."
6937
msgstr "Preview patch does not match requested changes."
5895
msgstr ""
6938
5896
6939
#: bzrlib/errors.py:2518
5897
#: bzrlib/errors.py:2509
6940
5898
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6941
msgstr "Patch_type was %(patch_type)s, but no patch was supplied."
5899
msgstr ""
6942
5900
6943
#: bzrlib/errors.py:2528
5901
#: bzrlib/errors.py:2519
6944
5902
msgid ""
6945
5903
"Your branch does not have all of the revisions required in order to merge "
6946
5904
"this merge directive and the target location specified in the merge "
6947
5905
"directive is not a branch: %(location)s."
6948
5906
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."
6952
5907
6953
#: bzrlib/errors.py:2540
5908
#: bzrlib/errors.py:2531
6954
5909
msgid "Unsupported entry kind %(kind)s"
6955
msgstr "Unsupported entry kind %(kind)s"
5910
msgstr ""
6956
5911
6957
#: bzrlib/errors.py:2548
5912
#: bzrlib/errors.py:2539
6958
5913
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6959
msgstr "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5914
msgstr ""
6960
5915
6961
#: bzrlib/errors.py:2558
5916
#: bzrlib/errors.py:2549
6962
5917
msgid "Subsume target %(other_tree)s needs to be upgraded."
6963
msgstr "Subsume target %(other_tree)s needs to be upgraded."
5918
msgstr ""
6964
5919
6965
#: bzrlib/errors.py:2577
5920
#: bzrlib/errors.py:2568
6966
5921
msgid "No such tag: %(tag_name)s"
6967
msgstr "No such tag: %(tag_name)s"
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:2576
5925
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5926
msgstr ""
6968
5927
6969
5928
#: bzrlib/errors.py:2585
6970
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6971
msgstr ""
6972
"Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6973
6974
#: bzrlib/errors.py:2594
6975
5929
msgid "Tag %(tag_name)s already exists."
6976
msgstr "Tag %(tag_name)s already exists."
6977
6978
#: bzrlib/errors.py:2602
6979
msgid ""
6980
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6981
"bugs\" for more information on this feature."
6982
msgstr ""
6983
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6984
"bugs\" for more information on this feature."
6985
6986
#: bzrlib/errors.py:2612
6987
msgid ""
6988
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6989
msgstr ""
6990
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6991
6992
#: bzrlib/errors.py:2622
6993
msgid ""
6994
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6995
msgstr ""
6996
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6997
6998
#: bzrlib/errors.py:2632
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2593
5933
msgid ""
5934
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5935
"bugs\" for more information on this feature."
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2603
5939
msgid ""
5940
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2613
5944
msgid ""
5945
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2623
6999
5949
msgid "Invalid line in bugs property: '%(line)s'"
7000
msgstr "Invalid line in bugs property: '%(line)s'"
5950
msgstr ""
7001
5951
7002
#: bzrlib/errors.py:2640
5952
#: bzrlib/errors.py:2631
7003
5953
msgid "Invalid bug status: '%(status)s'"
7004
msgstr "Invalid bug status: '%(status)s'"
5954
msgstr ""
7005
5955
7006
#: bzrlib/errors.py:2648
5956
#: bzrlib/errors.py:2639
7007
5957
msgid "Could not understand response from smart server: %(response_tuple)r"
7008
msgstr "Could not understand response from smart server: %(response_tuple)r"
5958
msgstr ""
7009
5959
7010
#: bzrlib/errors.py:2687
5960
#: bzrlib/errors.py:2678
7011
5961
msgid "Server sent an unexpected error: %(error_tuple)r"
7012
msgstr "Server sent an unexpected error: %(error_tuple)r"
5962
msgstr ""
7013
5963
7014
#: bzrlib/errors.py:2706
5964
#: bzrlib/errors.py:2697
7015
5965
msgid "Unrecognised container format: %(container_format)r"
7016
msgstr "Unrecognised container format: %(container_format)r"
5966
msgstr ""
7017
5967
7018
#: bzrlib/errors.py:2714
5968
#: bzrlib/errors.py:2705
7019
5969
msgid "Unexpected end of container stream"
7020
msgstr "Unexpected end of container stream"
5970
msgstr ""
7021
5971
7022
#: bzrlib/errors.py:2719
5972
#: bzrlib/errors.py:2710
7023
5973
msgid "Unknown record type: %(record_type)r"
7024
msgstr "Unknown record type: %(record_type)r"
5974
msgstr ""
7025
5975
7026
#: bzrlib/errors.py:2727
5976
#: bzrlib/errors.py:2718
7027
5977
msgid "Invalid record: %(reason)s"
7028
msgstr "Invalid record: %(reason)s"
5978
msgstr ""
7029
5979
7030
#: bzrlib/errors.py:2735
5980
#: bzrlib/errors.py:2726
7031
5981
msgid "Container has data after end marker: %(excess)r"
7032
msgstr "Container has data after end marker: %(excess)r"
5982
msgstr ""
7033
5983
7034
#: bzrlib/errors.py:2743
5984
#: bzrlib/errors.py:2734
7035
5985
msgid "Container has multiple records with the same name: %(name)s"
7036
msgstr "Container has multiple records with the same name: %(name)s"
5986
msgstr ""
7037
5987
7038
#: bzrlib/errors.py:2756
5988
#: bzrlib/errors.py:2747
7039
5989
msgid "Corrupt or incompatible data stream: %(reason)s"
7040
msgstr "Corrupt or incompatible data stream: %(reason)s"
5990
msgstr ""
7041
5991
7042
#: bzrlib/errors.py:2764
5992
#: bzrlib/errors.py:2755
7043
5993
msgid "SMTP error: %(error)s"
7044
msgstr "SMTP error: %(error)s"
5994
msgstr ""
7045
5995
7046
#: bzrlib/errors.py:2772
5996
#: bzrlib/errors.py:2763
7047
5997
msgid "No message supplied."
7048
msgstr "No message supplied."
5998
msgstr ""
7049
5999
7050
#: bzrlib/errors.py:2777
6000
#: bzrlib/errors.py:2768
7051
6001
msgid "No mail-to address (--mail-to) or output (-o) specified."
7052
msgstr "No mail-to address (--mail-to) or output (-o) specified."
7053
7054
#: bzrlib/errors.py:2782
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:2773
6005
msgid "Unknown mail client: %(mail_client)s"
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2781
7055
6009
msgid ""
7056
6010
"Unable to find mail client with the following names: "
7057
6011
"%(mail_command_list_string)s"
7058
6012
msgstr ""
7059
"Unable to find mail client with the following names: "
7060
"%(mail_command_list_string)s"
7061
6013
7062
#: bzrlib/errors.py:2792
6014
#: bzrlib/errors.py:2791
7063
6015
msgid "SMTP connection to %(host)s refused"
7064
msgstr "SMTP connection to %(host)s refused"
6016
msgstr ""
7065
6017
7066
#: bzrlib/errors.py:2801
6018
#: bzrlib/errors.py:2800
7067
6019
msgid "Please specify smtp_server. No server at default %(host)s."
7068
msgstr "Please specify smtp_server. No server at default %(host)s."
6020
msgstr ""
7069
6021
7070
#: bzrlib/errors.py:2815
6022
#: bzrlib/errors.py:2814
7071
6023
msgid ""
7072
6024
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
7073
6025
"reconfigure."
7074
6026
msgstr ""
7075
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
7076
"reconfigure."
7077
6027
7078
#: bzrlib/errors.py:2827
6028
#: bzrlib/errors.py:2826
7079
6029
msgid "'%(display_url)s' is already a branch."
7080
msgstr "'%(display_url)s' is already a branch."
6030
msgstr ""
7081
6031
7082
#: bzrlib/errors.py:2832
6032
#: bzrlib/errors.py:2831
7083
6033
msgid "'%(display_url)s' is already a tree."
7084
msgstr "'%(display_url)s' is already a tree."
6034
msgstr ""
7085
6035
7086
#: bzrlib/errors.py:2837
6036
#: bzrlib/errors.py:2836
7087
6037
msgid "'%(display_url)s' is already a checkout."
7088
msgstr "'%(display_url)s' is already a checkout."
6038
msgstr ""
7089
6039
7090
#: bzrlib/errors.py:2842
6040
#: bzrlib/errors.py:2841
7091
6041
msgid "'%(display_url)s' is already a lightweight checkout."
7092
msgstr "'%(display_url)s' is already a lightweight checkout."
6042
msgstr ""
7093
6043
7094
#: bzrlib/errors.py:2847
6044
#: bzrlib/errors.py:2846
7095
6045
msgid "'%(display_url)s' is already using a shared repository."
7096
msgstr "'%(display_url)s' is already using a shared repository."
6046
msgstr ""
7097
6047
7098
#: bzrlib/errors.py:2852
6048
#: bzrlib/errors.py:2851
7099
6049
msgid "'%(display_url)s' is already standalone."
7100
msgstr "'%(display_url)s' is already standalone."
6050
msgstr ""
7101
6051
7102
#: bzrlib/errors.py:2857
6052
#: bzrlib/errors.py:2856
7103
6053
msgid "Shared repository '%(display_url)s' already creates working trees."
7104
msgstr "Shared repository '%(display_url)s' already creates working trees."
6054
msgstr ""
7105
6055
7106
#: bzrlib/errors.py:2863
6056
#: bzrlib/errors.py:2862
7107
6057
msgid ""
7108
6058
"Shared repository '%(display_url)s' already doesn't create working trees."
7109
6059
msgstr ""
7110
"Shared repository '%(display_url)s' already doesn't create working trees."
7111
6060
7112
#: bzrlib/errors.py:2869
6061
#: bzrlib/errors.py:2868
7113
6062
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
7114
msgstr "Requested reconfiguration of '%(display_url)s' is not supported."
6063
msgstr ""
7115
6064
7116
#: bzrlib/errors.py:2874
6065
#: bzrlib/errors.py:2873
7117
6066
msgid "No location could be found to bind to at %(display_url)s."
7118
msgstr "No location could be found to bind to at %(display_url)s."
7119
7120
#: bzrlib/errors.py:2879
7121
msgid ""
7122
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
7123
"status).%(more)s"
7124
msgstr ""
7125
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
7126
"status).%(more)s"
7127
7128
#: bzrlib/errors.py:2898
7129
msgid ""
7130
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
7131
"list).%(more)s"
7132
msgstr ""
7133
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
7134
"list).%(more)s"
7135
7136
#: bzrlib/errors.py:2904
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:2878
6070
msgid ""
6071
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6072
"status).%(more)s"
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:2897
6076
msgid ""
6077
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6078
"list).%(more)s"
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:2903
7137
6082
msgid "Variable {%(name)s} is not available."
7138
msgstr "Variable {%(name)s} is not available."
6083
msgstr ""
7139
6084
7140
#: bzrlib/errors.py:2912
6085
#: bzrlib/errors.py:2911
7141
6086
msgid "No template specified."
7142
msgstr "No template specified."
6087
msgstr ""
7143
6088
7144
#: bzrlib/errors.py:2917
6089
#: bzrlib/errors.py:2916
7145
6090
msgid "Unable to create symlink %(path_str)son this platform"
7146
msgstr "Unable to create symlink %(path_str)son this platform"
7147
7148
#: bzrlib/errors.py:2932
7149
msgid ""
7150
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
7151
"\"original\", \"local\"."
7152
msgstr ""
7153
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
7154
"\"original\", \"local\"."
7155
7156
#: bzrlib/errors.py:2966
7157
msgid ""
7158
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
7159
msgstr ""
7160
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
7161
7162
#: bzrlib/errors.py:2978
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:2931
6094
msgid ""
6095
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6096
"\"original\", \"local\"."
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:2965
6100
msgid ""
6101
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:2977
7163
6105
msgid "The \"%(config_id)s\" configuration does not exist."
7164
msgstr "The \"%(config_id)s\" configuration does not exist."
6106
msgstr ""
7165
6107
7166
#: bzrlib/errors.py:2986
6108
#: bzrlib/errors.py:2985
7167
6109
msgid "The \"%(option_name)s\" configuration option does not exist."
7168
msgstr "The \"%(option_name)s\" configuration option does not exist."
6110
msgstr ""
7169
6111
7170
#: bzrlib/errors.py:2994
6112
#: bzrlib/errors.py:2993
7171
6113
msgid "The alias \"%(alias_name)s\" does not exist."
7172
msgstr "The alias \"%(alias_name)s\" does not exist."
6114
msgstr ""
7173
6115
7174
#: bzrlib/errors.py:3008
6116
#: bzrlib/errors.py:3007
7175
6117
msgid "\"%(alias_name)s\" is not a valid location alias."
7176
msgstr "\"%(alias_name)s\" is not a valid location alias."
6118
msgstr ""
7177
6119
7178
#: bzrlib/errors.py:3016
6120
#: bzrlib/errors.py:3015
7179
6121
msgid "No %(alias_name)s location assigned."
7180
msgstr "No %(alias_name)s location assigned."
6122
msgstr ""
7181
6123
7182
#: bzrlib/errors.py:3024
6124
#: bzrlib/errors.py:3023
7183
6125
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
7184
msgstr "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6126
msgstr ""
7185
6127
7186
#: bzrlib/errors.py:3034
6128
#: bzrlib/errors.py:3033
7187
6129
msgid "Unknown rules detected: %(unknowns_str)s."
7188
msgstr "Unknown rules detected: %(unknowns_str)s."
6130
msgstr ""
7189
6131
7190
#: bzrlib/errors.py:3045
6132
#: bzrlib/errors.py:3044
7191
6133
msgid "Tip change rejected: %(msg)s"
7192
msgstr "Tip change rejected: %(msg)s"
6134
msgstr ""
7193
6135
7194
#: bzrlib/errors.py:3053
6136
#: bzrlib/errors.py:3052
7195
6137
msgid "Shelf corrupt."
7196
msgstr "Shelf corrupt."
6138
msgstr ""
7197
6139
7198
#: bzrlib/errors.py:3058
6140
#: bzrlib/errors.py:3057
7199
6141
msgid "Corruption while decompressing repository file%(orig_error)s"
7200
msgstr "Corruption while decompressing repository file%(orig_error)s"
6142
msgstr ""
7201
6143
7202
#: bzrlib/errors.py:3070
6144
#: bzrlib/errors.py:3069
7203
6145
msgid "No changes are shelved with id \"%(shelf_id)d\"."
7204
msgstr "No changes are shelved with id \"%(shelf_id)d\"."
6146
msgstr ""
7205
6147
7206
#: bzrlib/errors.py:3078
6148
#: bzrlib/errors.py:3077
7207
6149
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
7208
msgstr "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6150
msgstr ""
7209
6151
7210
#: bzrlib/errors.py:3086
6152
#: bzrlib/errors.py:3085
7211
6153
msgid ""
7212
6154
"An attempt to access a url outside the server jail was made: '%(url)s'."
7213
6155
msgstr ""
7214
"An attempt to access a url outside the server jail was made: '%(url)s'."
7215
6156
7216
#: bzrlib/errors.py:3094
6157
#: bzrlib/errors.py:3093
7217
6158
msgid "The user aborted the operation."
7218
msgstr "The user aborted the operation."
6159
msgstr ""
7219
6160
7220
#: bzrlib/errors.py:3099
6161
#: bzrlib/errors.py:3098
7221
6162
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
7222
msgstr "Branching '%(url)s'(%(format)s) must create a working tree."
6163
msgstr ""
7223
6164
7224
#: bzrlib/errors.py:3109
6165
#: bzrlib/errors.py:3108
7225
6166
msgid "No such view: %(view_name)s."
7226
msgstr "No such view: %(view_name)s."
7227
7228
#: bzrlib/errors.py:3119
7229
msgid ""
7230
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
7231
"to a later format."
7232
msgstr ""
7233
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
7234
"to a later format."
7235
7236
#: bzrlib/errors.py:3128
7237
msgid ""
7238
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
7239
msgstr ""
7240
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
7241
7242
#: bzrlib/errors.py:3195
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:3118
6170
msgid ""
6171
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6172
"to a later format."
6173
msgstr ""
6174
6175
#: bzrlib/errors.py:3127
6176
msgid ""
6177
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6178
msgstr ""
6179
6180
#: bzrlib/errors.py:3194
7243
6181
msgid "%(bzrdir)r does not support co-located branches."
7244
msgstr "%(bzrdir)r does not support co-located branches."
6182
msgstr ""
7245
6183
7246
#: bzrlib/errors.py:3201
6184
#: bzrlib/errors.py:3200
7247
6185
msgid ""
7248
6186
"Unable to determine your name.\n"
7249
6187
"Please, set your name with the 'whoami' command.\n"
7250
6188
"E.g. bzr whoami \"Your Name <name@example.com>\""
7251
6189
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>\""
7255
6190
7256
#: bzrlib/errors.py:3210
6191
#: bzrlib/errors.py:3209
7257
6192
msgid "Invalid pattern(s) found. %(msg)s"
7258
msgstr "Invalid pattern(s) found. %(msg)s"
6193
msgstr ""
7259
6194
7260
#: bzrlib/errors.py:3218
6195
#: bzrlib/errors.py:3217
7261
6196
msgid ""
7262
6197
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
7263
6198
"unbind` to fix."
7264
6199
msgstr ""
7265
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
7266
"unbind` to fix."
7267
6200
7268
#: bzrlib/errors.py:3229
6201
#: bzrlib/errors.py:3228
7269
6202
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
7270
msgstr "Loop involving %(refs)r while expanding \"%(string)s\"."
6203
msgstr ""
7271
6204
7272
#: bzrlib/errors.py:3238
6205
#: bzrlib/errors.py:3237
7273
6206
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
7274
msgstr "Option %(name)s is not defined while expanding \"%(string)s\"."
7275
7276
#: bzrlib/errors.py:3247
7277
msgid ""
7278
"No compatible object available for operations from %(source)r to %(target)r."
7279
msgstr ""
7280
"No compatible object available for operations from %(source)r to %(target)r."
7281
7282
#: bzrlib/errors.py:3257
7283
msgid ""
7284
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
7285
"%(arguments)s."
7286
msgstr ""
7287
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
7288
"%(arguments)s."
7289
7290
#: bzrlib/errors.py:3267
7291
msgid ""
7292
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
7293
"format %(format)r"
7294
msgstr ""
7295
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
7296
"format %(format)r"
7297
7298
#: bzrlib/errors.py:3279
7299
msgid ""
7300
"Missing feature %(feature)s not provided by this version of Bazaar or any "
7301
"plugin."
7302
msgstr ""
7303
"Missing feature %(feature)s not provided by this version of Bazaar or any "
7304
"plugin."
7305
7306
#: bzrlib/errors.py:3292
6207
msgstr ""
6208
6209
#: bzrlib/errors.py:3246
6210
msgid ""
6211
"No compatible object available for operations from %(source)r to %(target)r."
6212
msgstr ""
6213
6214
#: bzrlib/errors.py:3256
6215
msgid ""
6216
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6217
"%(arguments)s."
6218
msgstr ""
6219
6220
#: bzrlib/errors.py:3266
6221
msgid ""
6222
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6223
"format %(format)r"
6224
msgstr ""
6225
6226
#: bzrlib/errors.py:3278
6227
msgid ""
6228
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6229
"plugin."
6230
msgstr ""
6231
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6232
"plugin."
6233
6234
#: bzrlib/errors.py:3291
7307
6235
msgid "Binary files section encountered."
7308
msgstr "Binary files section encountered."
7309
7310
#: bzrlib/errors.py:3300
7311
msgid ""
7312
"Malformed patch header. %(desc)s\n"
7313
"%(line)r"
7314
msgstr ""
7315
"Malformed patch header. %(desc)s\n"
7316
"%(line)r"
7317
7318
#: bzrlib/errors.py:3309
7319
msgid ""
7320
"Malformed hunk header. %(desc)s\n"
7321
"%(line)r"
7322
msgstr ""
7323
"Malformed hunk header. %(desc)s\n"
7324
"%(line)r"
7325
7326
#: bzrlib/errors.py:3318
7327
msgid ""
7328
"Malformed line. %(desc)s\n"
7329
"%(line)r"
7330
msgstr ""
7331
"Malformed line. %(desc)s\n"
7332
"%(line)r"
7333
7334
#: bzrlib/errors.py:3328
7335
msgid ""
7336
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
7337
"but patch says it should be \"%(patch_line)s\""
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\""
7341
7342
#: bzrlib/errors.py:3339
6236
msgstr ""
6237
6238
#: bzrlib/errors.py:3299
6239
msgid ""
6240
"Malformed patch header. %(desc)s\n"
6241
"%(line)r"
6242
msgstr ""
6243
6244
#: bzrlib/errors.py:3308
6245
msgid ""
6246
"Malformed hunk header. %(desc)s\n"
6247
"%(line)r"
6248
msgstr ""
6249
6250
#: bzrlib/errors.py:3317
6251
msgid ""
6252
"Malformed line. %(desc)s\n"
6253
"%(line)r"
6254
msgstr ""
6255
6256
#: bzrlib/errors.py:3327
6257
msgid ""
6258
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6259
"but patch says it should be \"%(patch_line)s\""
6260
msgstr ""
6261
6262
#: bzrlib/errors.py:3338
7343
6263
msgid "The feature %(feature)s has already been registered."
7344
6264
msgstr "The feature %(feature)s has already been registered."
7345
6265
7346
6266
#: bzrlib/export_pot.py:252
7347
6267
#, python-format
7348
6268
msgid "Exporting messages from builtin command: %s"
7349
msgstr "Exporting messages from builtin command: %s"
6269
msgstr ""
7350
6270
7351
6271
#: bzrlib/export_pot.py:271
7352
6272
msgid "Exporting messages from plugin command: {0} in {1}"
7353
msgstr "Exporting messages from plugin command: {0} in {1}"
6273
msgstr ""
7354
6274
7355
6275
#: bzrlib/export_pot.py:292
7356
6276
#, python-format
7357
6277
msgid "Exporting message from error: %s"
7358
msgstr "Exporting message from error: %s"
6278
msgstr ""
7359
6279
7360
6280
#: bzrlib/fetch.py:98
7361
6281
msgid "Finding revisions"
7362
msgstr "Finding revisions"
6282
msgstr ""
7363
6283
7364
6284
#: bzrlib/fetch.py:103
7365
6285
msgid "Fetching revisions"
7366
msgstr "Fetching revisions"
6286
msgstr ""
7367
6287
7368
6288
#: bzrlib/foreign.py:262
7369
6289
msgid "Push into a different VCS without any custom bzr metadata."
7370
msgstr "Push into a different VCS without any custom bzr metadata."
6290
msgstr ""
7371
6291
7372
6292
#: bzrlib/foreign.py:264
7373
6293
msgid ""
7375
6295
"branch unless the --no-rebase option is used, in which case \n"
7376
6296
"the two branches will be out of sync after the push. "
7377
6297
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. "
7381
6298
7382
6299
#: bzrlib/foreign.py:277
7383
6300
msgid "Do not rebase after push."
7384
msgstr "Do not rebase after push."
6301
msgstr ""
7385
6302
7386
6303
#: bzrlib/foreign.py:311
7387
6304
#, python-format
7388
6305
msgid "Using saved location: %s\n"
7389
msgstr "Using saved location: %s\n"
6306
msgstr ""
7390
6307
7391
6308
#: bzrlib/foreign.py:321
7392
6309
msgid ""
7393
6310
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
7394
6311
"regular push."
7395
6312
msgstr ""
7396
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
7397
"regular push."
7398
7399
#: bzrlib/gpg.py:366
7400
msgid "No GnuPG key results for pattern: {0}"
7401
msgstr "No GnuPG key results for pattern: {0}"
7402
7403
#: bzrlib/gpg.py:439
6313
6314
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
7404
6315
msgid "{0} commits with valid signatures"
7405
msgstr "{0} commits with valid signatures"
6316
msgstr ""
7406
6317
7407
#: bzrlib/gpg.py:445
6318
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
7408
6319
msgid "{0} commit with unknown key"
7409
6320
msgid_plural "{0} commits with unknown keys"
7410
msgstr[0] "{0} commit with unknown key"
7411
msgstr[1] "{0} commits with unknown keys"
6321
msgstr[0] ""
6322
msgstr[1] ""
7412
6323
7413
#: bzrlib/gpg.py:453
6324
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
7414
6325
msgid "{0} commit not valid"
7415
6326
msgid_plural "{0} commits not valid"
7416
msgstr[0] "{0} commit not valid"
7417
msgstr[1] "{0} commits not valid"
6327
msgstr[0] ""
6328
msgstr[1] ""
7418
6329
7419
#: bzrlib/gpg.py:461
6330
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
7420
6331
msgid "{0} commit not signed"
7421
6332
msgid_plural "{0} commits not signed"
7422
msgstr[0] "{0} commit not signed"
7423
msgstr[1] "{0} commits not signed"
6333
msgstr[0] ""
6334
msgstr[1] ""
7424
6335
7425
#: bzrlib/gpg.py:469
6336
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
7426
6337
msgid "{0} commit with key now expired"
7427
6338
msgid_plural "{0} commits with key now expired"
7428
msgstr[0] "{0} commit with key now expired"
7429
msgstr[1] "{0} commits with key now expired"
7430
7431
#: bzrlib/gpg.py:489
7432
msgid "{0} commit by author {1} with key {2} now expired"
7433
msgid_plural "{0} commits by author {1} with key {2} now expired"
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"
7436
7437
#: bzrlib/gpg.py:505
6339
msgstr[0] ""
6340
msgstr[1] ""
6341
6342
#: bzrlib/gpg.py:343
6343
msgid "No GnuPG key results for pattern: {0}"
6344
msgstr ""
6345
6346
#: bzrlib/gpg.py:386
7438
6347
msgid "{0} signed {1} commit"
7439
6348
msgid_plural "{0} signed {1} commits"
7440
msgstr[0] "{0} signed {1} commit"
7441
msgstr[1] "{0} signed {1} commits"
6349
msgstr[0] ""
6350
msgstr[1] ""
7442
6351
7443
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6352
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
7444
6353
msgid "{0} commit by author {1}"
7445
6354
msgid_plural "{0} commits by author {1}"
7446
msgstr[0] "{0} commit by author {1}"
7447
msgstr[1] "{0} commits by author {1}"
6355
msgstr[0] ""
6356
msgstr[1] ""
7448
6357
7449
#: bzrlib/gpg.py:554
6358
#: bzrlib/gpg.py:433
7450
6359
msgid "Unknown key {0} signed {1} commit"
7451
6360
msgid_plural "Unknown key {0} signed {1} commits"
7452
msgstr[0] "Unknown key {0} signed {1} commit"
7453
msgstr[1] "Unknown key {0} signed {1} commits"
6361
msgstr[0] ""
6362
msgstr[1] ""
6363
6364
#: bzrlib/gpg.py:452
6365
msgid "{0} commit by author {1} with key {2} now expired"
6366
msgid_plural "{0} commits by author {1} with key {2} now expired"
6367
msgstr[0] ""
6368
msgstr[1] ""
7454
6369
7455
6370
#: bzrlib/groupcompress.py:1739
7456
6371
#, python-format
7457
6372
msgid "Insert claimed random_id=True, but then inserted %r two times"
7458
msgstr "Insert claimed random_id=True, but then inserted %r two times"
6373
msgstr ""
7459
6374
7460
#: bzrlib/hooks.py:313
6375
#: bzrlib/hooks.py:331
7461
6376
#, python-format
7462
6377
msgid "Introduced in: %s"
7463
msgstr "Introduced in: %s"
6378
msgstr ""
7464
6379
7465
#: bzrlib/hooks.py:316
6380
#: bzrlib/hooks.py:334
7466
6381
#, python-format
7467
6382
msgid "Deprecated in: %s"
7468
msgstr "Deprecated in: %s"
6383
msgstr ""
7469
6384
7470
6385
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
7471
6386
msgid "Walking content"
7472
msgstr "Walking content"
6387
msgstr ""
7473
6388
7474
6389
#: bzrlib/knit.py:3330
7475
6390
msgid "annotating"
7476
msgstr "annotating"
6391
msgstr ""
7477
6392
7478
6393
#: bzrlib/lock.py:548
7479
6394
msgid "{0!r} was {1} locked again"
7480
msgstr "{0!r} was {1} locked again"
6395
msgstr ""
7481
6396
7482
6397
#: bzrlib/lockdir.py:321
7483
6398
#, python-format
7484
6399
msgid "error removing pending lock: %s"
7485
msgstr "error removing pending lock: %s"
6400
msgstr ""
7486
6401
7487
6402
#: bzrlib/lockdir.py:616
7488
6403
msgid "Unable to obtain"
7489
msgstr "Unable to obtain"
6404
msgstr ""
7490
6405
7491
6406
#: bzrlib/lockdir.py:618
7492
6407
msgid "Lock owner changed for"
7493
msgstr "Lock owner changed for"
6408
msgstr ""
7494
6409
7495
6410
#: bzrlib/lockdir.py:620
7496
6411
msgid "{0} lock {1} {2}."
7497
msgstr "{0} lock {1} {2}."
6412
msgstr ""
7498
6413
7499
6414
#: bzrlib/lockdir.py:627
7500
6415
#, python-format
7501
6416
msgid "Will continue to try until %s, unless you press Ctrl-C."
7502
msgstr "Will continue to try until %s, unless you press Ctrl-C."
6417
msgstr ""
7503
6418
7504
6419
#: bzrlib/lockdir.py:629
7505
6420
msgid "See \"bzr help break-lock\" for more."
7506
msgstr "See \"bzr help break-lock\" for more."
6421
msgstr ""
7507
6422
7508
6423
#: bzrlib/lockdir.py:739
7509
6424
#, python-format
7510
6425
msgid ""
7511
6426
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
7512
6427
msgstr ""
7513
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
7514
6428
7515
#: bzrlib/log.py:563
6429
#: bzrlib/log.py:572
7516
6430
msgid "--exclude-common-ancestry requires two different revisions"
7517
msgstr "--exclude-common-ancestry requires two different revisions"
6431
msgstr ""
7518
6432
7519
#: bzrlib/log.py:565
6433
#: bzrlib/log.py:574
7520
6434
#, python-format
7521
6435
msgid "invalid direction %r"
7522
msgstr "invalid direction %r"
6436
msgstr ""
7523
6437
7524
#: bzrlib/log.py:653
6438
#: bzrlib/log.py:662
7525
6439
msgid "Start revision not found in history of end revision."
7526
msgstr "Start revision not found in history of end revision."
6440
msgstr ""
7527
6441
7528
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6442
#: bzrlib/log.py:1080 bzrlib/log.py:1138
7529
6443
msgid "Logging revision 0 is invalid."
7530
msgstr "Logging revision 0 is invalid."
6444
msgstr ""
7531
6445
7532
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6446
#: bzrlib/log.py:1082 bzrlib/log.py:1140
7533
6447
msgid "Start revision must be older than the end revision."
7534
msgstr "Start revision must be older than the end revision."
6448
msgstr ""
7535
6449
7536
#: bzrlib/log.py:1818
6450
#: bzrlib/log.py:1827
7537
6451
#, python-format
7538
6452
msgid "unknown log formatter: %r"
7539
msgstr "unknown log formatter: %r"
6453
msgstr ""
7540
6454
7541
#: bzrlib/log.py:2114
6455
#: bzrlib/log.py:2123
7542
6456
msgid "fixes bug"
7543
6457
msgid_plural "fixes bugs"
7544
msgstr[0] "fixes bug"
7545
msgstr[1] "fixes bugs"
6458
msgstr[0] ""
6459
msgstr[1] ""
7546
6460
7547
6461
#: bzrlib/merge.py:689
7548
6462
msgid "All changes applied successfully."
7549
msgstr "All changes applied successfully."
6463
msgstr ""
7550
6464
7551
6465
#: bzrlib/merge.py:691
7552
6466
#, python-format
7553
6467
msgid "%d conflicts encountered."
7554
msgstr "%d conflicts encountered."
6468
msgstr ""
7555
6469
7556
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6470
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
7557
6471
msgid "Preparing file merge"
7558
msgstr "Preparing file merge"
6472
msgstr ""
7559
6473
7560
6474
#: bzrlib/multiparent.py:426
7561
6475
msgid "Importing revisions"
7562
msgstr "Importing revisions"
6476
msgstr ""
7563
6477
7564
6478
#: bzrlib/option.py:526
7565
6479
msgid "Show help message."
7566
msgstr "Show help message."
6480
msgstr ""
7567
6481
7568
6482
#: bzrlib/option.py:528
7569
6483
msgid "Only display errors and warnings."
7570
msgstr "Only display errors and warnings."
6484
msgstr ""
7571
6485
7572
6486
#: bzrlib/option.py:531
7573
6487
msgid "Show usage message and options."
7574
msgstr "Show usage message and options."
6488
msgstr ""
7575
6489
7576
6490
#: bzrlib/option.py:533
7577
6491
msgid "Display more information."
7578
msgstr "Display more information."
6492
msgstr ""
7579
6493
7580
6494
#: bzrlib/option.py:541
7581
6495
msgid ""
7582
6496
"Select changes introduced by the specified revision. See also \"help "
7583
6497
"revisionspec\"."
7584
6498
msgstr ""
7585
"Select changes introduced by the specified revision. See also \"help "
7586
"revisionspec\"."
7587
6499
7588
6500
#: bzrlib/option.py:543
7589
6501
msgid "Branch to operate on, instead of working directory."
7590
msgstr "Branch to operate on, instead of working directory."
6502
msgstr ""
7591
6503
7592
6504
#: bzrlib/option.py:545
7593
6505
msgid "Detailed log format."
7594
msgstr "Detailed log format."
6506
msgstr ""
7595
6507
7596
6508
#: bzrlib/option.py:545
7597
6509
msgid "Format used by GNU ChangeLog files."
7598
msgstr "Format used by GNU ChangeLog files."
6510
msgstr ""
7599
6511
7600
6512
#: bzrlib/option.py:545
7601
6513
msgid "Log format with one line per revision."
7602
msgstr "Log format with one line per revision."
6514
msgstr ""
7603
6515
7604
6516
#: bzrlib/option.py:545
7605
6517
msgid "Moderately short log format."
7606
msgstr "Moderately short log format."
6518
msgstr ""
7607
6519
7608
6520
#: bzrlib/option.py:545
7609
6521
msgid "Use specified log format."
7610
msgstr "Use specified log format."
6522
msgstr ""
7611
6523
7612
6524
#: bzrlib/option.py:547
7613
6525
msgid "Log format"
7614
msgstr "Log format"
6526
msgstr ""
7615
6527
7616
6528
#: bzrlib/option.py:549
7617
6529
msgid "LCA-newness merge."
7618
msgstr "LCA-newness merge."
6530
msgstr ""
7619
6531
7620
6532
#: bzrlib/option.py:549
7621
6533
msgid "Merge using external diff3."
7622
msgstr "Merge using external diff3."
6534
msgstr ""
7623
6535
7624
6536
#: bzrlib/option.py:549
7625
6537
msgid "Native diff3-style merge."
7626
msgstr "Native diff3-style merge."
6538
msgstr ""
7627
6539
7628
6540
#: bzrlib/option.py:549
7629
6541
msgid "Select a particular merge algorithm."
7630
msgstr "Select a particular merge algorithm."
6542
msgstr ""
7631
6543
7632
6544
#: bzrlib/option.py:549
7633
6545
msgid "Weave-based merge."
7634
msgstr "Weave-based merge."
6546
msgstr ""
7635
6547
7636
6548
#: bzrlib/option.py:551
7637
6549
msgid "Merge algorithm"
7638
msgstr "Merge algorithm"
6550
msgstr ""
7639
6551
7640
6552
#: bzrlib/option.py:554
7641
6553
msgid "Message string."
7642
msgstr "Message string."
6554
msgstr ""
7643
6555
7644
6556
#: bzrlib/option.py:556
7645
6557
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
7646
msgstr "Use an ASCII NUL (\\0) separator rather than a newline."
6558
msgstr ""
7647
6559
7648
6560
#: bzrlib/option.py:558
7649
6561
msgid "Ignore differences between branches and overwrite unconditionally."
7650
msgstr "Ignore differences between branches and overwrite unconditionally."
6562
msgstr ""
7651
6563
7652
6564
#: bzrlib/option.py:560
7653
6565
msgid "Remember the specified location as a default."
7654
msgstr "Remember the specified location as a default."
6566
msgstr ""
7655
6567
7656
6568
#: bzrlib/option.py:562
7657
6569
msgid "Reprocess to reduce spurious conflicts."
7658
msgstr "Reprocess to reduce spurious conflicts."
6570
msgstr ""
7659
6571
7660
6572
#: bzrlib/option.py:566
7661
6573
msgid "See \"help revisionspec\" for details."
7662
msgstr "See \"help revisionspec\" for details."
6574
msgstr ""
7663
6575
7664
6576
#: bzrlib/option.py:568
7665
6577
msgid "Show internal object ids."
7666
msgstr "Show internal object ids."
6578
msgstr ""
7667
6579
7668
6580
#: bzrlib/option.py:571
7669
6581
msgid "Display timezone as local, original, or utc."
7670
msgstr "Display timezone as local, original, or utc."
6582
msgstr ""
7671
6583
7672
6584
#: bzrlib/osutils.py:100
7673
6585
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
7674
msgstr "Parameter {0!r} encoding is unsupported by {1} application locale."
6586
msgstr ""
7675
6587
7676
6588
#: bzrlib/osutils.py:220
7677
6589
msgid "lstat/stat of ({0!r}): {1!r}"
7678
msgstr "lstat/stat of ({0!r}): {1!r}"
6590
msgstr ""
7679
6591
7680
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6592
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
7681
6593
#, python-format
7682
6594
msgid "sorry, %r not allowed in path"
7683
msgstr "sorry, %r not allowed in path"
6595
msgstr ""
7684
6596
7685
#: bzrlib/osutils.py:1259
6597
#: bzrlib/osutils.py:1237
7686
6598
#, python-format
7687
6599
msgid "%r is too short to calculate a relative path"
7688
msgstr "%r is too short to calculate a relative path"
6600
msgstr ""
7689
6601
7690
6602
#: bzrlib/plugin.py:143
7691
6603
#, python-format
7692
6604
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
7693
msgstr "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6605
msgstr ""
7694
6606
7695
6607
#: bzrlib/plugins/bash_completion/bashcomp.py:411
7696
6608
msgid "Enable completions for the selected plugin (default: all plugins)"
7697
msgstr "Enable completions for the selected plugin (default: all plugins)"
6609
msgstr ""
7698
6610
7699
6611
#: bzrlib/plugins/bash_completion/bashcomp.py:412
7700
6612
msgid "Generate a shell function for bash command line completion."
7701
msgstr "Generate a shell function for bash command line completion."
6613
msgstr ""
7702
6614
7703
6615
#: bzrlib/plugins/bash_completion/bashcomp.py:414
7704
6616
msgid ""
7706
6618
"automatically complete the currently typed command when the user presses\n"
7707
6619
"the completion key (usually tab)."
7708
6620
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)."
7712
6621
7713
6622
#: bzrlib/plugins/bash_completion/bashcomp.py:418
7714
6623
msgid ""
7715
6624
"Commonly used like this:\n"
7716
6625
" eval \"`bzr bash-completion`\""
7717
6626
msgstr ""
7718
"Commonly used like this:\n"
7719
" eval \"`bzr bash-completion`\""
7720
6627
7721
6628
#: bzrlib/plugins/bash_completion/bashcomp.py:424
7722
6629
msgid "Name of the generated function (default: _bzr)"
7723
msgstr "Name of the generated function (default: _bzr)"
6630
msgstr ""
7724
6631
7725
6632
#: bzrlib/plugins/bash_completion/bashcomp.py:426
7726
6633
msgid "Generate only the shell function, don't enable it"
7727
msgstr "Generate only the shell function, don't enable it"
7728
7729
#: bzrlib/plugins/launchpad/account.py:66
7730
msgid "Setting ssh/sftp usernames for launchpad.net."
7731
msgstr "Setting ssh/sftp usernames for launchpad.net."
7732
7733
#: bzrlib/plugins/launchpad/cmds.py:44
6634
msgstr ""
6635
6636
#: bzrlib/plugins/launchpad/__init__.py:81
7734
6637
msgid "Register a branch with launchpad.net."
7735
msgstr "Register a branch with launchpad.net."
7736
7737
#: bzrlib/plugins/launchpad/cmds.py:46
7738
msgid ""
7739
"This command lists a bzr branch in the directory of branches on\n"
7740
"launchpad.net. Registration allows the branch to be associated with\n"
7741
"bugs or specifications."
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."
7746
7747
#: bzrlib/plugins/launchpad/cmds.py:50
7748
msgid ""
7749
"Before using this command you must register the project to which the\n"
7750
"branch belongs, and create an account for yourself on launchpad.net."
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."
7754
7755
#: bzrlib/plugins/launchpad/cmds.py:53
7756
msgid ""
7757
"arguments:\n"
7758
" public_url: The publicly visible url for the branch to register.\n"
7759
" This must be an http or https url (which Launchpad can read\n"
7760
" from to access the branch). Local file urls, SFTP urls, and\n"
7761
" bzr+ssh urls will not work.\n"
7762
" If no public_url is provided, bzr will use the configured\n"
7763
" public_url if there is one for the current branch, and\n"
7764
" otherwise error."
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."
7774
7775
#: bzrlib/plugins/launchpad/cmds.py:62
7776
msgid ""
7777
"example:\n"
7778
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7779
" --project fooproject"
7780
msgstr ""
7781
"example:\n"
7782
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7783
" --project fooproject"
7784
7785
#: bzrlib/plugins/launchpad/cmds.py:69
6638
msgstr ""
6639
6640
#: bzrlib/plugins/launchpad/__init__.py:83
6641
msgid ""
6642
"This command lists a bzr branch in the directory of branches on\n"
6643
"launchpad.net. Registration allows the branch to be associated with\n"
6644
"bugs or specifications."
6645
msgstr ""
6646
6647
#: bzrlib/plugins/launchpad/__init__.py:87
6648
msgid ""
6649
"Before using this command you must register the project to which the\n"
6650
"branch belongs, and create an account for yourself on launchpad.net."
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/__init__.py:90
6654
msgid ""
6655
"arguments:\n"
6656
" public_url: The publicly visible url for the branch to register.\n"
6657
" This must be an http or https url (which Launchpad can read\n"
6658
" from to access the branch). Local file urls, SFTP urls, and\n"
6659
" bzr+ssh urls will not work.\n"
6660
" If no public_url is provided, bzr will use the configured\n"
6661
" public_url if there is one for the current branch, and\n"
6662
" otherwise error."
6663
msgstr ""
6664
6665
#: bzrlib/plugins/launchpad/__init__.py:99
6666
msgid ""
6667
"example:\n"
6668
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6669
" --project fooproject"
6670
msgstr ""
6671
6672
#: bzrlib/plugins/launchpad/__init__.py:106
7786
6673
msgid "Launchpad project short name to associate with the branch."
7787
msgstr "Launchpad project short name to associate with the branch."
6674
msgstr ""
7788
6675
7789
#: bzrlib/plugins/launchpad/cmds.py:76
6676
#: bzrlib/plugins/launchpad/__init__.py:113
7790
6677
msgid ""
7791
6678
"Short name for the branch; by default taken from the last component of the "
7792
6679
"url."
7793
6680
msgstr ""
7794
"Short name for the branch; by default taken from the last component of the "
7795
"url."
7796
6681
7797
#: bzrlib/plugins/launchpad/cmds.py:80
6682
#: bzrlib/plugins/launchpad/__init__.py:117
7798
6683
msgid "One-sentence description of the branch."
7799
msgstr "One-sentence description of the branch."
6684
msgstr ""
7800
6685
7801
#: bzrlib/plugins/launchpad/cmds.py:83
6686
#: bzrlib/plugins/launchpad/__init__.py:120
7802
6687
msgid "Longer description of the purpose or contents of the branch."
7803
msgstr "Longer description of the purpose or contents of the branch."
6688
msgstr ""
7804
6689
7805
#: bzrlib/plugins/launchpad/cmds.py:86
6690
#: bzrlib/plugins/launchpad/__init__.py:123
7806
6691
msgid "Branch author's email address, if not yourself."
7807
msgstr "Branch author's email address, if not yourself."
6692
msgstr ""
7808
6693
7809
#: bzrlib/plugins/launchpad/cmds.py:89
6694
#: bzrlib/plugins/launchpad/__init__.py:126
7810
6695
msgid "The bug this branch fixes."
7811
msgstr "The bug this branch fixes."
6696
msgstr ""
7812
6697
7813
#: bzrlib/plugins/launchpad/cmds.py:92
6698
#: bzrlib/plugins/launchpad/__init__.py:129
7814
6699
msgid "Prepare the request but don't actually send it."
7815
msgstr "Prepare the request but don't actually send it."
6700
msgstr ""
7816
6701
7817
#: bzrlib/plugins/launchpad/cmds.py:114
6702
#: bzrlib/plugins/launchpad/__init__.py:151
7818
6703
msgid ""
7819
6704
"register-branch requires a public branch url - see bzr help register-branch."
7820
6705
msgstr ""
7821
"register-branch requires a public branch url - see bzr help register-branch."
7822
6706
7823
#: bzrlib/plugins/launchpad/cmds.py:122
6707
#: bzrlib/plugins/launchpad/__init__.py:159
7824
6708
msgid "--product is deprecated; please use --project."
7825
msgstr "--product is deprecated; please use --project."
6709
msgstr ""
7826
6710
7827
#: bzrlib/plugins/launchpad/cmds.py:152
6711
#: bzrlib/plugins/launchpad/__init__.py:191
7828
6712
msgid "Open a Launchpad branch page in your web browser."
7829
msgstr "Open a Launchpad branch page in your web browser."
6713
msgstr ""
7830
6714
7831
#: bzrlib/plugins/launchpad/cmds.py:157
6715
#: bzrlib/plugins/launchpad/__init__.py:196
7832
6716
msgid "Do not actually open the browser. Just say the URL we would use."
7833
msgstr "Do not actually open the browser. Just say the URL we would use."
6717
msgstr ""
7834
6718
7835
#: bzrlib/plugins/launchpad/cmds.py:192
6719
#: bzrlib/plugins/launchpad/__init__.py:231
7836
6720
#, python-format
7837
6721
msgid "Opening %s in web browser"
7838
msgstr "Opening %s in web browser"
6722
msgstr ""
7839
6723
7840
#: bzrlib/plugins/launchpad/cmds.py:200
6724
#: bzrlib/plugins/launchpad/__init__.py:241
7841
6725
msgid "Show or set the Launchpad user ID."
7842
msgstr "Show or set the Launchpad user ID."
7843
7844
#: bzrlib/plugins/launchpad/cmds.py:202
7845
msgid ""
7846
"When communicating with Launchpad, some commands need to know your\n"
7847
"Launchpad user ID. This command can be used to set or show the\n"
7848
"user ID that Bazaar will use for such communication."
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."
7853
7854
#: bzrlib/plugins/launchpad/cmds.py:206
7855
msgid ""
7856
":Examples:\n"
7857
" Show the Launchpad ID of the current user::"
7858
msgstr ""
7859
":Examples:\n"
7860
" Show the Launchpad ID of the current user::"
7861
7862
#: bzrlib/plugins/launchpad/cmds.py:209
6726
msgstr ""
6727
6728
#: bzrlib/plugins/launchpad/__init__.py:243
6729
msgid ""
6730
"When communicating with Launchpad, some commands need to know your\n"
6731
"Launchpad user ID. This command can be used to set or show the\n"
6732
"user ID that Bazaar will use for such communication."
6733
msgstr ""
6734
6735
#: bzrlib/plugins/launchpad/__init__.py:247
6736
msgid ""
6737
":Examples:\n"
6738
" Show the Launchpad ID of the current user::"
6739
msgstr ""
6740
6741
#: bzrlib/plugins/launchpad/__init__.py:250
7863
6742
msgid " bzr launchpad-login"
7864
msgstr " bzr launchpad-login"
6743
msgstr ""
7865
6744
7866
#: bzrlib/plugins/launchpad/cmds.py:211
6745
#: bzrlib/plugins/launchpad/__init__.py:252
7867
6746
msgid " Set the Launchpad ID of the current user to 'bob'::"
7868
msgstr " Set the Launchpad ID of the current user to 'bob'::"
6747
msgstr ""
7869
6748
7870
#: bzrlib/plugins/launchpad/cmds.py:213
6749
#: bzrlib/plugins/launchpad/__init__.py:254
7871
6750
msgid " bzr launchpad-login bob"
7872
msgstr " bzr launchpad-login bob"
6751
msgstr ""
7873
6752
7874
#: bzrlib/plugins/launchpad/cmds.py:220
6753
#: bzrlib/plugins/launchpad/__init__.py:261
7875
6754
msgid "Don't check that the user name is valid."
7876
msgstr "Don't check that the user name is valid."
6755
msgstr ""
7877
6756
7878
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6757
#: bzrlib/plugins/launchpad/__init__.py:276
6758
#: bzrlib/plugins/launchpad/__init__.py:287
7879
6759
msgid "Launchpad user ID exists and has SSH keys.\n"
7880
msgstr "Launchpad user ID exists and has SSH keys.\n"
6760
msgstr ""
7881
6761
7882
#: bzrlib/plugins/launchpad/cmds.py:238
6762
#: bzrlib/plugins/launchpad/__init__.py:279
7883
6763
msgid "No Launchpad user ID configured.\n"
7884
msgstr "No Launchpad user ID configured.\n"
6764
msgstr ""
7885
6765
7886
#: bzrlib/plugins/launchpad/cmds.py:249
6766
#: bzrlib/plugins/launchpad/__init__.py:290
7887
6767
#, python-format
7888
6768
msgid "Launchpad user ID set to '%s'.\n"
7889
msgstr "Launchpad user ID set to '%s'.\n"
6769
msgstr ""
7890
6770
7891
#: bzrlib/plugins/launchpad/cmds.py:255
6771
#: bzrlib/plugins/launchpad/__init__.py:298
7892
6772
msgid "Ask Launchpad to mirror a branch now."
7893
msgstr "Ask Launchpad to mirror a branch now."
6773
msgstr ""
7894
6774
7895
#: bzrlib/plugins/launchpad/cmds.py:272
6775
#: bzrlib/plugins/launchpad/__init__.py:318
7896
6776
msgid "Propose merging a branch on Launchpad."
7897
msgstr "Propose merging a branch on Launchpad."
7898
7899
#: bzrlib/plugins/launchpad/cmds.py:274
7900
msgid ""
7901
"This will open your usual editor to provide the initial comment. When it\n"
7902
"has created the proposal, it will open it in your default web browser."
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."
7906
7907
#: bzrlib/plugins/launchpad/cmds.py:277
7908
msgid ""
7909
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7910
"is not supplied, the remembered submit branch will be used. If no submit\n"
7911
"branch is remembered, the development focus will be used."
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."
7916
7917
#: bzrlib/plugins/launchpad/cmds.py:281
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/__init__.py:320
6780
msgid ""
6781
"This will open your usual editor to provide the initial comment. When it\n"
6782
"has created the proposal, it will open it in your default web browser."
6783
msgstr ""
6784
6785
#: bzrlib/plugins/launchpad/__init__.py:323
6786
msgid ""
6787
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6788
"is not supplied, the remembered submit branch will be used. If no submit\n"
6789
"branch is remembered, the development focus will be used."
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/__init__.py:327
7918
6793
msgid ""
7919
6794
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7920
6795
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7921
6796
"The parameter the launchpad account name of the desired reviewer. This\n"
7922
6797
"may optionally be followed by '=' and the review type. For example:"
7923
6798
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:"
7928
6799
7929
#: bzrlib/plugins/launchpad/cmds.py:286
6800
#: bzrlib/plugins/launchpad/__init__.py:332
7930
6801
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7931
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
6802
msgstr ""
7932
6803
7933
#: bzrlib/plugins/launchpad/cmds.py:288
6804
#: bzrlib/plugins/launchpad/__init__.py:334
7934
6805
msgid ""
7935
6806
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7936
6807
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7937
6808
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."
7940
6809
7941
#: bzrlib/plugins/launchpad/cmds.py:293
6810
#: bzrlib/plugins/launchpad/__init__.py:339
7942
6811
msgid "Propose the merge on staging."
7943
msgstr "Propose the merge on staging."
6812
msgstr ""
7944
6813
7945
#: bzrlib/plugins/launchpad/cmds.py:295
6814
#: bzrlib/plugins/launchpad/__init__.py:341
7946
6815
msgid "Commit message."
7947
msgstr "Commit message."
6816
msgstr ""
7948
6817
7949
#: bzrlib/plugins/launchpad/cmds.py:297
6818
#: bzrlib/plugins/launchpad/__init__.py:343
7950
6819
msgid "Mark the proposal as approved immediately."
7951
msgstr "Mark the proposal as approved immediately."
7952
7953
#: bzrlib/plugins/launchpad/cmds.py:298
7954
msgid "The bug this proposal fixes."
7955
msgstr "The bug this proposal fixes."
7956
7957
#: bzrlib/plugins/launchpad/cmds.py:300
6820
msgstr ""
6821
6822
#: bzrlib/plugins/launchpad/__init__.py:345
7958
6823
msgid "Requested reviewer and optional type."
7959
msgstr "Requested reviewer and optional type."
6824
msgstr ""
7960
6825
7961
#: bzrlib/plugins/launchpad/cmds.py:335
6826
#: bzrlib/plugins/launchpad/__init__.py:382
7962
6827
msgid "Find the proposal to merge this revision."
7963
msgstr "Find the proposal to merge this revision."
7964
7965
#: bzrlib/plugins/launchpad/cmds.py:337
7966
msgid ""
7967
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7968
"This works only if the selected branch was the merge proposal target, and\n"
7969
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7970
"are opened in a web browser."
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."
7976
7977
#: bzrlib/plugins/launchpad/cmds.py:342
7978
msgid ""
7979
"Any revision involved in the merge may be specified-- the revision in\n"
7980
"which the merge was performed, or one of the revisions that was merged."
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."
7984
7985
#: bzrlib/plugins/launchpad/cmds.py:345
6828
msgstr ""
6829
6830
#: bzrlib/plugins/launchpad/__init__.py:384
6831
msgid ""
6832
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6833
"This works only if the selected branch was the merge proposal target, and\n"
6834
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6835
"are opened in a web browser."
6836
msgstr ""
6837
6838
#: bzrlib/plugins/launchpad/__init__.py:389
6839
msgid ""
6840
"Any revision involved in the merge may be specified-- the revision in\n"
6841
"which the merge was performed, or one of the revisions that was merged."
6842
msgstr ""
6843
6844
#: bzrlib/plugins/launchpad/__init__.py:392
7986
6845
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7987
msgstr "So, to find the merge proposal that reviewed line 1 of README::"
6846
msgstr ""
7988
6847
7989
#: bzrlib/plugins/launchpad/cmds.py:347
6848
#: bzrlib/plugins/launchpad/__init__.py:394
7990
6849
msgid " bzr lp-find-proposal -r annotate:README:1"
7991
msgstr " bzr lp-find-proposal -r annotate:README:1"
6850
msgstr ""
7992
6851
7993
#: bzrlib/plugins/launchpad/cmds.py:363
6852
#: bzrlib/plugins/launchpad/__init__.py:409
7994
6853
msgid "No review found."
7995
msgstr "No review found."
6854
msgstr ""
7996
6855
7997
#: bzrlib/plugins/launchpad/cmds.py:364
6856
#: bzrlib/plugins/launchpad/__init__.py:410
7998
6857
#, python-format
7999
6858
msgid "%d proposals(s) found."
8000
msgstr "%d proposals(s) found."
6859
msgstr ""
8001
6860
8002
#: bzrlib/plugins/launchpad/cmds.py:374
6861
#: bzrlib/plugins/launchpad/__init__.py:420
8003
6862
msgid "Finding revision-id"
8004
msgstr "Finding revision-id"
6863
msgstr ""
8005
6864
8006
#: bzrlib/plugins/launchpad/cmds.py:381
6865
#: bzrlib/plugins/launchpad/__init__.py:427
8007
6866
msgid "Finding merge"
8008
msgstr "Finding merge"
6867
msgstr ""
8009
6868
8010
#: bzrlib/plugins/launchpad/cmds.py:386
6869
#: bzrlib/plugins/launchpad/__init__.py:432
8011
6870
msgid "Finding revno"
8012
msgstr "Finding revno"
6871
msgstr ""
8013
6872
8014
#: bzrlib/plugins/launchpad/cmds.py:392
6873
#: bzrlib/plugins/launchpad/__init__.py:437
8015
6874
msgid "Finding Launchpad branch"
8016
msgstr "Finding Launchpad branch"
6875
msgstr ""
8017
6876
8018
#: bzrlib/plugins/launchpad/cmds.py:395
6877
#: bzrlib/plugins/launchpad/__init__.py:440
8019
6878
msgid "Finding proposals"
8020
msgstr "Finding proposals"
6879
msgstr ""
6880
6881
#: bzrlib/plugins/launchpad/account.py:66
6882
msgid "Setting ssh/sftp usernames for launchpad.net."
6883
msgstr ""
8021
6884
8022
6885
#: bzrlib/plugins/launchpad/lp_api.py:241
8023
6886
#: bzrlib/plugins/launchpad/lp_api.py:246
8024
6887
#, python-format
8025
6888
msgid "%s is not registered on Launchpad"
8026
msgstr "%s is not registered on Launchpad"
6889
msgstr ""
8027
6890
8028
6891
#: bzrlib/plugins/launchpad/lp_api.py:256
8029
6892
#, python-format
8030
6893
msgid "%s has no development focus."
8031
msgstr "%s has no development focus."
6894
msgstr ""
8032
6895
8033
6896
#: bzrlib/plugins/launchpad/lp_api.py:261
8034
6897
#, python-format
8035
6898
msgid "development focus %s has no branch."
8036
msgstr "development focus %s has no branch."
6899
msgstr ""
8037
6900
8038
6901
#: bzrlib/plugins/launchpad/lp_api.py:266
8039
6902
#, python-format
8040
6903
msgid "source package %s has no branch."
8041
msgstr "source package %s has no branch."
6904
msgstr ""
8042
6905
8043
6906
#: bzrlib/plugins/launchpad/lp_api.py:270
8044
6907
#, python-format
8045
6908
msgid "%s has no associated product or source package."
8046
msgstr "%s has no associated product or source package."
6909
msgstr ""
8047
6910
8048
6911
#: bzrlib/plugins/launchpad/lp_api.py:282
8049
6912
#, python-format
8050
6913
msgid "%s is already up-to-date."
8051
msgstr "%s is already up-to-date."
6914
msgstr ""
8052
6915
8053
6916
#: bzrlib/plugins/launchpad/lp_api.py:289
8054
6917
#, python-format
8055
6918
msgid "Pushing to %s"
8056
msgstr "Pushing to %s"
6919
msgstr ""
8057
6920
8058
6921
#: bzrlib/plugins/launchpad/lp_directory.py:170
8059
6922
msgid ""
8061
6924
" local: {1}\n"
8062
6925
" remote: {2}"
8063
6926
msgstr ""
8064
"resolution for {0}\n"
8065
" local: {1}\n"
8066
" remote: {2}"
8067
6927
8068
#: bzrlib/plugins/launchpad/lp_propose.py:150
6928
#: bzrlib/plugins/launchpad/lp_propose.py:149
8069
6929
#, python-format
8070
6930
msgid "There is already a branch merge proposal: %s"
8071
msgstr "There is already a branch merge proposal: %s"
6931
msgstr ""
8072
6932
8073
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
8074
6934
msgid "pb parameter to convert() is deprecated"
8075
msgstr "pb parameter to convert() is deprecated"
6935
msgstr ""
8076
6936
8077
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6937
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
8078
6938
msgid "starting upgrade from format 4 to 5"
8079
msgstr "starting upgrade from format 4 to 5"
6939
msgstr ""
8080
6940
8081
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
8082
6942
msgid "note: upgrade may be faster if all store files are ungzipped first"
8083
msgstr "note: upgrade may be faster if all store files are ungzipped first"
6943
msgstr ""
8084
6944
8085
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6945
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
8086
6946
msgid "converting revision"
8087
msgstr "converting revision"
6947
msgstr ""
6948
6949
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6950
msgid "upgraded to weaves:"
6951
msgstr ""
8088
6952
8089
6953
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
8090
msgid "upgraded to weaves:"
8091
msgstr "upgraded to weaves:"
8092
8093
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
8094
6954
#, python-format
8095
6955
msgid "%6d revisions and inventories"
8096
msgstr "%6d revisions and inventories"
6956
msgstr ""
8097
6957
8098
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6958
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
8099
6959
#, python-format
8100
6960
msgid "%6d revisions not present"
8101
msgstr "%6d revisions not present"
6961
msgstr ""
8102
6962
8103
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6963
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
8104
6964
#, python-format
8105
6965
msgid "%6d texts"
8106
msgstr "%6d texts"
6966
msgstr ""
8107
6967
8108
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6968
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
8109
6969
msgid "writing weave"
8110
msgstr "writing weave"
6970
msgstr ""
8111
6971
8112
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
8113
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6972
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6973
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
8114
6974
msgid "inventory"
8115
msgstr "inventory"
6975
msgstr ""
8116
6976
8117
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6977
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
8118
6978
msgid "write revision"
8119
msgstr "write revision"
6979
msgstr ""
8120
6980
8121
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6981
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
8122
6982
msgid "loading revision"
8123
msgstr "loading revision"
6983
msgstr ""
8124
6984
8125
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6985
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
8126
6986
#, python-format
8127
6987
msgid "revision {%s} not present in branch; will be converted as a ghost"
8128
msgstr "revision {%s} not present in branch; will be converted as a ghost"
6988
msgstr ""
8129
6989
8130
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6990
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
8131
6991
msgid "starting upgrade from format 5 to 6"
8132
msgstr "starting upgrade from format 5 to 6"
6992
msgstr ""
8133
6993
8134
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6994
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
8135
6995
#, python-format
8136
6996
msgid "adding prefixes to %s"
8137
msgstr "adding prefixes to %s"
6997
msgstr ""
8138
6998
8139
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6999
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
8140
7000
msgid "starting upgrade from format 6 to metadir"
8141
msgstr "starting upgrade from format 6 to metadir"
7001
msgstr ""
8142
7002
8143
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7003
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
8144
7004
msgid "Removing ancestry.weave"
8145
msgstr "Removing ancestry.weave"
7005
msgstr ""
8146
7006
8147
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7007
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
8148
7008
msgid "Finding branch files"
8149
msgstr "Finding branch files"
7009
msgstr ""
8150
7010
8151
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7011
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
8152
7012
msgid "Upgrading repository"
8153
msgstr "Upgrading repository"
7013
msgstr ""
8154
7014
8155
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7015
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
8156
7016
msgid "Upgrading branch"
8157
msgstr "Upgrading branch"
7017
msgstr ""
8158
7018
8159
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7019
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
8160
7020
msgid "No working tree."
8161
msgstr "No working tree."
7021
msgstr ""
8162
7022
8163
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7023
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
8164
7024
msgid "Upgrading working tree"
8165
msgstr "Upgrading working tree"
7025
msgstr ""
8166
7026
8167
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7027
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
8168
7028
#, python-format
8169
7029
msgid "Make %s lock"
8170
msgstr "Make %s lock"
7030
msgstr ""
8171
7031
8172
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7032
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
8173
7033
#, python-format
8174
7034
msgid "Moving %s"
8175
msgstr "Moving %s"
7035
msgstr ""
8176
7036
8177
7037
#: bzrlib/push.py:56
8178
7038
msgid "Created new branch."
8179
msgstr "Created new branch."
7039
msgstr ""
8180
7040
8181
7041
#: bzrlib/push.py:97
8182
7042
#, python-format
8183
7043
msgid ""
8184
7044
"Target directory %s already contains a .bzr directory, but it is not valid."
8185
7045
msgstr ""
8186
"Target directory %s already contains a .bzr directory, but it is not valid."
8187
7046
8188
7047
#: bzrlib/push.py:101
8189
7048
#, python-format
8191
7050
"Target directory %s already exists, but does not have a .bzr directory. "
8192
7051
"Supply --use-existing-dir to push there anyway."
8193
7052
msgstr ""
8194
"Target directory %s already exists, but does not have a .bzr directory. "
8195
"Supply --use-existing-dir to push there anyway."
8196
7053
8197
7054
#: bzrlib/push.py:122
8198
7055
#, python-format
8199
7056
msgid "Too many redirections trying to make %s."
8200
msgstr "Too many redirections trying to make %s."
8201
8202
#: bzrlib/push.py:148
8203
msgid ""
8204
"These branches have diverged. See \"bzr help diverged-branches\" for more "
8205
"information."
8206
msgstr ""
8207
"These branches have diverged. See \"bzr help diverged-branches\" for more "
8208
"information."
8209
8210
#: bzrlib/push.py:152
8211
#, python-format
8212
msgid ""
8213
"It is not possible to losslessly push to %s. You may want to use dpush "
8214
"instead."
8215
msgstr ""
8216
"It is not possible to losslessly push to %s. You may want to use dpush "
8217
"instead."
8218
8219
#: bzrlib/push.py:158
8220
#, python-format
8221
msgid ""
8222
"At %s you have a valid .bzr control directory, but not a branch or "
8223
"repository. This is an unsupported configuration. Please move the target "
8224
"directory out of the way and try again."
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."
7057
msgstr ""
7058
7059
#: bzrlib/push.py:147
7060
msgid ""
7061
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7062
"information."
7063
msgstr ""
7064
7065
#: bzrlib/push.py:151
7066
#, python-format
7067
msgid ""
7068
"It is not possible to losslessly push to %s. You may want to use dpush "
7069
"instead."
7070
msgstr ""
7071
7072
#: bzrlib/push.py:157
7073
#, python-format
7074
msgid ""
7075
"At %s you have a valid .bzr control directory, but not a branch or "
7076
"repository. This is an unsupported configuration. Please move the target "
7077
"directory out of the way and try again."
7078
msgstr ""
8229
7079
8230
7080
#: bzrlib/reconcile.py:97
8231
7081
#, python-format
8232
7082
msgid "Reconciling branch %s"
8233
msgstr "Reconciling branch %s"
7083
msgstr ""
8234
7084
8235
7085
#: bzrlib/reconcile.py:103
8236
7086
#, python-format
8237
7087
msgid "Reconciling repository %s"
8238
msgstr "Reconciling repository %s"
7088
msgstr ""
8239
7089
8240
7090
#: bzrlib/reconcile.py:105
8241
7091
msgid "Reconciling repository"
8242
msgstr "Reconciling repository"
7092
msgstr ""
8243
7093
8244
7094
#: bzrlib/reconcile.py:111
8245
7095
#, python-format
8246
7096
msgid "%s cannot canonicalize CHKs."
8247
msgstr "%s cannot canonicalise CHKs."
7097
msgstr ""
8248
7098
8249
7099
#: bzrlib/reconcile.py:119
8250
7100
msgid "Reconcile aborted: revision index has inconsistent parents."
8251
msgstr "Reconcile aborted: revision index has inconsistent parents."
7101
msgstr ""
8252
7102
8253
7103
#: bzrlib/reconcile.py:121
8254
7104
msgid "Run \"bzr check\" for more details."
8255
msgstr "Run \"bzr check\" for more details."
7105
msgstr ""
8256
7106
8257
7107
#: bzrlib/reconcile.py:123
8258
7108
msgid "Reconciliation complete."
8259
msgstr "Reconciliation complete."
7109
msgstr ""
8260
7110
8261
7111
#: bzrlib/reconcile.py:166
8262
7112
msgid "Fixing last revision info {0} => {1}"
8263
msgstr "Fixing last revision info {0} => {1}"
7113
msgstr ""
8264
7114
8265
7115
#: bzrlib/reconcile.py:173
8266
7116
msgid "revision_history ok."
8267
msgstr "revision_history ok."
7117
msgstr ""
8268
7118
8269
7119
#: bzrlib/reconcile.py:234
8270
7120
msgid "Reading inventory data"
8271
msgstr "Reading inventory data"
7121
msgstr ""
8272
7122
8273
7123
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
8274
7124
msgid "Inventory ok."
8275
msgstr "Inventory ok."
7125
msgstr ""
8276
7126
8277
7127
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
8278
7128
msgid "Backing up inventory"
8279
msgstr "Backing up inventory"
7129
msgstr ""
8280
7130
8281
7131
#: bzrlib/reconcile.py:258
8282
7132
msgid "Backup inventory created."
8283
msgstr "Backup inventory created."
7133
msgstr ""
8284
7134
8285
7135
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
8286
7136
msgid "Writing weave"
8287
msgstr "Writing weave"
7137
msgstr ""
8288
7138
8289
7139
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
8290
7140
msgid "Inventory regenerated."
8291
msgstr "Inventory regenerated."
7141
msgstr ""
8292
7142
8293
7143
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
8294
7144
msgid "Reading indexes"
8295
msgstr "Reading indexes"
7145
msgstr ""
8296
7146
8297
7147
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
8298
7148
msgid "Checking unused inventories"
8299
msgstr "Checking unused inventories"
7149
msgstr ""
8300
7150
8301
7151
#: bzrlib/reconcile.py:388
8302
7152
msgid "Backup Inventory created"
8303
msgstr "Backup Inventory created"
7153
msgstr ""
8304
7154
8305
7155
#: bzrlib/reconcile.py:446
8306
7156
msgid "Fixing text parents"
8307
msgstr "Fixing text parents"
7157
msgstr ""
8308
7158
8309
7159
#: bzrlib/reconfigure.py:54
8310
7160
msgid "{0} is now stacked on {1}\n"
8311
msgstr "{0} is now stacked on {1}\n"
7161
msgstr ""
8312
7162
8313
7163
#: bzrlib/reconfigure.py:69
8314
7164
#, python-format
8315
7165
msgid "%s is now not stacked\n"
8316
msgstr "%s is now not stacked\n"
7166
msgstr ""
8317
7167
8318
7168
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
8319
7169
#, python-format
8320
7170
msgid "bzr: ERROR (ignored): %s"
8321
msgstr "bzr: ERROR (ignored): %s"
7171
msgstr ""
8322
7172
8323
#: bzrlib/remote.py:2534
7173
#: bzrlib/remote.py:2541
8324
7174
msgid "Copying repository content as tarball..."
8325
msgstr "Copying repository content as tarball..."
7175
msgstr ""
8326
7176
8327
7177
#: bzrlib/rename_map.py:69
8328
7178
msgid "Calculating hashes"
8329
msgstr "Calculating hashes"
7179
msgstr ""
8330
7180
8331
7181
#: bzrlib/rename_map.py:107
8332
7182
msgid "Determining hash hits"
8333
msgstr "Determining hash hits"
7183
msgstr ""
8334
7184
8335
7185
#: bzrlib/rename_map.py:242
8336
7186
msgid "{0} => {1}"
8337
msgstr "{0} => {1}"
7187
msgstr ""
8338
7188
8339
#: bzrlib/repository.py:1738
7189
#: bzrlib/repository.py:1787
8340
7190
msgid "Moving repository to repository.backup"
8341
msgstr "Moving repository to repository.backup"
7191
msgstr ""
8342
7192
8343
#: bzrlib/repository.py:1745
7193
#: bzrlib/repository.py:1794
8344
7194
msgid "Creating new repository"
8345
msgstr "Creating new repository"
7195
msgstr ""
8346
7196
8347
#: bzrlib/repository.py:1750
7197
#: bzrlib/repository.py:1799
8348
7198
msgid "Copying content"
8349
msgstr "Copying content"
7199
msgstr ""
8350
7200
8351
#: bzrlib/repository.py:1754
7201
#: bzrlib/repository.py:1803
8352
7202
msgid "Deleting old repository content"
8353
msgstr "Deleting old repository content"
7203
msgstr ""
8354
7204
8355
#: bzrlib/repository.py:1756
7205
#: bzrlib/repository.py:1805
8356
7206
msgid "repository converted"
8357
msgstr "repository converted"
7207
msgstr ""
8358
7208
8359
7209
#: bzrlib/revisionspec.py:903
8360
7210
msgid "Using {0} {1}"
8361
msgstr "Using {0} {1}"
7211
msgstr ""
8362
7212
8363
#: bzrlib/send.py:59
7213
#: bzrlib/send.py:58
8364
7214
#, python-format
8365
7215
msgid "Mail client \"%s\" does not support specifying body"
8366
msgstr "Mail client \"%s\" does not support specifying body"
7216
msgstr ""
8367
7217
8368
#: bzrlib/send.py:63
7218
#: bzrlib/send.py:62
8369
7219
msgid "--remember requires a branch to be specified."
8370
msgstr "--remember requires a branch to be specified."
7220
msgstr ""
8371
7221
8372
#: bzrlib/send.py:78
7222
#: bzrlib/send.py:77
8373
7223
msgid "No submit branch known or specified"
8374
msgstr "No submit branch known or specified"
7224
msgstr ""
8375
7225
8376
#: bzrlib/send.py:81
7226
#: bzrlib/send.py:80
8377
7227
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
8378
7228
msgstr ""
8379
"Using saved {0} location \"{1}\" to determine what changes to submit."
8380
7229
8381
#: bzrlib/send.py:99
7230
#: bzrlib/send.py:98
8382
7231
#, python-format
8383
7232
msgid "No such send format '%s'."
8384
msgstr "No such send format '%s'."
7233
msgstr ""
8385
7234
8386
#: bzrlib/send.py:115
7235
#: bzrlib/send.py:114
8387
7236
msgid "bzr send takes at most two one revision identifiers"
8388
msgstr "bzr send takes at most two one revision identifiers"
7237
msgstr ""
8389
7238
8390
#: bzrlib/send.py:128
7239
#: bzrlib/send.py:127
8391
7240
msgid "No revisions to submit."
8392
msgstr "No revisions to submit."
7241
msgstr ""
8393
7242
8394
#: bzrlib/send.py:140
7243
#: bzrlib/send.py:139
8395
7244
msgid ""
8396
7245
"- not supported for merge directives that use more than one output file."
8397
7246
msgstr ""
8398
"- not supported for merge directives that use more than one output file."
8399
7247
8400
#: bzrlib/send.py:186
7248
#: bzrlib/send.py:185
8401
7249
msgid "Format 0.9 does not permit bundle with no patch"
8402
msgstr "Format 0.9 does not permit bundle with no patch"
7250
msgstr ""
8403
7251
8404
7252
#: bzrlib/shelf_ui.py:46
8405
7253
#, python-format
8406
7254
msgid "Shelve adding file \"%(path)s\"?"
8407
msgstr "Shelve adding file \"%(path)s\"?"
7255
msgstr ""
8408
7256
8409
7257
#: bzrlib/shelf_ui.py:47
8410
7258
msgid "Shelve binary changes?"
8411
msgstr "Shelve binary changes?"
7259
msgstr ""
8412
7260
8413
7261
#: bzrlib/shelf_ui.py:48
8414
7262
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
8415
msgstr "Shelve changing \"%s\" from %(other)s to %(this)s?"
7263
msgstr ""
8416
7264
8417
7265
#: bzrlib/shelf_ui.py:50
8418
7266
#, python-format
8419
7267
msgid "Shelve removing file \"%(path)s\"?"
8420
msgstr "Shelve removing file \"%(path)s\"?"
7268
msgstr ""
8421
7269
8422
7270
#: bzrlib/shelf_ui.py:51
8423
7271
#, python-format
8424
7272
msgid "Shelve %d change(s)?"
8425
msgstr "Shelve %d change(s)?"
7273
msgstr ""
8426
7274
8427
7275
#: bzrlib/shelf_ui.py:52
8428
7276
msgid "Shelve?"
8429
msgstr "Shelve?"
7277
msgstr ""
8430
7278
8431
7279
#: bzrlib/shelf_ui.py:53
8432
7280
#, python-format
8433
7281
msgid ""
8434
7282
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
8435
7283
msgstr ""
8436
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
8437
7284
8438
7285
#: bzrlib/shelf_ui.py:55
8439
7286
#, python-format
8440
7287
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
8441
msgstr "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7288
msgstr ""
8442
7289
8443
7290
#: bzrlib/shelf_ui.py:70
8444
7291
#, python-format
8445
7292
msgid "Changes shelved with id \"%d\"."
8446
msgstr "Changes shelved with id \"%d\"."
7293
msgstr ""
8447
7294
8448
7295
#: bzrlib/shelf_ui.py:74
8449
7296
msgid "Selected changes destroyed."
8450
msgstr "Selected changes destroyed."
7297
msgstr ""
8451
7298
8452
7299
#: bzrlib/shelf_ui.py:78
8453
7300
msgid "Selected changes:"
8454
msgstr "Selected changes:"
7301
msgstr ""
8455
7302
8456
7303
#: bzrlib/shelf_ui.py:98
8457
7304
#, python-format
8458
7305
msgid "Delete file \"%(path)s\"?"
8459
msgstr "Delete file \"%(path)s\"?"
7306
msgstr ""
8460
7307
8461
7308
#: bzrlib/shelf_ui.py:99
8462
7309
msgid "Apply binary changes?"
8463
msgstr "Apply binary changes?"
7310
msgstr ""
8464
7311
8465
7312
#: bzrlib/shelf_ui.py:100
8466
7313
#, python-format
8467
7314
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
8468
msgstr "Change \"%(path)s\" from %(this)s to %(other)s?"
7315
msgstr ""
8469
7316
8470
7317
#: bzrlib/shelf_ui.py:102
8471
7318
#, python-format
8472
7319
msgid "Add file \"%(path)s\"?"
8473
msgstr "Add file \"%(path)s\"?"
7320
msgstr ""
8474
7321
8475
7322
#: bzrlib/shelf_ui.py:103
8476
7323
#, python-format
8477
7324
msgid "Apply %d change(s)?"
8478
msgstr "Apply %d change(s)?"
7325
msgstr ""
8479
7326
8480
7327
#: bzrlib/shelf_ui.py:104
8481
7328
msgid "Apply change?"
8482
msgstr "Apply change?"
7329
msgstr ""
8483
7330
8484
7331
#: bzrlib/shelf_ui.py:105
8485
7332
#, python-format
8486
7333
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
8487
msgstr "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7334
msgstr ""
8488
7335
8489
7336
#: bzrlib/shelf_ui.py:107
8490
7337
#, python-format
8491
7338
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
8492
msgstr "Rename \"%(this)s\" => \"%(other)s\"?"
7339
msgstr ""
8493
7340
8494
7341
#: bzrlib/shelf_ui.py:402
8495
7342
msgid "No changes are shelved."
8496
msgstr "No changes are shelved."
7343
msgstr ""
8497
7344
8498
7345
#: bzrlib/shelf_ui.py:460
8499
7346
#, python-format
8500
7347
msgid "Using changes with id \"%d\"."
8501
msgstr "Using changes with id \"%d\"."
7348
msgstr ""
8502
7349
8503
7350
#: bzrlib/shelf_ui.py:464
8504
7351
#, python-format
8505
7352
msgid "Message: %s"
8506
msgstr "Message: %s"
7353
msgstr ""
8507
7354
8508
7355
#: bzrlib/shelf_ui.py:476
8509
7356
#, python-format
8510
7357
msgid "Deleted changes with id \"%d\"."
8511
msgstr "Deleted changes with id \"%d\"."
7358
msgstr ""
8512
7359
8513
7360
#: bzrlib/smart/medium.py:714
8514
7361
msgid "HPSS calls: {0} ({1} vfs) {2}"
8515
msgstr "HPSS calls: {0} ({1} vfs) {2}"
7362
msgstr ""
8516
7363
8517
7364
#: bzrlib/smart/server.py:169
8518
7365
msgid "Requested to stop gracefully"
8519
msgstr "Requested to stop gracefully"
7366
msgstr ""
8520
7367
8521
7368
#: bzrlib/smart/server.py:179
8522
7369
#, python-format
8523
7370
msgid "Waiting for %d client(s) to finish"
8524
msgstr "Waiting for %d client(s) to finish"
7371
msgstr ""
8525
7372
8526
7373
#: bzrlib/smart/server.py:185
8527
7374
#, python-format
8528
7375
msgid "Still waiting for %d client(s) to finish"
8529
msgstr "Still waiting for %d client(s) to finish"
7376
msgstr ""
8530
7377
8531
7378
#: bzrlib/smart/server.py:219
8532
7379
#, python-format
8533
7380
msgid "listening socket error: %s"
8534
msgstr "listening socket error: %s"
7381
msgstr ""
8535
7382
8536
7383
#: bzrlib/smart/server.py:452
8537
7384
#, python-format
8538
7385
msgid "listening on port: %s"
8539
msgstr "listening on port: %s"
7386
msgstr ""
8540
7387
8541
7388
#: bzrlib/switch.py:73
8542
7389
msgid "Pending merges must be committed or reverted before using switch."
8543
msgstr "Pending merges must be committed or reverted before using switch."
7390
msgstr ""
8544
7391
8545
7392
#: bzrlib/switch.py:100
8546
7393
msgid ""
8547
7394
"Cannot switch as local commits found in the checkout. Commit these to the "
8548
7395
"bound branch or use --force to throw them away."
8549
7396
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."
8552
7397
8553
7398
#: bzrlib/switch.py:105
8554
7399
#, python-format
8556
7401
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8557
7402
"anyway, use --force."
8558
7403
msgstr ""
8559
"Unable to connect to current master branch %(target)s: %(error)s To switch "
8560
"anyway, use --force."
8561
7404
8562
#: bzrlib/switch.py:129
7405
#: bzrlib/switch.py:125
8563
7406
msgid "Cannot switch a branch, only a checkout."
8564
msgstr "Cannot switch a branch, only a checkout."
7407
msgstr ""
8565
7408
8566
#: bzrlib/switch.py:167
7409
#: bzrlib/switch.py:163
8567
7410
#, python-format
8568
7411
msgid "Tree is up to date at revision %d."
8569
msgstr "Tree is up to date at revision %d."
7412
msgstr ""
8570
7413
8571
#: bzrlib/switch.py:173
7414
#: bzrlib/switch.py:169
8572
7415
#, python-format
8573
7416
msgid "Updated to revision %d."
8574
msgstr "Updated to revision %d."
7417
msgstr ""
8575
7418
8576
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7419
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
8577
7420
msgid "Apply phase"
8578
msgstr "Apply phase"
7421
msgstr ""
8579
7422
8580
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7423
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
8581
7424
msgid "removing file"
8582
msgstr "removing file"
7425
msgstr ""
8583
7426
8584
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7427
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
8585
7428
msgid "adding file"
8586
msgstr "adding file"
7429
msgstr ""
8587
7430
8588
#: bzrlib/transform.py:2598
7431
#: bzrlib/transform.py:2591
8589
7432
msgid "Building tree"
8590
msgstr "Building tree"
7433
msgstr ""
8591
7434
8592
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7435
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
8593
7436
msgid "Adding file contents"
8594
msgstr "Adding file contents"
7437
msgstr ""
8595
7438
8596
#: bzrlib/transform.py:3017
7439
#: bzrlib/transform.py:3028
8597
7440
msgid "Resolution pass"
8598
msgstr "Resolution pass"
7441
msgstr ""
8599
7442
8600
7443
#: bzrlib/transport/ftp/_gssapi.py:88
8601
7444
#, python-format
8602
7445
msgid "Authenticated as %s"
8603
msgstr "Authenticated as %s"
7446
msgstr ""
8604
7447
8605
#: bzrlib/tree.py:647
7448
#: bzrlib/tree.py:634
8606
7449
msgid "*** {0} content-filter: {1} => {2!r}"
8607
msgstr "*** {0} content-filter: {1} => {2!r}"
7450
msgstr ""
8608
7451
8609
7452
#: bzrlib/upgrade.py:77
8610
7453
#, python-format
8611
7454
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
8612
msgstr "This is a checkout. The branch (%s) needs to be upgraded separately."
7455
msgstr ""
8613
7456
8614
7457
#: bzrlib/upgrade.py:100
8615
7458
#, python-format
8616
7459
msgid "cannot upgrade from bzrdir format %s"
8617
msgstr "cannot upgrade from bzrdir format %s"
7460
msgstr ""
8618
7461
8619
7462
#: bzrlib/upgrade.py:103
8620
7463
#, python-format
8621
7464
msgid "starting upgrade of %s"
8622
msgstr "starting upgrade of %s"
7465
msgstr ""
8623
7466
8624
7467
#: bzrlib/upgrade.py:110
8625
7468
msgid "finished"
8626
msgstr "finished"
7469
msgstr ""
8627
7470
8628
7471
#: bzrlib/upgrade.py:120
8629
7472
msgid "Deleting backup.bzr"
8630
msgstr "Deleting backup.bzr"
7473
msgstr ""
8631
7474
8632
7475
#: bzrlib/upgrade.py:151
8633
7476
msgid ""
8634
7477
"\n"
8635
7478
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
8636
7479
msgstr ""
8637
"\n"
8638
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
8639
7480
8640
7481
#: bzrlib/upgrade.py:208
8641
7482
#, python-format
8642
7483
msgid "Found %d dependent branches - upgrading ..."
8643
msgstr "Found %d dependent branches - upgrading ..."
7484
msgstr ""
8644
7485
8645
7486
#: bzrlib/upgrade.py:276
8646
7487
msgid "Upgrading bzrdirs"
8647
msgstr "Upgrading bzrdirs"
7488
msgstr ""
8648
7489
8649
7490
#: bzrlib/upgrade.py:282
8650
7491
#, python-format
8651
7492
msgid "Upgrading %s"
8652
msgstr "Upgrading %s"
7493
msgstr ""
8653
7494
8654
7495
#: bzrlib/upgrade.py:283
8655
7496
msgid "Upgrading {0} {1} ..."
8656
msgstr "Upgrading {0} {1} ..."
7497
msgstr ""
8657
7498
8658
7499
#: bzrlib/upgrade.py:301
8659
7500
msgid "Removing backup ..."
8660
msgstr "Removing backup ..."
7501
msgstr ""
8661
7502
8662
7503
#: bzrlib/upgrade.py:305
8663
7504
msgid "failed to clean-up {0}: {1}"
8664
msgstr "failed to clean-up {0}: {1}"
7505
msgstr ""
8665
7506
8666
#: bzrlib/vf_repository.py:1091
7507
#: bzrlib/vf_repository.py:1090
8667
7508
msgid "inventories"
8668
msgstr "inventories"
7509
msgstr ""
8669
7510
8670
#: bzrlib/vf_repository.py:1117
7511
#: bzrlib/vf_repository.py:1116
8671
7512
msgid "texts"
8672
msgstr "texts"
7513
msgstr ""
8673
7514
8674
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7515
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
8675
7516
msgid "Calculating text parents"
8676
msgstr "Calculating text parents"
7517
msgstr ""
8677
7518
8678
#: bzrlib/vf_repository.py:1707
7519
#: bzrlib/vf_repository.py:1706
8679
7520
msgid "Fetch texts"
8680
msgstr "Fetch texts"
7521
msgstr ""
8681
7522
8682
#: bzrlib/vf_repository.py:2536
7523
#: bzrlib/vf_repository.py:2535
8683
7524
msgid "loading text store"
8684
msgstr "loading text store"
7525
msgstr ""
8685
7526
8686
#: bzrlib/vf_repository.py:2542
7527
#: bzrlib/vf_repository.py:2541
8687
7528
msgid "checking text graph"
8688
msgstr "checking text graph"
7529
msgstr ""
8689
7530
8690
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8691
#: bzrlib/vf_repository.py:3127
7531
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7532
#: bzrlib/vf_repository.py:3124
8692
7533
msgid "Transferring revisions"
8693
msgstr "Transferring revisions"
7534
msgstr ""
8694
7535
8695
7536
#: bzrlib/win32utils.py:146
8696
7537
msgid "Failed to GetProcessMemoryInfo()"
8697
msgstr "Failed to GetProcessMemoryInfo()"
7538
msgstr ""
8698
7539
8699
7540
#: bzrlib/win32utils.py:167
8700
7541
msgid "Cannot debug memory on win32 without ctypes or win32process"
8701
msgstr "Cannot debug memory on win32 without ctypes or win32process"
7542
msgstr ""
8702
7543
8703
7544
#: bzrlib/win32utils.py:172
8704
7545
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
8705
msgstr "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7546
msgstr ""
8706
7547
8707
7548
#: bzrlib/win32utils.py:180
8708
7549
#, python-format
8709
7550
msgid "WorkingSize %8d KiB"
8710
msgstr "WorkingSize %8d KiB"
7551
msgstr ""
8711
7552
8712
7553
#: bzrlib/win32utils.py:181
8713
7554
#, python-format
8714
7555
msgid "PeakWorking %8d KiB"
8715
msgstr "PeakWorking %8d KiB"
7556
msgstr ""
8716
7557
8717
7558
#: bzrlib/win32utils.py:182
8718
7559
#, python-format
8719
7560
msgid "PagefileUsage %8d KiB"
8720
msgstr "PagefileUsage %8d KiB"
7561
msgstr ""
8721
7562
8722
7563
#: bzrlib/win32utils.py:183
8723
7564
#, python-format
8724
7565
msgid "PeakPagefileUsage %8d KiB"
8725
msgstr "PeakPagefileUsage %8d KiB"
7566
msgstr ""
8726
7567
8727
7568
#: bzrlib/win32utils.py:185
8728
7569
#, python-format
8729
7570
msgid "PrivateUsage %8d KiB"
8730
msgstr "PrivateUsage %8d KiB"
7571
msgstr ""
8731
7572
8732
7573
#: bzrlib/win32utils.py:186
8733
7574
#, python-format
8734
7575
msgid "PageFaultCount %8d"
8735
msgstr "PageFaultCount %8d"
7576
msgstr ""
8736
7577
8737
#: bzrlib/workingtree.py:1482
7578
#: bzrlib/workingtree.py:1478
8738
7579
msgid "Rerun update after fixing the conflicts."
8739
msgstr "Rerun update after fixing the conflicts."
7580
msgstr ""
8740
7581
8741
7582
#: dummy/help_topics/authentication/summary.txt:1
8742
7583
msgid "Information on configuring authentication"
8743
msgstr "Information on configuring authentication"
7584
msgstr ""
8744
7585
8745
7586
#: dummy/help_topics/basic/detail.txt:1
8746
7587
msgid ""
8747
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7588
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
8748
7589
"http://bazaar.canonical.com/"
8749
7590
msgstr ""
8750
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8751
"http://bazaar.canonical.com/"
8752
7591
8753
7592
#: dummy/help_topics/basic/detail.txt:4
8754
7593
msgid ""
8756
7595
" bzr init makes this directory a versioned branch\n"
8757
7596
" bzr branch make a copy of another branch"
8758
7597
msgstr ""
8759
"Basic commands:\n"
8760
" bzr init makes this directory a versioned branch\n"
8761
" bzr branch make a copy of another branch"
8762
7598
8763
7599
#: dummy/help_topics/basic/detail.txt:8
8764
7600
msgid ""
8766
7602
" bzr ignore ignore a file or pattern\n"
8767
7603
" bzr mv move or rename a versioned file"
8768
7604
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"
8772
7605
8773
7606
#: dummy/help_topics/basic/detail.txt:12
8774
7607
msgid ""
8775
7608
" bzr status summarize changes in working copy\n"
8776
7609
" bzr diff show detailed diffs"
8777
7610
msgstr ""
8778
" bzr status summarise changes in working copy\n"
8779
" bzr diff show detailed diffs"
8780
7611
8781
7612
#: dummy/help_topics/basic/detail.txt:15
8782
7613
msgid ""
8784
7615
" bzr commit save some or all changes\n"
8785
7616
" bzr send send changes via email"
8786
7617
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"
8790
7618
8791
7619
#: dummy/help_topics/basic/detail.txt:19
8792
7620
msgid ""
8793
7621
" bzr log show history of changes\n"
8794
7622
" bzr check validate storage"
8795
7623
msgstr ""
8796
" bzr log show history of changes\n"
8797
" bzr check validate storage"
8798
7624
8799
7625
#: dummy/help_topics/basic/detail.txt:22
8800
7626
msgid ""
8802
7628
" bzr help commands list all commands\n"
8803
7629
" bzr help topics list all help topics\n"
8804
7630
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"
8808
7631
8809
7632
#: dummy/help_topics/basic/summary.txt:1
8810
7633
msgid "Basic commands"
8811
msgstr "Basic commands"
7634
msgstr ""
8812
7635
8813
7636
#: dummy/help_topics/branches/detail.txt:1
8814
7637
msgid "Branches"
8815
msgstr "Branches"
7638
msgstr ""
8816
7639
8817
7640
#: dummy/help_topics/branches/detail.txt:3
8818
7641
msgid ""
8821
7644
"branch history is stored), but multiple branches may share the same\n"
8822
7645
"repository (a shared repository). Branches can be copied and merged."
8823
7646
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."
8828
7647
8829
7648
#: dummy/help_topics/branches/detail.txt:8
8830
7649
msgid ""
8835
7654
"to succeed, it may be necessary to update the current branch using \n"
8836
7655
"``bzr update``."
8837
7656
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``."
8844
7657
8845
7658
#: dummy/help_topics/branches/detail.txt:15
8846
7659
#: dummy/help_topics/checkouts/detail.txt:66
8847
7660
#: dummy/help_topics/repositories/detail.txt:36
8848
7661
msgid "Related commands::"
8849
msgstr "Related commands::"
7662
msgstr ""
8850
7663
8851
7664
#: dummy/help_topics/branches/detail.txt:17
8852
7665
msgid ""
8855
7668
" merge Perform a three-way merge.\n"
8856
7669
" bind Bind a branch to another one.\n"
8857
7670
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"
8862
7671
8863
7672
#: dummy/help_topics/branches/summary.txt:1
8864
7673
msgid "Information on what a branch is"
8865
msgstr "Information on what a branch is"
7674
msgstr ""
8866
7675
8867
7676
#: dummy/help_topics/bugs/summary.txt:1
8868
7677
msgid "Bug tracker settings"
8869
msgstr "Bug tracker settings"
7678
msgstr ""
8870
7679
8871
7680
#: dummy/help_topics/checkouts/detail.txt:1
8872
7681
msgid "Checkouts"
8873
msgstr "Checkouts"
7682
msgstr ""
8874
7683
8875
7684
#: dummy/help_topics/checkouts/detail.txt:3
8876
7685
msgid ""
8882
7691
"doesn't have the same restrictions. And using checkouts still allows\n"
8883
7692
"others working on the project to use whatever workflow they like."
8884
7693
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."
8892
7694
8893
7695
#: dummy/help_topics/checkouts/detail.txt:11
8894
7696
msgid ""
8903
7705
"facilitates lockstep development, where each developer is working together,\n"
8904
7706
"continuously integrating the changes of others."
8905
7707
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."
8916
7708
8917
7709
#: dummy/help_topics/checkouts/detail.txt:19
8918
7710
msgid ""
8927
7719
"local\n"
8928
7720
"commit."
8929
7721
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."
8940
7722
8941
7723
#: dummy/help_topics/checkouts/detail.txt:26
8942
7724
msgid ""
8947
7729
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8948
7730
"command when needed."
8949
7731
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."
8956
7732
8957
7733
#: dummy/help_topics/checkouts/detail.txt:32
8958
7734
msgid ""
8965
7741
"you\n"
8966
7742
"don't have a local branch, then you cannot commit locally."
8967
7743
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."
8976
7744
8977
7745
#: dummy/help_topics/checkouts/detail.txt:39
8978
7746
msgid ""
8987
7755
"on\n"
8988
7756
"the same disk then there won't be a noticeable difference."
8989
7757
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."
9000
7758
9001
7759
#: dummy/help_topics/checkouts/detail.txt:47
9002
7760
msgid ""
9005
7763
"switching the master branch that the checkout points to when you want to\n"
9006
7764
"work on a different branch."
9007
7765
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."
9012
7766
9013
7767
#: dummy/help_topics/checkouts/detail.txt:52
9014
7768
msgid ""
9022
7776
"is\n"
9023
7777
"file permissions."
9024
7778
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."
9034
7779
9035
7780
#: dummy/help_topics/checkouts/detail.txt:58
9036
7781
msgid ""
9046
7791
"the\n"
9047
7792
"branch is bound it will tell you the location of the bound branch."
9048
7793
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."
9060
7794
9061
7795
#: dummy/help_topics/checkouts/detail.txt:68
9062
7796
msgid ""
9078
7812
" bound, then it will also display the location of the bound "
9079
7813
"branch\n"
9080
7814
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"
9098
7815
9099
7816
#: dummy/help_topics/checkouts/summary.txt:1
9100
7817
msgid "Information on what a checkout is"
9101
msgstr "Information on what a checkout is"
7818
msgstr ""
9102
7819
9103
7820
#: dummy/help_topics/commands/summary.txt:1
9104
7821
msgid "Basic help for all commands"
9105
msgstr "Basic help for all commands"
7822
msgstr ""
9106
7823
9107
7824
#: dummy/help_topics/configuration/summary.txt:1
9108
7825
msgid "Details on the configuration settings available"
9109
msgstr "Details on the configuration settings available"
7826
msgstr ""
9110
7827
9111
7828
#: dummy/help_topics/conflict-types/summary.txt:1
9112
7829
msgid "Types of conflicts and what to do about them"
9113
msgstr "Types of conflicts and what to do about them"
7830
msgstr ""
9114
7831
9115
7832
#: dummy/help_topics/content-filters/summary.txt:1
9116
7833
msgid "Conversion of content into/from working trees"
9117
msgstr "Conversion of content into/from working trees"
7834
msgstr ""
9118
7835
9119
7836
#: dummy/help_topics/criss-cross/detail.txt:1
9120
7837
msgid "Criss-Cross"
9121
msgstr "Criss-Cross"
7838
msgstr ""
9122
7839
9123
7840
#: dummy/help_topics/criss-cross/detail.txt:3
9124
7841
msgid ""
9125
7842
"A criss-cross in the branch history can cause the default merge technique\n"
9126
7843
"to emit more conflicts than would normally be expected."
9127
7844
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."
9130
7845
9131
7846
#: dummy/help_topics/criss-cross/detail.txt:6
9132
7847
msgid ""
9135
7850
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
9136
7851
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
9137
7852
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."
9142
7853
9143
7854
#: dummy/help_topics/criss-cross/detail.txt:10
9144
7855
msgid ""
9149
7860
"time. They can be avoided by having each branch only merge from or into a\n"
9150
7861
"designated central branch (a \"star topology\")."
9151
7862
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\")."
9158
7863
9159
7864
#: dummy/help_topics/criss-cross/detail.txt:15
9160
7865
msgid ""
9165
7870
"differences between THIS and OTHER are due to one side adding lines, or\n"
9166
7871
"from another side removing lines."
9167
7872
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."
9174
7873
9175
7874
#: dummy/help_topics/criss-cross/detail.txt:21
9176
7875
msgid ""
9180
7879
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
9181
7880
"are emitted."
9182
7881
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."
9188
7882
9189
7883
#: dummy/help_topics/criss-cross/detail.txt:26
9190
7884
msgid ""
9192
7886
"line-origin detection instead of a basis revision to determine the cause of\n"
9193
7887
"differences.\n"
9194
7888
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"
9198
7889
9199
7890
#: dummy/help_topics/criss-cross/summary.txt:1
9200
7891
msgid "Information on criss-cross merging"
9201
msgstr "Information on criss-cross merging"
7892
msgstr ""
9202
7893
9203
7894
#: dummy/help_topics/current-formats/summary.txt:1
9204
7895
msgid "Current storage formats"
9205
msgstr "Current storage formats"
7896
msgstr ""
9206
7897
9207
7898
#: dummy/help_topics/debug-flags/summary.txt:1
9208
7899
msgid "Options to show or record debug information"
9209
msgstr "Options to show or record debug information"
7900
msgstr ""
9210
7901
9211
7902
#: dummy/help_topics/diverged-branches/summary.txt:1
9212
7903
msgid "How to fix diverged branches"
9213
msgstr "How to fix diverged branches"
7904
msgstr ""
7905
7906
#: dummy/help_topics/env-variables/detail.txt:1
7907
msgid "Environment Variables"
7908
msgstr ""
7909
7910
#: dummy/help_topics/env-variables/detail.txt:3
7911
msgid ""
7912
"=================== "
7913
"===========================================================\n"
7914
"BZRPATH Path where bzr is to look for shell plugin external\n"
7915
" commands.\n"
7916
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7917
"EMAIL E-Mail address of the user.\n"
7918
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7919
"EDITOR Editor for editing commit messages.\n"
7920
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7921
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7922
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7923
"BZR_PLUGIN_PATH.\n"
7924
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7925
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7926
"and\n"
7927
" HOME.\n"
7928
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7929
"URLs).\n"
7930
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7931
"sshcorp,\n"
7932
" plink or lsh.\n"
7933
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7934
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7935
"BZR_COLUMNS Override implicit terminal width.\n"
7936
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7937
"(selftest)\n"
7938
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7939
"'text'.\n"
7940
"BZR_PDB Control whether to launch a debugger on error.\n"
7941
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7942
" breakin debugger.\n"
7943
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7944
"(instead\n"
7945
" of char-based).\n"
7946
"=================== "
7947
"===========================================================\n"
7948
msgstr ""
9214
7949
9215
7950
#: dummy/help_topics/env-variables/summary.txt:1
9216
7951
msgid "Environment variable names and values"
9217
msgstr "Environment variable names and values"
7952
msgstr ""
9218
7953
9219
7954
#: dummy/help_topics/eol/summary.txt:1
9220
7955
msgid "Information on end-of-line handling"
9221
msgstr "Information on end-of-line handling"
7956
msgstr ""
9222
7957
9223
7958
#: dummy/help_topics/files/detail.txt:1
9224
7959
msgid "Files"
9225
msgstr "Files"
7960
msgstr ""
9226
7961
9227
7962
#: dummy/help_topics/files/detail.txt:3
9228
7963
msgid ""
9230
7965
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
9231
7966
"bazaar\\\\2.0\\\\bazaar.conf"
9232
7967
msgstr ""
9233
":On Unix: ~/.bazaar/bazaar.conf\n"
9234
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
9235
"bazaar\\\\2.0\\\\bazaar.conf"
9236
7968
9237
7969
#: dummy/help_topics/files/detail.txt:6
9238
7970
msgid ""
9241
7973
"The section ``[ALIASES]`` can be used to create command aliases for\n"
9242
7974
"commonly used options."
9243
7975
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."
9248
7976
9249
7977
#: dummy/help_topics/files/detail.txt:11
9250
7978
msgid "A typical config file might look something like::"
9251
msgstr "A typical config file might look something like::"
7979
msgstr ""
9252
7980
9253
7981
#: dummy/help_topics/files/detail.txt:13
9254
7982
msgid ""
9255
7983
" [DEFAULT]\n"
9256
7984
" email=John Doe <jdoe@isp.com>"
9257
7985
msgstr ""
9258
" [DEFAULT]\n"
9259
" email=John Doe <jdoe@isp.com>"
9260
7986
9261
7987
#: dummy/help_topics/files/detail.txt:16
9262
7988
msgid ""
9264
7990
" commit = commit --strict\n"
9265
7991
" log10 = log --short -r -10..-1\n"
9266
7992
msgstr ""
9267
" [ALIASES]\n"
9268
" commit = commit --strict\n"
9269
" log10 = log --short -r -10..-1\n"
9270
7993
9271
7994
#: dummy/help_topics/files/summary.txt:1
9272
7995
msgid "Information on configuration and log files"
9273
msgstr "Information on configuration and log files"
7996
msgstr ""
9274
7997
9275
7998
#: dummy/help_topics/formats/detail.txt:1
9276
7999
msgid "Storage Formats"
9277
msgstr "Storage Formats"
8000
msgstr ""
9278
8001
9279
8002
#: dummy/help_topics/formats/detail.txt:3
9280
8003
msgid ""
9284
8007
"formats may also be introduced to improve performance and\n"
9285
8008
"scalability."
9286
8009
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."
9292
8010
9293
8011
#: dummy/help_topics/formats/detail.txt:9
9294
8012
msgid ""
9296
8014
"project is not using 2a, then you should suggest to the\n"
9297
8015
"project owner to upgrade."
9298
8016
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."
9302
8017
9303
8018
#: dummy/help_topics/formats/detail.txt:13
9304
8019
msgid ""
9305
8020
"\n"
9306
8021
".. note::"
9307
8022
msgstr ""
9308
"\n"
9309
".. note::"
9310
8023
9311
8024
#: dummy/help_topics/formats/detail.txt:16
9312
8025
msgid ""
9320
8033
" around the same time. 2a and all future formats will be\n"
9321
8034
" implicitly rich-root."
9322
8035
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."
9332
8036
9333
8037
#: dummy/help_topics/formats/detail.txt:26
9334
8038
msgid ""
9336
8040
"currently supported formats. See :doc:`other-formats-help` for\n"
9337
8041
"descriptions of any available experimental and deprecated formats.\n"
9338
8042
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"
9342
8043
9343
8044
#: dummy/help_topics/formats/summary.txt:1
9344
8045
msgid "Information on choosing a storage format"
9345
msgstr "Information on choosing a storage format"
8046
msgstr ""
9346
8047
9347
8048
#: dummy/help_topics/global-options/detail.txt:1
9348
8049
msgid "Global Options"
9349
msgstr "Global Options"
8050
msgstr ""
9350
8051
9351
8052
#: dummy/help_topics/global-options/detail.txt:3
9352
8053
msgid ""
9353
8054
"These options may be used with any command, and may appear in front of any\n"
9354
8055
"command. (e.g. ``bzr --profile help``)."
9355
8056
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``)."
9358
8057
9359
8058
#: dummy/help_topics/global-options/detail.txt:6
9360
8059
msgid ""
9368
8067
"--no-l10n Do not translate messages.\n"
9369
8068
"--concurrency Number of processes that can be run concurrently (selftest)."
9370
8069
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)."
9380
8070
9381
8071
#: dummy/help_topics/global-options/detail.txt:14
9382
8072
msgid ""
9393
8083
" will be a pickle.\n"
9394
8084
"--coverage Generate line coverage report in the specified directory."
9395
8085
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."
9408
8086
9409
8087
#: dummy/help_topics/global-options/detail.txt:24
9410
8088
msgid ""
9414
8092
"if\n"
9415
8093
" several options need to be overridden."
9416
8094
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."
9422
8095
9423
8096
#: dummy/help_topics/global-options/detail.txt:28
9424
8097
msgid ""
9425
8098
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
9426
8099
"information on profiling."
9427
8100
msgstr ""
9428
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
9429
"information on profiling."
9430
8101
9431
8102
#: dummy/help_topics/global-options/detail.txt:31
9432
8103
msgid ""
9433
8104
"A number of debug flags are also available to assist troubleshooting and\n"
9434
8105
"development. See :doc:`debug-flags-help`.\n"
9435
8106
msgstr ""
9436
"A number of debug flags are also available to assist troubleshooting and\n"
9437
"development. See :doc:`debug-flags-help`.\n"
9438
8107
9439
8108
#: dummy/help_topics/global-options/summary.txt:1
9440
8109
msgid "Options that control how Bazaar runs"
9441
msgstr "Options that control how Bazaar runs"
8110
msgstr ""
9442
8111
9443
8112
#: dummy/help_topics/hidden-commands/summary.txt:1
9444
8113
msgid "All hidden commands"
9445
msgstr "All hidden commands"
8114
msgstr ""
9446
8115
9447
8116
#: dummy/help_topics/hooks/summary.txt:1
9448
8117
msgid "Points at which custom processing can be added"
9449
msgstr "Points at which custom processing can be added"
8118
msgstr ""
9450
8119
9451
8120
#: dummy/help_topics/launchpad/detail.txt:1
9452
8121
msgid "Integration with Launchpad.net"
9453
msgstr "Integration with Launchpad.net"
8122
msgstr ""
9454
8123
9455
8124
#: dummy/help_topics/launchpad/detail.txt:3
9456
8125
msgid ""
9457
8126
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
9458
8127
"specification tracking."
9459
8128
msgstr ""
9460
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
9461
"specification tracking."
9462
8129
9463
8130
#: dummy/help_topics/launchpad/detail.txt:6
9464
8131
msgid ""
9465
8132
"The bzr client (through the plugin called 'launchpad') has special\n"
9466
8133
"features to communicate with Launchpad:"
9467
8134
msgstr ""
9468
"The bzr client (through the plugin called 'launchpad') has special\n"
9469
"features to communicate with Launchpad:"
9470
8135
9471
8136
#: dummy/help_topics/launchpad/detail.txt:9
9472
8137
msgid ""
9475
8140
" is then used by the 'lp:' transport to download your branches using\n"
9476
8141
" bzr+ssh://."
9477
8142
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://."
9482
8143
9483
8144
#: dummy/help_topics/launchpad/detail.txt:13
9484
8145
msgid ""
9488
8149
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
9489
8150
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
9490
8151
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."
9496
8152
9497
8153
#: dummy/help_topics/launchpad/detail.txt:18
9498
8154
msgid ""
9503
8159
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
9504
8160
" automatically be linked to the bug report."
9505
8161
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."
9512
8162
9513
8163
#: dummy/help_topics/launchpad/detail.txt:24
9514
8164
msgid ""
9517
8167
" its contents and allow it to be attached to bugs and other\n"
9518
8168
" objects."
9519
8169
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."
9524
8170
9525
8171
#: dummy/help_topics/launchpad/detail.txt:29
9526
8172
msgid "For more information see http://help.launchpad.net/\n"
9527
msgstr "For more information see http://help.launchpad.net/\n"
8173
msgstr ""
9528
8174
9529
8175
#: dummy/help_topics/launchpad/summary.txt:1
9530
8176
msgid "Using Bazaar with Launchpad.net"
9531
msgstr "Using Bazaar with Launchpad.net"
8177
msgstr ""
9532
8178
9533
8179
#: dummy/help_topics/location-alias/summary.txt:1
9534
8180
msgid "Aliases for remembered locations"
9535
msgstr "Aliases for remembered locations"
8181
msgstr ""
9536
8182
9537
8183
#: dummy/help_topics/log-formats/summary.txt:1
9538
8184
msgid "Details on the logging formats available"
9539
msgstr "Details on the logging formats available"
8185
msgstr ""
9540
8186
9541
8187
#: dummy/help_topics/other-formats/summary.txt:1
9542
8188
msgid "Experimental and deprecated storage formats"
9543
msgstr "Experimental and deprecated storage formats"
8189
msgstr ""
9544
8190
9545
8191
#: dummy/help_topics/patterns/summary.txt:1
9546
8192
msgid "Information on the pattern syntax"
9547
msgstr "Information on the pattern syntax"
8193
msgstr ""
9548
8194
9549
8195
#: dummy/help_topics/repositories/detail.txt:1
9550
8196
msgid "Repositories"
9551
msgstr "Repositories"
8197
msgstr ""
9552
8198
9553
8199
#: dummy/help_topics/repositories/detail.txt:3
9554
8200
msgid ""
9555
8201
"Repositories in Bazaar are where committed information is stored. There is\n"
9556
8202
"a repository associated with every branch."
9557
8203
msgstr ""
9558
"Repositories in Bazaar are where committed information is stored. There is\n"
9559
"a repository associated with every branch."
9560
8204
9561
8205
#: dummy/help_topics/repositories/detail.txt:6
9562
8206
msgid ""
9565
8209
"very many commits in a short time period) you may want to ask bzr to\n"
9566
8210
"optimise the database indices. This can be done by the 'bzr pack' command."
9567
8211
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."
9572
8212
9573
8213
#: dummy/help_topics/repositories/detail.txt:11
9574
8214
msgid ""
9581
8221
"it\n"
9582
8222
"can use."
9583
8223
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."
9592
8224
9593
8225
#: dummy/help_topics/repositories/detail.txt:17
9594
8226
msgid ""
9596
8228
"generally a large space saving. For some operations (e.g. branching\n"
9597
8229
"within the repository) this translates in to a large time saving."
9598
8230
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."
9602
8231
9603
8232
#: dummy/help_topics/repositories/detail.txt:21
9604
8233
msgid ""
9610
8239
"this\n"
9611
8240
"directory will then use it for storage."
9612
8241
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."
9620
8242
9621
8243
#: dummy/help_topics/repositories/detail.txt:27
9622
8244
msgid ""
9631
8253
"the branches will not have working trees pass the '--no-trees' option to\n"
9632
8254
"'init-repository'."
9633
8255
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'."
9644
8256
9645
8257
#: dummy/help_topics/repositories/detail.txt:38
9646
8258
msgid ""
9648
8260
"one\n"
9649
8261
" in which new branches won't get a working tree.\n"
9650
8262
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"
9654
8263
9655
8264
#: dummy/help_topics/repositories/summary.txt:1
9656
8265
msgid "Basic information on shared repositories."
9657
msgstr "Basic information on shared repositories."
8266
msgstr ""
9658
8267
9659
8268
#: dummy/help_topics/revisionspec/summary.txt:1
9660
8269
msgid "Explain how to use --revision"
9661
msgstr "Explain how to use --revision"
8270
msgstr ""
9662
8271
9663
8272
#: dummy/help_topics/rules/summary.txt:1
9664
8273
msgid "Information on defining rule-based preferences"
9665
msgstr "Information on defining rule-based preferences"
8274
msgstr ""
9666
8275
9667
8276
#: dummy/help_topics/standalone-trees/detail.txt:1
9668
8277
msgid "Standalone Trees"
9669
msgstr "Standalone Trees"
8278
msgstr ""
9670
8279
9671
8280
#: dummy/help_topics/standalone-trees/detail.txt:3
9672
8281
msgid ""
9675
8284
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
9676
8285
"an existing project under version control."
9677
8286
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."
9682
8287
9683
8288
#: dummy/help_topics/standalone-trees/detail.txt:8
9684
8289
msgid "Related Commands::"
9685
msgstr "Related Commands::"
8290
msgstr ""
9686
8291
9687
8292
#: dummy/help_topics/standalone-trees/detail.txt:10
9688
8293
msgid " init Make a directory into a versioned branch.\n"
9689
msgstr " init Make a directory into a versioned branch.\n"
8294
msgstr ""
9690
8295
9691
8296
#: dummy/help_topics/standalone-trees/summary.txt:1
9692
8297
msgid "Information on what a standalone tree is"
9693
msgstr "Information on what a standalone tree is"
8298
msgstr ""
9694
8299
9695
8300
#: dummy/help_topics/standard-options/detail.txt:1
9696
8301
msgid "Standard Options"
9697
msgstr "Standard Options"
8302
msgstr ""
9698
8303
9699
8304
#: dummy/help_topics/standard-options/detail.txt:3
9700
8305
msgid "Standard options are legal for all commands."
9701
msgstr "Standard options are legal for all commands."
8306
msgstr ""
9702
8307
9703
8308
#: dummy/help_topics/standard-options/detail.txt:5
9704
8309
msgid ""
9706
8311
"--verbose, -v Display more information.\n"
9707
8312
"--quiet, -q Only display errors and warnings."
9708
8313
msgstr ""
9709
"--help, -h Show help message.\n"
9710
"--verbose, -v Display more information.\n"
9711
"--quiet, -q Only display errors and warnings."
9712
8314
9713
8315
#: dummy/help_topics/standard-options/detail.txt:9
9714
8316
msgid "Unlike global options, standard options can be used in aliases.\n"
9715
msgstr "Unlike global options, standard options can be used in aliases.\n"
8317
msgstr ""
9716
8318
9717
8319
#: dummy/help_topics/standard-options/summary.txt:1
9718
8320
msgid "Options that can be used with any command"
9719
msgstr "Options that can be used with any command"
8321
msgstr ""
9720
8322
9721
8323
#: dummy/help_topics/status-flags/detail.txt:1
9722
8324
msgid "Status Flags"
9723
msgstr "Status Flags"
8325
msgstr ""
9724
8326
9725
8327
#: dummy/help_topics/status-flags/detail.txt:3
9726
8328
msgid ""
9727
8329
"Status flags are used to summarise changes to the working tree in a concise\n"
9728
8330
"manner. They are in the form::"
9729
8331
msgstr ""
9730
"Status flags are used to summarise changes to the working tree in a concise\n"
9731
"manner. They are in the form::"
9732
8332
9733
8333
#: dummy/help_topics/status-flags/detail.txt:6
9734
8334
msgid " xxx <filename>"
9735
msgstr " xxx <filename>"
8335
msgstr ""
9736
8336
9737
8337
#: dummy/help_topics/status-flags/detail.txt:8
9738
8338
msgid "where the columns' meanings are as follows."
9739
msgstr "where the columns' meanings are as follows."
8339
msgstr ""
9740
8340
9741
8341
#: dummy/help_topics/status-flags/detail.txt:10
9742
8342
msgid "Column 1 - versioning/renames::"
9743
msgstr "Column 1 - versioning/renames::"
8343
msgstr ""
9744
8344
9745
8345
#: dummy/help_topics/status-flags/detail.txt:12
9746
8346
msgid ""
9752
8352
" C File has conflicts\n"
9753
8353
" P Entry for a pending merge (not a file)"
9754
8354
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)"
9762
8355
9763
8356
#: dummy/help_topics/status-flags/detail.txt:20
9764
8357
msgid "Column 2 - contents::"
9765
msgstr "Column 2 - contents::"
8358
msgstr ""
9766
8359
9767
8360
#: dummy/help_topics/status-flags/detail.txt:22
9768
8361
msgid ""
9771
8364
" K File kind changed\n"
9772
8365
" M File modified"
9773
8366
msgstr ""
9774
" N File created\n"
9775
" D File deleted\n"
9776
" K File kind changed\n"
9777
" M File modified"
9778
8367
9779
8368
#: dummy/help_topics/status-flags/detail.txt:27
9780
8369
msgid "Column 3 - execute::"
9781
msgstr "Column 3 - execute::"
8370
msgstr ""
9782
8371
9783
8372
#: dummy/help_topics/status-flags/detail.txt:29
9784
8373
msgid " * The execute bit was changed\n"
9785
msgstr " * The execute bit was changed\n"
8374
msgstr ""
9786
8375
9787
8376
#: dummy/help_topics/status-flags/summary.txt:1
9788
8377
msgid "Help on status flags"
9789
msgstr "Help on status flags"
8378
msgstr ""
9790
8379
9791
8380
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
9792
8381
msgid "Branches Out of Sync"
9793
msgstr "Branches Out of Sync"
8382
msgstr ""
9794
8383
9795
8384
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
9796
8385
msgid ""
9800
8389
"have the same last revision as the new reference branch for the lightweight\n"
9801
8390
"checkout, data could be lost, so Bazaar refuses."
9802
8391
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."
9808
8392
9809
8393
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
9810
8394
msgid "How you deal with this depends on *why* the branches are out of sync."
9811
8395
msgstr ""
9812
"How you deal with this depends on *why* the branches are out of sync."
9813
8396
9814
8397
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
9815
8398
msgid ""
9817
8400
"sync\n"
9818
8401
"by running \"bzr update\" (and possibly \"bzr commit\")."
9819
8402
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\")."
9823
8403
9824
8404
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
9825
8405
msgid ""
9831
8411
"and then push your changes. If you decide that some of the changes aren't\n"
9832
8412
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
9833
8413
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"
9841
8414
9842
8415
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
9843
8416
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
9844
msgstr "Steps to resolve \"out-of-sync\" when reconfiguring"
8417
msgstr ""
9845
8418
9846
8419
#: dummy/help_topics/topics/summary.txt:1
9847
8420
msgid "Topics list"
9848
msgstr "Topics list"
8421
msgstr ""
9849
8422
9850
8423
#: dummy/help_topics/url-special-chars/summary.txt:1
9851
8424
msgid "Special character handling in URLs"
9852
msgstr "Special character handling in URLs"
8425
msgstr ""
9853
8426
9854
8427
#: dummy/help_topics/urlspec/summary.txt:1
9855
8428
msgid "Supported transport protocols"
9856
msgstr "Supported transport protocols"
8429
msgstr ""
9857
8430
9858
8431
#: dummy/help_topics/working-trees/detail.txt:1
9859
8432
msgid "Working Trees"
9860
msgstr "Working Trees"
8433
msgstr ""
9861
8434
9862
8435
#: dummy/help_topics/working-trees/detail.txt:3
9863
8436
msgid ""
9867
8440
"branch, and when you commit the current state of the working tree is the\n"
9868
8441
"snapshot that is recorded in the commit."
9869
8442
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."
9875
8443
9876
8444
#: dummy/help_topics/working-trees/detail.txt:8
9877
8445
msgid ""
9883
8451
"are\n"
9884
8452
"difficult to deal with remotely."
9885
8453
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."
9893
8454
9894
8455
#: dummy/help_topics/working-trees/detail.txt:15
9895
8456
msgid ""
9901
8462
"the\n"
9902
8463
"working tree by running 'bzr update' in that directory."
9903
8464
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."
9911
8465
9912
8466
#: dummy/help_topics/working-trees/detail.txt:20
9913
8467
msgid ""
9918
8472
"branch. It can also be useful when working with a '--no-trees' repository\n"
9919
8473
"(see 'bzr help repositories')."
9920
8474
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')."
9927
8475
9928
8476
#: dummy/help_topics/working-trees/detail.txt:26
9929
8477
msgid ""
9938
8486
"SSH\n"
9939
8487
"after each push."
9940
8488
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."
9951
8489
9952
8490
#: dummy/help_topics/working-trees/detail.txt:33
9953
8491
msgid "Useful commands::"
9954
msgstr "Useful commands::"
8492
msgstr ""
9955
8493
9956
8494
#: dummy/help_topics/working-trees/detail.txt:35
9957
8495
msgid ""
9962
8500
"branch\n"
9963
8501
" this will update the tree to match the branch.\n"
9964
8502
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"
9971
8503
9972
8504
#: dummy/help_topics/working-trees/summary.txt:1
9973
8505
msgid "Information on working trees"
9974
msgstr "Information on working trees"
8506
msgstr ""
9975
8507
9976
8508
#: en/help_topics/authentication.txt:1
9977
8509
msgid ""
9978
8510
"Authentication Settings\n"
9979
8511
"======================="
9980
8512
msgstr ""
9981
"Authentication Settings\n"
9982
"======================="
9983
8513
9984
8514
#: en/help_topics/authentication.txt:4
9985
8515
msgid ""
9987
8517
"Intent\n"
9988
8518
"------"
9989
8519
msgstr ""
9990
"\n"
9991
"Intent\n"
9992
"------"
9993
8520
9994
8521
#: en/help_topics/authentication.txt:8
9995
8522
msgid ""
9999
8526
"password\n"
10000
8527
"for every branch he uses."
10001
8528
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."
10007
8529
10008
8530
#: en/help_topics/authentication.txt:13
10009
8531
msgid ""
10016
8538
"different\n"
10017
8539
"servers."
10018
8540
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."
10027
8541
10028
8542
#: en/help_topics/authentication.txt:19
10029
8543
msgid ""
10030
8544
"The intent is to make this file as small as possible to minimize maintenance."
10031
8545
msgstr ""
10032
"The intent is to make this file as small as possible to minimise maintenance."
10033
8546
10034
8547
#: en/help_topics/authentication.txt:21
10035
8548
msgid ""
10039
8552
"sharing\n"
10040
8553
"of your urls with others)."
10041
8554
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)."
10047
8555
10048
8556
#: en/help_topics/authentication.txt:25
10049
8557
msgid "Instead of using::"
10050
msgstr "Instead of using::"
8558
msgstr ""
10051
8559
10052
8560
#: en/help_topics/authentication.txt:27
10053
8561
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
10054
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8562
msgstr ""
10055
8563
10056
8564
#: en/help_topics/authentication.txt:29
10057
8565
msgid "you simply use::"
10058
msgstr "you simply use::"
8566
msgstr ""
10059
8567
10060
8568
#: en/help_topics/authentication.txt:31
10061
8569
msgid " bzr branch ftp://host.com/path/to/my/branch"
10062
msgstr " bzr branch ftp://host.com/path/to/my/branch"
8570
msgstr ""
10063
8571
10064
8572
#: en/help_topics/authentication.txt:33
10065
8573
msgid ""
10066
8574
"provided you have created the following ``authentication.conf`` file::"
10067
8575
msgstr ""
10068
"provided you have created the following ``authentication.conf`` file::"
10069
8576
10070
8577
#: en/help_topics/authentication.txt:35
10071
8578
msgid ""
10076
8583
" password=secret\n"
10077
8584
" "
10078
8585
msgstr ""
10079
" [myprojects]\n"
10080
" scheme=ftp\n"
10081
" host=host.com\n"
10082
" user=joe\n"
10083
" password=secret\n"
10084
" "
10085
8586
10086
8587
#: en/help_topics/authentication.txt:42
10087
8588
msgid ""
10088
8589
"Authentication definitions\n"
10089
8590
"--------------------------"
10090
8591
msgstr ""
10091
"Authentication definitions\n"
10092
"--------------------------"
10093
8592
10094
8593
#: en/help_topics/authentication.txt:45
10095
8594
msgid ""
10097
8596
"by\n"
10098
8597
"bzr:"
10099
8598
msgstr ""
10100
"There are two kinds of authentication used by the various schemes supported "
10101
"by\n"
10102
"bzr:"
10103
8599
10104
8600
#: en/help_topics/authentication.txt:48
10105
8601
msgid "1. user and password"
10106
msgstr "1. user and password"
8602
msgstr ""
10107
8603
10108
8604
#: en/help_topics/authentication.txt:50
10109
8605
msgid ""
10113
8609
"provide\n"
10114
8610
"our own less secure method."
10115
8611
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."
10121
8612
10122
8613
#: en/help_topics/authentication.txt:55
10123
8614
msgid "2. user, realm and password"
10124
msgstr "2. user, realm and password"
8615
msgstr ""
10125
8616
10126
8617
#: en/help_topics/authentication.txt:57
10127
8618
msgid ""
10136
8627
"prompts\n"
10137
8628
"you for a password."
10138
8629
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."
10149
8630
10150
8631
#: en/help_topics/authentication.txt:64
10151
8632
msgid ""
10152
8633
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
10153
8634
"specifying the appropriate port."
10154
8635
msgstr ""
10155
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
10156
"specifying the appropriate port."
10157
8636
10158
8637
#: en/help_topics/authentication.txt:67
10159
8638
msgid ""
10163
8642
"``user``,\n"
10164
8643
"``password``)."
10165
8644
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``)."
10171
8645
10172
8646
#: en/help_topics/authentication.txt:71
10173
8647
msgid ""
10178
8652
" should be used instead since this is the real scheme regarding\n"
10179
8653
" authentication,"
10180
8654
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,"
10187
8655
10188
8656
#: en/help_topics/authentication.txt:76
10189
8657
msgid " * ``host``: can be empty (to act as a default for any host),"
10190
msgstr " * ``host``: can be empty (to act as a default for any host),"
8658
msgstr ""
10191
8659
10192
8660
#: en/help_topics/authentication.txt:78
10193
8661
msgid ""
10197
8665
"only\n"
10198
8666
" when the server uses a port different than the scheme standard port,"
10199
8667
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,"
10205
8668
10206
8669
#: en/help_topics/authentication.txt:82
10207
8670
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
10208
msgstr " * ``path``: can be empty (FTP or SFTP will never user it),"
8671
msgstr ""
10209
8672
10210
8673
#: en/help_topics/authentication.txt:84
10211
8674
msgid ""
10212
8675
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
10213
8676
" ``getpass.get_user()``),"
10214
8677
msgstr ""
10215
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
10216
" ``getpass.get_user()``),"
10217
8678
10218
8679
#: en/help_topics/authentication.txt:87
10219
8680
msgid ""
10220
8681
" * ``password``: can be empty if you prefer to always be prompted for your\n"
10221
8682
" password."
10222
8683
msgstr ""
10223
" * ``password``: can be empty if you prefer to always be prompted for your\n"
10224
" password."
10225
8684
10226
8685
#: en/help_topics/authentication.txt:90
10227
8686
msgid ""
10229
8688
"a\n"
10230
8689
"(``user`` [, ``password``]) based on the following rules :"
10231
8690
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 :"
10235
8691
10236
8692
#: en/help_topics/authentication.txt:93
10237
8693
msgid " 1. the first match wins,"
10238
msgstr " 1. the first match wins,"
8694
msgstr ""
10239
8695
10240
8696
#: en/help_topics/authentication.txt:95
10241
8697
msgid " 2. empty fields match everything,"
10242
msgstr " 2. empty fields match everything,"
8698
msgstr ""
10243
8699
10244
8700
#: en/help_topics/authentication.txt:97
10245
8701
msgid ""
10246
8702
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
10247
8703
msgstr ""
10248
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
10249
8704
10250
8705
#: en/help_topics/authentication.txt:99
10251
8706
msgid ""
10254
8709
"``projectbzr.sf.net``\n"
10255
8710
" will not match ``bzr.sf.net``)."
10256
8711
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``)."
10261
8712
10262
8713
#: en/help_topics/authentication.txt:103
10263
8714
msgid ""
10264
8715
" 5. ``port`` matches if included in the requested URL (exact matches only)"
10265
8716
msgstr ""
10266
" 5. ``port`` matches if included in the requested URL (exact matches only)"
10267
8717
10268
8718
#: en/help_topics/authentication.txt:105
10269
8719
msgid ""
10271
8721
"above,\n"
10272
8722
" empty paths will match any provided path)."
10273
8723
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)."
10277
8724
10278
8725
#: en/help_topics/authentication.txt:110
10279
8726
msgid ""
10280
8727
"File format\n"
10281
8728
"-----------"
10282
8729
msgstr ""
10283
"File format\n"
10284
"-----------"
10285
8730
10286
8731
#: en/help_topics/authentication.txt:113
10287
8732
msgid ""
10288
8733
"The general rules for :doc:`configuration files <configuration-help>`\n"
10289
8734
"apply except for the variable policies."
10290
8735
msgstr ""
10291
"The general rules for :doc:`configuration files <configuration-help>`\n"
10292
"apply except for the variable policies."
10293
8736
10294
8737
#: en/help_topics/authentication.txt:116
10295
8738
msgid "Each section describes an authentication definition."
10296
msgstr "Each section describes an authentication definition."
8739
msgstr ""
10297
8740
10298
8741
#: en/help_topics/authentication.txt:118
10299
8742
msgid ""
10301
8744
"reserved\n"
10302
8745
"and should appear as the *last* section."
10303
8746
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."
10307
8747
10308
8748
#: en/help_topics/authentication.txt:121
10309
8749
msgid "Each section should define:"
10310
msgstr "Each section should define:"
8750
msgstr ""
10311
8751
10312
8752
#: en/help_topics/authentication.txt:123
10313
8753
msgid "* ``user``: the login to be used,"
10314
msgstr "* ``user``: the login to be used,"
8754
msgstr ""
10315
8755
10316
8756
#: en/help_topics/authentication.txt:125
10317
8757
msgid "Each section could define:"
10318
msgstr "Each section could define:"
8758
msgstr ""
10319
8759
10320
8760
#: en/help_topics/authentication.txt:127
10321
8761
msgid "* ``host``: the remote server,"
10322
msgstr "* ``host``: the remote server,"
8762
msgstr ""
10323
8763
10324
8764
#: en/help_topics/authentication.txt:129
10325
8765
msgid "* ``port``: the port the server is listening,"
10326
msgstr "* ``port``: the port the server is listening,"
8766
msgstr ""
10327
8767
10328
8768
#: en/help_topics/authentication.txt:131
10329
8769
msgid "* ``path``: the branch location,"
10330
msgstr "* ``path``: the branch location,"
8770
msgstr ""
10331
8771
10332
8772
#: en/help_topics/authentication.txt:133
10333
8773
msgid "* ``password``: the password."
10334
msgstr "* ``password``: the password."
8774
msgstr ""
10335
8775
10336
8776
#: en/help_topics/authentication.txt:135
10337
8777
msgid ""
10339
8779
"Examples\n"
10340
8780
"--------"
10341
8781
msgstr ""
10342
"\n"
10343
"Examples\n"
10344
"--------"
10345
8782
10346
8783
#: en/help_topics/authentication.txt:139
10347
8784
msgid ""
10349
8786
"Personal projects hosted outside\n"
10350
8787
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10351
8788
msgstr ""
10352
"\n"
10353
"Personal projects hosted outside\n"
10354
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10355
8789
10356
8790
#: en/help_topics/authentication.txt:143
10357
8791
msgid ""
10361
8795
"with\n"
10362
8796
"some exceptions::"
10363
8797
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::"
10369
8798
10370
8799
#: en/help_topics/authentication.txt:147
10371
8800
msgid ""
10387
8816
"foobar\n"
10388
8817
" user=foobar"
10389
8818
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"
10407
8819
10408
8820
#: en/help_topics/authentication.txt:164
10409
8821
msgid ""
10411
8823
"Source hosting provider\n"
10412
8824
"~~~~~~~~~~~~~~~~~~~~~~~"
10413
8825
msgstr ""
10414
"\n"
10415
"Source hosting provider\n"
10416
"~~~~~~~~~~~~~~~~~~~~~~~"
10417
8826
10418
8827
#: en/help_topics/authentication.txt:168
10419
8828
msgid "In the shp.net (fictitious) domain, each project has its own site::"
10420
msgstr "In the shp.net (fictitious) domain, each project has its own site::"
8829
msgstr ""
10421
8830
10422
8831
#: en/help_topics/authentication.txt:170
10423
8832
msgid ""
10431
8840
" # consider using an ssh agent if you don't want to supply\n"
10432
8841
" # a password interactively. (pageant, ssh-agent, etc)"
10433
8842
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)"
10443
8843
10444
8844
#: en/help_topics/authentication.txt:180
10445
8845
msgid ""
10446
8846
"HTTPS, SFTP servers and their proxy\n"
10447
8847
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10448
8848
msgstr ""
10449
"HTTPS, SFTP servers and their proxy\n"
10450
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10451
8849
10452
8850
#: en/help_topics/authentication.txt:183
10453
8851
msgid ""
10455
8853
"behind a\n"
10456
8854
"proxy, and the two branches use different authentication policies::"
10457
8855
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::"
10461
8856
10462
8857
#: en/help_topics/authentication.txt:186
10463
8858
msgid ""
10468
8863
" user=user1\n"
10469
8864
" password=pass1"
10470
8865
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"
10477
8866
10478
8867
#: en/help_topics/authentication.txt:193
10479
8868
msgid ""
10492
8881
" user=proxyuser1\n"
10493
8882
" password=proxypass1"
10494
8883
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"
10509
8884
10510
8885
#: en/help_topics/authentication.txt:208
10511
8886
msgid ""
10513
8888
"Planned enhancements\n"
10514
8889
"--------------------"
10515
8890
msgstr ""
10516
"\n"
10517
"Planned enhancements\n"
10518
"--------------------"
10519
8891
10520
8892
#: en/help_topics/authentication.txt:212
10521
8893
msgid ""
10522
8894
"The following are not yet implemented but planned as parts of a work in\n"
10523
8895
"progress:"
10524
8896
msgstr ""
10525
"The following are not yet implemented but planned as parts of a work in\n"
10526
"progress:"
10527
8897
10528
8898
#: en/help_topics/authentication.txt:215
10529
8899
msgid "* add a ``password_encoding`` field allowing:"
10530
msgstr "* add a ``password_encoding`` field allowing:"
8900
msgstr ""
10531
8901
10532
8902
#: en/help_topics/authentication.txt:217
10533
8903
msgid ""
10534
8904
" - storing the passwords in various obfuscating encodings (base64 for one),"
10535
8905
msgstr ""
10536
" - storing the passwords in various obfuscating encodings (base64 for one),"
10537
8906
10538
8907
#: en/help_topics/authentication.txt:219
10539
8908
msgid " - delegate password storage to plugins (.netrc for example)."
10540
msgstr " - delegate password storage to plugins (.netrc for example)."
8909
msgstr ""
10541
8910
10542
8911
#: en/help_topics/authentication.txt:221
10543
8912
msgid ""
10544
8913
"* update the credentials when the user is prompted for user or password,"
10545
8914
msgstr ""
10546
"* update the credentials when the user is prompted for user or password,"
10547
8915
10548
8916
#: en/help_topics/authentication.txt:223
10549
8917
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
10550
msgstr "* add a ``verify_certificates`` field for ``HTTPS``."
8918
msgstr ""
10551
8919
10552
8920
#: en/help_topics/authentication.txt:225
10553
8921
msgid ""
10555
8923
"but\n"
10556
8924
"ignored in the actual implementation.\n"
10557
8925
msgstr ""
10558
"The ``password_encoding`` and ``verify_certificates`` fields are recognised "
10559
"but\n"
10560
"ignored in the actual implementation.\n"
10561
8926
10562
8927
#: en/help_topics/bugs.txt:1
10563
8928
msgid "Bug Tracker Settings"
10564
msgstr "Bug Tracker Settings"
8929
msgstr ""
10565
8930
10566
8931
#: en/help_topics/bugs.txt:3
10567
8932
msgid ""
10570
8935
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
10571
8936
"(The only ``status`` value currently supported is ``fixed.``)"
10572
8937
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.``)"
10577
8938
10578
8939
#: en/help_topics/bugs.txt:8
10579
8940
msgid ""
10581
8942
"identifier\n"
10582
8943
"rather than a full URL. This looks like::"
10583
8944
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::"
10587
8945
10588
8946
#: en/help_topics/bugs.txt:11
10589
8947
msgid " bzr commit --fixes <tracker>:<id>"
10590
msgstr " bzr commit --fixes <tracker>:<id>"
8948
msgstr ""
10591
8949
10592
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8950
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
10593
8951
msgid "or::"
10594
msgstr "or::"
8952
msgstr ""
10595
8953
10596
8954
#: en/help_topics/bugs.txt:15
10597
8955
msgid " bzr commit --fixes <id>"
10598
msgstr " bzr commit --fixes <id>"
8956
msgstr ""
10599
8957
10600
8958
#: en/help_topics/bugs.txt:17
10601
8959
msgid ""
10605
8963
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
10606
8964
"or global configuration is used."
10607
8965
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."
10613
8966
10614
8967
#: en/help_topics/bugs.txt:22
10615
8968
msgid ""
10618
8971
"use this feature, you just need to know the tracker identifier to use.\n"
10619
8972
"These are the bugtrackers that are built in:"
10620
8973
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:"
10625
8974
10626
8975
#: en/help_topics/bugs.txt:27
10627
8976
msgid ""
10633
8982
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
10634
8983
" ============================ ============ ============"
10635
8984
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
" ============================ ============ ============"
10643
8985
10644
8986
#: en/help_topics/bugs.txt:35
10645
8987
msgid ""
10650
8992
"of the schemes described below then you can write a plugin to support\n"
10651
8993
"it."
10652
8994
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."
10659
8995
10660
8996
#: en/help_topics/bugs.txt:42
10661
8997
msgid ""
10665
9001
"configuration section in ``locations.conf``. You can set up these values\n"
10666
9002
"for each of the projects you work on."
10667
9003
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."
10673
9004
10674
9005
#: en/help_topics/bugs.txt:48
10675
9006
msgid ""
10676
9007
"Note: As you provide a short name for each tracker, you can specify one or\n"
10677
9008
"more bugs in one or more trackers at commit time if you wish."
10678
9009
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."
10681
9010
10682
9011
#: en/help_topics/bugs.txt:51
10683
9012
msgid ""
10684
9013
"Launchpad\n"
10685
9014
"---------"
10686
9015
msgstr ""
10687
"Launchpad\n"
10688
"---------"
10689
9016
10690
9017
#: en/help_topics/bugs.txt:54
10691
9018
msgid ""
10692
9019
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
10693
9020
msgstr ""
10694
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
10695
9021
10696
9022
#: en/help_topics/bugs.txt:56
10697
9023
msgid ""
10698
9024
"bugzilla_<tracker>_url\n"
10699
9025
"----------------------"
10700
9026
msgstr ""
10701
"bugzilla_<tracker>_url\n"
10702
"----------------------"
10703
9027
10704
9028
#: en/help_topics/bugs.txt:59
10705
9029
msgid ""
10708
9032
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10709
9033
"example::"
10710
9034
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::"
10715
9035
10716
9036
#: en/help_topics/bugs.txt:64
10717
9037
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
10718
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9038
msgstr ""
10719
9039
10720
9040
#: en/help_topics/bugs.txt:66
10721
9041
msgid ""
10722
9042
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
10723
9043
"fixed."
10724
9044
msgstr ""
10725
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
10726
"fixed."
10727
9045
10728
9046
#: en/help_topics/bugs.txt:69
10729
9047
msgid ""
10730
9048
"trac_<tracker>_url\n"
10731
9049
"------------------"
10732
9050
msgstr ""
10733
"trac_<tracker>_url\n"
10734
"------------------"
10735
9051
10736
9052
#: en/help_topics/bugs.txt:72
10737
9053
msgid ""
10740
9056
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
10741
9057
"example::"
10742
9058
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::"
10747
9059
10748
9060
#: en/help_topics/bugs.txt:77
10749
9061
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
10750
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9062
msgstr ""
10751
9063
10752
9064
#: en/help_topics/bugs.txt:79
10753
9065
msgid ""
10755
9067
"as\n"
10756
9068
"fixed."
10757
9069
msgstr ""
10758
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
10759
"as\n"
10760
"fixed."
10761
9070
10762
9071
#: en/help_topics/bugs.txt:82
10763
9072
msgid ""
10764
9073
"bugtracker_<tracker>_url\n"
10765
9074
"------------------------"
10766
9075
msgstr ""
10767
"bugtracker_<tracker>_url\n"
10768
"------------------------"
10769
9076
10770
9077
#: en/help_topics/bugs.txt:85
10771
9078
msgid ""
10775
9082
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
10776
9083
"fixed by that commit. For example::"
10777
9084
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::"
10783
9085
10784
9086
#: en/help_topics/bugs.txt:91
10785
9087
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
10786
msgstr " bugtracker_python_url = http://bugs.python.org/issue{id}"
9088
msgstr ""
10787
9089
10788
9090
#: en/help_topics/bugs.txt:93
10789
9091
msgid ""
10790
9092
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
10791
9093
"Roundup bug tracker as fixed, or::"
10792
9094
msgstr ""
10793
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
10794
"Roundup bug tracker as fixed, or::"
10795
9095
10796
9096
#: en/help_topics/bugs.txt:96
10797
9097
msgid ""
10798
9098
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
10799
9099
msgstr ""
10800
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
10801
9100
10802
9101
#: en/help_topics/bugs.txt:98
10803
9102
msgid ""
10804
9103
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
10805
9104
"RT bug tracker as fixed, or::"
10806
9105
msgstr ""
10807
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
10808
"RT bug tracker as fixed, or::"
10809
9106
10810
9107
#: en/help_topics/bugs.txt:101
10811
9108
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
10812
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9109
msgstr ""
10813
9110
10814
9111
#: en/help_topics/bugs.txt:103
10815
9112
msgid ""
10817
9114
"1234\n"
10818
9115
"in Hudson's JIRA bug tracker as fixed.\n"
10819
9116
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"
10823
9117
10824
9118
#: en/help_topics/commands.txt:1
10825
9119
msgid ""
10888
9182
"remove-tree Remove the working tree from a given branch/checkout.\n"
10889
9183
"renames Show list of renamed files.\n"
10890
9184
"resolve Mark a conflict as resolved.\n"
10891
"revert Set files in the working tree back to the contents of a\n"
10892
" previous revision.\n"
9185
"revert Revert files to a previous revision.\n"
10893
9186
"revno Show current revision number.\n"
10894
9187
"root Show the tree root directory.\n"
10895
9188
"send Mail or create a merge-directive for submitting changes.\n"
10914
9207
"view Manage filtered views.\n"
10915
9208
"whoami Show or set bzr user id.\n"
10916
9209
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"
11007
9210
11008
9211
#: en/help_topics/configuration.txt:1
11009
9212
msgid ""
11010
9213
"Configuration Settings\n"
11011
9214
"======================="
11012
9215
msgstr ""
11013
"Configuration Settings\n"
11014
"======================="
11015
9216
11016
9217
#: en/help_topics/configuration.txt:4
11017
9218
msgid ""
11018
9219
"Environment settings\n"
11019
9220
"---------------------"
11020
9221
msgstr ""
11021
"Environment settings\n"
11022
"---------------------"
11023
9222
11024
9223
#: en/help_topics/configuration.txt:7
11025
9224
msgid ""
11026
9225
"While most configuration is handled by configuration files, some options\n"
11027
9226
"which may be semi-permanent can also be controlled through the environment."
11028
9227
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."
11031
9228
11032
9229
#: en/help_topics/configuration.txt:10
11033
9230
msgid ""
11034
9231
"BZR_EMAIL\n"
11035
9232
"~~~~~~~~~"
11036
9233
msgstr ""
11037
"BZR_EMAIL\n"
11038
"~~~~~~~~~"
11039
9234
11040
9235
#: en/help_topics/configuration.txt:13
11041
9236
msgid "Override the email id used by Bazaar. Typical format::"
11042
msgstr "Override the email id used by Bazaar. Typical format::"
9237
msgstr ""
11043
9238
11044
9239
#: en/help_topics/configuration.txt:15
11045
9240
msgid " \"John Doe <jdoe@example.com>\""
11046
msgstr " \"John Doe <jdoe@example.com>\""
9241
msgstr ""
11047
9242
11048
9243
#: en/help_topics/configuration.txt:17
11049
9244
msgid "See also the ``email`` configuration option."
11050
msgstr "See also the ``email`` configuration option."
9245
msgstr ""
11051
9246
11052
9247
#: en/help_topics/configuration.txt:19
11053
9248
msgid ""
11054
9249
"BZR_PROGRESS_BAR\n"
11055
9250
"~~~~~~~~~~~~~~~~"
11056
9251
msgstr ""
11057
"BZR_PROGRESS_BAR\n"
11058
"~~~~~~~~~~~~~~~~"
11059
9252
11060
9253
#: en/help_topics/configuration.txt:22
11061
9254
msgid ""
11065
9258
"draws\n"
11066
9259
"the ordinary command line progress bar."
11067
9260
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."
11073
9261
11074
9262
#: en/help_topics/configuration.txt:26
11075
9263
msgid ""
11076
9264
"BZR_SIGQUIT_PDB\n"
11077
9265
"~~~~~~~~~~~~~~~"
11078
9266
msgstr ""
11079
"BZR_SIGQUIT_PDB\n"
11080
"~~~~~~~~~~~~~~~"
11081
9267
11082
9268
#: en/help_topics/configuration.txt:29
11083
9269
msgid ""
11084
9270
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
11085
9271
msgstr ""
11086
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
11087
9272
11088
9273
#: en/help_topics/configuration.txt:31
11089
9274
msgid ""
11090
9275
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
11091
9276
"* 1 = Invoke breakin debugger (default)"
11092
9277
msgstr ""
11093
"* 0 = Standard SIGQUIT behaviour (normally, exit with a core dump)\n"
11094
"* 1 = Invoke breakin debugger (default)"
11095
9278
11096
9279
#: en/help_topics/configuration.txt:34
11097
9280
msgid ""
11098
9281
"BZR_HOME\n"
11099
9282
"~~~~~~~~"
11100
9283
msgstr ""
11101
"BZR_HOME\n"
11102
"~~~~~~~~"
11103
9284
11104
9285
#: en/help_topics/configuration.txt:37
11105
9286
msgid "Override the home directory used by Bazaar."
11106
msgstr "Override the home directory used by Bazaar."
9287
msgstr ""
11107
9288
11108
9289
#: en/help_topics/configuration.txt:39
11109
9290
msgid ""
11110
9291
"BZR_SSH\n"
11111
9292
"~~~~~~~"
11112
9293
msgstr ""
11113
"BZR_SSH\n"
11114
"~~~~~~~"
11115
9294
11116
9295
#: en/help_topics/configuration.txt:42
11117
9296
msgid "Select a different SSH implementation."
11118
msgstr "Select a different SSH implementation."
9297
msgstr ""
11119
9298
11120
9299
#: en/help_topics/configuration.txt:44
11121
9300
msgid ""
11122
9301
"BZR_PDB\n"
11123
9302
"~~~~~~~"
11124
9303
msgstr ""
11125
"BZR_PDB\n"
11126
"~~~~~~~"
11127
9304
11128
9305
#: en/help_topics/configuration.txt:47
11129
9306
msgid "Control whether to launch a debugger on error."
11130
msgstr "Control whether to launch a debugger on error."
9307
msgstr ""
11131
9308
11132
9309
#: en/help_topics/configuration.txt:49
11133
9310
msgid ""
11134
9311
"* 0 = Standard behavior\n"
11135
9312
"* 1 = Launch debugger"
11136
9313
msgstr ""
11137
"* 0 = Standard behaviour\n"
11138
"* 1 = Launch debugger"
11139
9314
11140
9315
#: en/help_topics/configuration.txt:52
11141
9316
msgid ""
11142
9317
"BZR_REMOTE_PATH\n"
11143
9318
"~~~~~~~~~~~~~~~"
11144
9319
msgstr ""
11145
"BZR_REMOTE_PATH\n"
11146
"~~~~~~~~~~~~~~~"
11147
9320
11148
9321
#: en/help_topics/configuration.txt:55
11149
9322
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
11150
9323
msgstr ""
11151
"Path to the Bazaar executable to use when using the bzr+ssh protocol."
11152
9324
11153
9325
#: en/help_topics/configuration.txt:57
11154
9326
msgid "See also the ``bzr_remote_path`` configuration option."
11155
msgstr "See also the ``bzr_remote_path`` configuration option."
9327
msgstr ""
11156
9328
11157
9329
#: en/help_topics/configuration.txt:59
11158
9330
msgid ""
11159
9331
"BZR_EDITOR\n"
11160
9332
"~~~~~~~~~~"
11161
9333
msgstr ""
11162
"BZR_EDITOR\n"
11163
"~~~~~~~~~~"
11164
9334
11165
9335
#: en/help_topics/configuration.txt:62
11166
9336
msgid "Path to the editor Bazaar should use for commit messages, etc."
11167
msgstr "Path to the editor Bazaar should use for commit messages, etc."
9337
msgstr ""
11168
9338
11169
9339
#: en/help_topics/configuration.txt:64
11170
9340
msgid ""
11171
9341
"BZR_LOG\n"
11172
9342
"~~~~~~~"
11173
9343
msgstr ""
11174
"BZR_LOG\n"
11175
"~~~~~~~"
11176
9344
11177
9345
#: en/help_topics/configuration.txt:67
11178
9346
msgid ""
11179
9347
"Location of the Bazaar log file. You can check the current location by\n"
11180
9348
"running ``bzr version``."
11181
9349
msgstr ""
11182
"Location of the Bazaar log file. You can check the current location by\n"
11183
"running ``bzr version``."
11184
9350
11185
9351
#: en/help_topics/configuration.txt:70
11186
9352
msgid ""
11187
9353
"The log file contains debug information that is useful for diagnosing or\n"
11188
9354
"reporting problems with Bazaar."
11189
9355
msgstr ""
11190
"The log file contains debug information that is useful for diagnosing or\n"
11191
"reporting problems with Bazaar."
11192
9356
11193
9357
#: en/help_topics/configuration.txt:73
11194
9358
msgid ""
11195
9359
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
11196
9360
"will disable logging."
11197
9361
msgstr ""
11198
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
11199
"will disable logging."
11200
9362
11201
9363
#: en/help_topics/configuration.txt:76
11202
9364
msgid ""
11204
9366
"BZR_PLUGIN_PATH\n"
11205
9367
"~~~~~~~~~~~~~~~"
11206
9368
msgstr ""
11207
"\n"
11208
"BZR_PLUGIN_PATH\n"
11209
"~~~~~~~~~~~~~~~"
11210
9369
11211
9370
#: en/help_topics/configuration.txt:80
11212
9371
msgid ""
11213
9372
"The path to the plugins directory that Bazaar should use.\n"
11214
9373
"If not set, Bazaar will search for plugins in:"
11215
9374
msgstr ""
11216
"The path to the plugins directory that Bazaar should use.\n"
11217
"If not set, Bazaar will search for plugins in:"
11218
9375
11219
9376
#: en/help_topics/configuration.txt:83
11220
9377
msgid ""
11221
9378
"* the user specific plugin directory (containing the ``user`` plugins),"
11222
9379
msgstr ""
11223
"* the user specific plugin directory (containing the ``user`` plugins),"
11224
9380
11225
9381
#: en/help_topics/configuration.txt:85
11226
9382
msgid "* the bzrlib directory (containing the ``core`` plugins),"
11227
msgstr "* the bzrlib directory (containing the ``core`` plugins),"
9383
msgstr ""
11228
9384
11229
9385
#: en/help_topics/configuration.txt:87
11230
9386
msgid ""
11231
9387
"* the site specific plugin directory if applicable (containing\n"
11232
9388
" the ``site`` plugins)."
11233
9389
msgstr ""
11234
"* the site specific plugin directory if applicable (containing\n"
11235
" the ``site`` plugins)."
11236
9390
11237
9391
#: en/help_topics/configuration.txt:90
11238
9392
msgid ""
11239
9393
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
11240
9394
"the way the plugin are searched. "
11241
9395
msgstr ""
11242
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
11243
"the way the plugin are searched. "
11244
9396
11245
9397
#: en/help_topics/configuration.txt:93
11246
9398
msgid ""
11249
9401
"platform specific appropriate character (':' on Unix,\n"
11250
9402
"';' on windows)"
11251
9403
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)"
11256
9404
11257
9405
#: en/help_topics/configuration.txt:98
11258
9406
msgid ""
11260
9408
"in ``user``. However it will continue to search in ``core`` and\n"
11261
9409
"``site`` unless they are explicitly removed."
11262
9410
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."
11266
9411
11267
9412
#: en/help_topics/configuration.txt:102
11268
9413
msgid ""
11269
9414
"If you need to change the order or remove one of these\n"
11270
9415
"directories, you should use special values:"
11271
9416
msgstr ""
11272
"If you need to change the order or remove one of these\n"
11273
"directories, you should use special values:"
11274
9417
11275
9418
#: en/help_topics/configuration.txt:105
11276
9419
msgid ""
11277
9420
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
11278
9421
" path from the default values,"
11279
9422
msgstr ""
11280
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
11281
" path from the default values,"
11282
9423
11283
9424
#: en/help_topics/configuration.txt:108
11284
9425
msgid ""
11286
9427
" before the remaining default values (and also remove it from\n"
11287
9428
" the default values)."
11288
9429
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)."
11292
9430
11293
9431
#: en/help_topics/configuration.txt:112
11294
9432
msgid ""
11296
9434
"used literally, they will be substituted by the corresponding,\n"
11297
9435
"platform specific, values."
11298
9436
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."
11302
9437
11303
9438
#: en/help_topics/configuration.txt:116
11304
9439
msgid ""
11305
9440
"The examples below use ':' as the separator, windows users\n"
11306
9441
"should use ';'."
11307
9442
msgstr ""
11308
"The examples below use ':' as the separator, windows users\n"
11309
"should use ';'."
11310
9443
11311
9444
#: en/help_topics/configuration.txt:119
11312
9445
msgid "Overriding the default user plugin directory::"
11313
msgstr "Overriding the default user plugin directory::"
9446
msgstr ""
11314
9447
11315
9448
#: en/help_topics/configuration.txt:121
11316
9449
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
11317
msgstr " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9450
msgstr ""
11318
9451
11319
9452
#: en/help_topics/configuration.txt:123
11320
9453
msgid "Disabling the site directory while retaining the user directory::"
11321
msgstr "Disabling the site directory while retaining the user directory::"
9454
msgstr ""
11322
9455
11323
9456
#: en/help_topics/configuration.txt:125
11324
9457
msgid " BZR_PLUGIN_PATH='-site:+user'"
11325
msgstr " BZR_PLUGIN_PATH='-site:+user'"
9458
msgstr ""
11326
9459
11327
9460
#: en/help_topics/configuration.txt:127
11328
9461
msgid "Disabling all plugins (better achieved with --no-plugins)::"
11329
msgstr "Disabling all plugins (better achieved with --no-plugins)::"
9462
msgstr ""
11330
9463
11331
9464
#: en/help_topics/configuration.txt:129
11332
9465
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
11333
msgstr " BZR_PLUGIN_PATH='-user:-core:-site'"
9466
msgstr ""
11334
9467
11335
9468
#: en/help_topics/configuration.txt:131
11336
9469
msgid "Overriding the default site plugin directory::"
11337
msgstr "Overriding the default site plugin directory::"
9470
msgstr ""
11338
9471
11339
9472
#: en/help_topics/configuration.txt:133
11340
9473
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
11341
msgstr " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9474
msgstr ""
11342
9475
11343
9476
#: en/help_topics/configuration.txt:135
11344
9477
msgid ""
11345
9478
"BZR_DISABLE_PLUGINS\n"
11346
9479
"~~~~~~~~~~~~~~~~~~~"
11347
9480
msgstr ""
11348
"BZR_DISABLE_PLUGINS\n"
11349
"~~~~~~~~~~~~~~~~~~~"
11350
9481
11351
9482
#: en/help_topics/configuration.txt:138
11352
9483
msgid ""
11355
9486
"uninstalling them completely. Such plugins can be specified in\n"
11356
9487
"the ``BZR_DISABLE_PLUGINS`` environment variable."
11357
9488
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."
11362
9489
11363
9490
#: en/help_topics/configuration.txt:143
11364
9491
msgid ""
11366
9493
"will raise an import error if they are explicitly imported (by\n"
11367
9494
"another plugin that depends on them for example)."
11368
9495
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)."
11372
9496
11373
9497
#: en/help_topics/configuration.txt:147
11374
9498
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
11375
msgstr "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9499
msgstr ""
11376
9500
11377
9501
#: en/help_topics/configuration.txt:149
11378
9502
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
11379
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9503
msgstr ""
11380
9504
11381
9505
#: en/help_topics/configuration.txt:151
11382
9506
msgid ""
11383
9507
"BZR_PLUGINS_AT\n"
11384
9508
"~~~~~~~~~~~~~~"
11385
9509
msgstr ""
11386
"BZR_PLUGINS_AT\n"
11387
"~~~~~~~~~~~~~~"
11388
9510
11389
9511
#: en/help_topics/configuration.txt:154
11390
9512
msgid ""
11396
9518
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
11397
9519
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
11398
9520
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`` ."
11406
9521
11407
9522
#: en/help_topics/configuration.txt:162
11408
9523
msgid ""
11409
9524
"Plugins specified in this environment variable takes precedence\n"
11410
9525
"over the ones in ``BZR_PLUGIN_PATH``."
11411
9526
msgstr ""
11412
"Plugins specified in this environment variable takes precedence\n"
11413
"over the ones in ``BZR_PLUGIN_PATH``."
11414
9527
11415
9528
#: en/help_topics/configuration.txt:165
11416
9529
msgid ""
11421
9534
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
11422
9535
"separator, use ';' on windows."
11423
9536
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."
11430
9537
11431
9538
#: en/help_topics/configuration.txt:172
11432
9539
msgid ""
11433
9540
"Example:\n"
11434
9541
"~~~~~~~~"
11435
9542
msgstr ""
11436
"Example:\n"
11437
"~~~~~~~~"
11438
9543
11439
9544
#: en/help_topics/configuration.txt:175
11440
9545
msgid ""
11441
9546
"Using a specific version of ``myplugin``:\n"
11442
9547
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
11443
9548
msgstr ""
11444
"Using a specific version of ``myplugin``:\n"
11445
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
11446
9549
11447
9550
#: en/help_topics/configuration.txt:178
11448
9551
msgid ""
11449
9552
"BZRPATH\n"
11450
9553
"~~~~~~~"
11451
9554
msgstr ""
11452
"BZRPATH\n"
11453
"~~~~~~~"
11454
9555
11455
9556
#: en/help_topics/configuration.txt:181
11456
9557
msgid "The path where Bazaar should look for shell plugin external commands."
11457
9558
msgstr ""
11458
"The path where Bazaar should look for shell plugin external commands."
11459
9559
11460
9560
#: en/help_topics/configuration.txt:183
11461
9561
msgid ""
11463
9563
"http_proxy, https_proxy\n"
11464
9564
"~~~~~~~~~~~~~~~~~~~~~~~"
11465
9565
msgstr ""
11466
"\n"
11467
"http_proxy, https_proxy\n"
11468
"~~~~~~~~~~~~~~~~~~~~~~~"
11469
9566
11470
9567
#: en/help_topics/configuration.txt:187
11471
9568
msgid "Specifies the network proxy for outgoing connections, for example::"
11472
msgstr "Specifies the network proxy for outgoing connections, for example::"
9569
msgstr ""
11473
9570
11474
9571
#: en/help_topics/configuration.txt:189
11475
9572
msgid ""
11476
9573
" http_proxy=http://proxy.example.com:3128/ \n"
11477
9574
" https_proxy=http://proxy.example.com:3128/"
11478
9575
msgstr ""
11479
" http_proxy=http://proxy.example.com:3128/ \n"
11480
" https_proxy=http://proxy.example.com:3128/"
11481
9576
11482
9577
#: en/help_topics/configuration.txt:192
11483
9578
msgid ""
11485
9580
"Configuration files\n"
11486
9581
"-------------------"
11487
9582
msgstr ""
11488
"\n"
11489
"Configuration files\n"
11490
"-------------------"
11491
9583
11492
9584
#: en/help_topics/configuration.txt:196
11493
9585
msgid ""
11494
9586
"Location\n"
11495
9587
"~~~~~~~~"
11496
9588
msgstr ""
11497
"Location\n"
11498
"~~~~~~~~"
11499
9589
11500
9590
#: en/help_topics/configuration.txt:199
11501
9591
msgid ""
11505
9595
"Windows. (You can check the location for your system by using\n"
11506
9596
"``bzr version``.)"
11507
9597
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``.)"
11513
9598
11514
9599
#: en/help_topics/configuration.txt:204
11515
9600
msgid "There are three primary configuration files in this location:"
11516
msgstr "There are three primary configuration files in this location:"
9601
msgstr ""
11517
9602
11518
9603
#: en/help_topics/configuration.txt:206
11519
9604
msgid "* ``bazaar.conf`` describes default configuration options,"
11520
msgstr "* ``bazaar.conf`` describes default configuration options,"
9605
msgstr ""
11521
9606
11522
9607
#: en/help_topics/configuration.txt:208
11523
9608
msgid ""
11524
9609
"* ``locations.conf`` describes configuration information for\n"
11525
9610
" specific branch locations,"
11526
9611
msgstr ""
11527
"* ``locations.conf`` describes configuration information for\n"
11528
" specific branch locations,"
11529
9612
11530
9613
#: en/help_topics/configuration.txt:211
11531
9614
msgid ""
11532
9615
"* ``authentication.conf`` describes credential information for\n"
11533
9616
" remote servers."
11534
9617
msgstr ""
11535
"* ``authentication.conf`` describes credential information for\n"
11536
" remote servers."
11537
9618
11538
9619
#: en/help_topics/configuration.txt:214
11539
9620
msgid ""
11546
9627
"you\n"
11547
9628
"can do so in ``locations.conf``."
11548
9629
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``."
11557
9630
11558
9631
#: en/help_topics/configuration.txt:220
11559
9632
msgid ""
11560
9633
"General format\n"
11561
9634
"~~~~~~~~~~~~~~"
11562
9635
msgstr ""
11563
"General format\n"
11564
"~~~~~~~~~~~~~~"
11565
9636
11566
9637
#: en/help_topics/configuration.txt:223
11567
9638
msgid ""
11568
9639
"An ini file has three types of contructs: section headers, section\n"
11569
9640
"options and comments."
11570
9641
msgstr ""
11571
"An ini file has three types of contructs: section headers, section\n"
11572
"options and comments."
11573
9642
11574
9643
#: en/help_topics/configuration.txt:226
11575
9644
msgid ""
11576
9645
"Comments\n"
11577
9646
"^^^^^^^^"
11578
9647
msgstr ""
11579
"Comments\n"
11580
"^^^^^^^^"
11581
9648
11582
9649
#: en/help_topics/configuration.txt:229
11583
9650
msgid ""
11585
9652
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
11586
9653
"Bazaar when parsing ini files."
11587
9654
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."
11591
9655
11592
9656
#: en/help_topics/configuration.txt:233
11593
9657
msgid ""
11594
9658
"Section headers\n"
11595
9659
"^^^^^^^^^^^^^^^"
11596
9660
msgstr ""
11597
"Section headers\n"
11598
"^^^^^^^^^^^^^^^"
11599
9661
11600
9662
#: en/help_topics/configuration.txt:236
11601
9663
msgid ""
11602
9664
"A section header is a word enclosed in brackets that starts at the begining\n"
11603
9665
"of a line. A typical section header looks like this::"
11604
9666
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::"
11608
9667
11609
9668
#: en/help_topics/configuration.txt:239
11610
9669
msgid " [DEFAULT]"
11611
msgstr " [DEFAULT]"
9670
msgstr ""
11612
9671
11613
9672
#: en/help_topics/configuration.txt:241
11614
9673
msgid ""
11617
9676
"for\n"
11618
9677
"setting options which can be overridden with the branch config file."
11619
9678
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."
11624
9679
11625
9680
#: en/help_topics/configuration.txt:245
11626
9681
msgid ""
11629
9684
"potentially valid section headers. A section header uses the path for\n"
11630
9685
"the branch as the section header. Some examples include::"
11631
9686
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::"
11636
9687
11637
9688
#: en/help_topics/configuration.txt:250
11638
9689
msgid ""
11639
9690
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
11640
9691
" [/home/jdoe/branches/]"
11641
9692
msgstr ""
11642
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
11643
" [/home/jdoe/branches/]"
11644
9693
11645
9694
#: en/help_topics/configuration.txt:253
11646
9695
msgid ""
11648
9697
"Section options\n"
11649
9698
"^^^^^^^^^^^^^^^"
11650
9699
msgstr ""
11651
"\n"
11652
"Section options\n"
11653
"^^^^^^^^^^^^^^^"
11654
9700
11655
9701
#: en/help_topics/configuration.txt:257
11656
9702
msgid ""
11657
9703
"A section option resides within a section. A section option contains an\n"
11658
9704
"option name, an equals sign and a value. For example::"
11659
9705
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::"
11662
9706
11663
9707
#: en/help_topics/configuration.txt:260
11664
9708
msgid ""
11665
9709
" email = John Doe <jdoe@isp.com>\n"
11666
9710
" gpg_signing_key = Amy Pond <amy@example.com>"
11667
9711
msgstr ""
11668
" email = John Doe <jdoe@isp.com>\n"
11669
" gpg_signing_key = Amy Pond <amy@example.com>"
11670
9712
11671
9713
#: en/help_topics/configuration.txt:263
11672
9714
msgid ""
11673
9715
"A option can reference other options by enclosing them in curly brackets::"
11674
9716
msgstr ""
11675
"A option can reference other options by enclosing them in curly brackets::"
11676
9717
11677
9718
#: en/help_topics/configuration.txt:265
11678
9719
msgid ""
11680
9721
" my_server = bzr+ssh://example.com\n"
11681
9722
" push_location = {my_server}/project/{my_branch_name}"
11682
9723
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}"
11686
9724
11687
9725
#: en/help_topics/configuration.txt:269
11688
9726
msgid ""
11689
9727
"Option policies\n"
11690
9728
"^^^^^^^^^^^^^^^"
11691
9729
msgstr ""
11692
"Option policies\n"
11693
"^^^^^^^^^^^^^^^"
11694
9730
11695
9731
#: en/help_topics/configuration.txt:272
11696
9732
msgid ""
11699
9735
"option value is interpreted for contained locations. Currently\n"
11700
9736
"there are three policies available:"
11701
9737
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:"
11706
9738
11707
9739
#: en/help_topics/configuration.txt:277
11708
9740
msgid ""
11716
9748
" for contained locations, any additional path components are\n"
11717
9749
" appended to the value."
11718
9750
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."
11728
9751
11729
9752
#: en/help_topics/configuration.txt:287
11730
9753
msgid ""
11733
9756
"For example, to define the push location for a tree of branches, the\n"
11734
9757
"following could be used::"
11735
9758
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::"
11740
9759
11741
9760
#: en/help_topics/configuration.txt:291
11742
9761
msgid ""
11744
9763
" push_location = sftp://example.com/location\n"
11745
9764
" push_location:policy = appendpath"
11746
9765
msgstr ""
11747
" [/top/location]\n"
11748
" push_location = sftp://example.com/location\n"
11749
" push_location:policy = appendpath"
11750
9766
11751
9767
#: en/help_topics/configuration.txt:295
11752
9768
msgid ""
11753
9769
"With this configuration, the push location for ``/top/location/branch1``\n"
11754
9770
"would be ``sftp://example.com/location/branch1``."
11755
9771
msgstr ""
11756
"With this configuration, the push location for ``/top/location/branch1``\n"
11757
"would be ``sftp://example.com/location/branch1``."
11758
9772
11759
9773
#: en/help_topics/configuration.txt:298
11760
9774
msgid ""
11761
9775
"Section local options\n"
11762
9776
"^^^^^^^^^^^^^^^^^^^^^"
11763
9777
msgstr ""
11764
"Section local options\n"
11765
"^^^^^^^^^^^^^^^^^^^^^"
11766
9778
11767
9779
#: en/help_topics/configuration.txt:301
11768
9780
msgid ""
11769
9781
"Some options are defined automatically inside a given section and can be\n"
11770
9782
"refered to in this section only. "
11771
9783
msgstr ""
11772
"Some options are defined automatically inside a given section and can be\n"
11773
"referred to in this section only. "
11774
9784
11775
9785
#: en/help_topics/configuration.txt:304
11776
9786
msgid "For example, the ``appendpath`` policy can be used like this::"
11777
msgstr "For example, the ``appendpath`` policy can be used like this::"
9787
msgstr ""
11778
9788
11779
9789
#: en/help_topics/configuration.txt:306
11780
9790
msgid ""
11782
9792
" mypush = lp:~vila/bzr\n"
11783
9793
" mypush:policy=appendpath"
11784
9794
msgstr ""
11785
" [/home/vila/src/bzr/bugs]\n"
11786
" mypush = lp:~vila/bzr\n"
11787
" mypush:policy=appendpath"
11788
9795
11789
9796
#: en/help_topics/configuration.txt:310
11790
9797
msgid "Using ``relpath`` to achieve the same result is done like this::"
11791
msgstr "Using ``relpath`` to achieve the same result is done like this::"
9798
msgstr ""
11792
9799
11793
9800
#: en/help_topics/configuration.txt:312
11794
9801
msgid ""
11795
9802
" [/home/vila/src/bzr/bugs]\n"
11796
9803
" mypush = lp:~vila/bzr/{relpath}"
11797
9804
msgstr ""
11798
" [/home/vila/src/bzr/bugs]\n"
11799
" mypush = lp:~vila/bzr/{relpath}"
11800
9805
11801
9806
#: en/help_topics/configuration.txt:315
11802
9807
msgid ""
11803
9808
"In both cases, when used in a directory like\n"
11804
9809
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
11805
9810
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::"
11808
9811
11809
9812
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
11810
9813
msgid ""
11811
9814
" $ bzr config mypush\n"
11812
9815
" lp:~vila/bzr/832013-expand-in-stack"
11813
9816
msgstr ""
11814
" $ bzr config mypush\n"
11815
" lp:~vila/bzr/832013-expand-in-stack"
11816
9817
11817
9818
#: en/help_topics/configuration.txt:321
11818
9819
msgid "Another such option is ``basename`` which can be used like this::"
11819
msgstr "Another such option is ``basename`` which can be used like this::"
9820
msgstr ""
11820
9821
11821
9822
#: en/help_topics/configuration.txt:323
11822
9823
msgid ""
11823
9824
" [/home/vila/src/bzr]\n"
11824
9825
" mypush = lp:~vila/bzr/{basename}"
11825
9826
msgstr ""
11826
" [/home/vila/src/bzr]\n"
11827
" mypush = lp:~vila/bzr/{basename}"
11828
9827
11829
9828
#: en/help_topics/configuration.txt:326
11830
9829
msgid ""
11831
9830
"When used in a directory like\n"
11832
9831
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
11833
9832
msgstr ""
11834
"When used in a directory like\n"
11835
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
11836
9833
11837
9834
#: en/help_topics/configuration.txt:332
11838
9835
msgid ""
11840
9837
"itself is defined as the relative path between the section name and the\n"
11841
9838
"location it matches."
11842
9839
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."
11846
9840
11847
9841
#: en/help_topics/configuration.txt:336
11848
9842
msgid ""
11849
"Another such option is ``branchname``, which refers to the name of a "
11850
"colocated\n"
11851
"branch. For non-colocated branches, it behaves like basename. It can be "
11852
"used\n"
11853
"like this::"
9843
"When an option is local to a Section, it cannot be referred to from option\n"
9844
"values in any other section from the same ``Store`` nor from any other\n"
9845
"``Store``."
11854
9846
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::"
11860
9847
11861
9848
#: en/help_topics/configuration.txt:340
11862
9849
msgid ""
11863
" [/home/vila/src/bzr/bugs]\n"
11864
" mypush = lp:~vila/bzr/{branchname}"
11865
msgstr ""
11866
" [/home/vila/src/bzr/bugs]\n"
11867
" mypush = lp:~vila/bzr/{branchname}"
11868
11869
#: en/help_topics/configuration.txt:343
11870
msgid ""
11871
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
11872
"get::"
11873
msgstr ""
11874
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
11875
"get::"
11876
11877
#: en/help_topics/configuration.txt:345
11878
msgid ""
11879
" bzr config mypush\n"
11880
" lp:~vila/bzr/832013-expand-in-stack"
11881
msgstr ""
11882
" bzr config mypush\n"
11883
" lp:~vila/bzr/832013-expand-in-stack"
11884
11885
#: en/help_topics/configuration.txt:348
11886
msgid ""
11887
"When an option is local to a Section, it cannot be referred to from option\n"
11888
"values in any other section from the same ``Store`` nor from any other\n"
11889
"``Store``."
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``."
11894
11895
#: en/help_topics/configuration.txt:352
11896
msgid ""
11897
"\n"
11898
"The main configuration file, bazaar.conf\n"
11899
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11900
msgstr ""
11901
"\n"
11902
"The main configuration file, bazaar.conf\n"
11903
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11904
11905
#: en/help_topics/configuration.txt:356
9850
"\n"
9851
"The main configuration file, bazaar.conf\n"
9852
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9853
msgstr ""
9854
9855
#: en/help_topics/configuration.txt:344
11906
9856
msgid ""
11907
9857
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
11908
9858
"The default section contains the default\n"
11909
9859
"configuration options for all branches. The default section can be\n"
11910
9860
"overriden by providing a branch-specific section in ``locations.conf``."
11911
9861
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``."
11916
9862
11917
#: en/help_topics/configuration.txt:361
9863
#: en/help_topics/configuration.txt:349
11918
9864
msgid "A typical ``bazaar.conf`` section often looks like the following::"
11919
msgstr "A typical ``bazaar.conf`` section often looks like the following::"
11920
11921
#: en/help_topics/configuration.txt:363
11922
msgid ""
11923
" [DEFAULT]\n"
11924
" email = John Doe <jdoe@isp.com>\n"
11925
" editor = /usr/bin/vim\n"
11926
" create_signatures = when-required"
11927
msgstr ""
11928
" [DEFAULT]\n"
11929
" email = John Doe <jdoe@isp.com>\n"
11930
" editor = /usr/bin/vim\n"
11931
" create_signatures = when-required"
11932
11933
#: en/help_topics/configuration.txt:368
11934
msgid ""
11935
"\n"
11936
"The branch location configuration file, locations.conf\n"
11937
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11938
msgstr ""
11939
"\n"
11940
"The branch location configuration file, locations.conf\n"
11941
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9865
msgstr ""
9866
9867
#: en/help_topics/configuration.txt:351
9868
msgid ""
9869
" [DEFAULT]\n"
9870
" email = John Doe <jdoe@isp.com>\n"
9871
" editor = /usr/bin/vim\n"
9872
" create_signatures = when-required"
9873
msgstr ""
9874
9875
#: en/help_topics/configuration.txt:356
9876
msgid ""
9877
"\n"
9878
"The branch location configuration file, locations.conf\n"
9879
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:360
9883
msgid ""
9884
"``locations.conf`` allows one to specify overriding settings for\n"
9885
"a specific branch. The format is almost identical to the default section in\n"
9886
"bazaar.conf with one significant change: The section header, instead of "
9887
"saying\n"
9888
"default, will be the path to a branch that you wish to override a value\n"
9889
"for. The '?' and '*' wildcards are supported::"
9890
msgstr ""
9891
9892
#: en/help_topics/configuration.txt:366
9893
msgid ""
9894
" [/home/jdoe/branches/nethack]\n"
9895
" email = Nethack Admin <nethack@nethack.com>"
9896
msgstr ""
9897
9898
#: en/help_topics/configuration.txt:369
9899
msgid ""
9900
" [http://hypothetical.site.com/branches/devel-branch]\n"
9901
" create_signatures = always"
9902
msgstr ""
11942
9903
11943
9904
#: en/help_topics/configuration.txt:372
11944
9905
msgid ""
11945
"``locations.conf`` allows one to specify overriding settings for\n"
11946
"a specific branch. The format is almost identical to the default section in\n"
11947
"bazaar.conf with one significant change: The section header, instead of "
11948
"saying\n"
11949
"default, will be the path to a branch that you wish to override a value\n"
11950
"for. The '?' and '*' wildcards are supported::"
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::"
11958
11959
#: en/help_topics/configuration.txt:378
11960
msgid ""
11961
" [/home/jdoe/branches/nethack]\n"
11962
" email = Nethack Admin <nethack@nethack.com>"
11963
msgstr ""
11964
" [/home/jdoe/branches/nethack]\n"
11965
" email = Nethack Admin <nethack@nethack.com>"
11966
11967
#: en/help_topics/configuration.txt:381
11968
msgid ""
11969
" [http://hypothetical.site.com/branches/devel-branch]\n"
11970
" create_signatures = always"
11971
msgstr ""
11972
" [http://hypothetical.site.com/branches/devel-branch]\n"
11973
" create_signatures = always"
11974
11975
#: en/help_topics/configuration.txt:384
11976
msgid ""
11977
"The authentication configuration file, authentication.conf\n"
11978
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11979
msgstr ""
11980
"The authentication configuration file, authentication.conf\n"
11981
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11982
11983
#: en/help_topics/configuration.txt:387
11984
msgid ""
11985
"``authentication.conf`` allows one to specify credentials for\n"
11986
"remote servers. This can be used for all the supported transports and any "
11987
"part\n"
11988
"of bzr that requires authentication (smtp for example)."
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)."
11994
11995
#: en/help_topics/configuration.txt:391
11996
msgid ""
11997
"The syntax of the file obeys the same rules as the others except for the\n"
11998
"option policies which don't apply."
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."
12002
12003
#: en/help_topics/configuration.txt:394
12004
msgid ""
12005
"For more information on the possible uses of the authentication "
12006
"configuration\n"
12007
"file see :doc:`authentication-help`."
12008
msgstr ""
12009
"For more information on the possible uses of the authentication "
12010
"configuration\n"
12011
"file see :doc:`authentication-help`."
12012
12013
#: en/help_topics/configuration.txt:397
12014
msgid ""
12015
"\n"
12016
"Common options\n"
12017
"--------------"
12018
msgstr ""
12019
"\n"
12020
"Common options\n"
12021
"--------------"
12022
12023
#: en/help_topics/configuration.txt:401
12024
msgid ""
12025
"debug_flags\n"
12026
"~~~~~~~~~~~"
12027
msgstr ""
12028
"debug_flags\n"
12029
"~~~~~~~~~~~"
12030
12031
#: en/help_topics/configuration.txt:404
12032
msgid ""
12033
"A comma-separated list of debugging options to turn on. The same values\n"
12034
"can be used as with the -D command-line option (see `help global-options`).\n"
12035
"For example::"
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::"
12040
12041
#: en/help_topics/configuration.txt:408
9906
"The authentication configuration file, authentication.conf\n"
9907
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9908
msgstr ""
9909
9910
#: en/help_topics/configuration.txt:375
9911
msgid ""
9912
"``authentication.conf`` allows one to specify credentials for\n"
9913
"remote servers. This can be used for all the supported transports and any "
9914
"part\n"
9915
"of bzr that requires authentication (smtp for example)."
9916
msgstr ""
9917
9918
#: en/help_topics/configuration.txt:379
9919
msgid ""
9920
"The syntax of the file obeys the same rules as the others except for the\n"
9921
"option policies which don't apply."
9922
msgstr ""
9923
9924
#: en/help_topics/configuration.txt:382
9925
msgid ""
9926
"For more information on the possible uses of the authentication "
9927
"configuration\n"
9928
"file see :doc:`authentication-help`."
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:385
9932
msgid ""
9933
"\n"
9934
"Common options\n"
9935
"--------------"
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:389
9939
msgid ""
9940
"debug_flags\n"
9941
"~~~~~~~~~~~"
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:392
9945
msgid ""
9946
"A comma-separated list of debugging options to turn on. The same values\n"
9947
"can be used as with the -D command-line option (see `help global-options`).\n"
9948
"For example::"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:396
12042
9952
msgid " debug_flags = hpss"
12043
msgstr " debug_flags = hpss"
9953
msgstr ""
12044
9954
12045
#: en/help_topics/configuration.txt:412
9955
#: en/help_topics/configuration.txt:400
12046
9956
msgid " debug_flags = hpss,evil"
12047
msgstr " debug_flags = hpss,evil"
12048
12049
#: en/help_topics/configuration.txt:414
12050
msgid ""
12051
"email\n"
12052
"~~~~~"
12053
msgstr ""
12054
"email\n"
12055
"~~~~~"
12056
12057
#: en/help_topics/configuration.txt:417
12058
msgid ""
12059
"The email address to use when committing a branch. Typically takes the form\n"
12060
"of::"
12061
msgstr ""
12062
"The email address to use when committing a branch. Typically takes the form\n"
12063
"of::"
12064
12065
#: en/help_topics/configuration.txt:420
9957
msgstr ""
9958
9959
#: en/help_topics/configuration.txt:402
9960
msgid ""
9961
"email\n"
9962
"~~~~~"
9963
msgstr ""
9964
9965
#: en/help_topics/configuration.txt:405
9966
msgid ""
9967
"The email address to use when committing a branch. Typically takes the form\n"
9968
"of::"
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:408
12066
9972
msgid " email = Full Name <account@hostname.tld>"
12067
msgstr " email = Full Name <account@hostname.tld>"
12068
12069
#: en/help_topics/configuration.txt:422
12070
msgid ""
12071
"editor\n"
12072
"~~~~~~"
12073
msgstr ""
12074
"editor\n"
12075
"~~~~~~"
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:410
9976
msgid ""
9977
"editor\n"
9978
"~~~~~~"
9979
msgstr ""
9980
9981
#: en/help_topics/configuration.txt:413
9982
msgid ""
9983
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9984
"a commit message. This setting is trumped by the environment variable\n"
9985
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9986
"variables."
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:418
9990
msgid ""
9991
"log_format\n"
9992
"~~~~~~~~~~"
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:421
9996
msgid ""
9997
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9998
"and ``line``. Additional formats may be provided by plugins. The default\n"
9999
"value is ``long``."
10000
msgstr ""
12076
10001
12077
10002
#: en/help_topics/configuration.txt:425
12078
10003
msgid ""
12079
"The path of the editor that you wish to use if *bzr commit* is run without\n"
12080
"a commit message. This setting is trumped by the environment variable\n"
12081
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
12082
"variables."
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."
12088
12089
#: en/help_topics/configuration.txt:430
12090
msgid ""
12091
"log_format\n"
12092
"~~~~~~~~~~"
12093
msgstr ""
12094
"log_format\n"
12095
"~~~~~~~~~~"
12096
12097
#: en/help_topics/configuration.txt:433
12098
msgid ""
12099
"The default log format to use. Standard log formats are ``long``, ``short``\n"
12100
"and ``line``. Additional formats may be provided by plugins. The default\n"
12101
"value is ``long``."
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``."
10004
"check_signatures\n"
10005
"~~~~~~~~~~~~~~~~"
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:428
10009
msgid ""
10010
"Reserved for future use. These options will allow a policy for branches to\n"
10011
"require signatures."
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:431
10015
msgid ""
10016
"require\n"
10017
" The gnupg signature for revisions must be present and must be valid."
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:434
10021
msgid ""
10022
"ignore\n"
10023
" Do not check gnupg signatures of revisions."
10024
msgstr ""
12106
10025
12107
10026
#: en/help_topics/configuration.txt:437
12108
10027
msgid ""
12109
"check_signatures\n"
12110
"~~~~~~~~~~~~~~~~"
12111
msgstr ""
12112
"check_signatures\n"
12113
"~~~~~~~~~~~~~~~~"
12114
12115
#: en/help_topics/configuration.txt:440
12116
msgid ""
12117
"Reserved for future use. These options will allow a policy for branches to\n"
12118
"require signatures."
12119
msgstr ""
12120
"Reserved for future use. These options will allow a policy for branches to\n"
12121
"require signatures."
12122
12123
#: en/help_topics/configuration.txt:443
12124
msgid ""
12125
"require\n"
12126
" The gnupg signature for revisions must be present and must be valid."
12127
msgstr ""
12128
"require\n"
12129
" The gnupg signature for revisions must be present and must be valid."
12130
12131
#: en/help_topics/configuration.txt:446
12132
msgid ""
12133
"ignore\n"
12134
" Do not check gnupg signatures of revisions."
12135
msgstr ""
12136
"ignore\n"
12137
" Do not check gnupg signatures of revisions."
12138
12139
#: en/help_topics/configuration.txt:449
12140
msgid ""
12141
"check-available\n"
12142
" (default) If gnupg signatures for revisions are present, check them.\n"
12143
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
12144
" no signature is present."
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."
12150
12151
#: en/help_topics/configuration.txt:454
12152
msgid ""
12153
"create_signatures\n"
12154
"~~~~~~~~~~~~~~~~~"
12155
msgstr ""
12156
"create_signatures\n"
12157
"~~~~~~~~~~~~~~~~~"
12158
12159
#: en/help_topics/configuration.txt:457
12160
msgid ""
12161
"Defines the behaviour of signing revisions on commits. By default bzr will "
12162
"not\n"
12163
"sign new commits."
12164
msgstr ""
12165
"Defines the behaviour of signing revisions on commits. By default bzr will "
12166
"not\n"
12167
"sign new commits."
12168
12169
#: en/help_topics/configuration.txt:460
12170
msgid ""
12171
"always\n"
12172
" Sign every new revision that is committed. If the signing fails then "
12173
"the\n"
12174
" commit will not be made."
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."
12180
12181
#: en/help_topics/configuration.txt:464
12182
msgid ""
12183
"when-required\n"
12184
" Reserved for future use."
12185
msgstr ""
12186
"when-required\n"
12187
" Reserved for future use."
12188
12189
#: en/help_topics/configuration.txt:467
12190
msgid ""
12191
"never\n"
12192
" Reserved for future use."
12193
msgstr ""
12194
"never\n"
12195
" Reserved for future use."
12196
12197
#: en/help_topics/configuration.txt:470
12198
msgid ""
12199
"In future it is planned that ``when-required`` will sign newly\n"
12200
"committed revisions only when the branch requires them. ``never`` will "
12201
"refuse\n"
12202
"to sign newly committed revisions, even if the branch requires signatures."
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."
12208
12209
#: en/help_topics/configuration.txt:474
12210
msgid ""
12211
"dirstate.fdatasync\n"
12212
"~~~~~~~~~~~~~~~~~~"
12213
msgstr ""
12214
"dirstate.fdatasync\n"
12215
"~~~~~~~~~~~~~~~~~~"
12216
12217
#: en/help_topics/configuration.txt:477
12218
msgid ""
12219
"If true (default), working tree metadata changes are flushed through the\n"
12220
"OS buffers to physical disk. This is somewhat slower, but means data\n"
12221
"should not be lost if the machine crashes. See also repository.fdatasync."
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."
12226
12227
#: en/help_topics/configuration.txt:481
12228
msgid ""
12229
"gpg_signing_key\n"
12230
"~~~~~~~~~~~~~~~"
12231
msgstr ""
12232
"gpg_signing_key\n"
12233
"~~~~~~~~~~~~~~~"
12234
12235
#: en/help_topics/configuration.txt:484
12236
msgid ""
12237
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
12238
"address, key fingerprint or full key ID. When unset or when set to\n"
12239
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
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``."
12244
12245
#: en/help_topics/configuration.txt:488
12246
msgid ""
12247
"recurse\n"
12248
"~~~~~~~"
12249
msgstr ""
12250
"recurse\n"
12251
"~~~~~~~"
12252
12253
#: en/help_topics/configuration.txt:491
12254
msgid ""
12255
"Only useful in ``locations.conf``. Defines whether or not the\n"
12256
"configuration for this section applies to subdirectories:"
12257
msgstr ""
12258
"Only useful in ``locations.conf``. Defines whether or not the\n"
12259
"configuration for this section applies to subdirectories:"
12260
12261
#: en/help_topics/configuration.txt:494
12262
msgid ""
12263
"true\n"
12264
" (default) This section applies to subdirectories as well."
12265
msgstr ""
12266
"true\n"
12267
" (default) This section applies to subdirectories as well."
10028
"check-available\n"
10029
" (default) If gnupg signatures for revisions are present, check them.\n"
10030
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10031
" no signature is present."
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:442
10035
msgid ""
10036
"create_signatures\n"
10037
"~~~~~~~~~~~~~~~~~"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:445
10041
msgid ""
10042
"Defines the behaviour of signing revisions on commits. By default bzr will "
10043
"not\n"
10044
"sign new commits."
10045
msgstr ""
10046
10047
#: en/help_topics/configuration.txt:448
10048
msgid ""
10049
"always\n"
10050
" Sign every new revision that is committed. If the signing fails then "
10051
"the\n"
10052
" commit will not be made."
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:452
10056
msgid ""
10057
"when-required\n"
10058
" Reserved for future use."
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:455
10062
msgid ""
10063
"never\n"
10064
" Reserved for future use."
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:458
10068
msgid ""
10069
"In future it is planned that ``when-required`` will sign newly\n"
10070
"committed revisions only when the branch requires them. ``never`` will "
10071
"refuse\n"
10072
"to sign newly committed revisions, even if the branch requires signatures."
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:462
10076
msgid ""
10077
"dirstate.fdatasync\n"
10078
"~~~~~~~~~~~~~~~~~~"
10079
msgstr ""
10080
10081
#: en/help_topics/configuration.txt:465
10082
msgid ""
10083
"If true (default), working tree metadata changes are flushed through the\n"
10084
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10085
"should not be lost if the machine crashes. See also repository.fdatasync."
10086
msgstr ""
10087
10088
#: en/help_topics/configuration.txt:469
10089
msgid ""
10090
"gpg_signing_key\n"
10091
"~~~~~~~~~~~~~~~"
10092
msgstr ""
10093
10094
#: en/help_topics/configuration.txt:472
10095
msgid ""
10096
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10097
"address, key fingerprint or full key ID. When unset or when set to\n"
10098
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:476
10102
msgid ""
10103
"recurse\n"
10104
"~~~~~~~"
10105
msgstr ""
10106
10107
#: en/help_topics/configuration.txt:479
10108
msgid ""
10109
"Only useful in ``locations.conf``. Defines whether or not the\n"
10110
"configuration for this section applies to subdirectories:"
10111
msgstr ""
10112
10113
#: en/help_topics/configuration.txt:482
10114
msgid ""
10115
"true\n"
10116
" (default) This section applies to subdirectories as well."
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:485
10120
msgid ""
10121
"false\n"
10122
" This section only applies to the branch at this directory and not\n"
10123
" branches below it."
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:489
10127
msgid ""
10128
"gpg_signing_command\n"
10129
"~~~~~~~~~~~~~~~~~~~"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:492
10133
msgid ""
10134
"(Default: \"gpg\"). Which program should be used to sign and check "
10135
"revisions.\n"
10136
"For example::"
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:495
10140
msgid " gpg_signing_command = /usr/bin/gnpg"
10141
msgstr ""
12268
10142
12269
10143
#: en/help_topics/configuration.txt:497
12270
10144
msgid ""
12271
"false\n"
12272
" This section only applies to the branch at this directory and not\n"
12273
" branches below it."
12274
msgstr ""
12275
"false\n"
12276
" This section only applies to the branch at this directory and not\n"
12277
" branches below it."
12278
12279
#: en/help_topics/configuration.txt:501
12280
msgid ""
12281
"gpg_signing_command\n"
12282
"~~~~~~~~~~~~~~~~~~~"
12283
msgstr ""
12284
"gpg_signing_command\n"
12285
"~~~~~~~~~~~~~~~~~~~"
12286
12287
#: en/help_topics/configuration.txt:504
12288
msgid ""
12289
"(Default: \"gpg\"). Which program should be used to sign and check "
12290
"revisions.\n"
12291
"For example::"
12292
msgstr ""
12293
"(Default: \"gpg\"). Which program should be used to sign and check "
12294
"revisions.\n"
12295
"For example::"
12296
12297
#: en/help_topics/configuration.txt:507
12298
msgid " gpg_signing_command = /usr/bin/gnpg"
12299
msgstr " gpg_signing_command = /usr/bin/gnpg"
10145
"The specified command must accept the options \"--clearsign\" and \"-u "
10146
"<email>\"."
10147
msgstr ""
10148
10149
#: en/help_topics/configuration.txt:499
10150
msgid ""
10151
"bzr_remote_path\n"
10152
"~~~~~~~~~~~~~~~"
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:502
10156
msgid ""
10157
"(Default: \"bzr\"). The path to the command that should be used to run the "
10158
"smart\n"
10159
"server for bzr. This value may only be specified in locations.conf, because:"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:505
10163
msgid ""
10164
"- it's needed before branch.conf is accessible\n"
10165
"- allowing remote branch.conf files to specify commands would be a security\n"
10166
" risk"
10167
msgstr ""
12300
10168
12301
10169
#: en/help_topics/configuration.txt:509
12302
msgid ""
12303
"The specified command must accept the options \"--clearsign\" and \"-u "
12304
"<email>\"."
10170
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
12305
10171
msgstr ""
12306
"The specified command must accept the options \"--clearsign\" and \"-u "
12307
"<email>\"."
12308
10172
12309
10173
#: en/help_topics/configuration.txt:511
12310
10174
msgid ""
12311
"bzr_remote_path\n"
12312
"~~~~~~~~~~~~~~~"
10175
"smtp_server\n"
10176
"~~~~~~~~~~~"
12313
10177
msgstr ""
12314
"bzr_remote_path\n"
12315
"~~~~~~~~~~~~~~~"
12316
10178
12317
10179
#: en/help_topics/configuration.txt:514
12318
10180
msgid ""
12319
"(Default: \"bzr\"). The path to the command that should be used to run the "
12320
"smart\n"
12321
"server for bzr. This value may only be specified in locations.conf, because:"
10181
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10182
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
12322
10183
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:"
12326
10184
12327
10185
#: en/help_topics/configuration.txt:517
12328
10186
msgid ""
12329
"- it's needed before branch.conf is accessible\n"
12330
"- allowing remote branch.conf files to specify commands would be a security\n"
12331
" risk"
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"
12336
12337
#: en/help_topics/configuration.txt:521
12338
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
12339
msgstr "It is overridden by the BZR_REMOTE_PATH environment variable."
12340
12341
#: en/help_topics/configuration.txt:523
12342
msgid ""
12343
"smtp_server\n"
12344
"~~~~~~~~~~~"
12345
msgstr ""
12346
"smtp_server\n"
12347
"~~~~~~~~~~~"
12348
12349
#: en/help_topics/configuration.txt:526
12350
msgid ""
12351
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
12352
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
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."
12356
12357
#: en/help_topics/configuration.txt:529
12358
msgid ""
12359
"smtp_username, smtp_password\n"
12360
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12361
msgstr ""
12362
"smtp_username, smtp_password\n"
12363
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12364
12365
#: en/help_topics/configuration.txt:532
12366
msgid ""
12367
"User and password to authenticate to the SMTP server. If smtp_username\n"
12368
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
12369
"These settings are only needed if the SMTP server requires authentication\n"
12370
"to send mail."
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."
12376
12377
#: en/help_topics/configuration.txt:537
12378
msgid ""
12379
"locks.steal_dead\n"
12380
"~~~~~~~~~~~~~~~~"
12381
msgstr ""
12382
"locks.steal_dead\n"
12383
"~~~~~~~~~~~~~~~~"
12384
12385
#: en/help_topics/configuration.txt:540
12386
msgid ""
12387
"If set to true, bzr will automatically break locks held by processes from\n"
12388
"the same machine and user that are no longer alive. Otherwise, it will\n"
12389
"print a message and you can break the lock manually, if you are satisfied\n"
12390
"the object is no longer in use."
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."
12396
12397
#: en/help_topics/configuration.txt:545
12398
msgid ""
12399
"mail_client\n"
12400
"~~~~~~~~~~~"
12401
msgstr ""
12402
"mail_client\n"
12403
"~~~~~~~~~~~"
12404
12405
#: en/help_topics/configuration.txt:548
12406
msgid ""
12407
"A mail client to use for sending merge requests.\n"
12408
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
12409
"it\n"
12410
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
12411
"``editor``."
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``."
12418
12419
#: en/help_topics/configuration.txt:553
10187
"smtp_username, smtp_password\n"
10188
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:520
10192
msgid ""
10193
"User and password to authenticate to the SMTP server. If smtp_username\n"
10194
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10195
"These settings are only needed if the SMTP server requires authentication\n"
10196
"to send mail."
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:525
10200
msgid ""
10201
"locks.steal_dead\n"
10202
"~~~~~~~~~~~~~~~~"
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:528
10206
msgid ""
10207
"If set to true, bzr will automatically break locks held by processes from\n"
10208
"the same machine and user that are no longer alive. Otherwise, it will\n"
10209
"print a message and you can break the lock manually, if you are satisfied\n"
10210
"the object is no longer in use."
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:533
10214
msgid ""
10215
"mail_client\n"
10216
"~~~~~~~~~~~"
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:536
10220
msgid ""
10221
"A mail client to use for sending merge requests.\n"
10222
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10223
"it\n"
10224
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10225
"``editor``."
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:541
12420
10229
msgid "Supported values for specific clients:"
12421
msgstr "Supported values for specific clients:"
10230
msgstr ""
12422
10231
12423
#: en/help_topics/configuration.txt:555
10232
#: en/help_topics/configuration.txt:543
12424
10233
msgid ""
12425
10234
":claws: Use Claws. This skips a dialog for attaching files.\n"
12426
10235
":evolution: Use Evolution.\n"
12430
10239
"1.5,\n"
12431
10240
" this works around some bugs that xdg-email doesn't handle."
12432
10241
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."
10242
10243
#: en/help_topics/configuration.txt:550
10244
msgid "Supported generic values are:"
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:552
10248
msgid ""
10249
":default: See above.\n"
10250
":editor: Use your editor to compose the merge request. This also uses\n"
10251
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10252
" smtp_username and smtp_password.\n"
10253
":mapi: Use your preferred e-mail client on Windows.\n"
10254
":xdg-email: Use xdg-email to run your preferred mail program"
10255
msgstr ""
10256
10257
#: en/help_topics/configuration.txt:559
10258
msgid ""
10259
"repository.fdatasync\n"
10260
"~~~~~~~~~~~~~~~~~~~~"
10261
msgstr ""
12440
10262
12441
10263
#: en/help_topics/configuration.txt:562
12442
msgid "Supported generic values are:"
12443
msgstr "Supported generic values are:"
12444
12445
#: en/help_topics/configuration.txt:564
12446
msgid ""
12447
":default: See above.\n"
12448
":editor: Use your editor to compose the merge request. This also uses\n"
12449
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
12450
" smtp_username and smtp_password.\n"
12451
":mapi: Use your preferred e-mail client on Windows.\n"
12452
":xdg-email: Use xdg-email to run your preferred mail program"
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"
12460
12461
#: en/help_topics/configuration.txt:571
12462
msgid ""
12463
"repository.fdatasync\n"
12464
"~~~~~~~~~~~~~~~~~~~~"
12465
msgstr ""
12466
"repository.fdatasync\n"
12467
"~~~~~~~~~~~~~~~~~~~~"
12468
12469
#: en/help_topics/configuration.txt:574
12470
msgid ""
12471
"If true (default), repository changes are flushed through the OS buffers\n"
12472
"to physical disk. This is somewhat slower, but means data should not be\n"
12473
"lost if the machine crashes. See also dirstate.fdatasync."
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."
12478
12479
#: en/help_topics/configuration.txt:578
12480
msgid ""
12481
"submit_branch\n"
12482
"~~~~~~~~~~~~~"
12483
msgstr ""
12484
"submit_branch\n"
12485
"~~~~~~~~~~~~~"
12486
12487
#: en/help_topics/configuration.txt:581
12488
msgid ""
12489
"The branch you intend to submit your current work to. This is "
12490
"automatically\n"
12491
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
12492
"This\n"
12493
"should usually be set on a per-branch or per-location basis."
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."
12500
12501
#: en/help_topics/configuration.txt:585
12502
msgid ""
12503
"public_branch\n"
12504
"~~~~~~~~~~~~~"
12505
msgstr ""
12506
"public_branch\n"
12507
"~~~~~~~~~~~~~"
12508
12509
#: en/help_topics/configuration.txt:588
10264
msgid ""
10265
"If true (default), repository changes are flushed through the OS buffers\n"
10266
"to physical disk. This is somewhat slower, but means data should not be\n"
10267
"lost if the machine crashes. See also dirstate.fdatasync."
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:566
10271
msgid ""
10272
"submit_branch\n"
10273
"~~~~~~~~~~~~~"
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:569
10277
msgid ""
10278
"The branch you intend to submit your current work to. This is "
10279
"automatically\n"
10280
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10281
"This\n"
10282
"should usually be set on a per-branch or per-location basis."
10283
msgstr ""
10284
10285
#: en/help_topics/configuration.txt:573
10286
msgid ""
10287
"public_branch\n"
10288
"~~~~~~~~~~~~~"
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:576
12510
10292
msgid ""
12511
10293
"A publically-accessible version of this branch (implying that this version "
12512
10294
"is\n"
12513
10295
"not publically-accessible). Used (and set) by ``bzr send``."
12514
10296
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``."
10297
10298
#: en/help_topics/configuration.txt:579
10299
msgid ""
10300
"suppress_warnings\n"
10301
"~~~~~~~~~~~~~~~~~"
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:582
10305
msgid ""
10306
"A list of strings, each string represent a warning that can be emitted by\n"
10307
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10308
msgstr ""
10309
10310
#: en/help_topics/configuration.txt:585
10311
msgid "Valid values:"
10312
msgstr ""
10313
10314
#: en/help_topics/configuration.txt:587
10315
msgid ""
10316
"* ``format_deprecation``:\n"
10317
" whether the format deprecation warning is shown on repositories that "
10318
"are\n"
10319
" using deprecated formats."
10320
msgstr ""
12517
10321
12518
10322
#: en/help_topics/configuration.txt:591
12519
10323
msgid ""
12520
"suppress_warnings\n"
12521
"~~~~~~~~~~~~~~~~~"
10324
"default_format\n"
10325
"~~~~~~~~~~~~~~"
12522
10326
msgstr ""
12523
"suppress_warnings\n"
12524
"~~~~~~~~~~~~~~~~~"
12525
10327
12526
10328
#: en/help_topics/configuration.txt:594
12527
10329
msgid ""
12528
"A list of strings, each string represent a warning that can be emitted by\n"
12529
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10330
"A format name for the default format used when creating branches. See "
10331
"``bzr\n"
10332
"help formats`` for possible values."
12530
10333
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."
12533
10334
12534
10335
#: en/help_topics/configuration.txt:597
12535
msgid "Valid values:"
12536
msgstr "Valid values:"
12537
12538
#: en/help_topics/configuration.txt:599
12539
msgid ""
12540
"* ``format_deprecation``:\n"
12541
" whether the format deprecation warning is shown on repositories that "
12542
"are\n"
12543
" using deprecated formats."
12544
msgstr ""
12545
"* ``format_deprecation``:\n"
12546
" whether the format deprecation warning is shown on repositories that "
12547
"are\n"
12548
" using deprecated formats."
12549
12550
#: en/help_topics/configuration.txt:603
12551
msgid ""
12552
"default_format\n"
12553
"~~~~~~~~~~~~~~"
12554
msgstr ""
12555
"default_format\n"
12556
"~~~~~~~~~~~~~~"
12557
12558
#: en/help_topics/configuration.txt:606
12559
msgid ""
12560
"A format name for the default format used when creating branches. See "
12561
"``bzr\n"
12562
"help formats`` for possible values."
12563
msgstr ""
12564
"A format name for the default format used when creating branches. See "
12565
"``bzr\n"
12566
"help formats`` for possible values."
12567
12568
#: en/help_topics/configuration.txt:609
12569
msgid ""
12570
"\n"
12571
"Unicode options\n"
12572
"---------------"
12573
msgstr ""
12574
"\n"
12575
"Unicode options\n"
12576
"---------------"
12577
12578
#: en/help_topics/configuration.txt:613
12579
msgid ""
12580
"output_encoding\n"
12581
"~~~~~~~~~~~~~~~"
12582
msgstr ""
12583
"output_encoding\n"
12584
"~~~~~~~~~~~~~~~"
12585
12586
#: en/help_topics/configuration.txt:616
10336
msgid ""
10337
"\n"
10338
"Unicode options\n"
10339
"---------------"
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:601
10343
msgid ""
10344
"output_encoding\n"
10345
"~~~~~~~~~~~~~~~"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:604
12587
10349
msgid ""
12588
10350
"A Python unicode encoding name for text output from bzr, such as log\n"
12589
10351
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
12590
10352
"is the terminal encoding prefered by the operating system."
12591
10353
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."
10354
10355
#: en/help_topics/configuration.txt:608
10356
msgid ""
10357
"\n"
10358
"Branch type specific options\n"
10359
"----------------------------"
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:612
10363
msgid ""
10364
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10365
"later format. They\n"
10366
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10367
"manually set in ``locations.conf`` or ``bazaar.conf``."
10368
msgstr ""
10369
10370
#: en/help_topics/configuration.txt:617
10371
msgid ""
10372
"append_revisions_only\n"
10373
"~~~~~~~~~~~~~~~~~~~~~"
10374
msgstr ""
12595
10375
12596
10376
#: en/help_topics/configuration.txt:620
12597
10377
msgid ""
12598
"\n"
12599
"Branch type specific options\n"
12600
"----------------------------"
12601
msgstr ""
12602
"\n"
12603
"Branch type specific options\n"
12604
"----------------------------"
12605
12606
#: en/help_topics/configuration.txt:624
12607
msgid ""
12608
"These options apply only to branches that use the ``dirstate-tags`` or\n"
12609
"later format. They\n"
12610
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
12611
"manually set in ``locations.conf`` or ``bazaar.conf``."
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``."
12617
12618
#: en/help_topics/configuration.txt:629
12619
msgid ""
12620
"append_revisions_only\n"
12621
"~~~~~~~~~~~~~~~~~~~~~"
12622
msgstr ""
12623
"append_revisions_only\n"
12624
"~~~~~~~~~~~~~~~~~~~~~"
12625
12626
#: en/help_topics/configuration.txt:632
12627
msgid ""
12628
"If set to \"True\" then revisions can only be appended to the log, not\n"
12629
"removed. A branch with this setting enabled can only pull from another\n"
12630
"branch if the other branch's log is a longer version of its own. This is\n"
12631
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
12632
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
12633
"compatibility with previous bzr versions (older than 2.2)."
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)."
12641
12642
#: en/help_topics/configuration.txt:639
12643
msgid ""
12644
"parent_location\n"
12645
"~~~~~~~~~~~~~~~"
12646
msgstr ""
12647
"parent_location\n"
12648
"~~~~~~~~~~~~~~~"
12649
12650
#: en/help_topics/configuration.txt:642
12651
msgid ""
12652
"If present, the location of the default branch for pull or merge. This "
12653
"option\n"
12654
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
12655
"--remember``."
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``."
10378
"If set to \"True\" then revisions can only be appended to the log, not\n"
10379
"removed. A branch with this setting enabled can only pull from another\n"
10380
"branch if the other branch's log is a longer version of its own. This is\n"
10381
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10382
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10383
"compatibility with previous bzr versions (older than 2.2)."
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:627
10387
msgid ""
10388
"parent_location\n"
10389
"~~~~~~~~~~~~~~~"
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:630
10393
msgid ""
10394
"If present, the location of the default branch for pull or merge. This "
10395
"option\n"
10396
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10397
"--remember``."
10398
msgstr ""
10399
10400
#: en/help_topics/configuration.txt:634
10401
msgid ""
10402
"push_location\n"
10403
"~~~~~~~~~~~~~"
10404
msgstr ""
10405
10406
#: en/help_topics/configuration.txt:637
10407
msgid ""
10408
"If present, the location of the default branch for push. This option\n"
10409
"is normally set by the first ``push`` or ``push --remember``."
10410
msgstr ""
10411
10412
#: en/help_topics/configuration.txt:640
10413
msgid ""
10414
"push_strict\n"
10415
"~~~~~~~~~~~"
10416
msgstr ""
10417
10418
#: en/help_topics/configuration.txt:643
10419
msgid ""
10420
"If present, defines the ``--strict`` option default value for checking\n"
10421
"uncommitted changes before pushing."
10422
msgstr ""
12661
10423
12662
10424
#: en/help_topics/configuration.txt:646
12663
10425
msgid ""
12664
"push_location\n"
12665
"~~~~~~~~~~~~~"
10426
"dpush_strict\n"
10427
"~~~~~~~~~~~~"
12666
10428
msgstr ""
12667
"push_location\n"
12668
"~~~~~~~~~~~~~"
12669
10429
12670
10430
#: en/help_topics/configuration.txt:649
12671
10431
msgid ""
12672
"If present, the location of the default branch for push. This option\n"
12673
"is normally set by the first ``push`` or ``push --remember``."
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``."
12677
12678
#: en/help_topics/configuration.txt:652
12679
msgid ""
12680
"push_strict\n"
12681
"~~~~~~~~~~~"
12682
msgstr ""
12683
"push_strict\n"
12684
"~~~~~~~~~~~"
12685
12686
#: en/help_topics/configuration.txt:655
12687
msgid ""
12688
"If present, defines the ``--strict`` option default value for checking\n"
12689
"uncommitted changes before pushing."
12690
msgstr ""
12691
"If present, defines the ``--strict`` option default value for checking\n"
12692
"uncommitted changes before pushing."
12693
12694
#: en/help_topics/configuration.txt:658
12695
msgid ""
12696
"dpush_strict\n"
12697
"~~~~~~~~~~~~"
12698
msgstr ""
12699
"dpush_strict\n"
12700
"~~~~~~~~~~~~"
12701
12702
#: en/help_topics/configuration.txt:661
12703
msgid ""
12704
"If present, defines the ``--strict`` option default value for checking\n"
12705
"uncommitted changes before pushing into a different VCS without any\n"
12706
"custom bzr metadata."
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."
10432
"If present, defines the ``--strict`` option default value for checking\n"
10433
"uncommitted changes before pushing into a different VCS without any\n"
10434
"custom bzr metadata."
10435
msgstr ""
10436
10437
#: en/help_topics/configuration.txt:653
10438
msgid ""
10439
"bound_location\n"
10440
"~~~~~~~~~~~~~~"
10441
msgstr ""
10442
10443
#: en/help_topics/configuration.txt:656
10444
msgid ""
10445
"The location that commits should go to when acting as a checkout.\n"
10446
"This option is normally set by ``bind``."
10447
msgstr ""
10448
10449
#: en/help_topics/configuration.txt:659
10450
msgid ""
10451
"bound\n"
10452
"~~~~~"
10453
msgstr ""
10454
10455
#: en/help_topics/configuration.txt:662
10456
msgid ""
10457
"If set to \"True\", the branch should act as a checkout, and push each "
10458
"commit to\n"
10459
"the bound_location. This option is normally set by ``bind``/``unbind``."
10460
msgstr ""
12711
10461
12712
10462
#: en/help_topics/configuration.txt:665
12713
10463
msgid ""
12714
"bound_location\n"
12715
"~~~~~~~~~~~~~~"
10464
"send_strict\n"
10465
"~~~~~~~~~~~"
12716
10466
msgstr ""
12717
"bound_location\n"
12718
"~~~~~~~~~~~~~~"
12719
10467
12720
10468
#: en/help_topics/configuration.txt:668
12721
10469
msgid ""
12722
"The location that commits should go to when acting as a checkout.\n"
12723
"This option is normally set by ``bind``."
10470
"If present, defines the ``--strict`` option default value for checking\n"
10471
"uncommitted changes before sending a merge directive."
12724
10472
msgstr ""
12725
"The location that commits should go to when acting as a checkout.\n"
12726
"This option is normally set by ``bind``."
12727
10473
12728
10474
#: en/help_topics/configuration.txt:671
12729
10475
msgid ""
12730
"bound\n"
12731
"~~~~~"
10476
"add.maximum_file_size\n"
10477
"~~~~~~~~~~~~~~~~~~~~~"
12732
10478
msgstr ""
12733
"bound\n"
12734
"~~~~~"
12735
10479
12736
10480
#: en/help_topics/configuration.txt:674
12737
10481
msgid ""
12738
"If set to \"True\", the branch should act as a checkout, and push each "
12739
"commit to\n"
12740
"the bound_location. This option is normally set by ``bind``/``unbind``."
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``."
12745
12746
#: en/help_topics/configuration.txt:677
12747
msgid ""
12748
"send_strict\n"
12749
"~~~~~~~~~~~"
12750
msgstr ""
12751
"send_strict\n"
12752
"~~~~~~~~~~~"
10482
"Defines the maximum file size the command line \"add\" operation will allow\n"
10483
"in recursive mode, with files larger than this value being skipped. You may "
10484
"\n"
10485
"specify this value as an integer (in which case it is interpreted as bytes), "
10486
"\n"
10487
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10488
"0 \n"
10489
"will disable skipping."
10490
msgstr ""
12753
10491
12754
10492
#: en/help_topics/configuration.txt:680
12755
10493
msgid ""
12756
"If present, defines the ``--strict`` option default value for checking\n"
12757
"uncommitted changes before sending a merge directive."
10494
"External Merge Tools\n"
10495
"--------------------"
12758
10496
msgstr ""
12759
"If present, defines the ``--strict`` option default value for checking\n"
12760
"uncommitted changes before sending a merge directive."
12761
10497
12762
10498
#: en/help_topics/configuration.txt:683
12763
10499
msgid ""
12764
"add.maximum_file_size\n"
12765
"~~~~~~~~~~~~~~~~~~~~~"
10500
"bzr.mergetool.<name>\n"
10501
"~~~~~~~~~~~~~~~~~~~~"
12766
10502
msgstr ""
12767
"add.maximum_file_size\n"
12768
"~~~~~~~~~~~~~~~~~~~~~"
12769
10503
12770
10504
#: en/help_topics/configuration.txt:686
12771
10505
msgid ""
12772
"Defines the maximum file size the command line \"add\" operation will allow\n"
12773
"in recursive mode, with files larger than this value being skipped. You may "
12774
"\n"
12775
"specify this value as an integer (in which case it is interpreted as bytes), "
12776
"\n"
12777
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
12778
"0 \n"
12779
"will disable skipping."
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."
12789
12790
#: en/help_topics/configuration.txt:692
12791
msgid ""
12792
"External Merge Tools\n"
12793
"--------------------"
12794
msgstr ""
12795
"External Merge Tools\n"
12796
"--------------------"
12797
12798
#: en/help_topics/configuration.txt:695
12799
msgid ""
12800
"bzr.mergetool.<name>\n"
12801
"~~~~~~~~~~~~~~~~~~~~"
12802
msgstr ""
12803
"bzr.mergetool.<name>\n"
12804
"~~~~~~~~~~~~~~~~~~~~"
12805
12806
#: en/help_topics/configuration.txt:698
12807
msgid ""
12808
"Defines an external merge tool called <name> with the given command-line.\n"
12809
"Arguments containing spaces should be quoted using single or double quotes. "
12810
"The\n"
12811
"executable may omit its path if it can be found on the PATH."
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."
10506
"Defines an external merge tool called <name> with the given command-line.\n"
10507
"Arguments containing spaces should be quoted using single or double quotes. "
10508
"The\n"
10509
"executable may omit its path if it can be found on the PATH."
10510
msgstr ""
10511
10512
#: en/help_topics/configuration.txt:690
10513
msgid ""
10514
"The following markers can be used in the command-line to substitute "
10515
"filenames\n"
10516
"involved in the merge conflict::"
10517
msgstr ""
10518
10519
#: en/help_topics/configuration.txt:693
10520
msgid ""
10521
" {base} file.BASE\n"
10522
" {this} file.THIS\n"
10523
" {other} file.OTHER\n"
10524
" {result} output file\n"
10525
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10526
"merge\n"
10527
" succeeds."
10528
msgstr ""
12817
10529
12818
10530
#: en/help_topics/configuration.txt:702
12819
msgid ""
12820
"The following markers can be used in the command-line to substitute "
12821
"filenames\n"
12822
"involved in the merge conflict::"
12823
msgstr ""
12824
"The following markers can be used in the command-line to substitute "
12825
"filenames\n"
12826
"involved in the merge conflict::"
12827
12828
#: en/help_topics/configuration.txt:705
12829
msgid ""
12830
" {base} file.BASE\n"
12831
" {this} file.THIS\n"
12832
" {other} file.OTHER\n"
12833
" {result} output file\n"
12834
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
12835
"merge\n"
12836
" succeeds."
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."
12845
12846
#: en/help_topics/configuration.txt:714
12847
10531
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
12848
msgstr " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
12849
12850
#: en/help_topics/configuration.txt:716
12851
msgid ""
12852
"bzr.default_mergetool\n"
12853
"~~~~~~~~~~~~~~~~~~~~~"
12854
msgstr ""
12855
"bzr.default_mergetool\n"
12856
"~~~~~~~~~~~~~~~~~~~~~"
12857
12858
#: en/help_topics/configuration.txt:719
12859
msgid ""
12860
"Specifies which external merge tool (as defined above) should be selected "
12861
"by\n"
12862
"default in tools such as ``bzr qconflicts``."
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``."
12867
12868
#: en/help_topics/configuration.txt:724
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:704
10535
msgid ""
10536
"bzr.default_mergetool\n"
10537
"~~~~~~~~~~~~~~~~~~~~~"
10538
msgstr ""
10539
10540
#: en/help_topics/configuration.txt:707
10541
msgid ""
10542
"Specifies which external merge tool (as defined above) should be selected "
10543
"by\n"
10544
"default in tools such as ``bzr qconflicts``."
10545
msgstr ""
10546
10547
#: en/help_topics/configuration.txt:712
12869
10548
msgid " bzr.default_mergetool = kdiff3\n"
12870
msgstr " bzr.default_mergetool = kdiff3\n"
10549
msgstr ""
12871
10550
12872
10551
#: en/help_topics/conflict-types.txt:1
12873
10552
msgid ""
12874
10553
"Conflict Types\n"
12875
10554
"=============="
12876
10555
msgstr ""
12877
"Conflict Types\n"
12878
"=============="
12879
10556
12880
10557
#: en/help_topics/conflict-types.txt:4
12881
10558
msgid ""
12884
10561
"they\n"
12885
10562
"may conflict with the current state of your working tree. "
12886
10563
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. "
12891
10564
12892
10565
#: en/help_topics/conflict-types.txt:8
12893
10566
msgid ""
12896
10569
"conflicts\n"
12897
10570
"have been resolved."
12898
10571
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."
12903
10572
12904
10573
#: en/help_topics/conflict-types.txt:12
12905
10574
msgid ""
12910
10579
"presented\n"
12911
10580
"in a way that is not easy to understand."
12912
10581
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."
12919
10582
12920
10583
#: en/help_topics/conflict-types.txt:17
12921
10584
msgid ""
12931
10594
"to\n"
12932
10595
"do."
12933
10596
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."
12945
10597
12946
10598
#: en/help_topics/conflict-types.txt:25
12947
10599
msgid ""
12950
10602
"present the conflicting versions, and it's up to you to find the correct\n"
12951
10603
"resolution."
12952
10604
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."
12957
10605
12958
10606
#: en/help_topics/conflict-types.txt:29
12959
10607
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
12960
msgstr "Whatever the conflict is, resolving it is roughly done in two steps:"
10608
msgstr ""
12961
10609
12962
10610
#: en/help_topics/conflict-types.txt:31
12963
10611
msgid ""
12965
10613
"the\n"
12966
10614
" state you want to keep, then"
12967
10615
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"
12971
10616
12972
10617
#: en/help_topics/conflict-types.txt:34
12973
10618
msgid ""
12974
10619
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
12975
10620
" remaining generated information (``bzr resolve <item>``)."
12976
10621
msgstr ""
12977
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
12978
" remaining generated information (``bzr resolve <item>``)."
12979
10622
12980
10623
#: en/help_topics/conflict-types.txt:37
12981
10624
msgid ""
12983
10626
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
12984
10627
"itself already made a choice, when possible."
12985
10628
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."
12989
10629
12990
10630
#: en/help_topics/conflict-types.txt:41
12991
10631
msgid ""
12992
10632
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
12993
10633
"different ways to resolve the conflict."
12994
10634
msgstr ""
12995
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
12996
"different ways to resolve the conflict."
12997
10635
12998
10636
#: en/help_topics/conflict-types.txt:44
12999
10637
msgid ""
13001
10639
"to\n"
13002
10640
"resolve the conflict is outlined."
13003
10641
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."
13007
10642
13008
10643
#: en/help_topics/conflict-types.txt:47
13009
10644
msgid ""
13012
10647
"these actions, Bazaar can provide some help. In the end you should at least\n"
13013
10648
"inform Bazaar that you're done with the conflict with::"
13014
10649
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::"
13019
10650
13020
10651
#: en/help_topics/conflict-types.txt:51
13021
10652
msgid " ``bzr resolve FILE --action=done'"
13022
msgstr " ``bzr resolve FILE --action=done'"
10653
msgstr ""
13023
10654
13024
10655
#: en/help_topics/conflict-types.txt:53
13025
10656
msgid ""
13027
10658
"can\n"
13028
10659
"simply use::"
13029
10660
msgstr ""
13030
"Note that this is the default action when a single file is involved so you "
13031
"can\n"
13032
"simply use::"
13033
10661
13034
10662
#: en/help_topics/conflict-types.txt:56
13035
10663
msgid " ``bzr resolve FILE``"
13036
msgstr " ``bzr resolve FILE``"
10664
msgstr ""
13037
10665
13038
10666
#: en/help_topics/conflict-types.txt:58
13039
10667
msgid "See ``bzr help resolve`` for more details."
13040
msgstr "See ``bzr help resolve`` for more details."
10668
msgstr ""
13041
10669
13042
10670
#: en/help_topics/conflict-types.txt:60
13043
10671
msgid ""
13044
10672
"Text conflicts\n"
13045
10673
"--------------"
13046
10674
msgstr ""
13047
"Text conflicts\n"
13048
"--------------"
13049
10675
13050
10676
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
13051
10677
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
13053
10679
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
13054
10680
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
13055
10681
msgid "Typical message::"
13056
msgstr "Typical message::"
10682
msgstr ""
13057
10683
13058
10684
#: en/help_topics/conflict-types.txt:65
13059
10685
msgid " Text conflict in FILE"
13060
msgstr " Text conflict in FILE"
10686
msgstr ""
13061
10687
13062
10688
#: en/help_topics/conflict-types.txt:67
13063
10689
msgid ""
13072
10698
"basis\n"
13073
10699
"for comparison."
13074
10700
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."
13085
10701
13086
10702
#: en/help_topics/conflict-types.txt:74
13087
10703
msgid ""
13089
10705
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
13090
10706
"\"herringbone\" markers like ``<<<<<<<``."
13091
10707
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 ``<<<<<<<``."
13095
10708
13096
10709
#: en/help_topics/conflict-types.txt:78
13097
10710
msgid ""
13101
10714
"leader\n"
13102
10715
"released Bazaar.\" A conflict would look like this::"
13103
10716
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::"
13109
10717
13110
10718
#: en/help_topics/conflict-types.txt:82
13111
10719
msgid ""
13115
10723
" The project leader released Bazaar.\n"
13116
10724
" >>>>>>> MERGE-SOURCE"
13117
10725
msgstr ""
13118
" <<<<<<< TREE\n"
13119
" Martin Pool released it.\n"
13120
" =======\n"
13121
" The project leader released Bazaar.\n"
13122
" >>>>>>> MERGE-SOURCE"
13123
10726
13124
10727
#: en/help_topics/conflict-types.txt:88
13125
10728
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
13126
msgstr "The correct resolution would be \"Martin Pool released Bazaar.\""
10729
msgstr ""
13127
10730
13128
10731
#: en/help_topics/conflict-types.txt:90
13129
10732
msgid ""
13133
10736
"set of changes over the other (but see below when you encounter these\n"
13134
10737
"cases). More often, the two sets of changes must be intelligently combined."
13135
10738
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."
13141
10739
13142
10740
#: en/help_topics/conflict-types.txt:96
13143
10741
msgid ""
13146
10744
"be\n"
13147
10745
"ready to commit."
13148
10746
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."
13153
10747
13154
10748
#: en/help_topics/conflict-types.txt:100
13155
10749
msgid ""
13156
10750
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
13157
10751
"Bazaar will auto-detect which conflicts you have resolved."
13158
10752
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."
13161
10753
13162
10754
#: en/help_topics/conflict-types.txt:103
13163
10755
msgid ""
13165
10757
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
13166
10758
"working tree."
13167
10759
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."
13171
10760
13172
10761
#: en/help_topics/conflict-types.txt:107
13173
10762
msgid ""
13175
10764
"When you want to pick one set of changes over the other, you can use ``bzr\n"
13176
10765
"resolve`` with one of the following actions:"
13177
10766
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:"
13181
10767
13182
10768
#: en/help_topics/conflict-types.txt:111
13183
10769
msgid ""
13184
10770
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
13185
10771
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
13186
10772
msgstr ""
13187
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
13188
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
13189
10773
13190
10774
#: en/help_topics/conflict-types.txt:114
13191
10775
msgid ""
13192
10776
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
13193
10777
"modifications will be taken into account."
13194
10778
msgstr ""
13195
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
13196
"modifications will be taken into account."
13197
10779
13198
10780
#: en/help_topics/conflict-types.txt:117
13199
10781
msgid ""
13200
10782
"Content conflicts\n"
13201
10783
"-----------------"
13202
10784
msgstr ""
13203
"Content conflicts\n"
13204
"-----------------"
13205
10785
13206
10786
#: en/help_topics/conflict-types.txt:122
13207
10787
msgid " Contents conflict in FILE"
13208
msgstr " Contents conflict in FILE"
10788
msgstr ""
13209
10789
13210
10790
#: en/help_topics/conflict-types.txt:124
13211
10791
msgid ""
13217
10797
"files\n"
13218
10798
"that are deleted on one side, and modified on the other."
13219
10799
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."
13227
10800
13228
10801
#: en/help_topics/conflict-types.txt:129
13229
10802
msgid ""
13235
10808
"\"main\n"
13236
10809
"copy\" has been renamed to THIS or OTHER."
13237
10810
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."
13245
10811
13246
10812
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
13247
10813
msgid ""
13249
10815
"version\n"
13250
10816
"or a combination of both."
13251
10817
msgstr ""
13252
"To resolve that kind of conflict, you should rebuild FILE from either "
13253
"version\n"
13254
"or a combination of both."
13255
10818
13256
10819
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
13257
10820
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
13258
10821
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
13259
10822
#: en/help_topics/conflict-types.txt:361
13260
10823
msgid "``bzr resolve`` recognizes the following actions:"
13261
msgstr "``bzr resolve`` recognises the following actions:"
10824
msgstr ""
13262
10825
13263
10826
#: en/help_topics/conflict-types.txt:139
13264
10827
msgid ""
13266
10829
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
13267
10830
"* ``--action=done`` will just mark the conflict as resolved."
13268
10831
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."
13272
10832
13273
10833
#: en/help_topics/conflict-types.txt:143
13274
10834
msgid ""
13276
10836
"and\n"
13277
10837
"``.OTHER`` files if they are still present in the working tree."
13278
10838
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."
13282
10839
13283
10840
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
13284
10841
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
13287
10844
msgid ""
13288
10845
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
13289
10846
msgstr ""
13290
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
13291
10847
13292
10848
#: en/help_topics/conflict-types.txt:148
13293
10849
msgid ""
13294
10850
"Tag conflicts\n"
13295
10851
"-------------"
13296
10852
msgstr ""
13297
"Tag conflicts\n"
13298
"-------------"
13299
10853
13300
10854
#: en/help_topics/conflict-types.txt:153
13301
10855
msgid ""
13302
10856
" Conflicting tags:\n"
13303
10857
" version-0.1"
13304
10858
msgstr ""
13305
" Conflicting tags:\n"
13306
" version-0.1"
13307
10859
13308
10860
#: en/help_topics/conflict-types.txt:156
13309
10861
msgid ""
13313
10865
"different revisions. You need not resolve these conflicts, but subsequent\n"
13314
10866
"uses of pull or push will result in the same message."
13315
10867
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."
13321
10868
13322
10869
#: en/help_topics/conflict-types.txt:161
13323
10870
msgid ""
13336
10883
"overwrite\n"
13337
10884
"all tags as well.)"
13338
10885
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.)"
13353
10886
13354
10887
#: en/help_topics/conflict-types.txt:172
13355
10888
msgid ""
13356
10889
"Duplicate paths\n"
13357
10890
"---------------"
13358
10891
msgstr ""
13359
"Duplicate paths\n"
13360
"---------------"
13361
10892
13362
10893
#: en/help_topics/conflict-types.txt:177
13363
10894
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
13364
msgstr " Conflict adding file FILE. Moved existing file to FILE.moved."
10895
msgstr ""
13365
10896
13366
10897
#: en/help_topics/conflict-types.txt:179
13367
10898
msgid ""
13368
10899
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
13369
10900
"already been used. The existing file will be renamed to \"FILE.moved\". "
13370
10901
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\". "
13373
10902
13374
10903
#: en/help_topics/conflict-types.txt:187
13375
10904
msgid ""
13378
10907
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
13379
10908
"* ``--action=done`` will just mark the conflict as resolved."
13380
10909
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."
13385
10910
13386
10911
#: en/help_topics/conflict-types.txt:191
13387
10912
msgid ""
13388
10913
"Note that you must get rid of FILE.moved before using ``--action=done``."
13389
10914
msgstr ""
13390
"Note that you must get rid of FILE.moved before using ``--action=done``."
13391
10915
13392
10916
#: en/help_topics/conflict-types.txt:195
13393
10917
msgid ""
13394
10918
"Unversioned parent\n"
13395
10919
"------------------"
13396
10920
msgstr ""
13397
"Unversioned parent\n"
13398
"------------------"
13399
10921
13400
10922
#: en/help_topics/conflict-types.txt:200
13401
10923
msgid ""
13402
10924
" Conflict because FILE is not versioned, but has versioned children."
13403
10925
msgstr ""
13404
" Conflict because FILE is not versioned, but has versioned children."
13405
10926
13406
10927
#: en/help_topics/conflict-types.txt:202
13407
10928
msgid ""
13417
10938
"resolve\n"
13418
10939
"FILE\" to mark the conflict as resolved."
13419
10940
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."
13431
10941
13432
10942
#: en/help_topics/conflict-types.txt:210
13433
10943
msgid ""
13434
10944
"Missing parent\n"
13435
10945
"--------------"
13436
10946
msgstr ""
13437
"Missing parent\n"
13438
"--------------"
13439
10947
13440
10948
#: en/help_topics/conflict-types.txt:215
13441
10949
msgid " Conflict adding files to FILE. Created directory."
13442
msgstr " Conflict adding files to FILE. Created directory."
10950
msgstr ""
13443
10951
13444
10952
#: en/help_topics/conflict-types.txt:217
13445
10953
msgid ""
13450
10958
"unversioned. In this situation, Bazaar will create the missing parent.\n"
13451
10959
"Resolving this issue depends very much on the particular scenario."
13452
10960
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."
13459
10961
13460
10962
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
13461
10963
msgid ""
13462
10964
"To resolve that kind of conflict, you should either remove or rename the\n"
13463
10965
"children or the directory or a combination of both."
13464
10966
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."
13467
10967
13468
10968
#: en/help_topics/conflict-types.txt:228
13469
10969
msgid ""
13474
10974
" and restoring the directory,\n"
13475
10975
"* ``--action=done`` will just mark the conflict as resolved."
13476
10976
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."
13483
10977
13484
10978
#: en/help_topics/conflict-types.txt:236
13485
10979
msgid ""
13486
10980
"Deleting parent\n"
13487
10981
"---------------"
13488
10982
msgstr ""
13489
"Deleting parent\n"
13490
"---------------"
13491
10983
13492
10984
#: en/help_topics/conflict-types.txt:241
13493
10985
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
13494
msgstr " Conflict: can't delete DIR because it is not empty. Not deleting."
10986
msgstr ""
13495
10987
13496
10988
#: en/help_topics/conflict-types.txt:243
13497
10989
msgid ""
13501
10993
"will retain the directory. Resolving this issue depends very much on the\n"
13502
10994
"particular scenario."
13503
10995
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."
13509
10996
13510
10997
#: en/help_topics/conflict-types.txt:254
13511
10998
msgid ""
13512
10999
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
13513
11000
"directory,"
13514
11001
msgstr ""
13515
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
13516
"directory,"
13517
11002
13518
11003
#: en/help_topics/conflict-types.txt:256
13519
11004
msgid ""
13520
11005
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
13521
11006
" children,"
13522
11007
msgstr ""
13523
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
13524
" children,"
13525
11008
13526
11009
#: en/help_topics/conflict-types.txt:259
13527
11010
msgid "* ``--action=done`` will just mark the conflict as resolved."
13528
msgstr "* ``--action=done`` will just mark the conflict as resolved."
11011
msgstr ""
13529
11012
13530
11013
#: en/help_topics/conflict-types.txt:261
13531
11014
msgid ""
13533
11016
"present, they become potential orphans has they don't have a directory\n"
13534
11017
"parent anymore."
13535
11018
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."
13539
11019
13540
11020
#: en/help_topics/conflict-types.txt:265
13541
11021
msgid ""
13542
11022
"Handling such orphans, *before* the conflict is created, is controlled by\n"
13543
11023
"setting the ``bzr.transform.orphan_policy`` configuration option."
13544
11024
msgstr ""
13545
"Handling such orphans, *before* the conflict is created, is controlled by\n"
13546
"setting the ``bzr.transform.orphan_policy`` configuration option."
13547
11025
13548
11026
#: en/help_topics/conflict-types.txt:268
13549
11027
msgid "There are two possible values for this option:"
13550
msgstr "There are two possible values for this option:"
11028
msgstr ""
13551
11029
13552
11030
#: en/help_topics/conflict-types.txt:270
13553
11031
msgid ""
13554
11032
"* ``conflict`` (the default): will leave the orphans in place and\n"
13555
11033
" generate a conflicts,"
13556
11034
msgstr ""
13557
"* ``conflict`` (the default): will leave the orphans in place and\n"
13558
" generate a conflicts,"
13559
11035
13560
11036
#: en/help_topics/conflict-types.txt:273
13561
11037
msgid ""
13563
11039
"root\n"
13564
11040
" of the working tree with names like ``<file>.~#~``."
13565
11041
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>.~#~``."
13569
11042
13570
11043
#: en/help_topics/conflict-types.txt:278
13571
11044
msgid ""
13572
11045
"Path conflict\n"
13573
11046
"-------------"
13574
11047
msgstr ""
13575
"Path conflict\n"
13576
"-------------"
13577
11048
13578
11049
#: en/help_topics/conflict-types.txt:283
13579
11050
msgid " Path conflict: PATH1 / PATH2"
13580
msgstr " Path conflict: PATH1 / PATH2"
11051
msgstr ""
13581
11052
13582
11053
#: en/help_topics/conflict-types.txt:285
13583
11054
msgid ""
13585
11056
"parent\n"
13586
11057
"directory of a file. Bazaar will use the path elements from the source."
13587
11058
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."
13591
11059
13592
11060
#: en/help_topics/conflict-types.txt:288
13593
11061
msgid ""
13595
11063
"be\n"
13596
11064
"retained for the file involved."
13597
11065
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."
13601
11066
13602
11067
#: en/help_topics/conflict-types.txt:293
13603
11068
msgid ""
13607
11072
"``PATH2``,\n"
13608
11073
"* ``--action=done`` will just mark the conflict as resolved."
13609
11074
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."
13615
11075
13616
11076
#: en/help_topics/conflict-types.txt:300
13617
11077
msgid ""
13618
11078
"Parent loop\n"
13619
11079
"-----------"
13620
11080
msgstr ""
13621
"Parent loop\n"
13622
"-----------"
13623
11081
13624
11082
#: en/help_topics/conflict-types.txt:305
13625
11083
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
13626
msgstr " Conflict moving FILE into DIRECTORY. Cancelled move."
11084
msgstr ""
13627
11085
13628
11086
#: en/help_topics/conflict-types.txt:307
13629
11087
msgid ""
13632
11090
"itself.\n"
13633
11091
"For example::"
13634
11092
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::"
13639
11093
13640
11094
#: en/help_topics/conflict-types.txt:311
13641
11095
msgid ""
13650
11104
" $ bzr commit ../other -m \"OTHER\"\n"
13651
11105
" $ bzr merge ../other"
13652
11106
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"
13663
11107
13664
11108
#: en/help_topics/conflict-types.txt:322
13665
11109
msgid ""
13667
11111
"``black``. To resolve that kind of conflict, you just have to decide what\n"
13668
11112
"name should be retained for the directories involved."
13669
11113
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."
13673
11114
13674
11115
#: en/help_topics/conflict-types.txt:328
13675
11116
msgid ""
13680
11121
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
13681
11122
"* ``--action=done`` will just mark the conflict as resolved."
13682
11123
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."
13689
11124
13690
11125
#: en/help_topics/conflict-types.txt:336
13691
11126
msgid ""
13692
11127
"Non-directory parent\n"
13693
11128
"--------------------"
13694
11129
msgstr ""
13695
"Non-directory parent\n"
13696
"--------------------"
13697
11130
13698
11131
#: en/help_topics/conflict-types.txt:341
13699
11132
msgid ""
13700
11133
" Conflict: foo.new is not a directory, but has files in it.\n"
13701
11134
" Created directory."
13702
11135
msgstr ""
13703
" Conflict: foo.new is not a directory, but has files in it.\n"
13704
" Created directory."
13705
11136
13706
11137
#: en/help_topics/conflict-types.txt:344
13707
11138
msgid ""
13709
11140
"side\n"
13710
11141
"has changed the directory into a file or symlink. For example::"
13711
11142
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::"
13715
11143
13716
11144
#: en/help_topics/conflict-types.txt:347
13717
11145
msgid ""
13726
11154
" $ bzr commit ../other -m \"OTHER\"\n"
13727
11155
" $ bzr merge ../other"
13728
11156
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"
13739
11157
13740
11158
#: en/help_topics/conflict-types.txt:358
13741
11159
msgid ""
13742
11160
"To resolve that kind of conflict, you have to decide what name should be\n"
13743
11161
"retained for the file, directory or symlink involved."
13744
11162
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."
13747
11163
13748
11164
#: en/help_topics/conflict-types.txt:363
13749
11165
msgid ""
13753
11169
" ``bzr mv foo.new foo``,\n"
13754
11170
"* ``--action=done`` will just mark the conflict as resolved."
13755
11171
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."
13761
11172
13762
11173
#: en/help_topics/conflict-types.txt:371
13763
11174
msgid ""
13764
11175
"MalformedTransform\n"
13765
11176
"------------------"
13766
11177
msgstr ""
13767
"MalformedTransform\n"
13768
"------------------"
13769
11178
13770
11179
#: en/help_topics/conflict-types.txt:374
13771
11180
msgid ""
13776
11185
"you\n"
13777
11186
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
13778
11187
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"
13785
11188
13786
11189
#: en/help_topics/content-filters.txt:1
13787
11190
msgid ""
13788
11191
"Content Filters\n"
13789
11192
"==============="
13790
11193
msgstr ""
13791
"Content Filters\n"
13792
"==============="
13793
11194
13794
11195
#: en/help_topics/content-filters.txt:4
13795
11196
msgid ""
13796
11197
"Content formats\n"
13797
11198
"---------------"
13798
11199
msgstr ""
13799
"Content formats\n"
13800
"---------------"
13801
11200
13802
11201
#: en/help_topics/content-filters.txt:7
13803
11202
msgid ""
13810
11209
"and trailing spaces on lines in text files to be implicitly stripped\n"
13811
11210
"when committed."
13812
11211
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."
13821
11212
13822
11213
#: en/help_topics/content-filters.txt:16
13823
11214
msgid "To generalize, there are two content formats supported by Bazaar:"
13824
msgstr "To generalise, there are two content formats supported by Bazaar:"
11215
msgstr ""
13825
11216
13826
11217
#: en/help_topics/content-filters.txt:18
13827
11218
msgid ""
13828
11219
"* a canonical format - how files are stored internally\n"
13829
11220
"* a convenience format - how files are created in a working tree."
13830
11221
msgstr ""
13831
"* a canonical format - how files are stored internally\n"
13832
"* a convenience format - how files are created in a working tree."
13833
11222
13834
11223
#: en/help_topics/content-filters.txt:21
13835
11224
msgid ""
13837
11226
"Format conversion\n"
13838
11227
"-----------------"
13839
11228
msgstr ""
13840
"\n"
13841
"Format conversion\n"
13842
"-----------------"
13843
11229
13844
11230
#: en/help_topics/content-filters.txt:25
13845
11231
msgid ""
13846
11232
"The conversion between these formats is done by content filters.\n"
13847
11233
"A content filter has two parts:"
13848
11234
msgstr ""
13849
"The conversion between these formats is done by content filters.\n"
13850
"A content filter has two parts:"
13851
11235
13852
11236
#: en/help_topics/content-filters.txt:28
13853
11237
msgid ""
13854
11238
"* a read converter - converts from convenience to canonical format\n"
13855
11239
"* a write converter - converts from canonical to convenience format."
13856
11240
msgstr ""
13857
"* a read converter - converts from convenience to canonical format\n"
13858
"* a write converter - converts from canonical to convenience format."
13859
11241
13860
11242
#: en/help_topics/content-filters.txt:31
13861
11243
msgid ""
13866
11248
"trailing whitespace off lines in source code while the matching\n"
13867
11249
"write converter might pass content through unchanged."
13868
11250
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."
13875
11251
13876
11252
#: en/help_topics/content-filters.txt:38
13877
11253
msgid ""
13879
11255
"Enabling content filters\n"
13880
11256
"------------------------"
13881
11257
msgstr ""
13882
"\n"
13883
"Enabling content filters\n"
13884
"------------------------"
13885
11258
13886
11259
#: en/help_topics/content-filters.txt:42
13887
11260
msgid ""
13894
11267
"using rule-based preferences. See ``bzr help rules`` for general\n"
13895
11268
"information about defining these."
13896
11269
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."
13905
11270
13906
11271
#: en/help_topics/content-filters.txt:51
13907
11272
msgid ""
13909
11274
"Impact on commands\n"
13910
11275
"------------------"
13911
11276
msgstr ""
13912
"\n"
13913
"Impact on commands\n"
13914
"------------------"
13915
11277
13916
11278
#: en/help_topics/content-filters.txt:55
13917
11279
msgid ""
13920
11282
"will apply read converters to files in the working tree, then compare\n"
13921
11283
"the results to the content last committed."
13922
11284
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."
13927
11285
13928
11286
#: en/help_topics/content-filters.txt:60
13929
11287
msgid ""
13932
11290
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
13933
11291
"respectively."
13934
11292
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."
13939
11293
13940
11294
#: en/help_topics/content-filters.txt:65
13941
11295
msgid ""
13945
11299
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
13946
11300
"for more information on hooks."
13947
11301
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."
13953
11302
13954
11303
#: en/help_topics/content-filters.txt:71
13955
11304
msgid ""
13957
11306
"Refreshing your working tree\n"
13958
11307
"----------------------------"
13959
11308
msgstr ""
13960
"\n"
13961
"Refreshing your working tree\n"
13962
"----------------------------"
13963
11309
13964
11310
#: en/help_topics/content-filters.txt:75
13965
11311
msgid ""
13970
11316
"in one or both directions, e.g. after installing or reconfiguring\n"
13971
11317
"plugins providing it."
13972
11318
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."
13979
11319
13980
11320
#: en/help_topics/content-filters.txt:82
13981
11321
msgid "Here are some general guidelines for doing this:"
13982
msgstr "Here are some general guidelines for doing this:"
11322
msgstr ""
13983
11323
13984
11324
#: en/help_topics/content-filters.txt:84
13985
11325
msgid ""
13988
11328
" relevant read converters and compare the end result with the\n"
13989
11329
" canonical format."
13990
11330
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."
13995
11331
13996
11332
#: en/help_topics/content-filters.txt:89
13997
11333
msgid ""
13998
11334
" * To reapply write converters, ensure there are no local changes,\n"
13999
11335
" delete the relevant files and run ``bzr revert`` on those files."
14000
11336
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."
14003
11337
14004
11338
#: en/help_topics/content-filters.txt:92
14005
11339
msgid ""
14006
11340
"Note: In the future, it is likely that additional options will be added\n"
14007
11341
"to commands to make this refreshing process faster and safer.\n"
14008
11342
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"
14011
11343
14012
11344
#: en/help_topics/current-formats.txt:1
14013
11345
msgid "Current Storage Formats"
14014
msgstr "Current Storage Formats"
11346
msgstr ""
14015
11347
14016
11348
#: en/help_topics/current-formats.txt:3
14017
11349
msgid ""
14020
11352
" compress storage. Provides rich roots which are a one-way\n"
14021
11353
" transition."
14022
11354
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."
14027
11355
14028
11356
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
14029
11357
msgid ""
14030
11358
"\n"
14031
11359
"See :doc:`formats-help` for more about storage formats."
14032
11360
msgstr ""
14033
"\n"
14034
"See :doc:`formats-help` for more about storage formats."
14035
11361
14036
11362
#: en/help_topics/debug-flags.txt:1
14037
11363
msgid ""
14038
11364
"Debug Flags\n"
14039
11365
"==========="
14040
11366
msgstr ""
14041
"Debug Flags\n"
14042
"==========="
14043
11367
14044
11368
#: en/help_topics/debug-flags.txt:4
14045
11369
msgid ""
14046
11370
"These flags can be passed on the bzr command line or (without the ``-D``\n"
14047
11371
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
14048
11372
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``."
14051
11373
14052
11374
#: en/help_topics/debug-flags.txt:7
14053
11375
msgid ""
14098
11420
"appropriate\n"
14099
11421
" for the format, even for non-local fetches.\n"
14100
11422
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"
14147
11423
14148
11424
#: en/help_topics/diverged-branches.txt:1
14149
11425
msgid ""
14150
11426
"Diverged Branches\n"
14151
11427
"================="
14152
11428
msgstr ""
14153
"Diverged Branches\n"
14154
"================="
14155
11429
14156
11430
#: en/help_topics/diverged-branches.txt:4
14157
11431
msgid ""
14167
11441
"source\n"
14168
11442
"branch."
14169
11443
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."
14181
11444
14182
11445
#: en/help_topics/diverged-branches.txt:12
14183
11446
msgid ""
14186
11449
"last pull and you have local commits that have not yet been pushed to the\n"
14187
11450
"mainline, then your local branch and the mainline have diverged."
14188
11451
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."
14193
11452
14194
11453
#: en/help_topics/diverged-branches.txt:17
14195
11454
msgid ""
14196
11455
"Discovering What Has Diverged\n"
14197
11456
"-----------------------------"
14198
11457
msgstr ""
14199
"Discovering What Has Diverged\n"
14200
"-----------------------------"
14201
11458
14202
11459
#: en/help_topics/diverged-branches.txt:20
14203
11460
msgid ""
14211
11468
"old=other_branch``\n"
14212
11469
"to show the differences between other_branch and your current branch."
14213
11470
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."
14223
11471
14224
11472
#: en/help_topics/diverged-branches.txt:26
14225
11473
msgid ""
14226
11474
"A Solution\n"
14227
11475
"----------"
14228
11476
msgstr ""
14229
"A Solution\n"
14230
"----------"
14231
11477
14232
11478
#: en/help_topics/diverged-branches.txt:29
14233
11479
msgid ""
14248
11494
"local\n"
14249
11495
"branch can now be pushed to the mainline.\n"
14250
11496
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"
14267
14268
#: en/help_topics/env-variables.txt:1
14269
msgid "Environment Variables"
14270
msgstr "Environment Variables"
14271
14272
#: en/help_topics/env-variables.txt:3
14273
msgid ""
14274
"=================== "
14275
"===========================================================\n"
14276
"BZRPATH Path where bzr is to look for shell plugin external\n"
14277
" commands.\n"
14278
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
14279
"EMAIL E-Mail address of the user.\n"
14280
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
14281
"EDITOR Editor for editing commit messages.\n"
14282
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
14283
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
14284
"BZR_PLUGINS_AT Plugins to load from a directory not in "
14285
"BZR_PLUGIN_PATH.\n"
14286
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
14287
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
14288
"and\n"
14289
" HOME.\n"
14290
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
14291
"URLs).\n"
14292
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
14293
"sshcorp,\n"
14294
" plink or lsh.\n"
14295
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
14296
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
14297
"BZR_COLUMNS Override implicit terminal width.\n"
14298
"BZR_CONCURRENCY Number of processes that can be run concurrently "
14299
"(selftest)\n"
14300
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
14301
"'text'.\n"
14302
"BZR_PDB Control whether to launch a debugger on error.\n"
14303
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
14304
" breakin debugger.\n"
14305
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
14306
"(instead\n"
14307
" of char-based).\n"
14308
"=================== "
14309
"===========================================================\n"
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"
14347
11497
14348
11498
#: en/help_topics/eol.txt:1
14349
11499
msgid ""
14350
11500
"End of Line Conversion\n"
14351
11501
"======================"
14352
11502
msgstr ""
14353
"End of Line Conversion\n"
14354
"======================"
14355
11503
14356
11504
#: en/help_topics/eol.txt:4
14357
11505
msgid ""
14359
11507
"stores a canonical format but outputs a convenience format. See\n"
14360
11508
"``bzr help content-filters`` for general information about using these."
14361
11509
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."
14365
11510
14366
11511
#: en/help_topics/eol.txt:8
14367
11512
msgid ""
14372
11517
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
14373
11518
"or later."
14374
11519
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."
14381
11520
14382
11521
#: en/help_topics/eol.txt:15
14383
11522
msgid ""
14387
11526
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
14388
11527
"supported in a future verison of Bazaar."
14389
11528
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."
14395
11529
14396
11530
#: en/help_topics/eol.txt:21
14397
11531
msgid ""
14398
11532
"To configure which files to filter, set ``eol`` to one of the values below.\n"
14399
11533
"(If a value is not set, ``exact`` is the default.)"
14400
11534
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.)"
14403
11535
14404
11536
#: en/help_topics/eol.txt:24
14405
11537
msgid ""
14415
11547
" ``exact`` No conversion Exactly as in file\n"
14416
11548
" ========== ===================================== ======================"
14417
11549
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
" ========== ===================================== ======================"
14429
11550
14430
11551
#: en/help_topics/eol.txt:36
14431
11552
msgid ""
14432
11553
"Note: For safety reasons, no conversion is applied to any file where a null\n"
14433
11554
"byte is detected in the file."
14434
11555
msgstr ""
14435
"Note: For safety reasons, no conversion is applied to any file where a null\n"
14436
"byte is detected in the file."
14437
11556
14438
11557
#: en/help_topics/eol.txt:39
14439
11558
msgid ""
14440
11559
"For users working on a cross-platform project, here is a suggested rule\n"
14441
11560
"to use as a starting point::"
14442
11561
msgstr ""
14443
"For users working on a cross-platform project, here is a suggested rule\n"
14444
"to use as a starting point::"
14445
11562
14446
11563
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
14447
11564
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
14449
11566
" [name *]\n"
14450
11567
" eol = native"
14451
11568
msgstr ""
14452
" [name *]\n"
14453
" eol = native"
14454
11569
14455
11570
#: en/help_topics/eol.txt:45
14456
11571
msgid ""
14458
11573
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
14459
11574
"by giving more explicit patterns earlier in the rules file. For example::"
14460
11575
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::"
14464
11576
14465
11577
#: en/help_topics/eol.txt:49
14466
11578
msgid ""
14467
11579
" [name *.png]\n"
14468
11580
" eol = exact"
14469
11581
msgstr ""
14470
" [name *.png]\n"
14471
" eol = exact"
14472
11582
14473
11583
#: en/help_topics/eol.txt:55
14474
11584
msgid ""
14478
11588
"endings or line endings get mixed during editing, it gets committed\n"
14479
11589
"correctly and gets checked out correctly. For example::"
14480
11590
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::"
14486
11591
14487
11592
#: en/help_topics/eol.txt:61
14488
11593
msgid ""
14489
11594
" [name *.bat]\n"
14490
11595
" eol = crlf"
14491
11596
msgstr ""
14492
" [name *.bat]\n"
14493
" eol = crlf"
14494
11597
14495
11598
#: en/help_topics/eol.txt:64
14496
11599
msgid ""
14497
11600
" [name *.sh]\n"
14498
11601
" eol = lf"
14499
11602
msgstr ""
14500
" [name *.sh]\n"
14501
" eol = lf"
14502
11603
14503
11604
#: en/help_topics/eol.txt:70
14504
11605
msgid ""
14508
11609
"introducing mixed line endings will be corrected during commit for files\n"
14509
11610
"with those settings."
14510
11611
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."
14516
11612
14517
11613
#: en/help_topics/eol.txt:76
14518
11614
msgid ""
14519
11615
"If you have sample test data that deliberately has text files with mixed\n"
14520
11616
"newline conventions, you can ask for those to be left alone like this::"
14521
11617
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::"
14524
11618
14525
11619
#: en/help_topics/eol.txt:79
14526
11620
msgid ""
14527
11621
" [name test_data/]\n"
14528
11622
" eol = exact"
14529
11623
msgstr ""
14530
" [name test_data/]\n"
14531
" eol = exact"
14532
11624
14533
11625
#: en/help_topics/eol.txt:85
14534
11626
msgid ""
14538
11630
"In the future, a ``binary = true`` rule may be added but it is not\n"
14539
11631
"supported yet.)"
14540
11632
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.)"
14546
11633
14547
11634
#: en/help_topics/eol.txt:91
14548
11635
msgid ""
14553
11640
"may also help users who do not have rules configured. To do this, set\n"
14554
11641
"``eol`` to one of the values below."
14555
11642
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."
14562
11643
14563
11644
#: en/help_topics/eol.txt:97
14564
11645
msgid ""
14578
11659
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
14579
11660
" ============================ ======================== ======================"
14580
11661
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
" ============================ ======================== ======================"
14596
11662
14597
11663
#: en/help_topics/eol.txt:108
14598
11664
msgid ""
14600
11666
"conventions in their Bazaar repository, this rule is suggested as a\n"
14601
11667
"starting point::"
14602
11668
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::"
14606
11669
14607
11670
#: en/help_topics/eol.txt:112
14608
11671
msgid ""
14609
11672
" [name *]\n"
14610
11673
" eol = native-with-crlf-in-repo"
14611
11674
msgstr ""
14612
" [name *]\n"
14613
" eol = native-with-crlf-in-repo"
14614
11675
14615
11676
#: en/help_topics/eol.txt:115
14616
11677
msgid ""
14618
11679
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
14619
11680
"``crlf`` and ``exact``."
14620
11681
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``."
14624
11682
14625
11683
#: en/help_topics/eol.txt:119
14626
11684
msgid ""
14629
11687
"are found. A precommit hook should be used if you wish to validate\n"
14630
11688
"(and not just convert) content before committing.\n"
14631
11689
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"
14636
11690
14637
11691
#: en/help_topics/hidden-commands.txt:1
14638
11692
msgid ""
14672
11726
"wait-until-signalled Test helper for\n"
14673
11727
" test_start_and_stop_bzr_subprocess_send_signal.\n"
14674
11728
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"
14710
11729
14711
11730
#: en/help_topics/hooks.txt:1
14712
11731
msgid ""
14714
11733
"Hooks\n"
14715
11734
"====="
14716
11735
msgstr ""
14717
"\n"
14718
"Hooks\n"
14719
"====="
14720
11736
14721
11737
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
14722
11738
msgid ""
14723
11739
"Introduction\n"
14724
11740
"------------"
14725
11741
msgstr ""
14726
"Introduction\n"
14727
"------------"
14728
11742
14729
11743
#: en/help_topics/hooks.txt:8
14730
11744
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
14731
msgstr "A hook of type *xxx* of class *yyy* needs to be registered using::"
11745
msgstr ""
14732
11746
14733
11747
#: en/help_topics/hooks.txt:10
14734
11748
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
14735
msgstr " yyy.hooks.install_named_hook(\"xxx\", ...)"
11749
msgstr ""
14736
11750
14737
11751
#: en/help_topics/hooks.txt:12
14738
11752
msgid ""
14739
11753
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
14740
11754
msgstr ""
14741
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
14742
11755
14743
11756
#: en/help_topics/hooks.txt:14
14744
11757
msgid ""
14747
11760
"instance, BranchHooks as the class is the hooks class for\n"
14748
11761
"`bzrlib.branch.Branch.hooks`."
14749
11762
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`."
14754
11763
14755
11764
#: en/help_topics/hooks.txt:18
14756
11765
msgid ""
14758
11767
"machine where bzr was invoked) or the server (the machine addressed by\n"
14759
11768
"the branch URL). These may be, but are not necessarily, the same machine."
14760
11769
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."
14764
11770
14765
11771
#: en/help_topics/hooks.txt:22
14766
11772
msgid ""
14767
11773
"Plugins (including hooks) are run on the server if all of these is true:"
14768
11774
msgstr ""
14769
"Plugins (including hooks) are run on the server if all of these is true:"
14770
11775
14771
11776
#: en/help_topics/hooks.txt:24
14772
11777
msgid ""
14775
11780
"\"http://\"\n"
14776
11781
" URL when a smart server is available via HTTP)."
14777
11782
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)."
14782
11783
14783
11784
#: en/help_topics/hooks.txt:28
14784
11785
msgid ""
14786
11787
"rather\n"
14787
11788
" than client specific code (such as commit)."
14788
11789
msgstr ""
14789
" * The hook is either server specific or part of general infrastructure "
14790
"rather\n"
14791
" than client specific code (such as commit)."
14792
11790
14793
11791
#: en/help_topics/hooks.txt:31
14794
11792
msgid ""
14796
11794
"BranchHooks\n"
14797
11795
"-----------"
14798
11796
msgstr ""
14799
"\n"
14800
"BranchHooks\n"
14801
"-----------"
14802
11797
14803
11798
#: en/help_topics/hooks.txt:35
14804
11799
msgid ""
14805
11800
"automatic_tag_name\n"
14806
11801
"~~~~~~~~~~~~~~~~~~"
14807
11802
msgstr ""
14808
"automatic_tag_name\n"
14809
"~~~~~~~~~~~~~~~~~~"
14810
11803
14811
11804
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
14812
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11805
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
14813
11806
msgid "Introduced in: 2.2"
14814
msgstr "Introduced in: 2.2"
11807
msgstr ""
14815
11808
14816
11809
#: en/help_topics/hooks.txt:40
14817
11810
msgid ""
14820
11813
"return a tag name or None if no tag name could be determined. The\n"
14821
11814
"first non-None tag name returned will be used."
14822
11815
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."
14827
11816
14828
11817
#: en/help_topics/hooks.txt:45
14829
11818
msgid ""
14830
11819
"open\n"
14831
11820
"~~~~"
14832
11821
msgstr ""
14833
"open\n"
14834
"~~~~"
14835
11822
14836
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
14837
#: en/help_topics/hooks.txt:307
11823
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11824
#: en/help_topics/hooks.txt:304
14838
11825
msgid "Introduced in: 1.8"
14839
msgstr "Introduced in: 1.8"
11826
msgstr ""
14840
11827
14841
11828
#: en/help_topics/hooks.txt:50
14842
11829
msgid ""
14843
11830
"Called with the Branch object that has been opened after a branch is\n"
14844
11831
"opened."
14845
11832
msgstr ""
14846
"Called with the Branch object that has been opened after a branch is\n"
14847
"opened."
14848
11833
14849
11834
#: en/help_topics/hooks.txt:53
14850
11835
msgid ""
14851
11836
"post_branch_init\n"
14852
11837
"~~~~~~~~~~~~~~~~"
14853
11838
msgstr ""
14854
"post_branch_init\n"
14855
"~~~~~~~~~~~~~~~~"
14856
11839
14857
11840
#: en/help_topics/hooks.txt:58
14858
11841
msgid ""
14861
11844
"branch and checkout (both heavyweight and lightweight) will all\n"
14862
11845
"trigger this hook."
14863
11846
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."
14868
11847
14869
11848
#: en/help_topics/hooks.txt:63
14870
11849
msgid ""
14871
11850
"post_change_branch_tip\n"
14872
11851
"~~~~~~~~~~~~~~~~~~~~~~"
14873
11852
msgstr ""
14874
"post_change_branch_tip\n"
14875
"~~~~~~~~~~~~~~~~~~~~~~"
14876
11853
14877
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11854
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
14878
11855
msgid "Introduced in: 1.4"
14879
msgstr "Introduced in: 1.4"
11856
msgstr ""
14880
11857
14881
11858
#: en/help_topics/hooks.txt:68
14882
11859
msgid ""
14885
11862
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
14886
11863
"uncommit will all trigger this hook."
14887
11864
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."
14892
11865
14893
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11866
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
14894
11867
msgid ""
14895
11868
"post_commit\n"
14896
11869
"~~~~~~~~~~~"
14897
11870
msgstr ""
14898
"post_commit\n"
14899
"~~~~~~~~~~~"
14900
11871
14901
11872
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
14902
11873
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11874
#: en/help_topics/hooks.txt:145
14903
11875
msgid "Introduced in: 0.15"
14904
msgstr "Introduced in: 0.15"
11876
msgstr ""
14905
11877
14906
11878
#: en/help_topics/hooks.txt:78
14907
11879
msgid ""
14910
11882
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
14911
11883
"branch."
14912
11884
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."
14917
11885
14918
11886
#: en/help_topics/hooks.txt:83
14919
11887
msgid ""
14920
11888
"post_pull\n"
14921
11889
"~~~~~~~~~"
14922
11890
msgstr ""
14923
"post_pull\n"
14924
"~~~~~~~~~"
14925
11891
14926
11892
#: en/help_topics/hooks.txt:88
14927
11893
msgid ""
14928
11894
"Called after a pull operation completes. post_pull is called with a\n"
14929
11895
"bzrlib.branch.PullResult object and only runs in the bzr client."
14930
11896
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."
14933
11897
14934
11898
#: en/help_topics/hooks.txt:91
14935
11899
msgid ""
14936
11900
"post_push\n"
14937
11901
"~~~~~~~~~"
14938
11902
msgstr ""
14939
"post_push\n"
14940
"~~~~~~~~~"
14941
11903
14942
11904
#: en/help_topics/hooks.txt:96
14943
11905
msgid ""
14944
11906
"Called after a push operation completes. post_push is called with a\n"
14945
11907
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
14946
11908
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."
14949
11909
14950
11910
#: en/help_topics/hooks.txt:99
14951
11911
msgid ""
14952
11912
"post_switch\n"
14953
11913
"~~~~~~~~~~~"
14954
11914
msgstr ""
14955
"post_switch\n"
14956
"~~~~~~~~~~~"
14957
11915
14958
11916
#: en/help_topics/hooks.txt:104
14959
11917
msgid ""
14960
11918
"Called after a checkout switches branch. post_switch is called with a\n"
14961
11919
"bzrlib.branch.SwitchHookParams."
14962
11920
msgstr ""
14963
"Called after a checkout switches branch. post_switch is called with a\n"
14964
"bzrlib.branch.SwitchHookParams."
14965
11921
14966
11922
#: en/help_topics/hooks.txt:107
14967
11923
msgid ""
14968
11924
"post_uncommit\n"
14969
11925
"~~~~~~~~~~~~~"
14970
11926
msgstr ""
14971
"post_uncommit\n"
14972
"~~~~~~~~~~~~~"
14973
11927
14974
11928
#: en/help_topics/hooks.txt:112
14975
11929
msgid ""
14979
11933
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
14980
11934
"of None."
14981
11935
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."
14987
11936
14988
11937
#: en/help_topics/hooks.txt:118
14989
11938
msgid ""
14990
11939
"pre_change_branch_tip\n"
14991
11940
"~~~~~~~~~~~~~~~~~~~~~"
14992
11941
msgstr ""
14993
"pre_change_branch_tip\n"
14994
"~~~~~~~~~~~~~~~~~~~~~"
14995
11942
14996
11943
#: en/help_topics/hooks.txt:121
14997
11944
msgid "Introduced in: 1.6"
14998
msgstr "Introduced in: 1.6"
11945
msgstr ""
14999
11946
15000
11947
#: en/help_topics/hooks.txt:123
15001
11948
msgid ""
15004
11951
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
15005
11952
"uncommit will all trigger this hook."
15006
11953
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."
15011
11954
15012
11955
#: en/help_topics/hooks.txt:128
15013
11956
msgid ""
15014
11957
"pre_commit\n"
15015
11958
"~~~~~~~~~~"
15016
11959
msgstr ""
15017
"pre_commit\n"
15018
"~~~~~~~~~~"
15019
11960
15020
11961
#: en/help_topics/hooks.txt:131
15021
11962
msgid "Introduced in: 0.91"
15022
msgstr "Introduced in: 0.91"
11963
msgstr ""
15023
11964
15024
11965
#: en/help_topics/hooks.txt:133
15025
11966
msgid ""
15032
11973
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
15033
11974
"tree."
15034
11975
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."
15043
11976
15044
11977
#: en/help_topics/hooks.txt:142
15045
11978
msgid ""
15046
"transform_fallback_location\n"
15047
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
15048
msgstr ""
15049
"transform_fallback_location\n"
15050
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
15051
15052
#: en/help_topics/hooks.txt:145
11979
"set_rh\n"
11980
"~~~~~~"
11981
msgstr ""
11982
11983
#: en/help_topics/hooks.txt:147
11984
msgid ""
11985
"Invoked whenever the revision history has been set via\n"
11986
"set_revision_history. The api signature is (branch, revision_history),\n"
11987
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11988
"for bzr to trigger, a better hook to use is\n"
11989
"Branch.post_change_branch_tip."
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:153
11993
msgid ""
11994
"transform_fallback_location\n"
11995
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:156
15053
11999
msgid "Introduced in: 1.9"
15054
msgstr "Introduced in: 1.9"
15055
15056
#: en/help_topics/hooks.txt:147
15057
msgid ""
15058
"Called when a stacked branch is activating its fallback locations.\n"
15059
"transform_fallback_location is called with (branch, url), and should\n"
15060
"return a new url. Returning the same url allows it to be used as-is,\n"
15061
"returning a different one can be used to cause the branch to stack on\n"
15062
"a closer copy of that fallback_location. Note that the branch cannot\n"
15063
"have history accessing methods called on it during this hook because\n"
15064
"the fallback locations have not been activated. When there are\n"
15065
"multiple hooks installed for transform_fallback_location, all are\n"
15066
"called with the url returned from the previous hook.The order is\n"
15067
"however undefined."
15068
12000
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."
15079
12001
15080
12002
#: en/help_topics/hooks.txt:158
15081
12003
msgid ""
15082
"CommandHooks\n"
15083
"------------"
15084
msgstr ""
15085
"CommandHooks\n"
15086
"------------"
15087
15088
#: en/help_topics/hooks.txt:161
15089
msgid ""
15090
"extend_command\n"
15091
"~~~~~~~~~~~~~~"
15092
msgstr ""
15093
"extend_command\n"
15094
"~~~~~~~~~~~~~~"
15095
15096
#: en/help_topics/hooks.txt:164
12004
"Called when a stacked branch is activating its fallback locations.\n"
12005
"transform_fallback_location is called with (branch, url), and should\n"
12006
"return a new url. Returning the same url allows it to be used as-is,\n"
12007
"returning a different one can be used to cause the branch to stack on\n"
12008
"a closer copy of that fallback_location. Note that the branch cannot\n"
12009
"have history accessing methods called on it during this hook because\n"
12010
"the fallback locations have not been activated. When there are\n"
12011
"multiple hooks installed for transform_fallback_location, all are\n"
12012
"called with the url returned from the previous hook.The order is\n"
12013
"however undefined."
12014
msgstr ""
12015
12016
#: en/help_topics/hooks.txt:169
12017
msgid ""
12018
"CommandHooks\n"
12019
"------------"
12020
msgstr ""
12021
12022
#: en/help_topics/hooks.txt:172
12023
msgid ""
12024
"extend_command\n"
12025
"~~~~~~~~~~~~~~"
12026
msgstr ""
12027
12028
#: en/help_topics/hooks.txt:175
15097
12029
msgid "Introduced in: 1.13"
15098
msgstr "Introduced in: 1.13"
15099
15100
#: en/help_topics/hooks.txt:166
15101
msgid ""
15102
"Called after creating a command object to allow modifications such as\n"
15103
"adding or removing options, docs etc. Called with the new\n"
15104
"bzrlib.commands.Command object."
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."
15109
15110
#: en/help_topics/hooks.txt:170
15111
msgid ""
15112
"get_command\n"
15113
"~~~~~~~~~~~"
15114
msgstr ""
15115
"get_command\n"
15116
"~~~~~~~~~~~"
15117
15118
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
15119
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:177
12033
msgid ""
12034
"Called after creating a command object to allow modifications such as\n"
12035
"adding or removing options, docs etc. Called with the new\n"
12036
"bzrlib.commands.Command object."
12037
msgstr ""
12038
12039
#: en/help_topics/hooks.txt:181
12040
msgid ""
12041
"get_command\n"
12042
"~~~~~~~~~~~"
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12046
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
15120
12047
msgid "Introduced in: 1.17"
15121
msgstr "Introduced in: 1.17"
15122
15123
#: en/help_topics/hooks.txt:175
15124
msgid ""
15125
"Called when creating a single command. Called with (cmd_or_None,\n"
15126
"command_name). get_command should either return the cmd_or_None\n"
15127
"parameter, or a replacement Command object that should be used for the\n"
15128
"command. Note that the Command.hooks hooks are core infrastructure.\n"
15129
"Many users will prefer to use bzrlib.commands.register_command or\n"
15130
"plugin_cmds.register_lazy."
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."
15138
15139
#: en/help_topics/hooks.txt:182
15140
msgid ""
15141
"get_missing_command\n"
15142
"~~~~~~~~~~~~~~~~~~~"
15143
msgstr ""
15144
"get_missing_command\n"
15145
"~~~~~~~~~~~~~~~~~~~"
15146
15147
#: en/help_topics/hooks.txt:187
15148
msgid ""
15149
"Called when creating a single command if no command could be found.\n"
15150
"Called with (command_name). get_missing_command should either return\n"
15151
"None, or a Command object to be used for the command."
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."
15156
15157
#: en/help_topics/hooks.txt:191
15158
msgid ""
15159
"list_commands\n"
15160
"~~~~~~~~~~~~~"
15161
msgstr ""
15162
"list_commands\n"
15163
"~~~~~~~~~~~~~"
15164
15165
#: en/help_topics/hooks.txt:196
15166
msgid ""
15167
"Called when enumerating commands. Called with a set of cmd_name\n"
15168
"strings for all the commands found so far. This set is safe to mutate\n"
15169
"- e.g. to remove a command. list_commands should return the updated\n"
15170
"set of command names."
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."
15176
15177
#: en/help_topics/hooks.txt:201
15178
msgid ""
15179
"post_command\n"
15180
"~~~~~~~~~~~~"
15181
msgstr ""
15182
"post_command\n"
15183
"~~~~~~~~~~~~"
15184
15185
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
15186
msgid "Introduced in: 2.6"
15187
msgstr "Introduced in: 2.6"
15188
15189
#: en/help_topics/hooks.txt:206
15190
msgid "Called after executing a command. Called with the command object."
15191
msgstr "Called after executing a command. Called with the command object."
15192
15193
#: en/help_topics/hooks.txt:208
15194
msgid ""
15195
"pre_command\n"
15196
"~~~~~~~~~~~"
15197
msgstr ""
15198
"pre_command\n"
15199
"~~~~~~~~~~~"
15200
15201
#: en/help_topics/hooks.txt:213
15202
msgid "Called prior to executing a command. Called with the command object."
15203
msgstr "Called prior to executing a command. Called with the command object."
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:186
12051
msgid ""
12052
"Called when creating a single command. Called with (cmd_or_None,\n"
12053
"command_name). get_command should either return the cmd_or_None\n"
12054
"parameter, or a replacement Command object that should be used for the\n"
12055
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12056
"Many users will prefer to use bzrlib.commands.register_command or\n"
12057
"plugin_cmds.register_lazy."
12058
msgstr ""
12059
12060
#: en/help_topics/hooks.txt:193
12061
msgid ""
12062
"get_missing_command\n"
12063
"~~~~~~~~~~~~~~~~~~~"
12064
msgstr ""
12065
12066
#: en/help_topics/hooks.txt:198
12067
msgid ""
12068
"Called when creating a single command if no command could be found.\n"
12069
"Called with (command_name). get_missing_command should either return\n"
12070
"None, or a Command object to be used for the command."
12071
msgstr ""
12072
12073
#: en/help_topics/hooks.txt:202
12074
msgid ""
12075
"list_commands\n"
12076
"~~~~~~~~~~~~~"
12077
msgstr ""
12078
12079
#: en/help_topics/hooks.txt:207
12080
msgid ""
12081
"Called when enumerating commands. Called with a set of cmd_name\n"
12082
"strings for all the commands found so far. This set is safe to mutate\n"
12083
"- e.g. to remove a command. list_commands should return the updated\n"
12084
"set of command names."
12085
msgstr ""
12086
12087
#: en/help_topics/hooks.txt:212
12088
msgid ""
12089
"_ConfigHooks\n"
12090
"------------"
12091
msgstr ""
15204
12092
15205
12093
#: en/help_topics/hooks.txt:215
15206
12094
msgid ""
15207
"_ConfigHooks\n"
15208
"------------"
15209
msgstr ""
15210
"_ConfigHooks\n"
15211
"------------"
15212
15213
#: en/help_topics/hooks.txt:218
15214
msgid ""
15215
"get\n"
15216
"~~~"
15217
msgstr ""
15218
"get\n"
15219
"~~~"
15220
15221
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
15222
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
15223
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
15224
#: en/help_topics/hooks.txt:446
12095
"get\n"
12096
"~~~"
12097
msgstr ""
12098
12099
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12100
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12101
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12102
#: en/help_topics/hooks.txt:443
15225
12103
msgid "Introduced in: 2.4"
15226
msgstr "Introduced in: 2.4"
12104
msgstr ""
12105
12106
#: en/help_topics/hooks.txt:220
12107
msgid ""
12108
"Invoked when a config option is read. The signature is (stack, name,\n"
12109
"value)."
12110
msgstr ""
15227
12111
15228
12112
#: en/help_topics/hooks.txt:223
15229
12113
msgid ""
15230
"Invoked when a config option is read. The signature is (stack, name,\n"
15231
"value)."
15232
msgstr ""
15233
"Invoked when a config option is read. The signature is (stack, name,\n"
15234
"value)."
15235
15236
#: en/help_topics/hooks.txt:226
15237
msgid ""
15238
"load\n"
15239
"~~~~"
15240
msgstr ""
15241
"load\n"
15242
"~~~~"
15243
15244
#: en/help_topics/hooks.txt:231
12114
"load\n"
12115
"~~~~"
12116
msgstr ""
12117
12118
#: en/help_topics/hooks.txt:228
15245
12119
msgid "Invoked when a config store is loaded. The signature is (store)."
15246
msgstr "Invoked when a config store is loaded. The signature is (store)."
15247
15248
#: en/help_topics/hooks.txt:233
15249
msgid ""
15250
"remove\n"
15251
"~~~~~~"
15252
msgstr ""
15253
"remove\n"
15254
"~~~~~~"
12120
msgstr ""
12121
12122
#: en/help_topics/hooks.txt:230
12123
msgid ""
12124
"remove\n"
12125
"~~~~~~"
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:235
12129
msgid ""
12130
"Invoked when a config option is removed. The signature is (stack,\n"
12131
"name)."
12132
msgstr ""
15255
12133
15256
12134
#: en/help_topics/hooks.txt:238
15257
12135
msgid ""
15258
"Invoked when a config option is removed. The signature is (stack,\n"
15259
"name)."
15260
msgstr ""
15261
"Invoked when a config option is removed. The signature is (stack,\n"
15262
"name)."
15263
15264
#: en/help_topics/hooks.txt:241
15265
msgid ""
15266
"save\n"
15267
"~~~~"
15268
msgstr ""
15269
"save\n"
15270
"~~~~"
15271
15272
#: en/help_topics/hooks.txt:246
12136
"save\n"
12137
"~~~~"
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:243
15273
12141
msgid "Invoked when a config store is saved. The signature is (store)."
15274
msgstr "Invoked when a config store is saved. The signature is (store)."
15275
15276
#: en/help_topics/hooks.txt:248
15277
msgid ""
15278
"set\n"
15279
"~~~"
15280
msgstr ""
15281
"set\n"
15282
"~~~"
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:245
12145
msgid ""
12146
"set\n"
12147
"~~~"
12148
msgstr ""
12149
12150
#: en/help_topics/hooks.txt:250
12151
msgid ""
12152
"Invoked when a config option is set. The signature is (stack, name,\n"
12153
"value)."
12154
msgstr ""
15283
12155
15284
12156
#: en/help_topics/hooks.txt:253
15285
12157
msgid ""
15286
"Invoked when a config option is set. The signature is (stack, name,\n"
15287
"value)."
12158
"ControlDirHooks\n"
12159
"---------------"
15288
12160
msgstr ""
15289
"Invoked when a config option is set. The signature is (stack, name,\n"
15290
"value)."
15291
12161
15292
12162
#: en/help_topics/hooks.txt:256
15293
12163
msgid ""
15294
"ControlDirHooks\n"
15295
"---------------"
12164
"post_repo_init\n"
12165
"~~~~~~~~~~~~~~"
15296
12166
msgstr ""
15297
"ControlDirHooks\n"
15298
"---------------"
15299
12167
15300
#: en/help_topics/hooks.txt:259
12168
#: en/help_topics/hooks.txt:261
15301
12169
msgid ""
15302
"post_repo_init\n"
15303
"~~~~~~~~~~~~~~"
12170
"Invoked after a repository has been initialized. post_repo_init is\n"
12171
"called with a bzrlib.controldir.RepoInitHookParams."
15304
12172
msgstr ""
15305
"post_repo_init\n"
15306
"~~~~~~~~~~~~~~"
15307
12173
15308
12174
#: en/help_topics/hooks.txt:264
15309
12175
msgid ""
15310
"Invoked after a repository has been initialized. post_repo_init is\n"
15311
"called with a bzrlib.controldir.RepoInitHookParams."
12176
"pre_open\n"
12177
"~~~~~~~~"
15312
12178
msgstr ""
15313
"Invoked after a repository has been initialised. post_repo_init is\n"
15314
"called with a bzrlib.controldir.RepoInitHookParams."
15315
12179
15316
12180
#: en/help_topics/hooks.txt:267
15317
msgid ""
15318
"pre_open\n"
15319
"~~~~~~~~"
15320
msgstr ""
15321
"pre_open\n"
15322
"~~~~~~~~"
15323
15324
#: en/help_topics/hooks.txt:270
15325
12181
msgid "Introduced in: 1.14"
15326
msgstr "Introduced in: 1.14"
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:269
12185
msgid ""
12186
"Invoked before attempting to open a ControlDir with the transport that\n"
12187
"the open will use."
12188
msgstr ""
15327
12189
15328
12190
#: en/help_topics/hooks.txt:272
15329
12191
msgid ""
15330
"Invoked before attempting to open a ControlDir with the transport that\n"
15331
"the open will use."
12192
"InfoHooks\n"
12193
"---------"
15332
12194
msgstr ""
15333
"Invoked before attempting to open a ControlDir with the transport that\n"
15334
"the open will use."
15335
12195
15336
12196
#: en/help_topics/hooks.txt:275
15337
12197
msgid ""
15338
"InfoHooks\n"
15339
"---------"
15340
msgstr ""
15341
"InfoHooks\n"
15342
"---------"
15343
15344
#: en/help_topics/hooks.txt:278
15345
msgid ""
15346
"repository\n"
15347
"~~~~~~~~~~"
15348
msgstr ""
15349
"repository\n"
15350
"~~~~~~~~~~"
15351
15352
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
15353
#: en/help_topics/hooks.txt:524
12198
"repository\n"
12199
"~~~~~~~~~~"
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12203
#: en/help_topics/hooks.txt:521
15354
12204
msgid "Introduced in: 1.15"
15355
msgstr "Introduced in: 1.15"
15356
15357
#: en/help_topics/hooks.txt:283
15358
msgid ""
15359
"Invoked when displaying the statistics for a repository. repository is\n"
15360
"called with a statistics dictionary as returned by the repository and\n"
15361
"a file-like object to write to."
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."
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:280
12208
msgid ""
12209
"Invoked when displaying the statistics for a repository. repository is\n"
12210
"called with a statistics dictionary as returned by the repository and\n"
12211
"a file-like object to write to."
12212
msgstr ""
12213
12214
#: en/help_topics/hooks.txt:284
12215
msgid ""
12216
"LockHooks\n"
12217
"---------"
12218
msgstr ""
15366
12219
15367
12220
#: en/help_topics/hooks.txt:287
15368
12221
msgid ""
15369
"LockHooks\n"
15370
"---------"
15371
msgstr ""
15372
"LockHooks\n"
15373
"---------"
15374
15375
#: en/help_topics/hooks.txt:290
15376
msgid ""
15377
"lock_acquired\n"
15378
"~~~~~~~~~~~~~"
15379
msgstr ""
15380
"lock_acquired\n"
15381
"~~~~~~~~~~~~~"
15382
15383
#: en/help_topics/hooks.txt:295
15384
msgid ""
15385
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
15386
msgstr ""
15387
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
15388
15389
#: en/help_topics/hooks.txt:297
15390
msgid ""
15391
"lock_broken\n"
15392
"~~~~~~~~~~~"
15393
msgstr ""
15394
"lock_broken\n"
15395
"~~~~~~~~~~~"
15396
15397
#: en/help_topics/hooks.txt:302
12222
"lock_acquired\n"
12223
"~~~~~~~~~~~~~"
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:292
12227
msgid ""
12228
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:294
12232
msgid ""
12233
"lock_broken\n"
12234
"~~~~~~~~~~~"
12235
msgstr ""
12236
12237
#: en/help_topics/hooks.txt:299
15398
12238
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
15399
msgstr "Called with a bzrlib.lock.LockResult when a physical lock is broken."
15400
15401
#: en/help_topics/hooks.txt:304
15402
msgid ""
15403
"lock_released\n"
15404
"~~~~~~~~~~~~~"
15405
msgstr ""
15406
"lock_released\n"
15407
"~~~~~~~~~~~~~"
15408
15409
#: en/help_topics/hooks.txt:309
15410
msgid ""
15411
"Called with a bzrlib.lock.LockResult when a physical lock is released."
15412
msgstr ""
15413
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:301
12242
msgid ""
12243
"lock_released\n"
12244
"~~~~~~~~~~~~~"
12245
msgstr ""
12246
12247
#: en/help_topics/hooks.txt:306
12248
msgid ""
12249
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:308
12253
msgid ""
12254
"MergeHooks\n"
12255
"----------"
12256
msgstr ""
15414
12257
15415
12258
#: en/help_topics/hooks.txt:311
15416
12259
msgid ""
15417
"MergeHooks\n"
15418
"----------"
12260
"merge_file_content\n"
12261
"~~~~~~~~~~~~~~~~~~"
15419
12262
msgstr ""
15420
"MergeHooks\n"
15421
"----------"
15422
12263
15423
12264
#: en/help_topics/hooks.txt:314
15424
msgid ""
15425
"merge_file_content\n"
15426
"~~~~~~~~~~~~~~~~~~"
15427
msgstr ""
15428
"merge_file_content\n"
15429
"~~~~~~~~~~~~~~~~~~"
15430
15431
#: en/help_topics/hooks.txt:317
15432
12265
msgid "Introduced in: 2.1"
15433
msgstr "Introduced in: 2.1"
15434
15435
#: en/help_topics/hooks.txt:319
15436
msgid ""
15437
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
15438
"object when starting a merge. Should return either None or a subclass\n"
15439
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
15440
"called per file that needs to be merged (including when one side has\n"
15441
"deleted the file and the other has changed it). See the\n"
15442
"AbstractPerFileMerger API docs for details on how it is used by merge."
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."
15450
15451
#: en/help_topics/hooks.txt:326
15452
msgid ""
15453
"post_merge\n"
15454
"~~~~~~~~~~"
15455
msgstr ""
15456
"post_merge\n"
15457
"~~~~~~~~~~"
15458
15459
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
15460
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
15461
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12266
msgstr ""
12267
12268
#: en/help_topics/hooks.txt:316
12269
msgid ""
12270
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12271
"object when starting a merge. Should return either None or a subclass\n"
12272
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12273
"called per file that needs to be merged (including when one side has\n"
12274
"deleted the file and the other has changed it). See the\n"
12275
"AbstractPerFileMerger API docs for details on how it is used by merge."
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:323
12279
msgid ""
12280
"post_merge\n"
12281
"~~~~~~~~~~"
12282
msgstr ""
12283
"post_merge\n"
12284
"~~~~~~~~~~"
12285
12286
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12287
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12288
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
15462
12289
msgid "Introduced in: 2.5"
15463
12290
msgstr "Introduced in: 2.5"
15464
12291
12292
#: en/help_topics/hooks.txt:328
12293
msgid ""
12294
"Called after a merge. Receives a Merger object as the single argument.\n"
12295
"The return value is ignored."
12296
msgstr ""
12297
"Called after a merge. Receives a Merger object as the single argument.\n"
12298
"The return value is ignored."
12299
15465
12300
#: en/help_topics/hooks.txt:331
15466
12301
msgid ""
15467
"Called after a merge. Receives a Merger object as the single argument.\n"
15468
"The return value is ignored."
12302
"pre_merge\n"
12303
"~~~~~~~~~"
15469
12304
msgstr ""
15470
"Called after a merge. Receives a Merger object as the single argument.\n"
15471
"The return value is ignored."
12305
"pre_merge\n"
12306
"~~~~~~~~~"
15472
12307
15473
#: en/help_topics/hooks.txt:334
12308
#: en/help_topics/hooks.txt:336
15474
12309
msgid ""
15475
"pre_merge\n"
15476
"~~~~~~~~~"
12310
"Called before a merge. Receives a Merger object as the single\n"
12311
"argument."
15477
12312
msgstr ""
15478
"pre_merge\n"
15479
"~~~~~~~~~"
12313
"Called before a merge. Receives a Merger object as the single\n"
12314
"argument."
15480
12315
15481
12316
#: en/help_topics/hooks.txt:339
15482
12317
msgid ""
15483
"Called before a merge. Receives a Merger object as the single\n"
15484
"argument."
12318
"MergeDirectiveHooks\n"
12319
"-------------------"
15485
12320
msgstr ""
15486
"Called before a merge. Receives a Merger object as the single\n"
15487
"argument."
15488
12321
15489
12322
#: en/help_topics/hooks.txt:342
15490
12323
msgid ""
15491
"MergeDirectiveHooks\n"
15492
"-------------------"
12324
"merge_request_body\n"
12325
"~~~~~~~~~~~~~~~~~~"
15493
12326
msgstr ""
15494
"MergeDirectiveHooks\n"
15495
"-------------------"
15496
12327
15497
12328
#: en/help_topics/hooks.txt:345
15498
msgid ""
15499
"merge_request_body\n"
15500
"~~~~~~~~~~~~~~~~~~"
15501
msgstr ""
15502
"merge_request_body\n"
15503
"~~~~~~~~~~~~~~~~~~"
15504
15505
#: en/help_topics/hooks.txt:348
15506
12329
msgid "Introduced in: 1.15.0"
15507
msgstr "Introduced in: 1.15.0"
15508
15509
#: en/help_topics/hooks.txt:350
15510
msgid ""
15511
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
15512
"request. Callbacks must return a body. If more than one callback is\n"
15513
"registered, the output of one callback is provided to the next."
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."
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:347
12333
msgid ""
12334
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12335
"request. Callbacks must return a body. If more than one callback is\n"
12336
"registered, the output of one callback is provided to the next."
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:351
12340
msgid ""
12341
"MessageEditorHooks\n"
12342
"------------------"
12343
msgstr ""
15518
12344
15519
12345
#: en/help_topics/hooks.txt:354
15520
12346
msgid ""
15521
"MessageEditorHooks\n"
15522
"------------------"
12347
"commit_message_template\n"
12348
"~~~~~~~~~~~~~~~~~~~~~~~"
15523
12349
msgstr ""
15524
"MessageEditorHooks\n"
15525
"------------------"
15526
12350
15527
12351
#: en/help_topics/hooks.txt:357
15528
msgid ""
15529
"commit_message_template\n"
15530
"~~~~~~~~~~~~~~~~~~~~~~~"
15531
msgstr ""
15532
"commit_message_template\n"
15533
"~~~~~~~~~~~~~~~~~~~~~~~"
15534
15535
#: en/help_topics/hooks.txt:360
15536
12352
msgid "Introduced in: 1.10"
15537
msgstr "Introduced in: 1.10"
15538
15539
#: en/help_topics/hooks.txt:362
15540
msgid ""
15541
"Called when a commit message is being generated.\n"
15542
"commit_message_template is called with the bzrlib.commit.Commit object\n"
15543
"and the message that is known so far. commit_message_template must\n"
15544
"return a new message to use (which could be the same as it was given).\n"
15545
"When there are multiple hooks registered for commit_message_template,\n"
15546
"they are chained with the result from the first passed into the\n"
15547
"second, and so on."
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."
15556
15557
#: en/help_topics/hooks.txt:370
15558
msgid ""
15559
"set_commit_message\n"
15560
"~~~~~~~~~~~~~~~~~~"
15561
msgstr ""
15562
"set_commit_message\n"
15563
"~~~~~~~~~~~~~~~~~~"
15564
15565
#: en/help_topics/hooks.txt:375
15566
msgid ""
15567
"Set a fixed commit message. set_commit_message is called with the\n"
15568
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
15569
"properties by editing commit.builder._revprops) and the message so\n"
15570
"far. set_commit_message must return the message to use or None if it\n"
15571
"should use the message editor as normal."
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."
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:359
12356
msgid ""
12357
"Called when a commit message is being generated.\n"
12358
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12359
"and the message that is known so far. commit_message_template must\n"
12360
"return a new message to use (which could be the same as it was given).\n"
12361
"When there are multiple hooks registered for commit_message_template,\n"
12362
"they are chained with the result from the first passed into the\n"
12363
"second, and so on."
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:367
12367
msgid ""
12368
"set_commit_message\n"
12369
"~~~~~~~~~~~~~~~~~~"
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:372
12373
msgid ""
12374
"Set a fixed commit message. set_commit_message is called with the\n"
12375
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12376
"properties by editing commit.builder._revprops) and the message so\n"
12377
"far. set_commit_message must return the message to use or None if it\n"
12378
"should use the message editor as normal."
12379
msgstr ""
12380
12381
#: en/help_topics/hooks.txt:378
12382
msgid ""
12383
"MutableTreeHooks\n"
12384
"----------------"
12385
msgstr ""
15578
12386
15579
12387
#: en/help_topics/hooks.txt:381
15580
12388
msgid ""
15581
"MutableTreeHooks\n"
15582
"----------------"
15583
msgstr ""
15584
"MutableTreeHooks\n"
15585
"----------------"
15586
15587
#: en/help_topics/hooks.txt:384
15588
msgid ""
15589
"post_build_tree\n"
15590
"~~~~~~~~~~~~~~~"
15591
msgstr ""
15592
"post_build_tree\n"
15593
"~~~~~~~~~~~~~~~"
15594
15595
#: en/help_topics/hooks.txt:389
15596
msgid ""
15597
"Called after a completely new tree is built. The hook is called with\n"
15598
"the tree as its only argument."
15599
msgstr ""
15600
"Called after a completely new tree is built. The hook is called with\n"
15601
"the tree as its only argument."
15602
15603
#: en/help_topics/hooks.txt:395
12389
"post_build_tree\n"
12390
"~~~~~~~~~~~~~~~"
12391
msgstr ""
12392
"post_build_tree\n"
12393
"~~~~~~~~~~~~~~~"
12394
12395
#: en/help_topics/hooks.txt:386
12396
msgid ""
12397
"Called after a completely new tree is built. The hook is called with\n"
12398
"the tree as its only argument."
12399
msgstr ""
12400
"Called after a completely new tree is built. The hook is called with\n"
12401
"the tree as its only argument."
12402
12403
#: en/help_topics/hooks.txt:392
15604
12404
msgid "Introduced in: 2.0"
15605
msgstr "Introduced in: 2.0"
15606
15607
#: en/help_topics/hooks.txt:397
15608
msgid ""
15609
"Called after a commit is performed on a tree. The hook is called with\n"
15610
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
15611
"commit was performed on is available via the mutable_tree attribute of\n"
15612
"that object."
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."
15618
15619
#: en/help_topics/hooks.txt:402
15620
msgid ""
15621
"post_transform\n"
15622
"~~~~~~~~~~~~~~"
15623
msgstr ""
15624
"post_transform\n"
15625
"~~~~~~~~~~~~~~"
12405
msgstr ""
12406
12407
#: en/help_topics/hooks.txt:394
12408
msgid ""
12409
"Called after a commit is performed on a tree. The hook is called with\n"
12410
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12411
"commit was performed on is available via the mutable_tree attribute of\n"
12412
"that object."
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:399
12416
msgid ""
12417
"post_transform\n"
12418
"~~~~~~~~~~~~~~"
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:404
12422
msgid ""
12423
"Called after a tree transform has been performed on a tree. The hook\n"
12424
"is called with the tree that is being transformed and the transform."
12425
msgstr ""
15626
12426
15627
12427
#: en/help_topics/hooks.txt:407
15628
12428
msgid ""
15629
"Called after a tree transform has been performed on a tree. The hook\n"
15630
"is called with the tree that is being transformed and the transform."
12429
"pre_transform\n"
12430
"~~~~~~~~~~~~~"
15631
12431
msgstr ""
15632
"Called after a tree transform has been performed on a tree. The hook\n"
15633
"is called with the tree that is being transformed and the transform."
15634
12432
15635
#: en/help_topics/hooks.txt:410
12433
#: en/help_topics/hooks.txt:412
15636
12434
msgid ""
15637
"pre_transform\n"
15638
"~~~~~~~~~~~~~"
12435
"Called before a tree transform on this tree. The hook is called with\n"
12436
"the tree that is being transformed and the transform."
15639
12437
msgstr ""
15640
"pre_transform\n"
15641
"~~~~~~~~~~~~~"
15642
12438
15643
12439
#: en/help_topics/hooks.txt:415
15644
12440
msgid ""
15645
"Called before a tree transform on this tree. The hook is called with\n"
15646
"the tree that is being transformed and the transform."
15647
msgstr ""
15648
"Called before a tree transform on this tree. The hook is called with\n"
15649
"the tree that is being transformed and the transform."
15650
15651
#: en/help_topics/hooks.txt:418
15652
msgid ""
15653
"start_commit\n"
15654
"~~~~~~~~~~~~"
15655
msgstr ""
15656
"start_commit\n"
15657
"~~~~~~~~~~~~"
15658
15659
#: en/help_topics/hooks.txt:423
15660
msgid ""
15661
"Called before a commit is performed on a tree. The start commit hook\n"
15662
"is able to change the tree before the commit takes place. start_commit\n"
15663
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
15664
"being performed on."
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."
12441
"start_commit\n"
12442
"~~~~~~~~~~~~"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:420
12446
msgid ""
12447
"Called before a commit is performed on a tree. The start commit hook\n"
12448
"is able to change the tree before the commit takes place. start_commit\n"
12449
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12450
"being performed on."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:425
12454
msgid ""
12455
"SmartClientHooks\n"
12456
"----------------"
12457
msgstr ""
15670
12458
15671
12459
#: en/help_topics/hooks.txt:428
15672
12460
msgid ""
15673
"SmartClientHooks\n"
15674
"----------------"
12461
"call\n"
12462
"~~~~"
15675
12463
msgstr ""
15676
"SmartClientHooks\n"
15677
"----------------"
15678
12464
15679
12465
#: en/help_topics/hooks.txt:431
15680
msgid ""
15681
"call\n"
15682
"~~~~"
15683
msgstr ""
15684
"call\n"
15685
"~~~~"
15686
15687
#: en/help_topics/hooks.txt:434
15688
12466
msgid "Introduced in: unknown"
15689
msgstr "Introduced in: unknown"
15690
15691
#: en/help_topics/hooks.txt:436
15692
msgid ""
15693
"Called when the smart client is submitting a request to the smart\n"
15694
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
15695
"Streaming request bodies, and responses, are not accessible."
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."
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:433
12470
msgid ""
12471
"Called when the smart client is submitting a request to the smart\n"
12472
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12473
"Streaming request bodies, and responses, are not accessible."
12474
msgstr ""
12475
12476
#: en/help_topics/hooks.txt:437
12477
msgid ""
12478
"SmartServerHooks\n"
12479
"----------------"
12480
msgstr ""
15700
12481
15701
12482
#: en/help_topics/hooks.txt:440
15702
12483
msgid ""
15703
"SmartServerHooks\n"
15704
"----------------"
15705
msgstr ""
15706
"SmartServerHooks\n"
15707
"----------------"
15708
15709
#: en/help_topics/hooks.txt:443
15710
msgid ""
15711
"server_exception\n"
15712
"~~~~~~~~~~~~~~~~"
15713
msgstr ""
15714
"server_exception\n"
15715
"~~~~~~~~~~~~~~~~"
15716
15717
#: en/help_topics/hooks.txt:448
15718
msgid ""
15719
"Called by the bzr server when an exception occurs. server_exception is\n"
15720
"called with the sys.exc_info() tuple return true for the hook if the\n"
15721
"exception has been handled, in which case the server will exit\n"
15722
"normally."
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."
15728
15729
#: en/help_topics/hooks.txt:453
15730
msgid ""
15731
"server_started\n"
15732
"~~~~~~~~~~~~~~"
15733
msgstr ""
15734
"server_started\n"
15735
"~~~~~~~~~~~~~~"
15736
15737
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12484
"server_exception\n"
12485
"~~~~~~~~~~~~~~~~"
12486
msgstr ""
12487
12488
#: en/help_topics/hooks.txt:445
12489
msgid ""
12490
"Called by the bzr server when an exception occurs. server_exception is\n"
12491
"called with the sys.exc_info() tuple return true for the hook if the\n"
12492
"exception has been handled, in which case the server will exit\n"
12493
"normally."
12494
msgstr ""
12495
12496
#: en/help_topics/hooks.txt:450
12497
msgid ""
12498
"server_started\n"
12499
"~~~~~~~~~~~~~~"
12500
msgstr ""
12501
12502
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
15738
12503
msgid "Introduced in: 0.16"
15739
msgstr "Introduced in: 0.16"
15740
15741
#: en/help_topics/hooks.txt:458
15742
msgid ""
15743
"Called by the bzr server when it starts serving a directory.\n"
15744
"server_started is called with (backing urls, public url), where\n"
15745
"backing_url is a list of URLs giving the server-specific directory\n"
15746
"locations, and public_url is the public URL for the directory being\n"
15747
"served."
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."
15754
15755
#: en/help_topics/hooks.txt:464
15756
msgid ""
15757
"server_started_ex\n"
15758
"~~~~~~~~~~~~~~~~~"
15759
msgstr ""
15760
"server_started_ex\n"
15761
"~~~~~~~~~~~~~~~~~"
12504
msgstr ""
12505
12506
#: en/help_topics/hooks.txt:455
12507
msgid ""
12508
"Called by the bzr server when it starts serving a directory.\n"
12509
"server_started is called with (backing urls, public url), where\n"
12510
"backing_url is a list of URLs giving the server-specific directory\n"
12511
"locations, and public_url is the public URL for the directory being\n"
12512
"served."
12513
msgstr ""
12514
12515
#: en/help_topics/hooks.txt:461
12516
msgid ""
12517
"server_started_ex\n"
12518
"~~~~~~~~~~~~~~~~~"
12519
msgstr ""
12520
12521
#: en/help_topics/hooks.txt:466
12522
msgid ""
12523
"Called by the bzr server when it starts serving a directory.\n"
12524
"server_started is called with (backing_urls, server_obj)."
12525
msgstr ""
15762
12526
15763
12527
#: en/help_topics/hooks.txt:469
15764
12528
msgid ""
15765
"Called by the bzr server when it starts serving a directory.\n"
15766
"server_started is called with (backing_urls, server_obj)."
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)."
15770
15771
#: en/help_topics/hooks.txt:472
15772
msgid ""
15773
"server_stopped\n"
15774
"~~~~~~~~~~~~~~"
15775
msgstr ""
15776
"server_stopped\n"
15777
"~~~~~~~~~~~~~~"
15778
15779
#: en/help_topics/hooks.txt:477
15780
msgid ""
15781
"Called by the bzr server when it stops serving a directory.\n"
15782
"server_stopped is called with the same parameters as the\n"
15783
"server_started hook: (backing_urls, public_url)."
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)."
12529
"server_stopped\n"
12530
"~~~~~~~~~~~~~~"
12531
msgstr ""
12532
12533
#: en/help_topics/hooks.txt:474
12534
msgid ""
12535
"Called by the bzr server when it stops serving a directory.\n"
12536
"server_stopped is called with the same parameters as the\n"
12537
"server_started hook: (backing_urls, public_url)."
12538
msgstr ""
12539
12540
#: en/help_topics/hooks.txt:478
12541
msgid ""
12542
"StatusHooks\n"
12543
"-----------"
12544
msgstr ""
15788
12545
15789
12546
#: en/help_topics/hooks.txt:481
15790
12547
msgid ""
15791
"StatusHooks\n"
15792
"-----------"
15793
msgstr ""
15794
"StatusHooks\n"
15795
"-----------"
15796
15797
#: en/help_topics/hooks.txt:484
15798
msgid ""
15799
"post_status\n"
15800
"~~~~~~~~~~~"
15801
msgstr ""
15802
"post_status\n"
15803
"~~~~~~~~~~~"
15804
15805
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12548
"post_status\n"
12549
"~~~~~~~~~~~"
12550
msgstr ""
12551
12552
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
15806
12553
msgid "Introduced in: 2.3"
15807
msgstr "Introduced in: 2.3"
15808
15809
#: en/help_topics/hooks.txt:489
15810
msgid ""
15811
"Called with argument StatusHookParams after Bazaar has displayed the\n"
15812
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15813
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15814
"correspond to the command line options specified by the user for the\n"
15815
"status command. to_file is the output stream for writing."
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."
15822
15823
#: en/help_topics/hooks.txt:495
15824
msgid ""
15825
"pre_status\n"
15826
"~~~~~~~~~~"
15827
msgstr ""
15828
"pre_status\n"
15829
"~~~~~~~~~~"
15830
15831
#: en/help_topics/hooks.txt:500
15832
msgid ""
15833
"Called with argument StatusHookParams before Bazaar displays the\n"
15834
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
15835
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
15836
"correspond to the command line options specified by the user for the\n"
15837
"status command. to_file is the output stream for writing."
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."
12554
msgstr ""
12555
12556
#: en/help_topics/hooks.txt:486
12557
msgid ""
12558
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12559
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12560
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12561
"correspond to the command line options specified by the user for the\n"
12562
"status command. to_file is the output stream for writing."
12563
msgstr ""
12564
12565
#: en/help_topics/hooks.txt:492
12566
msgid ""
12567
"pre_status\n"
12568
"~~~~~~~~~~"
12569
msgstr ""
12570
12571
#: en/help_topics/hooks.txt:497
12572
msgid ""
12573
"Called with argument StatusHookParams before Bazaar displays the\n"
12574
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12575
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12576
"correspond to the command line options specified by the user for the\n"
12577
"status command. to_file is the output stream for writing."
12578
msgstr ""
12579
12580
#: en/help_topics/hooks.txt:503
12581
msgid ""
12582
"TransportHooks\n"
12583
"--------------"
12584
msgstr ""
12585
"TransportHooks\n"
12586
"--------------"
15844
12587
15845
12588
#: en/help_topics/hooks.txt:506
15846
12589
msgid ""
15847
"TransportHooks\n"
15848
"--------------"
15849
msgstr ""
15850
"TransportHooks\n"
15851
"--------------"
15852
15853
#: en/help_topics/hooks.txt:509
15854
msgid ""
15855
"post_connect\n"
15856
"~~~~~~~~~~~~"
15857
msgstr ""
15858
"post_connect\n"
15859
"~~~~~~~~~~~~"
15860
15861
#: en/help_topics/hooks.txt:514
15862
msgid ""
15863
"Called after a new connection is established or a reconnect occurs.\n"
15864
"The sole argument passed is either the connected transport or smart\n"
15865
"medium instance."
15866
msgstr ""
15867
"Called after a new connection is established or a reconnect occurs.\n"
15868
"The sole argument passed is either the connected transport or smart\n"
15869
"medium instance."
12590
"post_connect\n"
12591
"~~~~~~~~~~~~"
12592
msgstr ""
12593
"post_connect\n"
12594
"~~~~~~~~~~~~"
12595
12596
#: en/help_topics/hooks.txt:511
12597
msgid ""
12598
"Called after a new connection is established or a reconnect occurs.\n"
12599
"The sole argument passed is either the connected transport or smart\n"
12600
"medium instance."
12601
msgstr ""
12602
"Called after a new connection is established or a reconnect occurs.\n"
12603
"The sole argument passed is either the connected transport or smart\n"
12604
"medium instance."
12605
12606
#: en/help_topics/hooks.txt:515
12607
msgid ""
12608
"RioVersionInfoBuilderHooks\n"
12609
"--------------------------"
12610
msgstr ""
15870
12611
15871
12612
#: en/help_topics/hooks.txt:518
15872
12613
msgid ""
15873
"RioVersionInfoBuilderHooks\n"
15874
"--------------------------"
15875
msgstr ""
15876
"RioVersionInfoBuilderHooks\n"
15877
"--------------------------"
15878
15879
#: en/help_topics/hooks.txt:521
15880
msgid ""
15881
"revision\n"
15882
"~~~~~~~~"
15883
msgstr ""
15884
"revision\n"
15885
"~~~~~~~~"
15886
15887
#: en/help_topics/hooks.txt:526
15888
msgid ""
15889
"Invoked when adding information about a revision to the RIO stanza\n"
15890
"that is printed. revision is called with a revision object and a RIO\n"
15891
"stanza.\n"
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"
12614
"revision\n"
12615
"~~~~~~~~"
12616
msgstr ""
12617
12618
#: en/help_topics/hooks.txt:523
12619
msgid ""
12620
"Invoked when adding information about a revision to the RIO stanza\n"
12621
"that is printed. revision is called with a revision object and a RIO\n"
12622
"stanza.\n"
12623
msgstr ""
15896
12624
15897
12625
#: en/help_topics/location-alias.txt:1
15898
12626
msgid ""
15899
12627
"Location aliases\n"
15900
12628
"================"
15901
12629
msgstr ""
15902
"Location aliases\n"
15903
"================"
15904
12630
15905
12631
#: en/help_topics/location-alias.txt:4
15906
12632
msgid ""
15908
12634
"These\n"
15909
12635
"can be used with most commands that expect a location, such as `bzr push`."
15910
12636
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`."
15914
12637
15915
12638
#: en/help_topics/location-alias.txt:7
15916
12639
msgid "The aliases are::"
15917
msgstr "The aliases are::"
12640
msgstr ""
15918
12641
15919
12642
#: en/help_topics/location-alias.txt:9
15920
12643
msgid ""
15925
12648
" :submit The submit branch for this branch.\n"
15926
12649
" :this This branch."
15927
12650
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."
15934
12651
15935
12652
#: en/help_topics/location-alias.txt:16
15936
12653
msgid "For example, to push to the parent location::"
15937
msgstr "For example, to push to the parent location::"
12654
msgstr ""
15938
12655
15939
12656
#: en/help_topics/location-alias.txt:18
15940
12657
msgid " bzr push :parent\n"
15941
msgstr " bzr push :parent\n"
12658
msgstr ""
15942
12659
15943
12660
#: en/help_topics/log-formats.txt:1
15944
12661
msgid ""
15945
12662
"Log Formats\n"
15946
12663
"==========="
15947
12664
msgstr ""
15948
"Log Formats\n"
15949
"==========="
15950
12665
15951
12666
#: en/help_topics/log-formats.txt:4
15952
12667
msgid ""
15953
12668
"A log format controls how information about each revision is displayed.\n"
15954
12669
"The standard log formats are compared below::"
15955
12670
msgstr ""
15956
"A log format controls how information about each revision is displayed.\n"
15957
"The standard log formats are compared below::"
15958
12671
15959
12672
#: en/help_topics/log-formats.txt:7
15960
12673
msgid ""
15975
12688
" preferred levels all 1 1\n"
15976
12689
" digital signature optional - -"
15977
12690
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 - -"
15994
12691
15995
12692
#: en/help_topics/log-formats.txt:24
15996
12693
msgid ""
15997
12694
"The default format is ``long``. To change this, define the ``log_format``\n"
15998
12695
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
15999
12696
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)::"
16002
12697
16003
12698
#: en/help_topics/log-formats.txt:27
16004
12699
msgid ""
16005
12700
" [DEFAULT]\n"
16006
12701
" log_format = short"
16007
12702
msgstr ""
16008
" [DEFAULT]\n"
16009
" log_format = short"
16010
12703
16011
12704
#: en/help_topics/log-formats.txt:30
16012
12705
msgid ""
16013
12706
"Alternatively, to change the log format used for a given query, use the\n"
16014
12707
"--long, --short or --line options."
16015
12708
msgstr ""
16016
"Alternatively, to change the log format used for a given query, use the\n"
16017
"--long, --short or --line options."
16018
12709
16019
12710
#: en/help_topics/log-formats.txt:33
16020
12711
msgid ""
16021
12712
"If one of the standard log formats does not meet your needs, additional\n"
16022
12713
"formats can be provided by plugins.\n"
16023
12714
msgstr ""
16024
"If one of the standard log formats does not meet your needs, additional\n"
16025
"formats can be provided by plugins.\n"
16026
12715
16027
12716
#: en/help_topics/other-formats.txt:1
16028
12717
msgid "Other Storage Formats"
16029
msgstr "Other Storage Formats"
12718
msgstr ""
16030
12719
16031
12720
#: en/help_topics/other-formats.txt:3
16032
12721
msgid "Experimental formats are shown below."
16033
msgstr "Experimental formats are shown below."
12722
msgstr ""
16034
12723
16035
12724
#: en/help_topics/other-formats.txt:5
16036
12725
msgid ""
16038
12727
" (native) The 2a format with experimental support for colocated\n"
16039
12728
" branches."
16040
12729
msgstr ""
16041
":development-colo:\n"
16042
" (native) The 2a format with experimental support for colocated\n"
16043
" branches."
16044
12730
16045
12731
#: en/help_topics/other-formats.txt:9
16046
12732
msgid ""
16047
12733
"\n"
16048
12734
"Deprecated formats are shown below."
16049
12735
msgstr ""
16050
"\n"
16051
"Deprecated formats are shown below."
16052
12736
16053
12737
#: en/help_topics/other-formats.txt:12
16054
12738
msgid ""
16057
12741
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
16058
12742
" by bzr < 0.92."
16059
12743
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."
16064
12744
16065
12745
#: en/help_topics/patterns.txt:1
16066
12746
msgid ""
16067
12747
"Patterns\n"
16068
12748
"========"
16069
12749
msgstr ""
16070
"Patterns\n"
16071
"========"
16072
12750
16073
12751
#: en/help_topics/patterns.txt:4
16074
12752
msgid ""
16077
12755
"and preferences can be associated with files using rule patterns.\n"
16078
12756
"The pattern syntax is described below."
16079
12757
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."
16084
12758
16085
12759
#: en/help_topics/patterns.txt:9
16086
12760
msgid ""
16090
12764
"component of the path. To match a file only in the root directory,\n"
16091
12765
"prepend ``./``. Patterns specifying absolute paths are not allowed."
16092
12766
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."
16098
12767
16099
12768
#: en/help_topics/patterns.txt:15
16100
12769
msgid "Patterns may include globbing wildcards such as::"
16101
msgstr "Patterns may include globbing wildcards such as::"
12770
msgstr ""
16102
12771
16103
12772
#: en/help_topics/patterns.txt:17
16104
12773
msgid ""
16107
12776
" /**/ - Matches 0 or more directories in a path\n"
16108
12777
" [a-z] - Matches a single character from within a group of characters"
16109
12778
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"
16114
12779
16115
12780
#: en/help_topics/patterns.txt:22
16116
12781
msgid ""
16119
12784
"expression. Regular expression patterns may not include named or\n"
16120
12785
"numbered groups."
16121
12786
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."
16126
12787
16127
12788
#: en/help_topics/patterns.txt:27
16128
12789
msgid ""
16129
12790
"Case insensitive ignore patterns can be specified with regular expressions\n"
16130
12791
"by using the ``i`` (for ignore case) flag in the pattern."
16131
12792
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."
16134
12793
16135
12794
#: en/help_topics/patterns.txt:30
16136
12795
msgid ""
16137
12796
"For example, a case insensitive match for ``foo`` may be specified as::"
16138
12797
msgstr ""
16139
"For example, a case insensitive match for ``foo`` may be specified as::"
16140
12798
16141
12799
#: en/help_topics/patterns.txt:32
16142
12800
msgid " RE:(?i)foo"
16143
msgstr " RE:(?i)foo"
12801
msgstr ""
16144
12802
16145
12803
#: en/help_topics/patterns.txt:34
16146
12804
msgid ""
16147
12805
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
16148
12806
"matched by that pattern will not be ignored."
16149
12807
msgstr ""
16150
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
16151
"matched by that pattern will not be ignored."
16152
12808
16153
12809
#: en/help_topics/patterns.txt:37
16154
12810
msgid ""
16155
12811
".. _Python regular expressions: http://docs.python.org/library/re.html"
16156
12812
msgstr ""
16157
".. _Python regular expressions: http://docs.python.org/library/re.html"
16158
12813
16159
12814
#: en/help_topics/revisionspec.txt:1
16160
12815
msgid "Revision Identifiers"
16161
msgstr "Revision Identifiers"
12816
msgstr ""
16162
12817
16163
12818
#: en/help_topics/revisionspec.txt:3
16164
12819
msgid ""
16167
12822
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
16168
12823
"'before:yesterday' and 'submit:'."
16169
12824
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:'."
16174
12825
16175
12826
#: en/help_topics/revisionspec.txt:8
16176
12827
msgid ""
16182
12833
"will\n"
16183
12834
"be found first."
16184
12835
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."
16192
12836
16193
12837
#: en/help_topics/revisionspec.txt:14
16194
12838
msgid ""
16198
12842
"or\n"
16199
12843
"spaces around the '..')."
16200
12844
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 '..')."
16206
12845
16207
12846
#: en/help_topics/revisionspec.txt:19
16208
12847
msgid ""
16221
12860
"and\n"
16222
12861
"3649, but not 3647."
16223
12862
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."
16238
12863
16239
12864
#: en/help_topics/revisionspec.txt:28
16240
12865
msgid "The keywords used as revision selection methods are the following:"
16241
msgstr "The keywords used as revision selection methods are the following:"
12866
msgstr ""
16242
12867
16243
12868
#: en/help_topics/revisionspec.txt:30
16244
12869
msgid ""
16265
12890
":last:\n"
16266
12891
"\tSelects the nth revision from the end."
16267
12892
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."
16290
12893
16291
12894
#: en/help_topics/revisionspec.txt:53
16292
12895
msgid "In addition, plugins can provide other keywords."
16293
msgstr "In addition, plugins can provide other keywords."
12896
msgstr ""
16294
12897
16295
12898
#: en/help_topics/revisionspec.txt:55
16296
12899
msgid "A detailed description of each keyword is given below."
16297
msgstr "A detailed description of each keyword is given below."
12900
msgstr ""
16298
12901
16299
12902
#: en/help_topics/revisionspec.txt:57
16300
12903
msgid ":revid:"
16301
msgstr ":revid:"
12904
msgstr ""
16302
12905
16303
12906
#: en/help_topics/revisionspec.txt:59
16304
12907
msgid ""
16307
12910
" Including merges, and pending merges.\n"
16308
12911
" Examples::"
16309
12912
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::"
16314
12913
16315
12914
#: en/help_topics/revisionspec.txt:64
16316
12915
msgid ""
16317
12916
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
16318
12917
msgstr ""
16319
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
16320
12918
16321
12919
#: en/help_topics/revisionspec.txt:66
16322
12920
msgid ":submit:"
16323
msgstr ":submit:"
12921
msgstr ""
16324
12922
16325
12923
#: en/help_topics/revisionspec.txt:68
16326
12924
msgid ""
16330
12928
" used by the bundle and merge directive commands. If no submit branch\n"
16331
12929
" is specified, the parent branch is used instead."
16332
12930
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."
16338
12931
16339
12932
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
16340
12933
msgid ""
16342
12935
" branches. Usually this is the branch point, but it could also be\n"
16343
12936
" a revision that was merged."
16344
12937
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."
16348
12938
16349
12939
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
16350
12940
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
16351
12941
#: en/help_topics/revisionspec.txt:153
16352
12942
msgid " Examples::"
16353
msgstr " Examples::"
12943
msgstr ""
16354
12944
16355
12945
#: en/help_topics/revisionspec.txt:79
16356
12946
msgid " $ bzr diff -r submit:"
16357
msgstr " $ bzr diff -r submit:"
12947
msgstr ""
16358
12948
16359
12949
#: en/help_topics/revisionspec.txt:81
16360
12950
msgid ":ancestor:"
16361
msgstr ":ancestor:"
12951
msgstr ""
16362
12952
16363
12953
#: en/help_topics/revisionspec.txt:83
16364
12954
msgid " Supply the path to a branch to select the common ancestor."
16365
msgstr " Supply the path to a branch to select the common ancestor."
12955
msgstr ""
16366
12956
16367
12957
#: en/help_topics/revisionspec.txt:89
16368
12958
msgid ""
16370
12960
" that your branch introduces, while excluding the changes that you\n"
16371
12961
" have not merged from the remote branch."
16372
12962
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."
16376
12963
16377
12964
#: en/help_topics/revisionspec.txt:95
16378
12965
msgid ""
16379
12966
" ancestor:/path/to/branch\n"
16380
12967
" $ bzr diff -r ancestor:../../mainline/branch"
16381
12968
msgstr ""
16382
" ancestor:/path/to/branch\n"
16383
" $ bzr diff -r ancestor:../../mainline/branch"
16384
12969
16385
12970
#: en/help_topics/revisionspec.txt:98
16386
12971
msgid ":date:"
16387
msgstr ":date:"
12972
msgstr ""
16388
12973
16389
12974
#: en/help_topics/revisionspec.txt:100
16390
12975
msgid ""
16393
12978
" Matches the first entry after a given date (either at midnight or\n"
16394
12979
" at a specified time)."
16395
12980
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)."
16400
12981
16401
12982
#: en/help_topics/revisionspec.txt:105
16402
12983
msgid " One way to display all the changes since yesterday would be::"
16403
msgstr " One way to display all the changes since yesterday would be::"
12984
msgstr ""
16404
12985
16405
12986
#: en/help_topics/revisionspec.txt:107
16406
12987
msgid " bzr log -r date:yesterday.."
16407
msgstr " bzr log -r date:yesterday.."
12988
msgstr ""
16408
12989
16409
12990
#: en/help_topics/revisionspec.txt:111
16410
12991
msgid ""
16413
12994
" date:2006-08-14,17:10:14 -> select the first revision after\n"
16414
12995
" August 14th, 2006 at 5:10pm."
16415
12996
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."
16420
12997
16421
12998
#: en/help_topics/revisionspec.txt:115
16422
12999
msgid ":branch:"
16423
msgstr ":branch:"
13000
msgstr ""
16424
13001
16425
13002
#: en/help_topics/revisionspec.txt:117
16426
13003
msgid " Supply the path to a branch to select its last revision."
16427
msgstr " Supply the path to a branch to select its last revision."
13004
msgstr ""
16428
13005
16429
13006
#: en/help_topics/revisionspec.txt:121
16430
13007
msgid " branch:/path/to/branch"
16431
msgstr " branch:/path/to/branch"
13008
msgstr ""
16432
13009
16433
13010
#: en/help_topics/revisionspec.txt:123
16434
13011
msgid ":tag:"
16435
msgstr ":tag:"
13012
msgstr ""
16436
13013
16437
13014
#: en/help_topics/revisionspec.txt:125
16438
13015
msgid " Tags are stored in the branch and created by the 'tag' command."
16439
msgstr " Tags are stored in the branch and created by the 'tag' command."
13016
msgstr ""
16440
13017
16441
13018
#: en/help_topics/revisionspec.txt:127
16442
13019
msgid ":revno:"
16443
msgstr ":revno:"
13020
msgstr ""
16444
13021
16445
13022
#: en/help_topics/revisionspec.txt:129
16446
13023
msgid ""
16451
13028
" first revision is returned.\n"
16452
13029
" Examples::"
16453
13030
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::"
16460
13031
16461
13032
#: en/help_topics/revisionspec.txt:136
16462
13033
msgid ""
16469
13040
" -1000000 -> Most likely the first revision, unless\n"
16470
13041
" your history is very long."
16471
13042
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."
16480
13043
16481
13044
#: en/help_topics/revisionspec.txt:145
16482
13045
msgid ":before:"
16483
msgstr ":before:"
13046
msgstr ""
16484
13047
16485
13048
#: en/help_topics/revisionspec.txt:147
16486
13049
msgid ""
16490
13053
"history\n"
16491
13054
" of a branch."
16492
13055
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."
16498
13056
16499
13057
#: en/help_topics/revisionspec.txt:151
16500
13058
msgid ""
16501
13059
" It is an error to request the parent of the null revision (before:0)."
16502
13060
msgstr ""
16503
" It is an error to request the parent of the null revision (before:0)."
16504
13061
16505
13062
#: en/help_topics/revisionspec.txt:155
16506
13063
msgid ""
16513
13070
" (What changes did revision 1913 introduce).\n"
16514
13071
" This is equivalent to: bzr diff -c 1913"
16515
13072
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"
16524
13073
16525
13074
#: en/help_topics/revisionspec.txt:163
16526
13075
msgid ":annotate:"
16527
msgstr ":annotate:"
13076
msgstr ""
16528
13077
16529
13078
#: en/help_topics/revisionspec.txt:165
16530
13079
msgid ""
16534
13083
" start at 1, and are relative to the current version, not the last-\n"
16535
13084
" committed version of the file."
16536
13085
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."
16542
13086
16543
13087
#: en/help_topics/revisionspec.txt:170
16544
13088
msgid ":mainline:"
16545
msgstr ":mainline:"
13089
msgstr ""
16546
13090
16547
13091
#: en/help_topics/revisionspec.txt:172
16548
13092
msgid ""
16549
13093
" Select the revision that merged the specified revision into mainline."
16550
13094
msgstr ""
16551
" Select the revision that merged the specified revision into mainline."
16552
13095
16553
13096
#: en/help_topics/revisionspec.txt:174
16554
13097
msgid ":last:"
16555
msgstr ":last:"
13098
msgstr ""
16556
13099
16557
13100
#: en/help_topics/revisionspec.txt:176
16558
13101
msgid ""
16560
13103
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
16561
13104
" Examples::"
16562
13105
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::"
16566
13106
16567
13107
#: en/help_topics/revisionspec.txt:180
16568
13108
msgid ""
16569
13109
" last:1 -> return the last revision\n"
16570
13110
" last:3 -> return the revision 2 before the end.\n"
16571
13111
msgstr ""
16572
" last:1 -> return the last revision\n"
16573
" last:3 -> return the revision 2 before the end.\n"
16574
13112
16575
13113
#: en/help_topics/rules.txt:1
16576
13114
msgid ""
16577
13115
"Rules\n"
16578
13116
"====="
16579
13117
msgstr ""
16580
"Rules\n"
16581
"====="
16582
13118
16583
13119
#: en/help_topics/rules.txt:7
16584
13120
msgid ""
16586
13122
"patterns and the contents of each section are the preferences for files\n"
16587
13123
"matching that pattern(s). For example::"
16588
13124
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::"
16592
13125
16593
13126
#: en/help_topics/rules.txt:11
16594
13127
msgid ""
16595
13128
" [name *.bat]\n"
16596
13129
" eol = native"
16597
13130
msgstr ""
16598
" [name *.bat]\n"
16599
" eol = native"
16600
13131
16601
13132
#: en/help_topics/rules.txt:14
16602
13133
msgid ""
16603
13134
" [name *.html *.xml]\n"
16604
13135
" keywords = xml_escape"
16605
13136
msgstr ""
16606
" [name *.html *.xml]\n"
16607
" keywords = xml_escape"
16608
13137
16609
13138
#: en/help_topics/rules.txt:17
16610
13139
msgid ""
16614
13143
"Keyword support is provided by the `keywords plugin\n"
16615
13144
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
16616
13145
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>`_."
16622
13146
16623
13147
#: en/help_topics/rules.txt:23
16624
13148
msgid ""
16625
13149
"Files\n"
16626
13150
"-----"
16627
13151
msgstr ""
16628
"Files\n"
16629
"-----"
16630
13152
16631
13153
#: en/help_topics/rules.txt:26
16632
13154
msgid ""
16633
13155
"Default rules for all branches are defined in the optional file\n"
16634
13156
"``BZR_HOME/rules``. "
16635
13157
msgstr ""
16636
"Default rules for all branches are defined in the optional file\n"
16637
"``BZR_HOME/rules``. "
16638
13158
16639
13159
#: en/help_topics/rules.txt:29
16640
13160
msgid ""
16641
13161
"Rule Patterns\n"
16642
13162
"-------------"
16643
13163
msgstr ""
16644
"Rule Patterns\n"
16645
"-------------"
16646
13164
16647
13165
#: en/help_topics/rules.txt:32
16648
13166
msgid ""
16651
13169
"the top of the file. Rule patterns use exactly the same conventions\n"
16652
13170
"as ignore patterns. See :doc:`patterns-help` for details."
16653
13171
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."
16658
13172
16659
13173
#: en/help_topics/rules.txt:37
16660
13174
msgid ".. note::"
16661
msgstr ".. note::"
13175
msgstr ""
16662
13176
16663
13177
#: en/help_topics/rules.txt:39
16664
13178
msgid ""
16665
13179
" Patterns containing square brackets or spaces should be\n"
16666
13180
" surrounded in quotes to ensure they are correctly parsed.\n"
16667
13181
msgstr ""
16668
" Patterns containing square brackets or spaces should be\n"
16669
" surrounded in quotes to ensure they are correctly parsed.\n"
16670
13182
16671
13183
#: en/help_topics/topics.txt:1
16672
13184
msgid ""
16707
13219
"urlspec Supported transport protocols\n"
16708
13220
"working-trees Information on working trees\n"
16709
13221
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"
16746
13222
16747
13223
#: en/help_topics/url-special-chars.txt:1
16748
13224
msgid ""
16749
13225
"Special character handling in URLs\n"
16750
13226
"=================================="
16751
13227
msgstr ""
16752
"Special character handling in URLs\n"
16753
"=================================="
16754
13228
16755
13229
#: en/help_topics/url-special-chars.txt:4
16756
13230
msgid "Bazaar allows locations to be specified in multiple ways, either:"
16757
msgstr "Bazaar allows locations to be specified in multiple ways, either:"
13231
msgstr ""
16758
13232
16759
13233
#: en/help_topics/url-special-chars.txt:6
16760
13234
msgid " * Fully qualified URLs"
16761
msgstr " * Fully qualified URLs"
13235
msgstr ""
16762
13236
16763
13237
#: en/help_topics/url-special-chars.txt:8
16764
13238
msgid " * File system paths, relative or absolute"
16765
msgstr " * File system paths, relative or absolute"
13239
msgstr ""
16766
13240
16767
13241
#: en/help_topics/url-special-chars.txt:10
16768
13242
msgid ""
16770
13244
"that are specified it will automatically determine the appropriate URL\n"
16771
13245
"representation, and escape special characters where necessary."
16772
13246
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."
16776
13247
16777
13248
#: en/help_topics/url-special-chars.txt:14
16778
13249
msgid ""
16783
13254
"be\n"
16784
13255
"urlencoded when the path is converted to a URL."
16785
13256
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."
16792
13257
16793
13258
#: en/help_topics/url-special-chars.txt:19
16794
13259
msgid ""
16799
13264
"generous in what it accepts as a URL and to print them in a way that\n"
16800
13265
"will be readable."
16801
13266
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."
16808
13267
16809
13268
#: en/help_topics/url-special-chars.txt:24
16810
13269
msgid ""
16813
13272
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
16814
13273
"slash)::"
16815
13274
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)::"
16820
13275
16821
13276
#: en/help_topics/url-special-chars.txt:27
16822
13277
msgid ""
16827
13282
" bzr log file://localhost/tmp/%252False\n"
16828
13283
" bzr log file:%252False"
16829
13284
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"
16836
13285
16837
13286
#: en/help_topics/url-special-chars.txt:34
16838
13287
msgid "These are valid but do not refer to the same file::"
16839
msgstr "These are valid but do not refer to the same file::"
13288
msgstr ""
16840
13289
16841
13290
#: en/help_topics/url-special-chars.txt:36
16842
13291
msgid ""
16843
13292
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
16844
13293
" bzr log %252False (refers to a file called /tmp/%252False)"
16845
13294
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)"
16848
13295
16849
13296
#: en/help_topics/url-special-chars.txt:39
16850
13297
msgid ""
16851
13298
"Comma also has special meaning in URLs, because it denotes `segment "
16852
13299
"parameters`_"
16853
13300
msgstr ""
16854
"Comma also has special meaning in URLs, because it denotes `segment "
16855
"parameters`_"
16856
13301
16857
13302
#: en/help_topics/url-special-chars.txt:41
16858
13303
msgid ""
16859
13304
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
16860
13305
msgstr ""
16861
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
16862
13306
16863
13307
#: en/help_topics/url-special-chars.txt:43
16864
13308
msgid ""
16866
13310
"literal\n"
16867
13311
"comma in a file system path, specify a URL and URL encode the comma::"
16868
13312
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::"
16872
13313
16873
13314
#: en/help_topics/url-special-chars.txt:46
16874
13315
msgid ""
16878
13319
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
16879
13320
"\"branch\" set to \"bla\"\n"
16880
13321
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"
16886
13322
16887
13323
#: en/help_topics/urlspec.txt:1
16888
13324
msgid "URL Identifiers"
16889
msgstr "URL Identifiers"
13325
msgstr ""
16890
13326
16891
13327
#: en/help_topics/urlspec.txt:3
16892
13328
msgid "Supported URL prefixes::"
16893
msgstr "Supported URL prefixes::"
13329
msgstr ""
16894
13330
16895
13331
#: en/help_topics/urlspec.txt:5
16896
13332
msgid ""
16904
13340
"SSL.\n"
16905
13341
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
16906
13342
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)."
16916
13343
16917
13344
#: en/help_topics/urlspec.txt:14
16918
13345
msgid "Supported modifiers::"
16919
msgstr "Supported modifiers::"
13346
msgstr ""
16920
13347
16921
13348
#: en/help_topics/urlspec.txt:16
16922
13349
msgid " gio+ Access using any GIO supported protocols."
16923
msgstr " gio+ Access using any GIO supported protocols."
13350
msgstr ""
16924
13351
16925
13352
#: en/help_topics/urlspec.txt:18
16926
13353
msgid "Bazaar supports all of the standard parts within the URL::"
16927
msgstr "Bazaar supports all of the standard parts within the URL::"
13354
msgstr ""
16928
13355
16929
13356
#: en/help_topics/urlspec.txt:20
16930
13357
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
16931
msgstr " <protocol>://[user[:password]@]host[:port]/[path]"
13358
msgstr ""
16932
13359
16933
13360
#: en/help_topics/urlspec.txt:22
16934
13361
msgid "allowing URLs such as::"
16935
msgstr "allowing URLs such as::"
13362
msgstr ""
16936
13363
16937
13364
#: en/help_topics/urlspec.txt:24
16938
13365
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
16939
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13366
msgstr ""
16940
13367
16941
13368
#: en/help_topics/urlspec.txt:26
16942
13369
msgid ""
16946
13373
"``remote`` has a home directory of ``/home/remote`` on the server\n"
16947
13374
"shell.example.com, then::"
16948
13375
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::"
16954
13376
16955
13377
#: en/help_topics/urlspec.txt:32
16956
13378
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
16957
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13379
msgstr ""
16958
13380
16959
13381
#: en/help_topics/urlspec.txt:34
16960
13382
msgid "would refer to ``/home/remote/myproject/trunk``."
16961
msgstr "would refer to ``/home/remote/myproject/trunk``."
13383
msgstr ""
16962
13384
16963
13385
#: en/help_topics/urlspec.txt:36
16964
13386
msgid ""
16965
13387
"Many commands that accept URLs also accept location aliases too.\n"
16966
13388
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
16967
13389
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."
17237
17238
#~ msgid ""
17239
#~ "Bazaar 2.5b6 -- a free distributed version-control tool\n"
13390
13391
#~ msgid ""
13392
#~ "Bazaar 2.5b5 -- a free distributed version-control tool\n"
17240
13393
#~ "http://bazaar.canonical.com/"
17241
13394
#~ msgstr ""
17242
#~ "Bazaar 2.5b6 -- a free distributed version-control tool\n"
13395
#~ "Bazaar 2.5b5 -- a free distributed version-control tool\n"
17243
13396
#~ "http://bazaar.canonical.com/"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1