« back to all changes in this revision
Viewing changes to po/en_GB.po
- browse files at revision 6578.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6578.1.1
- Committer: John Arbash Meinel
- Date: 2013-06-24 12:03:12 UTC
- mfrom: (6437.77.2 2.5)
- mto: This revision was merged to the branch mainline in revision 6579.
- Revision ID: john@arbash-meinel.com-20130624120312-pmvck24x052csigx
Merge lp:bzr/2.5 r6515 to get the fix for bug #855155 (Dirstate.update_basis_by_delta)
- files removed:
- bzrlib/tests/blackbox/test_verify_signatures.py
- files modified:
- bzr
added
removed
po/en_GB.po
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2012-01-17 10:28+0000\n"
12
"Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\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 (United Kingdom) <en_GB@li.org>\n"
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:34+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:21+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
38
msgstr[0] "%d tag updated."
39
39
msgstr[1] "%d tags updated."
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
51
msgstr "checked branch {0} format {1}"
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
120
"kind changed\n"
121
121
" File kind has been changed (e.g. from file to directory)."
122
122
msgstr ""
123
123
"type changed\n"
124
124
" File type has been changed (e.g. from file to directory)."
125
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."
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
msgstr "You must supply either --revision or a revision_id"
232
msgstr ""
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
msgstr "Repository %r does not support access to raw revision texts"
237
msgstr ""
238
238
239
#: bzrlib/builtins.py:462
239
#: bzrlib/builtins.py:450
240
240
msgid "The repository {0} contains no revision {1}."
241
msgstr "The repository {0} contains no revision {1}."
241
msgstr ""
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
msgstr "Remove the working tree from a given branch/checkout."
249
msgstr ""
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."
255
255
msgstr ""
256
"Since a lightweight checkout is little more than a working tree,\n"
257
"this will refuse to run against one."
258
256
259
#: bzrlib/builtins.py:566
257
#: bzrlib/builtins.py:554
260
258
msgid "To re-create the working tree, use \"bzr checkout\"."
261
msgstr "To re-create the working tree, use \"bzr checkout\"."
259
msgstr ""
262
260
263
#: bzrlib/builtins.py:572
261
#: bzrlib/builtins.py:560
264
262
msgid ""
265
263
"Remove the working tree even if it has uncommitted or shelved changes."
266
264
msgstr ""
267
265
"Remove the working tree even if it has uncommitted or shelved changes."
268
266
269
#: bzrlib/builtins.py:586
267
#: bzrlib/builtins.py:574
270
268
msgid "No working tree to remove"
271
msgstr "No working tree to remove"
269
msgstr ""
272
270
273
#: bzrlib/builtins.py:588
271
#: bzrlib/builtins.py:576
274
272
msgid "You cannot remove the working tree of a remote path"
275
273
msgstr "You cannot remove the working tree of a remote path"
276
274
277
#: bzrlib/builtins.py:597
275
#: bzrlib/builtins.py:585
278
276
msgid "You cannot remove the working tree from a lightweight checkout"
279
277
msgstr "You cannot remove the working tree from a lightweight checkout"
280
278
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
279
#: bzrlib/builtins.py:625
280
msgid ""
281
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
282
"instead. Use \"--force\" if you are sure you want to reset the working tree."
283
msgstr ""
284
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
285
"instead. Use \"--force\" if you are sure you want to reset the working tree."
286
287
#: bzrlib/builtins.py:636
288
msgid ""
289
", the header appears corrupt, try passing -r -1 to set the state to the last "
290
"commit"
291
msgstr ""
292
293
#: bzrlib/builtins.py:640
298
294
msgid "failed to reset the tree state{0}"
299
295
msgstr "failed to reset the tree state{0}"
300
296
301
#: bzrlib/builtins.py:656
297
#: bzrlib/builtins.py:644
302
298
msgid "Show current revision number."
303
299
msgstr "Show current revision number."
304
300
305
#: bzrlib/builtins.py:658
301
#: bzrlib/builtins.py:646
306
302
msgid "This is equal to the number of revisions on this branch."
307
msgstr "This is equal to the number of revisions on this branch."
303
msgstr ""
308
304
309
#: bzrlib/builtins.py:671
305
#: bzrlib/builtins.py:659
310
306
msgid "--tree and --revision can not be used together"
311
msgstr "--tree and --revision can not be used together"
307
msgstr ""
312
308
313
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
309
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
314
310
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"
311
msgstr ""
316
312
317
#: bzrlib/builtins.py:712
313
#: bzrlib/builtins.py:700
318
314
msgid "Show revno of working tree."
319
315
msgstr "Show revno of working tree."
320
316
321
#: bzrlib/builtins.py:760
317
#: bzrlib/builtins.py:748
322
318
msgid "Add specified files or directories."
323
319
msgstr "Add specified files or directories."
324
320
325
#: bzrlib/builtins.py:762
321
#: bzrlib/builtins.py:750
326
322
msgid ""
327
323
"In non-recursive mode, all the named items are added, regardless\n"
328
324
"of whether they were previously ignored. A warning is given if\n"
329
325
"any of the named files are already versioned."
330
326
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
327
335
#: bzrlib/builtins.py:766
328
#: bzrlib/builtins.py:754
336
329
msgid ""
337
330
"In recursive mode (the default), files are treated the same way\n"
338
331
"but the behaviour for directories is different. Directories that\n"
343
336
"directories. If no names are given '.' is assumed."
344
337
msgstr ""
345
338
346
#: bzrlib/builtins.py:774
347
msgid ""
348
"A warning will be printed when nested trees are encountered,\n"
349
"unless they are explicitly ignored."
350
msgstr ""
351
"A warning will be printed when nested trees are encountered,\n"
352
"unless they are explicitly ignored."
353
354
#: bzrlib/builtins.py:777
355
msgid ""
356
"Therefore simply saying 'bzr add' will version all files that\n"
357
"are currently unknown."
358
msgstr ""
359
"Therefore simply saying 'bzr add' will version all files that\n"
360
"are currently unknown."
361
362
#: bzrlib/builtins.py:780
339
#: bzrlib/builtins.py:762
340
msgid ""
341
"A warning will be printed when nested trees are encountered,\n"
342
"unless they are explicitly ignored."
343
msgstr ""
344
345
#: bzrlib/builtins.py:765
346
msgid ""
347
"Therefore simply saying 'bzr add' will version all files that\n"
348
"are currently unknown."
349
msgstr ""
350
351
#: bzrlib/builtins.py:768
363
352
msgid ""
364
353
"Adding a file whose parent directory is not versioned will\n"
365
354
"implicitly add the parent, and so on up to the root. This means\n"
367
356
"get added when you add a file in the directory."
368
357
msgstr ""
369
358
370
#: bzrlib/builtins.py:785
359
#: bzrlib/builtins.py:773
371
360
msgid ""
372
361
"--dry-run will show which files would be added, but not actually\n"
373
362
"add them."
375
364
"--dry-run will show which files would be added, but not actually\n"
376
365
"add them."
377
366
378
#: bzrlib/builtins.py:788
367
#: bzrlib/builtins.py:776
379
368
msgid ""
380
369
"--file-ids-from will try to use the file ids from the supplied path.\n"
381
370
"It looks up ids trying to find a matching parent directory with the\n"
386
375
"into a subdirectory of this one."
387
376
msgstr ""
388
377
389
#: bzrlib/builtins.py:796
390
msgid ""
391
"Any files matching patterns in the ignore list will not be added\n"
392
"unless they are explicitly mentioned."
393
msgstr ""
394
"Any files matching patterns in the ignore list will not be added\n"
395
"unless they are explicitly mentioned."
396
397
#: bzrlib/builtins.py:799
398
msgid ""
399
"In recursive mode, files larger than the configuration option \n"
400
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
401
"to file size."
402
msgstr ""
403
"In recursive mode, files larger than the configuration option \n"
404
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
405
"to file size."
406
407
#: bzrlib/builtins.py:806
378
#: bzrlib/builtins.py:784
379
msgid ""
380
"Any files matching patterns in the ignore list will not be added\n"
381
"unless they are explicitly mentioned."
382
msgstr ""
383
384
#: bzrlib/builtins.py:787
385
msgid ""
386
"In recursive mode, files larger than the configuration option \n"
387
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
388
"to file size."
389
msgstr ""
390
391
#: bzrlib/builtins.py:794
408
392
msgid "Don't recursively add the contents of directories."
409
msgstr "Do not recursively add the contents of directories."
393
msgstr ""
410
394
411
#: bzrlib/builtins.py:813
395
#: bzrlib/builtins.py:800
412
396
msgid "Lookup file ids from this tree."
413
397
msgstr "Lookup file ids from this tree."
414
398
415
#: bzrlib/builtins.py:849
399
#: bzrlib/builtins.py:836
416
400
msgid "ignored {0} matching \"{1}\"\n"
417
msgstr "ignored {0} matching \"{1}\"\n"
401
msgstr ""
418
402
419
#: bzrlib/builtins.py:854
403
#: bzrlib/builtins.py:841
420
404
msgid "Create a new versioned directory."
421
405
msgstr "Create a new versioned directory."
422
406
423
#: bzrlib/builtins.py:856
407
#: bzrlib/builtins.py:843
424
408
msgid "This is equivalent to creating the directory and then adding it."
425
msgstr "This is equivalent to creating the directory and then adding it."
409
msgstr ""
426
410
427
#: bzrlib/builtins.py:863
411
#: bzrlib/builtins.py:850
428
412
msgid "No error if existing, make parent directories as needed."
429
413
msgstr "No error if existing, make parent directories as needed."
430
414
431
#: bzrlib/builtins.py:897
415
#: bzrlib/builtins.py:884
432
416
#, python-format
433
417
msgid "added %s\n"
434
msgstr "added %s\n"
418
msgstr ""
435
419
436
#: bzrlib/builtins.py:939
420
#: bzrlib/builtins.py:926
437
421
#, python-format
438
422
msgid "invalid kind %r specified"
439
423
msgstr "invalid type %r specified"
440
424
441
#: bzrlib/builtins.py:976
425
#: bzrlib/builtins.py:963
442
426
msgid "Move or rename a file."
443
427
msgstr "Move or rename a file."
444
428
445
#: bzrlib/builtins.py:978
429
#: bzrlib/builtins.py:965
446
430
msgid " bzr mv SOURCE... DESTINATION"
447
431
msgstr " bzr mv SOURCE... DESTINATION"
448
432
449
#: bzrlib/builtins.py:980
450
msgid ""
451
"If the last argument is a versioned directory, all the other names\n"
452
"are moved into it. Otherwise, there must be exactly two arguments\n"
453
"and the file is changed to a new name."
454
msgstr ""
455
"If the last argument is a versioned directory, all the other names\n"
456
"are moved into it. Otherwise, there must be exactly two arguments\n"
457
"and the file is changed to a new name."
458
459
#: bzrlib/builtins.py:984
460
msgid ""
461
"If OLDNAME does not exist on the filesystem but is versioned and\n"
462
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
463
"assumes that the file has been manually moved and only updates\n"
464
"its internal inventory to reflect that change.\n"
465
"The same is valid when moving many SOURCE files to a DESTINATION."
466
msgstr ""
467
"If OLDNAME does not exist on the filesystem but is versioned and\n"
468
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
469
"assumes that the file has been manually moved and only updates\n"
470
"its internal inventory to reflect that change.\n"
471
"The same is valid when moving many SOURCE files to a DESTINATION."
472
473
#: bzrlib/builtins.py:990
433
#: bzrlib/builtins.py:967
434
msgid ""
435
"If the last argument is a versioned directory, all the other names\n"
436
"are moved into it. Otherwise, there must be exactly two arguments\n"
437
"and the file is changed to a new name."
438
msgstr ""
439
440
#: bzrlib/builtins.py:971
441
msgid ""
442
"If OLDNAME does not exist on the filesystem but is versioned and\n"
443
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
444
"assumes that the file has been manually moved and only updates\n"
445
"its internal inventory to reflect that change.\n"
446
"The same is valid when moving many SOURCE files to a DESTINATION."
447
msgstr ""
448
449
#: bzrlib/builtins.py:977
474
450
msgid "Files cannot be moved between branches."
475
451
msgstr "Files cannot be moved between branches."
476
452
477
#: bzrlib/builtins.py:997
453
#: bzrlib/builtins.py:984
478
454
msgid ""
479
455
"Move only the bzr identifier of the file, because the file has already been "
480
456
"moved."
481
457
msgstr ""
482
"Move only the bzr identifier of the file, because the file has already been "
483
"moved."
484
458
485
#: bzrlib/builtins.py:999
459
#: bzrlib/builtins.py:986
486
460
msgid "Automatically guess renames."
487
461
msgstr "Automatically guess renames."
488
462
489
#: bzrlib/builtins.py:1000
463
#: bzrlib/builtins.py:987
490
464
msgid "Avoid making changes when guessing renames."
491
465
msgstr "Avoid making changes when guessing renames."
492
466
493
#: bzrlib/builtins.py:1009
467
#: bzrlib/builtins.py:996
494
468
msgid "--dry-run requires --auto."
495
msgstr "--dry-run requires --auto."
469
msgstr ""
496
470
497
#: bzrlib/builtins.py:1013
471
#: bzrlib/builtins.py:1000
498
472
msgid "missing file argument"
499
473
msgstr "missing file argument"
500
474
501
#: bzrlib/builtins.py:1017
475
#: bzrlib/builtins.py:1004
502
476
msgid "can not move root of branch"
503
477
msgstr "cannot move root of branch"
504
478
505
#: bzrlib/builtins.py:1023
479
#: bzrlib/builtins.py:1010
506
480
msgid "Only one path may be specified to --auto."
507
msgstr "Only one path may be specified to --auto."
481
msgstr ""
508
482
509
#: bzrlib/builtins.py:1026
483
#: bzrlib/builtins.py:1013
510
484
msgid "--after cannot be specified with --auto."
511
msgstr "--after cannot be specified with --auto."
485
msgstr ""
512
486
513
#: bzrlib/builtins.py:1062
487
#: bzrlib/builtins.py:1050
514
488
msgid "to mv multiple files the destination must be a versioned directory"
515
msgstr "to mv multiple files the destination must be a versioned directory"
489
msgstr ""
516
490
517
#: bzrlib/builtins.py:1114
491
#: bzrlib/builtins.py:1102
518
492
msgid "Turn this branch into a mirror of another branch."
519
msgstr "Turn this branch into a mirror of another branch."
493
msgstr ""
520
494
521
#: bzrlib/builtins.py:1116
495
#: bzrlib/builtins.py:1104
522
496
msgid ""
523
497
"By default, this command only works on branches that have not diverged.\n"
524
498
"Branches are considered diverged if the destination branch's most recent \n"
525
499
"commit is one that has not been merged (directly or indirectly) into the \n"
526
500
"parent."
527
501
msgstr ""
528
"By default, this command only works on branches that have not diverged.\n"
529
"Branches are considered diverged if the destination branch's most recent \n"
530
"commit is one that has not been merged (directly or indirectly) into the \n"
531
"parent."
532
502
533
#: bzrlib/builtins.py:1121
503
#: bzrlib/builtins.py:1109
534
504
msgid ""
535
505
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
536
506
"from one into the other. Once one branch has merged, the other should\n"
537
507
"be able to pull it again."
538
508
msgstr ""
539
509
540
#: bzrlib/builtins.py:1125
510
#: bzrlib/builtins.py:1113
541
511
msgid ""
542
512
"If you want to replace your local changes and just want your branch to\n"
543
513
"match the remote one, use pull --overwrite. This will work even if the two\n"
544
514
"branches have diverged."
545
515
msgstr ""
546
516
547
#: bzrlib/builtins.py:1129
517
#: bzrlib/builtins.py:1117
548
518
msgid ""
549
519
"If there is no default location set, the first pull will set it (use\n"
550
520
"--no-remember to avoid setting it). After that, you can omit the\n"
552
522
"value will only be saved if the remote location can be accessed."
553
523
msgstr ""
554
524
555
#: bzrlib/builtins.py:1134
525
#: bzrlib/builtins.py:1122
556
526
msgid ""
557
527
"The --verbose option will display the revisions pulled using the log_format\n"
558
528
"configuration option. You can use a different format by overriding it with\n"
559
529
"-Olog_format=<other_format>."
560
530
msgstr ""
561
531
562
#: bzrlib/builtins.py:1138
532
#: bzrlib/builtins.py:1126
563
533
msgid ""
564
534
"Note: The location can be specified either in the form of a branch,\n"
565
535
"or in the form of a path to a file containing a merge directive generated\n"
566
536
"with bzr send."
567
537
msgstr ""
568
538
569
#: bzrlib/builtins.py:1146
539
#: bzrlib/builtins.py:1134
570
540
msgid "Show logs of pulled revisions."
571
541
msgstr ""
572
542
573
#: bzrlib/builtins.py:1148
543
#: bzrlib/builtins.py:1136
574
544
msgid ""
575
545
"Branch to pull into, rather than the one containing the working directory."
576
546
msgstr ""
577
547
578
#: bzrlib/builtins.py:1151
548
#: bzrlib/builtins.py:1139
579
549
msgid ""
580
550
"Perform a local pull in a bound branch. Local pulls are not applied to the "
581
551
"master branch."
582
552
msgstr ""
583
553
584
#: bzrlib/builtins.py:1189
554
#: bzrlib/builtins.py:1168
585
555
msgid "Need working tree for --show-base."
586
556
msgstr ""
587
557
588
#: bzrlib/builtins.py:1205
558
#: bzrlib/builtins.py:1184
589
559
msgid "No pull location known or specified."
590
560
msgstr ""
591
561
592
#: bzrlib/builtins.py:1211
562
#: bzrlib/builtins.py:1190
593
563
#, python-format
594
564
msgid "Using saved parent location: %s\n"
595
565
msgstr ""
596
566
597
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
567
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
598
568
msgid "Cannot use -r with merge directives or bundles"
599
569
msgstr ""
600
570
601
#: bzrlib/builtins.py:1261
571
#: bzrlib/builtins.py:1238
602
572
msgid "Update a mirror of this branch."
603
573
msgstr ""
604
574
605
#: bzrlib/builtins.py:1263
575
#: bzrlib/builtins.py:1240
606
576
msgid ""
607
577
"The target branch will not have its working tree populated because this\n"
608
578
"is both expensive, and is not supported on remote file systems."
609
579
msgstr ""
610
580
611
#: bzrlib/builtins.py:1266
581
#: bzrlib/builtins.py:1243
612
582
msgid ""
613
583
"Some smart servers or protocols *may* put the working tree in place in\n"
614
584
"the future."
615
585
msgstr ""
616
586
617
#: bzrlib/builtins.py:1269
587
#: bzrlib/builtins.py:1246
618
588
msgid ""
619
589
"This command only works on branches that have not diverged. Branches are\n"
620
590
"considered diverged if the destination branch's most recent commit is one\n"
621
591
"that has not been merged (directly or indirectly) by the source branch."
622
592
msgstr ""
623
593
624
#: bzrlib/builtins.py:1273
594
#: bzrlib/builtins.py:1250
625
595
msgid ""
626
596
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
627
597
"the other branch completely, discarding its unmerged changes."
628
598
msgstr ""
629
599
630
#: bzrlib/builtins.py:1276
600
#: bzrlib/builtins.py:1253
631
601
msgid ""
632
602
"If you want to ensure you have the different changes in the other branch,\n"
633
603
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
634
604
"After that you will be able to do a push without '--overwrite'."
635
605
msgstr ""
636
606
637
#: bzrlib/builtins.py:1280
607
#: bzrlib/builtins.py:1257
638
608
msgid ""
639
609
"If there is no default push location set, the first push will set it (use\n"
640
610
"--no-remember to avoid setting it). After that, you can omit the\n"
642
612
"value will only be saved if the remote location can be accessed."
643
613
msgstr ""
644
614
645
#: bzrlib/builtins.py:1285
615
#: bzrlib/builtins.py:1262
646
616
msgid ""
647
617
"The --verbose option will display the revisions pushed using the log_format\n"
648
618
"configuration option. You can use a different format by overriding it with\n"
649
619
"-Olog_format=<other_format>."
650
620
msgstr ""
651
621
652
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
622
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
653
623
msgid ""
654
624
"Branch to push from, rather than the one containing the working directory."
655
625
msgstr ""
656
626
657
#: bzrlib/builtins.py:1299
627
#: bzrlib/builtins.py:1276
658
628
msgid ""
659
629
"By default push will fail if the target directory exists, but does not "
660
630
"already have a control directory. This flag will allow push to proceed."
661
631
msgstr ""
662
632
663
#: bzrlib/builtins.py:1304
633
#: bzrlib/builtins.py:1281
664
634
msgid ""
665
635
"Create a stacked branch that references the public location of the parent "
666
636
"branch."
667
637
msgstr ""
668
638
669
#: bzrlib/builtins.py:1307
639
#: bzrlib/builtins.py:1284
670
640
msgid ""
671
641
"Create a stacked branch that refers to another branch for the commit "
672
642
"history. Only the work not present in the referenced branch is included in "
673
643
"the branch created."
674
644
msgstr ""
675
645
676
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
646
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
677
647
msgid ""
678
648
"Refuse to push if there are uncommitted changes in the working tree, --no-"
679
649
"strict disables the check."
680
650
msgstr ""
681
651
682
#: bzrlib/builtins.py:1315
652
#: bzrlib/builtins.py:1292
683
653
msgid "Don't populate the working tree, even for protocols that support it."
684
654
msgstr ""
685
655
686
#: bzrlib/builtins.py:1318
687
msgid "Overwrite tags only."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1369
656
#: bzrlib/builtins.py:1336
691
657
msgid "Could not determine branch to refer to."
692
658
msgstr ""
693
659
694
#: bzrlib/builtins.py:1378
660
#: bzrlib/builtins.py:1345
695
661
#, python-format
696
662
msgid ""
697
663
"No push location known or specified. To push to the parent branch (at %s), "
698
664
"use 'bzr push :parent'."
699
665
msgstr ""
700
666
701
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
667
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
702
668
msgid "No push location known or specified."
703
669
msgstr ""
704
670
705
#: bzrlib/builtins.py:1388
671
#: bzrlib/builtins.py:1355
706
672
#, python-format
707
673
msgid "Using saved push location: %s"
708
674
msgstr ""
709
675
710
#: bzrlib/builtins.py:1398
676
#: bzrlib/builtins.py:1365
711
677
msgid "Create a new branch that is a copy of an existing branch."
712
678
msgstr ""
713
679
714
#: bzrlib/builtins.py:1400
680
#: bzrlib/builtins.py:1367
715
681
msgid ""
716
682
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
717
683
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
722
688
"create ./foo-bar."
723
689
msgstr ""
724
690
725
#: bzrlib/builtins.py:1407
691
#: bzrlib/builtins.py:1374
726
692
msgid ""
727
693
"To retrieve the branch as of a particular revision, supply the --revision\n"
728
694
"parameter, as in \"branch foo/bar -r 5\"."
729
695
msgstr ""
730
696
731
#: bzrlib/builtins.py:1410
697
#: bzrlib/builtins.py:1377
732
698
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
733
699
msgstr ""
734
700
735
#: bzrlib/builtins.py:1420
701
#: bzrlib/builtins.py:1387
736
702
msgid "Create a branch without a working-tree."
737
703
msgstr ""
738
704
739
#: bzrlib/builtins.py:1422
705
#: bzrlib/builtins.py:1389
740
706
msgid "Switch the checkout in the current directory to the new branch."
741
707
msgstr ""
742
708
743
#: bzrlib/builtins.py:1425
709
#: bzrlib/builtins.py:1392
744
710
msgid ""
745
711
"Create a stacked branch referring to the source branch. The new branch will "
746
712
"depend on the availability of the source branch for all operations."
747
713
msgstr ""
748
714
749
#: bzrlib/builtins.py:1429
715
#: bzrlib/builtins.py:1396
750
716
msgid "Do not use a shared repository, even if available."
751
717
msgstr ""
752
718
753
#: bzrlib/builtins.py:1431
719
#: bzrlib/builtins.py:1398
754
720
msgid ""
755
721
"By default branch will fail if the target directory exists, but does not "
756
722
"already have a control directory. This flag will allow branch to proceed."
757
723
msgstr ""
758
724
759
#: bzrlib/builtins.py:1436
725
#: bzrlib/builtins.py:1403
760
726
msgid "Bind new branch to from location."
761
727
msgstr ""
762
728
763
#: bzrlib/builtins.py:1483
729
#: bzrlib/builtins.py:1450
764
730
#, python-format
765
731
msgid "Target directory \"%s\" already exists."
766
732
msgstr ""
767
733
768
#: bzrlib/builtins.py:1495
734
#: bzrlib/builtins.py:1462
769
735
#, python-format
770
736
msgid "Parent of \"%s\" does not exist."
771
737
msgstr ""
772
738
773
#: bzrlib/builtins.py:1514
739
#: bzrlib/builtins.py:1481
774
740
msgid "The branch {0} has no revision {1}."
775
741
msgstr ""
776
742
777
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
743
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
778
744
#, python-format
779
745
msgid "Created new stacked branch referring to %s."
780
746
msgstr ""
781
747
782
#: bzrlib/builtins.py:1533
748
#: bzrlib/builtins.py:1500
783
749
#, python-format
784
750
msgid "Branched %d revision."
785
751
msgid_plural "Branched %d revisions."
786
752
msgstr[0] ""
787
753
msgstr[1] ""
788
754
789
#: bzrlib/builtins.py:1538
755
#: bzrlib/builtins.py:1505
790
756
#, python-format
791
757
msgid "New branch bound to %s"
792
758
msgstr ""
793
759
794
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
760
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
795
761
#, python-format
796
762
msgid "Switched to branch: %s"
797
763
msgstr ""
798
764
799
#: bzrlib/builtins.py:1548
765
#: bzrlib/builtins.py:1515
800
766
msgid "List the branches available at the current location."
801
767
msgstr ""
802
768
803
#: bzrlib/builtins.py:1550
769
#: bzrlib/builtins.py:1517
804
770
msgid ""
805
771
"This command will print the names of all the branches at the current\n"
806
772
"location."
807
773
msgstr ""
808
774
809
#: bzrlib/builtins.py:1557
775
#: bzrlib/builtins.py:1524
810
776
msgid ""
811
777
"Recursively scan for branches rather than just looking in the specified "
812
778
"location."
813
779
msgstr ""
814
780
815
#: bzrlib/builtins.py:1586
781
#: bzrlib/builtins.py:1554
816
782
msgid "(default)"
817
783
msgstr ""
818
784
819
#: bzrlib/builtins.py:1598
785
#: bzrlib/builtins.py:1566
820
786
msgid "Create a new checkout of an existing branch."
821
787
msgstr ""
822
788
823
#: bzrlib/builtins.py:1600
789
#: bzrlib/builtins.py:1568
824
790
msgid ""
825
791
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
826
792
"for\n"
830
796
"location using SFTP."
831
797
msgstr ""
832
798
833
#: bzrlib/builtins.py:1605
799
#: bzrlib/builtins.py:1573
834
800
msgid ""
835
801
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
836
802
"will\n"
842
808
"create ./foo-bar."
843
809
msgstr ""
844
810
845
#: bzrlib/builtins.py:1612
811
#: bzrlib/builtins.py:1580
846
812
msgid ""
847
813
"To retrieve the branch as of a particular revision, supply the --revision\n"
848
814
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
852
818
"code.)"
853
819
msgstr ""
854
820
855
#: bzrlib/builtins.py:1622
821
#: bzrlib/builtins.py:1590
856
822
msgid ""
857
823
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
858
824
"the branch for every operation. Normal checkouts can perform common "
860
826
"commits."
861
827
msgstr ""
862
828
863
#: bzrlib/builtins.py:1629
829
#: bzrlib/builtins.py:1597
864
830
msgid "Get file contents from this tree."
865
831
msgstr ""
866
832
867
#: bzrlib/builtins.py:1631
833
#: bzrlib/builtins.py:1599
868
834
msgid "Hard-link working tree files where possible."
869
835
msgstr ""
870
836
871
#: bzrlib/builtins.py:1672
837
#: bzrlib/builtins.py:1640
872
838
msgid ""
873
839
"Show list of renamed files.\n"
874
840
" "
875
841
msgstr ""
876
842
877
#: bzrlib/builtins.py:1700
843
#: bzrlib/builtins.py:1670
878
844
msgid "Update a working tree to a new revision."
879
845
msgstr ""
880
846
881
#: bzrlib/builtins.py:1702
847
#: bzrlib/builtins.py:1672
882
848
msgid ""
883
849
"This will perform a merge of the destination revision (the tip of the\n"
884
850
"branch, or the specified revision) into the working tree, and then make\n"
885
851
"that revision the basis revision for the working tree. "
886
852
msgstr ""
887
853
888
#: bzrlib/builtins.py:1706
854
#: bzrlib/builtins.py:1676
889
855
msgid ""
890
856
"You can use this to visit an older revision, or to update a working tree\n"
891
857
"that is out of date from its branch."
892
858
msgstr ""
893
859
894
#: bzrlib/builtins.py:1709
860
#: bzrlib/builtins.py:1679
895
861
msgid ""
896
862
"If there are any uncommitted changes in the tree, they will be carried\n"
897
863
"across and remain as uncommitted changes after the update. To discard\n"
899
865
"with the changes brought in by the change in basis revision."
900
866
msgstr ""
901
867
902
#: bzrlib/builtins.py:1714
868
#: bzrlib/builtins.py:1684
903
869
msgid ""
904
870
"If the tree's branch is bound to a master branch, bzr will also update\n"
905
871
"the branch from the master."
906
872
msgstr ""
907
873
908
#: bzrlib/builtins.py:1717
874
#: bzrlib/builtins.py:1687
909
875
msgid ""
910
876
"You cannot update just a single file or directory, because each Bazaar\n"
911
877
"working tree has just a single basis revision. If you want to restore a\n"
915
881
"out the old content of that file to a new location."
916
882
msgstr ""
917
883
918
#: bzrlib/builtins.py:1724
884
#: bzrlib/builtins.py:1694
919
885
msgid ""
920
886
"The 'dir' argument, if given, must be the location of the root of a\n"
921
887
"working tree to update. By default, the working tree that contains the \n"
922
888
"current working directory is used."
923
889
msgstr ""
924
890
925
#: bzrlib/builtins.py:1740
891
#: bzrlib/builtins.py:1710
926
892
msgid "bzr update --revision takes exactly one revision"
927
893
msgstr ""
928
894
929
#: bzrlib/builtins.py:1748
895
#: bzrlib/builtins.py:1718
930
896
msgid "bzr update can only update a whole tree, not a file or subdirectory"
931
897
msgstr ""
932
898
933
#: bzrlib/builtins.py:1779
899
#: bzrlib/builtins.py:1749
934
900
msgid "Tree is up to date at revision {0} of branch {1}"
935
901
msgstr ""
936
902
937
#: bzrlib/builtins.py:1795
903
#: bzrlib/builtins.py:1765
938
904
#, python-format
939
905
msgid ""
940
906
"branch has no revision %s\n"
941
907
"bzr update --revision only works for a revision in the branch history"
942
908
msgstr ""
943
909
944
#: bzrlib/builtins.py:1801
910
#: bzrlib/builtins.py:1771
945
911
msgid "Updated to revision {0} of branch {1}"
946
912
msgstr ""
947
913
948
#: bzrlib/builtins.py:1805
914
#: bzrlib/builtins.py:1775
949
915
msgid ""
950
916
"Your local commits will now show as pending merges with 'bzr status', and "
951
917
"can be committed with 'bzr commit'."
952
918
msgstr ""
953
919
954
#: bzrlib/builtins.py:1814
920
#: bzrlib/builtins.py:1784
955
921
msgid "Show information about a working tree, branch or repository."
956
922
msgstr ""
957
923
958
#: bzrlib/builtins.py:1816
924
#: bzrlib/builtins.py:1786
959
925
msgid ""
960
926
"This command will show all known locations and formats associated to the\n"
961
927
"tree, branch or repository."
962
928
msgstr ""
963
929
964
#: bzrlib/builtins.py:1819
930
#: bzrlib/builtins.py:1789
965
931
msgid ""
966
932
"In verbose mode, statistical information is included with each report.\n"
967
933
"To see extended statistic information, use a verbosity level of 2 or\n"
968
934
"higher by specifying the verbose option multiple times, e.g. -vv."
969
935
msgstr ""
970
936
971
#: bzrlib/builtins.py:1823
937
#: bzrlib/builtins.py:1793
972
938
msgid "Branches and working trees will also report any missing revisions."
973
939
msgstr ""
974
940
975
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
976
#: bzrlib/builtins.py:6466
941
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
942
#: bzrlib/builtins.py:6442
977
943
msgid ":Examples:"
978
944
msgstr ""
979
945
980
#: bzrlib/builtins.py:1827
946
#: bzrlib/builtins.py:1797
981
947
msgid " Display information on the format and related locations:"
982
948
msgstr ""
983
949
984
#: bzrlib/builtins.py:1829
950
#: bzrlib/builtins.py:1799
985
951
msgid " bzr info"
986
952
msgstr ""
987
953
988
#: bzrlib/builtins.py:1831
954
#: bzrlib/builtins.py:1801
989
955
msgid ""
990
956
" Display the above together with extended format information and\n"
991
957
" basic statistics (like the number of files in the working tree and\n"
992
958
" number of revisions in the branch and repository):"
993
959
msgstr ""
994
960
995
#: bzrlib/builtins.py:1835
961
#: bzrlib/builtins.py:1805
996
962
msgid " bzr info -v"
997
963
msgstr ""
998
964
999
#: bzrlib/builtins.py:1837
965
#: bzrlib/builtins.py:1807
1000
966
msgid " Display the above together with number of committers to the branch:"
1001
967
msgstr ""
1002
968
1003
#: bzrlib/builtins.py:1839
969
#: bzrlib/builtins.py:1809
1004
970
msgid " bzr info -vv"
1005
971
msgstr ""
1006
972
1007
#: bzrlib/builtins.py:1858
973
#: bzrlib/builtins.py:1828
1008
974
msgid "Remove files or directories."
1009
975
msgstr ""
1010
976
1011
#: bzrlib/builtins.py:1860
977
#: bzrlib/builtins.py:1830
1012
978
msgid ""
1013
979
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1014
980
"delete them if they can easily be recovered using revert otherwise they\n"
1015
"will be backed up (adding an extension of the form .~#~). If no options or\n"
981
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1016
982
"parameters are given Bazaar will scan for files that are being tracked by\n"
1017
983
"Bazaar but missing in your tree and stop tracking them for you."
1018
984
msgstr ""
1019
985
1020
#: bzrlib/builtins.py:1868
986
#: bzrlib/builtins.py:1838
1021
987
msgid "Only remove files that have never been committed."
1022
988
msgstr ""
1023
989
1024
#: bzrlib/builtins.py:1870
990
#: bzrlib/builtins.py:1840
1025
991
msgid "The file deletion mode to be used."
1026
992
msgstr ""
1027
993
1028
#: bzrlib/builtins.py:1871
994
#: bzrlib/builtins.py:1841
1029
995
msgid "Deletion Strategy"
1030
996
msgstr ""
1031
997
1032
#: bzrlib/builtins.py:1872
998
#: bzrlib/builtins.py:1842
1033
999
msgid "Backup changed files (default)."
1034
1000
msgstr ""
1035
1001
1036
#: bzrlib/builtins.py:1873
1002
#: bzrlib/builtins.py:1843
1037
1003
msgid "Delete from bzr but leave the working copy."
1038
1004
msgstr ""
1039
1005
1040
#: bzrlib/builtins.py:1874
1006
#: bzrlib/builtins.py:1844
1041
1007
msgid "Don't backup changed files."
1042
1008
msgstr ""
1043
1009
1044
#: bzrlib/builtins.py:1875
1010
#: bzrlib/builtins.py:1845
1045
1011
msgid ""
1046
1012
"Delete all the specified files, even if they can not be recovered and even "
1047
1013
"if they are non-empty directories. (deprecated, use no-backup)"
1048
1014
msgstr ""
1049
1015
1050
#: bzrlib/builtins.py:1884
1016
#: bzrlib/builtins.py:1854
1051
1017
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1052
1018
msgstr ""
1053
1019
1054
#: bzrlib/builtins.py:1901
1020
#: bzrlib/builtins.py:1871
1055
1021
msgid "No matching files."
1056
1022
msgstr ""
1057
1023
1058
#: bzrlib/builtins.py:1962
1024
#: bzrlib/builtins.py:1932
1059
1025
msgid "Reconcile bzr metadata in a branch."
1060
1026
msgstr ""
1061
1027
1062
#: bzrlib/builtins.py:1964
1028
#: bzrlib/builtins.py:1934
1063
1029
msgid ""
1064
1030
"This can correct data mismatches that may have been caused by\n"
1065
1031
"previous ghost operations or bzr upgrades. You should only\n"
1067
1033
"advises you to run it."
1068
1034
msgstr ""
1069
1035
1070
#: bzrlib/builtins.py:1969
1036
#: bzrlib/builtins.py:1939
1071
1037
msgid ""
1072
1038
"If a second branch is provided, cross-branch reconciliation is\n"
1073
1039
"also attempted, which will check that data like the tree root\n"
1075
1041
"correctly in both branches."
1076
1042
msgstr ""
1077
1043
1078
#: bzrlib/builtins.py:1974
1044
#: bzrlib/builtins.py:1944
1079
1045
msgid ""
1080
1046
"At the same time it is run it may recompress data resulting in\n"
1081
1047
"a potential saving in disk space or performance gain."
1082
1048
msgstr ""
1083
1049
1084
#: bzrlib/builtins.py:1977
1050
#: bzrlib/builtins.py:1947
1085
1051
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1086
1052
msgstr ""
1087
1053
1088
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1054
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1089
1055
msgid ""
1090
1056
"Format for the bzr 2.0 series.\n"
1091
1057
"Uses group-compress storage.\n"
1092
1058
"Provides rich roots which are a one-way transition.\n"
1093
1059
msgstr ""
1094
1060
1095
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1061
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1096
1062
msgid ""
1097
1063
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1098
1064
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1099
1065
msgstr ""
1100
1066
1101
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1067
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1102
1068
msgid "The 2a format with experimental support for colocated branches.\n"
1103
1069
msgstr ""
1104
1070
1105
#: bzrlib/builtins.py:2045
1071
#: bzrlib/builtins.py:2015
1106
1072
msgid "Make a directory into a versioned branch."
1107
1073
msgstr ""
1108
1074
1109
#: bzrlib/builtins.py:2047
1075
#: bzrlib/builtins.py:2017
1110
1076
msgid ""
1111
1077
"Use this to create an empty branch, or before importing an\n"
1112
1078
"existing project."
1113
1079
msgstr ""
1114
1080
1115
#: bzrlib/builtins.py:2050
1081
#: bzrlib/builtins.py:2020
1116
1082
msgid ""
1117
1083
"If there is a repository in a parent directory of the location, then\n"
1118
1084
"the history of the branch will be stored in the repository. Otherwise\n"
1120
1086
"in the .bzr directory."
1121
1087
msgstr ""
1122
1088
1123
#: bzrlib/builtins.py:2055
1089
#: bzrlib/builtins.py:2025
1124
1090
msgid ""
1125
1091
"If there is already a branch at the location but it has no working tree,\n"
1126
1092
"the tree can be populated with 'bzr checkout'."
1127
1093
msgstr ""
1128
1094
1129
#: bzrlib/builtins.py:2058
1095
#: bzrlib/builtins.py:2028
1130
1096
msgid "Recipe for importing a tree of files::"
1131
1097
msgstr ""
1132
1098
1133
#: bzrlib/builtins.py:2060
1099
#: bzrlib/builtins.py:2030
1134
1100
msgid ""
1135
1101
" cd ~/project\n"
1136
1102
" bzr init\n"
1139
1105
" bzr commit -m \"imported project\""
1140
1106
msgstr ""
1141
1107
1142
#: bzrlib/builtins.py:2071
1108
#: bzrlib/builtins.py:2041
1143
1109
msgid ""
1144
1110
"Create the path leading up to the branch if it does not already exist."
1145
1111
msgstr ""
1146
1112
1147
#: bzrlib/builtins.py:2074
1113
#: bzrlib/builtins.py:2044
1148
1114
msgid "Specify a format for this branch. See \"help formats\"."
1149
1115
msgstr ""
1150
1116
1151
#: bzrlib/builtins.py:2082
1117
#: bzrlib/builtins.py:2052
1152
1118
msgid ""
1153
1119
"Never change revnos or the existing log. Append revisions to it only."
1154
1120
msgstr ""
1155
1121
1156
#: bzrlib/builtins.py:2085
1122
#: bzrlib/builtins.py:2055
1157
1123
msgid "Create a branch without a working tree."
1158
1124
msgstr ""
1159
1125
1160
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1126
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1161
1127
#, python-format
1162
1128
msgid ""
1163
1129
"Parent directory of %s does not exist.\n"
1164
1130
"You may supply --create-prefix to create all leading parent directories."
1165
1131
msgstr ""
1166
1132
1167
#: bzrlib/builtins.py:2139
1133
#: bzrlib/builtins.py:2109
1168
1134
msgid ""
1169
1135
"This branch format cannot be set to append-revisions-only. Try --default."
1170
1136
msgstr ""
1171
1137
1172
#: bzrlib/builtins.py:2150
1138
#: bzrlib/builtins.py:2120
1173
1139
msgid "Created a {0} (format: {1})\n"
1174
1140
msgstr ""
1175
1141
1176
#: bzrlib/builtins.py:2159
1142
#: bzrlib/builtins.py:2129
1177
1143
#, python-format
1178
1144
msgid "Using shared repository: %s\n"
1179
1145
msgstr ""
1180
1146
1181
#: bzrlib/builtins.py:2163
1147
#: bzrlib/builtins.py:2133
1182
1148
msgid "Create a shared repository for branches to share storage space."
1183
1149
msgstr ""
1184
1150
1185
#: bzrlib/builtins.py:2165
1151
#: bzrlib/builtins.py:2135
1186
1152
msgid ""
1187
1153
"New branches created under the repository directory will store their\n"
1188
1154
"revisions in the repository, not in the branch directory. For branches\n"
1190
1156
"speeds up the creation of new branches."
1191
1157
msgstr ""
1192
1158
1193
#: bzrlib/builtins.py:2170
1159
#: bzrlib/builtins.py:2140
1194
1160
msgid ""
1195
1161
"If the --no-trees option is given then the branches in the repository\n"
1196
1162
"will not have working trees by default. They will still exist as \n"
1200
1166
"branches, such as on a server."
1201
1167
msgstr ""
1202
1168
1203
#: bzrlib/builtins.py:2177
1169
#: bzrlib/builtins.py:2147
1204
1170
msgid ""
1205
1171
":Examples:\n"
1206
1172
" Create a shared repository holding just branches::"
1207
1173
msgstr ""
1208
1174
1209
#: bzrlib/builtins.py:2180
1175
#: bzrlib/builtins.py:2150
1210
1176
msgid ""
1211
1177
" bzr init-repo --no-trees repo\n"
1212
1178
" bzr init repo/trunk"
1213
1179
msgstr ""
1214
1180
1215
#: bzrlib/builtins.py:2183
1181
#: bzrlib/builtins.py:2153
1216
1182
msgid " Make a lightweight checkout elsewhere::"
1217
1183
msgstr ""
1218
1184
1219
#: bzrlib/builtins.py:2185
1185
#: bzrlib/builtins.py:2155
1220
1186
msgid ""
1221
1187
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1222
1188
" cd trunk-checkout\n"
1223
1189
" (add files here)"
1224
1190
msgstr ""
1225
1191
1226
#: bzrlib/builtins.py:2193
1192
#: bzrlib/builtins.py:2163
1227
1193
msgid ""
1228
1194
"Specify a format for this repository. See \"bzr help formats\" for details."
1229
1195
msgstr ""
1230
1196
1231
#: bzrlib/builtins.py:2197
1197
#: bzrlib/builtins.py:2167
1232
1198
msgid "Repository format"
1233
1199
msgstr ""
1234
1200
1235
#: bzrlib/builtins.py:2199
1201
#: bzrlib/builtins.py:2169
1236
1202
msgid "Branches in the repository will default to not having a working tree."
1237
1203
msgstr ""
1238
1204
1239
#: bzrlib/builtins.py:2225
1205
#: bzrlib/builtins.py:2195
1240
1206
msgid "Show differences in the working tree, between revisions or branches."
1241
1207
msgstr ""
1242
1208
1243
#: bzrlib/builtins.py:2227
1209
#: bzrlib/builtins.py:2197
1244
1210
msgid ""
1245
1211
"If no arguments are given, all changes for the current tree are listed.\n"
1246
1212
"If files are given, only the changes in those files are listed.\n"
1250
1216
"given."
1251
1217
msgstr ""
1252
1218
1253
#: bzrlib/builtins.py:2234
1219
#: bzrlib/builtins.py:2204
1254
1220
msgid ""
1255
1221
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1256
1222
"produces patches suitable for \"patch -p1\"."
1257
1223
msgstr ""
1258
1224
1259
#: bzrlib/builtins.py:2237
1225
#: bzrlib/builtins.py:2207
1260
1226
msgid ""
1261
1227
"Note that when using the -r argument with a range of revisions, the\n"
1262
1228
"differences are computed between the two specified revisions. That\n"
1266
1232
"in the range."
1267
1233
msgstr ""
1268
1234
1269
#: bzrlib/builtins.py:2244
1235
#: bzrlib/builtins.py:2214
1270
1236
msgid ""
1271
1237
":Exit values:\n"
1272
1238
" 1 - changed\n"
1275
1241
" 0 - no change"
1276
1242
msgstr ""
1277
1243
1278
#: bzrlib/builtins.py:2250
1244
#: bzrlib/builtins.py:2220
1279
1245
msgid ""
1280
1246
":Examples:\n"
1281
1247
" Shows the difference in the working tree versus the last commit::"
1282
1248
msgstr ""
1283
1249
1284
#: bzrlib/builtins.py:2253
1250
#: bzrlib/builtins.py:2223
1285
1251
msgid " bzr diff"
1286
1252
msgstr ""
1287
1253
1288
#: bzrlib/builtins.py:2255
1254
#: bzrlib/builtins.py:2225
1289
1255
msgid " Difference between the working tree and revision 1::"
1290
1256
msgstr ""
1291
1257
1292
#: bzrlib/builtins.py:2257
1258
#: bzrlib/builtins.py:2227
1293
1259
msgid " bzr diff -r1"
1294
1260
msgstr ""
1295
1261
1296
#: bzrlib/builtins.py:2259
1262
#: bzrlib/builtins.py:2229
1297
1263
msgid " Difference between revision 3 and revision 1::"
1298
1264
msgstr ""
1299
1265
1300
#: bzrlib/builtins.py:2261
1266
#: bzrlib/builtins.py:2231
1301
1267
msgid " bzr diff -r1..3"
1302
1268
msgstr ""
1303
1269
1304
#: bzrlib/builtins.py:2263
1270
#: bzrlib/builtins.py:2233
1305
1271
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1306
1272
msgstr ""
1307
1273
1308
#: bzrlib/builtins.py:2265
1274
#: bzrlib/builtins.py:2235
1309
1275
msgid " bzr diff -r1..3 xxx"
1310
1276
msgstr ""
1311
1277
1312
#: bzrlib/builtins.py:2267
1278
#: bzrlib/builtins.py:2237
1313
1279
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1314
1280
msgstr ""
1315
1281
1316
#: bzrlib/builtins.py:2269
1282
#: bzrlib/builtins.py:2239
1317
1283
msgid " bzr diff -c2"
1318
1284
msgstr ""
1319
1285
1320
#: bzrlib/builtins.py:2271
1286
#: bzrlib/builtins.py:2241
1321
1287
msgid ""
1322
1288
" To see the changes introduced by revision X::\n"
1323
1289
" \n"
1324
1290
" bzr diff -cX"
1325
1291
msgstr ""
1326
1292
1327
#: bzrlib/builtins.py:2275
1293
#: bzrlib/builtins.py:2245
1328
1294
msgid ""
1329
1295
" Note that in the case of a merge, the -c option shows the changes\n"
1330
1296
" compared to the left hand parent. To see the changes against\n"
1331
1297
" another parent, use::"
1332
1298
msgstr ""
1333
1299
1334
#: bzrlib/builtins.py:2279
1300
#: bzrlib/builtins.py:2249
1335
1301
msgid " bzr diff -r<chosen_parent>..X"
1336
1302
msgstr ""
1337
1303
1338
#: bzrlib/builtins.py:2281
1304
#: bzrlib/builtins.py:2251
1339
1305
msgid ""
1340
1306
" The changes between the current revision and the previous revision\n"
1341
1307
" (equivalent to -c-1 and -r-2..-1)"
1342
1308
msgstr ""
1343
1309
1344
#: bzrlib/builtins.py:2284
1310
#: bzrlib/builtins.py:2254
1345
1311
msgid " bzr diff -r-2.."
1346
1312
msgstr ""
1347
1313
1348
#: bzrlib/builtins.py:2286
1314
#: bzrlib/builtins.py:2256
1349
1315
msgid " Show just the differences for file NEWS::"
1350
1316
msgstr ""
1351
1317
1352
#: bzrlib/builtins.py:2288
1318
#: bzrlib/builtins.py:2258
1353
1319
msgid " bzr diff NEWS"
1354
1320
msgstr ""
1355
1321
1356
#: bzrlib/builtins.py:2290
1322
#: bzrlib/builtins.py:2260
1357
1323
msgid " Show the differences in working tree xxx for file NEWS::"
1358
1324
msgstr ""
1359
1325
1360
#: bzrlib/builtins.py:2292
1326
#: bzrlib/builtins.py:2262
1361
1327
msgid " bzr diff xxx/NEWS"
1362
1328
msgstr ""
1363
1329
1364
#: bzrlib/builtins.py:2294
1330
#: bzrlib/builtins.py:2264
1365
1331
msgid " Show the differences from branch xxx to this working tree:"
1366
1332
msgstr ""
1367
1333
1368
#: bzrlib/builtins.py:2296
1334
#: bzrlib/builtins.py:2266
1369
1335
msgid " bzr diff --old xxx"
1370
1336
msgstr ""
1371
1337
1372
#: bzrlib/builtins.py:2298
1338
#: bzrlib/builtins.py:2268
1373
1339
msgid " Show the differences between two branches for file NEWS::"
1374
1340
msgstr ""
1375
1341
1376
#: bzrlib/builtins.py:2300
1342
#: bzrlib/builtins.py:2270
1377
1343
msgid " bzr diff --old xxx --new yyy NEWS"
1378
1344
msgstr ""
1379
1345
1380
#: bzrlib/builtins.py:2302
1346
#: bzrlib/builtins.py:2272
1381
1347
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1382
1348
msgstr ""
1383
1349
1384
#: bzrlib/builtins.py:2304
1350
#: bzrlib/builtins.py:2274
1385
1351
msgid ""
1386
1352
" bzr diff --prefix old/:new/\n"
1387
1353
" \n"
1390
1356
" bzr diff --using /usr/bin/diff --diff-options -wu"
1391
1357
msgstr ""
1392
1358
1393
#: bzrlib/builtins.py:2314
1359
#: bzrlib/builtins.py:2284
1394
1360
msgid "Pass these options to the external diff program."
1395
1361
msgstr ""
1396
1362
1397
#: bzrlib/builtins.py:2317
1363
#: bzrlib/builtins.py:2287
1398
1364
msgid ""
1399
1365
"Set prefixes added to old and new filenames, as two values separated by a "
1400
1366
"colon. (eg \"old/:new/\")."
1401
1367
msgstr ""
1402
1368
1403
#: bzrlib/builtins.py:2320
1369
#: bzrlib/builtins.py:2290
1404
1370
msgid "Branch/tree to compare from."
1405
1371
msgstr ""
1406
1372
1407
#: bzrlib/builtins.py:2324
1373
#: bzrlib/builtins.py:2294
1408
1374
msgid "Branch/tree to compare to."
1409
1375
msgstr ""
1410
1376
1411
#: bzrlib/builtins.py:2330
1377
#: bzrlib/builtins.py:2300
1412
1378
msgid "Use this command to compare files."
1413
1379
msgstr ""
1414
1380
1415
#: bzrlib/builtins.py:2335
1381
#: bzrlib/builtins.py:2305
1416
1382
msgid "Diff format to use."
1417
1383
msgstr ""
1418
1384
1419
#: bzrlib/builtins.py:2337
1385
#: bzrlib/builtins.py:2307
1420
1386
msgid "Diff format"
1421
1387
msgstr ""
1422
1388
1423
#: bzrlib/builtins.py:2359
1389
#: bzrlib/builtins.py:2329
1424
1390
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1425
1391
msgstr ""
1426
1392
1427
#: bzrlib/builtins.py:2363
1393
#: bzrlib/builtins.py:2333
1428
1394
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1429
1395
msgstr ""
1430
1396
1431
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1432
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1397
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1398
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1433
1399
msgid "{0} and {1} are mutually exclusive"
1434
1400
msgstr ""
1435
1401
1436
#: bzrlib/builtins.py:2388
1402
#: bzrlib/builtins.py:2358
1437
1403
msgid ""
1438
1404
"List files deleted in the working tree.\n"
1439
1405
" "
1440
1406
msgstr ""
1441
1407
1442
#: bzrlib/builtins.py:2465
1408
#: bzrlib/builtins.py:2436
1443
1409
msgid "Show the tree root directory."
1444
1410
msgstr ""
1445
1411
1446
#: bzrlib/builtins.py:2467
1412
#: bzrlib/builtins.py:2438
1447
1413
msgid ""
1448
1414
"The root is the nearest enclosing directory with a .bzr control\n"
1449
1415
"directory."
1450
1416
msgstr ""
1451
1417
1452
#: bzrlib/builtins.py:2482
1418
#: bzrlib/builtins.py:2453
1453
1419
msgid "The limit argument must be an integer."
1454
1420
msgstr ""
1455
1421
1456
#: bzrlib/builtins.py:2490
1422
#: bzrlib/builtins.py:2461
1457
1423
msgid "The levels argument must be an integer."
1458
1424
msgstr ""
1459
1425
1460
#: bzrlib/builtins.py:2495
1426
#: bzrlib/builtins.py:2466
1461
1427
msgid "Show historical log for a branch or subset of a branch."
1462
1428
msgstr ""
1463
1429
1464
#: bzrlib/builtins.py:2497
1430
#: bzrlib/builtins.py:2468
1465
1431
msgid ""
1466
1432
"log is bzr's default tool for exploring the history of a branch.\n"
1467
1433
"The branch to use is taken from the first parameter. If no parameters\n"
1469
1435
"Here are some simple examples::"
1470
1436
msgstr ""
1471
1437
1472
#: bzrlib/builtins.py:2502
1438
#: bzrlib/builtins.py:2473
1473
1439
msgid ""
1474
1440
" bzr log log the current branch\n"
1475
1441
" bzr log foo.py log a file in its branch\n"
1476
1442
" bzr log http://server/branch log a branch on a server"
1477
1443
msgstr ""
1478
1444
1479
#: bzrlib/builtins.py:2506
1445
#: bzrlib/builtins.py:2477
1480
1446
msgid ""
1481
1447
"The filtering, ordering and information shown for each revision can\n"
1482
1448
"be controlled as explained below. By default, all revisions are\n"
1486
1452
"were merged."
1487
1453
msgstr ""
1488
1454
1489
#: bzrlib/builtins.py:2513
1455
#: bzrlib/builtins.py:2484
1490
1456
msgid ":Output control:"
1491
1457
msgstr ""
1492
1458
1493
#: bzrlib/builtins.py:2515
1459
#: bzrlib/builtins.py:2486
1494
1460
msgid ""
1495
1461
" The log format controls how information about each revision is\n"
1496
1462
" displayed. The standard log formats are called ``long``, ``short``\n"
1498
1464
" for more details on log formats."
1499
1465
msgstr ""
1500
1466
1501
#: bzrlib/builtins.py:2520
1467
#: bzrlib/builtins.py:2491
1502
1468
msgid ""
1503
1469
" The following options can be used to control what information is\n"
1504
1470
" displayed::"
1505
1471
msgstr ""
1506
1472
1507
#: bzrlib/builtins.py:2523
1473
#: bzrlib/builtins.py:2494
1508
1474
msgid ""
1509
1475
" -l N display a maximum of N revisions\n"
1510
1476
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1513
1479
" --show-ids display revision-ids (and file-ids), not just revnos"
1514
1480
msgstr ""
1515
1481
1516
#: bzrlib/builtins.py:2529
1482
#: bzrlib/builtins.py:2500
1517
1483
msgid ""
1518
1484
" Note that the default number of levels to display is a function of the\n"
1519
1485
" log format. If the -n option is not used, the standard log formats show\n"
1520
1486
" just the top level (mainline)."
1521
1487
msgstr ""
1522
1488
1523
#: bzrlib/builtins.py:2533
1489
#: bzrlib/builtins.py:2504
1524
1490
msgid ""
1525
1491
" Status summaries are shown using status flags like A, M, etc. To see\n"
1526
1492
" the changes explained using words like ``added`` and ``modified``\n"
1527
1493
" instead, use the -vv option."
1528
1494
msgstr ""
1529
1495
1530
#: bzrlib/builtins.py:2537
1496
#: bzrlib/builtins.py:2508
1531
1497
msgid ":Ordering control:"
1532
1498
msgstr ""
1533
1499
1534
#: bzrlib/builtins.py:2539
1500
#: bzrlib/builtins.py:2510
1535
1501
msgid ""
1536
1502
" To display revisions from oldest to newest, use the --forward option.\n"
1537
1503
" In most cases, using this option will have little impact on the total\n"
1539
1505
" display revisions like --reverse does when it can."
1540
1506
msgstr ""
1541
1507
1542
#: bzrlib/builtins.py:2544
1508
#: bzrlib/builtins.py:2515
1543
1509
msgid ":Revision filtering:"
1544
1510
msgstr ""
1545
1511
1546
#: bzrlib/builtins.py:2546
1512
#: bzrlib/builtins.py:2517
1547
1513
msgid ""
1548
1514
" The -r option can be used to specify what revision or range of revisions\n"
1549
1515
" to filter against. The various forms are shown below::"
1550
1516
msgstr ""
1551
1517
1552
#: bzrlib/builtins.py:2549
1518
#: bzrlib/builtins.py:2520
1553
1519
msgid ""
1554
1520
" -rX display revision X\n"
1555
1521
" -rX.. display revision X and later\n"
1557
1523
" -rX..Y display from X to Y inclusive"
1558
1524
msgstr ""
1559
1525
1560
#: bzrlib/builtins.py:2554
1526
#: bzrlib/builtins.py:2525
1561
1527
msgid ""
1562
1528
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1563
1529
" Some common examples are given below::"
1564
1530
msgstr ""
1565
1531
1566
#: bzrlib/builtins.py:2557
1532
#: bzrlib/builtins.py:2528
1567
1533
msgid ""
1568
1534
" -r-1 show just the tip\n"
1569
1535
" -r-10.. show the last 10 mainline revisions\n"
1573
1539
" -rdate:yesterday.. show changes since yesterday"
1574
1540
msgstr ""
1575
1541
1576
#: bzrlib/builtins.py:2564
1542
#: bzrlib/builtins.py:2535
1577
1543
msgid ""
1578
1544
" When logging a range of revisions using -rX..Y, log starts at\n"
1579
1545
" revision Y and searches back in history through the primary\n"
1583
1549
" a nested merge revision and the log will be truncated accordingly."
1584
1550
msgstr ""
1585
1551
1586
#: bzrlib/builtins.py:2571
1552
#: bzrlib/builtins.py:2542
1587
1553
msgid ":Path filtering:"
1588
1554
msgstr ""
1589
1555
1590
#: bzrlib/builtins.py:2573
1556
#: bzrlib/builtins.py:2544
1591
1557
msgid ""
1592
1558
" If parameters are given and the first one is not a branch, the log\n"
1593
1559
" will be filtered to show only those revisions that changed the\n"
1594
1560
" nominated files or directories."
1595
1561
msgstr ""
1596
1562
1597
#: bzrlib/builtins.py:2577
1563
#: bzrlib/builtins.py:2548
1598
1564
msgid ""
1599
1565
" Filenames are interpreted within their historical context. To log a\n"
1600
1566
" deleted file, specify a revision range so that the file existed at\n"
1601
1567
" the end or start of the range."
1602
1568
msgstr ""
1603
1569
1604
#: bzrlib/builtins.py:2581
1570
#: bzrlib/builtins.py:2552
1605
1571
msgid ""
1606
1572
" Historical context is also important when interpreting pathnames of\n"
1607
1573
" renamed files/directories. Consider the following example:"
1608
1574
msgstr ""
1609
1575
1610
#: bzrlib/builtins.py:2584
1576
#: bzrlib/builtins.py:2555
1611
1577
msgid ""
1612
1578
" * revision 1: add tutorial.txt\n"
1613
1579
" * revision 2: modify tutorial.txt\n"
1614
1580
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1615
1581
msgstr ""
1616
1582
1617
#: bzrlib/builtins.py:2588
1583
#: bzrlib/builtins.py:2559
1618
1584
msgid " In this case:"
1619
1585
msgstr ""
1620
1586
1621
#: bzrlib/builtins.py:2590
1587
#: bzrlib/builtins.py:2561
1622
1588
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1623
1589
msgstr ""
1624
1590
1625
#: bzrlib/builtins.py:2592
1591
#: bzrlib/builtins.py:2563
1626
1592
msgid ""
1627
1593
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1628
1594
msgstr ""
1629
1595
1630
#: bzrlib/builtins.py:2594
1596
#: bzrlib/builtins.py:2565
1631
1597
msgid ""
1632
1598
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1633
1599
" the original file in revision 2."
1634
1600
msgstr ""
1635
1601
1636
#: bzrlib/builtins.py:2597
1602
#: bzrlib/builtins.py:2568
1637
1603
msgid ""
1638
1604
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1639
1605
" was no file called guide.txt in revision 2."
1640
1606
msgstr ""
1641
1607
1642
#: bzrlib/builtins.py:2600
1608
#: bzrlib/builtins.py:2571
1643
1609
msgid ""
1644
1610
" Renames are always followed by log. By design, there is no need to\n"
1645
1611
" explicitly ask for this (and no way to stop logging a file back\n"
1646
1612
" until it was last renamed)."
1647
1613
msgstr ""
1648
1614
1649
#: bzrlib/builtins.py:2604
1615
#: bzrlib/builtins.py:2575
1650
1616
msgid ":Other filtering:"
1651
1617
msgstr ""
1652
1618
1653
#: bzrlib/builtins.py:2606
1619
#: bzrlib/builtins.py:2577
1654
1620
msgid ""
1655
1621
" The --match option can be used for finding revisions that match a\n"
1656
1622
" regular expression in a commit message, committer, author or bug.\n"
1659
1625
" --match-message can be used to only match a specific field."
1660
1626
msgstr ""
1661
1627
1662
#: bzrlib/builtins.py:2612
1628
#: bzrlib/builtins.py:2583
1663
1629
msgid ":Tips & tricks:"
1664
1630
msgstr ""
1665
1631
1666
#: bzrlib/builtins.py:2614
1632
#: bzrlib/builtins.py:2585
1667
1633
msgid ""
1668
1634
" GUI tools and IDEs are often better at exploring history than command\n"
1669
1635
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1672
1638
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1673
1639
msgstr ""
1674
1640
1675
#: bzrlib/builtins.py:2620
1641
#: bzrlib/builtins.py:2591
1676
1642
msgid ""
1677
1643
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1678
1644
msgstr ""
1679
1645
1680
#: bzrlib/builtins.py:2622
1646
#: bzrlib/builtins.py:2593
1681
1647
msgid ""
1682
1648
" [ALIASES]\n"
1683
1649
" tip = log -r-1\n"
1685
1651
" show = log -v -p"
1686
1652
msgstr ""
1687
1653
1688
#: bzrlib/builtins.py:2627
1654
#: bzrlib/builtins.py:2598
1689
1655
msgid ""
1690
1656
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1691
1657
" will show the last 10 mainline revisions. To see the details of a\n"
1692
1658
" particular revision X, ``bzr show -rX``."
1693
1659
msgstr ""
1694
1660
1695
#: bzrlib/builtins.py:2631
1661
#: bzrlib/builtins.py:2602
1696
1662
msgid ""
1697
1663
" If you are interested in looking deeper into a particular merge X,\n"
1698
1664
" use ``bzr log -n0 -rX``."
1699
1665
msgstr ""
1700
1666
1701
#: bzrlib/builtins.py:2634
1667
#: bzrlib/builtins.py:2605
1702
1668
msgid ""
1703
1669
" ``bzr log -v`` on a branch with lots of history is currently\n"
1704
1670
" very slow. A fix for this issue is currently under development.\n"
1706
1672
" be given when using the -v option."
1707
1673
msgstr ""
1708
1674
1709
#: bzrlib/builtins.py:2639
1675
#: bzrlib/builtins.py:2610
1710
1676
msgid ""
1711
1677
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1712
1678
" used to find revisions matching user names, commit messages, etc.\n"
1714
1680
" a list of words but not others."
1715
1681
msgstr ""
1716
1682
1717
#: bzrlib/builtins.py:2644
1683
#: bzrlib/builtins.py:2615
1718
1684
msgid ""
1719
1685
" When exploring non-mainline history on large projects with deep\n"
1720
1686
" history, the performance of log can be greatly improved by installing\n"
1722
1688
" trading disk space for faster speed."
1723
1689
msgstr ""
1724
1690
1725
#: bzrlib/builtins.py:2653
1691
#: bzrlib/builtins.py:2624
1726
1692
msgid "Show from oldest to newest."
1727
1693
msgstr ""
1728
1694
1729
#: bzrlib/builtins.py:2656
1695
#: bzrlib/builtins.py:2627
1730
1696
msgid "Show files changed in each revision."
1731
1697
msgstr ""
1732
1698
1733
#: bzrlib/builtins.py:2662
1699
#: bzrlib/builtins.py:2633
1734
1700
msgid "Show just the specified revision. See also \"help revisionspec\"."
1735
1701
msgstr ""
1736
1702
1737
#: bzrlib/builtins.py:2666
1703
#: bzrlib/builtins.py:2637
1738
1704
msgid "What names to list as authors - first, all or committer."
1739
1705
msgstr ""
1740
1706
1741
#: bzrlib/builtins.py:2667
1707
#: bzrlib/builtins.py:2638
1742
1708
msgid "Authors"
1743
1709
msgstr ""
1744
1710
1745
#: bzrlib/builtins.py:2672
1711
#: bzrlib/builtins.py:2643
1746
1712
msgid "Number of levels to display - 0 for all, 1 for flat."
1747
1713
msgstr ""
1748
1714
1749
#: bzrlib/builtins.py:2682
1715
#: bzrlib/builtins.py:2653
1750
1716
msgid "Limit the output to the first N revisions."
1751
1717
msgstr ""
1752
1718
1753
#: bzrlib/builtins.py:2687
1719
#: bzrlib/builtins.py:2658
1754
1720
msgid "Show changes made in each revision as a patch."
1755
1721
msgstr ""
1756
1722
1757
#: bzrlib/builtins.py:2689
1723
#: bzrlib/builtins.py:2660
1758
1724
msgid "Show merged revisions like --levels 0 does."
1759
1725
msgstr ""
1760
1726
1761
#: bzrlib/builtins.py:2693
1727
#: bzrlib/builtins.py:2664
1762
1728
msgid "Do not report commits with more than one parent."
1763
1729
msgstr ""
1764
1730
1765
#: bzrlib/builtins.py:2695
1731
#: bzrlib/builtins.py:2666
1766
1732
msgid ""
1767
1733
"Display only the revisions that are not part of both ancestries (require -"
1768
1734
"rX..Y)."
1769
1735
msgstr ""
1770
1736
1771
#: bzrlib/builtins.py:2699
1737
#: bzrlib/builtins.py:2670
1772
1738
msgid "Show digital signature validity."
1773
1739
msgstr ""
1774
1740
1775
#: bzrlib/builtins.py:2702
1741
#: bzrlib/builtins.py:2673
1776
1742
msgid "Show revisions whose properties match this expression."
1777
1743
msgstr ""
1778
1744
1779
#: bzrlib/builtins.py:2706
1745
#: bzrlib/builtins.py:2677
1780
1746
msgid "Show revisions whose message matches this expression."
1781
1747
msgstr ""
1782
1748
1783
#: bzrlib/builtins.py:2710
1749
#: bzrlib/builtins.py:2681
1784
1750
msgid "Show revisions whose committer matches this expression."
1785
1751
msgstr ""
1786
1752
1787
#: bzrlib/builtins.py:2714
1753
#: bzrlib/builtins.py:2685
1788
1754
msgid "Show revisions whose authors match this expression."
1789
1755
msgstr ""
1790
1756
1791
#: bzrlib/builtins.py:2718
1757
#: bzrlib/builtins.py:2689
1792
1758
msgid "Show revisions whose bugs match this expression."
1793
1759
msgstr ""
1794
1760
1795
#: bzrlib/builtins.py:2772
1761
#: bzrlib/builtins.py:2743
1796
1762
msgid "--exclude-common-ancestry requires -r with two revisions"
1797
1763
msgstr ""
1798
1764
1799
#: bzrlib/builtins.py:2800
1765
#: bzrlib/builtins.py:2771
1800
1766
#, python-format
1801
1767
msgid "Path unknown at end or start of revision range: %s"
1802
1768
msgstr ""
1803
1769
1804
#: bzrlib/builtins.py:2917
1770
#: bzrlib/builtins.py:2888
1805
1771
#, python-format
1806
1772
msgid "bzr %s doesn't accept two revisions in different branches."
1807
1773
msgstr ""
1808
1774
1809
#: bzrlib/builtins.py:2933
1775
#: bzrlib/builtins.py:2904
1810
1776
#, python-format
1811
1777
msgid "bzr %s --revision takes one or two values."
1812
1778
msgstr ""
1813
1779
1814
#: bzrlib/builtins.py:2978
1780
#: bzrlib/builtins.py:2949
1815
1781
msgid ""
1816
1782
"List files in a tree.\n"
1817
1783
" "
1818
1784
msgstr ""
1819
1785
1820
#: bzrlib/builtins.py:2987
1786
#: bzrlib/builtins.py:2958
1821
1787
msgid "Recurse into subdirectories."
1822
1788
msgstr ""
1823
1789
1824
#: bzrlib/builtins.py:2989
1790
#: bzrlib/builtins.py:2960
1825
1791
msgid "Print paths relative to the root of the branch."
1826
1792
msgstr ""
1827
1793
1828
#: bzrlib/builtins.py:2991
1794
#: bzrlib/builtins.py:2962
1829
1795
msgid "Print unknown files."
1830
1796
msgstr ""
1831
1797
1832
#: bzrlib/builtins.py:2992
1798
#: bzrlib/builtins.py:2963
1833
1799
msgid "Print versioned files."
1834
1800
msgstr ""
1835
1801
1836
#: bzrlib/builtins.py:2995
1802
#: bzrlib/builtins.py:2966
1837
1803
msgid "Print ignored files."
1838
1804
msgstr ""
1839
1805
1840
#: bzrlib/builtins.py:2997
1806
#: bzrlib/builtins.py:2968
1841
1807
msgid "List entries of a particular kind: file, directory, symlink."
1842
1808
msgstr "List entries of a particular type: file, directory, symlink."
1843
1809
1844
#: bzrlib/builtins.py:3010
1810
#: bzrlib/builtins.py:2981
1845
1811
msgid "invalid kind specified"
1846
1812
msgstr "invalid type specified"
1847
1813
1848
#: bzrlib/builtins.py:3013
1814
#: bzrlib/builtins.py:2984
1849
1815
msgid "Cannot set both --verbose and --null"
1850
1816
msgstr ""
1851
1817
1852
#: bzrlib/builtins.py:3022
1818
#: bzrlib/builtins.py:2993
1853
1819
msgid "cannot specify both --from-root and PATH"
1854
1820
msgstr ""
1855
1821
1856
#: bzrlib/builtins.py:3109
1822
#: bzrlib/builtins.py:3080
1857
1823
msgid "Ignore specified files or patterns."
1858
1824
msgstr ""
1859
1825
1860
#: bzrlib/builtins.py:3111
1826
#: bzrlib/builtins.py:3082
1861
1827
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1862
1828
msgstr ""
1863
1829
1864
#: bzrlib/builtins.py:3113
1830
#: bzrlib/builtins.py:3084
1865
1831
msgid ""
1866
1832
"If a .bzrignore file does not exist, the ignore command\n"
1867
1833
"will create one and add the specified files or patterns to the newly\n"
1870
1836
"the use of the ignore command will require an explicit add command."
1871
1837
msgstr ""
1872
1838
1873
#: bzrlib/builtins.py:3119
1839
#: bzrlib/builtins.py:3090
1874
1840
msgid ""
1875
1841
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1876
1842
"After adding, editing or deleting that file either indirectly by\n"
1878
1844
"it."
1879
1845
msgstr ""
1880
1846
1881
#: bzrlib/builtins.py:3124
1847
#: bzrlib/builtins.py:3095
1882
1848
msgid ""
1883
1849
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1884
1850
"the global ignore file can be found in the application data directory as\n"
1887
1853
"can be edited directly using an editor."
1888
1854
msgstr ""
1889
1855
1890
#: bzrlib/builtins.py:3130
1856
#: bzrlib/builtins.py:3101
1891
1857
msgid ""
1892
1858
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1893
1859
"precedence over regular ignores. Such exceptions are used to specify\n"
1894
1860
"files that should be versioned which would otherwise be ignored."
1895
1861
msgstr ""
1896
1862
1897
#: bzrlib/builtins.py:3134
1863
#: bzrlib/builtins.py:3105
1898
1864
msgid ""
1899
1865
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1900
1866
"precedence over the '!' exception patterns."
1901
1867
msgstr ""
1902
1868
1903
#: bzrlib/builtins.py:3137
1869
#: bzrlib/builtins.py:3108
1904
1870
msgid ""
1905
1871
":Notes: \n"
1906
1872
" \n"
1908
1874
" the shell on Unix."
1909
1875
msgstr ""
1910
1876
1911
#: bzrlib/builtins.py:3142
1877
#: bzrlib/builtins.py:3113
1912
1878
msgid ""
1913
1879
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1914
1880
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1915
1881
msgstr ""
1916
1882
1917
#: bzrlib/builtins.py:3145
1883
#: bzrlib/builtins.py:3116
1918
1884
msgid ""
1919
1885
":Examples:\n"
1920
1886
" Ignore the top level Makefile::"
1921
1887
msgstr ""
1922
1888
1923
#: bzrlib/builtins.py:3148
1889
#: bzrlib/builtins.py:3119
1924
1890
msgid " bzr ignore ./Makefile"
1925
1891
msgstr ""
1926
1892
1927
#: bzrlib/builtins.py:3150
1893
#: bzrlib/builtins.py:3121
1928
1894
msgid " Ignore .class files in all directories...::"
1929
1895
msgstr ""
1930
1896
1931
#: bzrlib/builtins.py:3152
1897
#: bzrlib/builtins.py:3123
1932
1898
msgid " bzr ignore \"*.class\""
1933
1899
msgstr ""
1934
1900
1935
#: bzrlib/builtins.py:3154
1901
#: bzrlib/builtins.py:3125
1936
1902
msgid " ...but do not ignore \"special.class\"::"
1937
1903
msgstr ""
1938
1904
1939
#: bzrlib/builtins.py:3156
1905
#: bzrlib/builtins.py:3127
1940
1906
msgid " bzr ignore \"!special.class\""
1941
1907
msgstr ""
1942
1908
1943
#: bzrlib/builtins.py:3158
1909
#: bzrlib/builtins.py:3129
1944
1910
msgid " Ignore files whose name begins with the \"#\" character::"
1945
1911
msgstr ""
1946
1912
1947
#: bzrlib/builtins.py:3160
1913
#: bzrlib/builtins.py:3131
1948
1914
msgid " bzr ignore \"RE:^#\""
1949
1915
msgstr ""
1950
1916
1951
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1917
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1952
1918
msgid " Ignore .o files under the lib directory::"
1953
1919
msgstr ""
1954
1920
1955
#: bzrlib/builtins.py:3164
1921
#: bzrlib/builtins.py:3135
1956
1922
msgid " bzr ignore \"lib/**/*.o\""
1957
1923
msgstr ""
1958
1924
1959
#: bzrlib/builtins.py:3168
1925
#: bzrlib/builtins.py:3139
1960
1926
msgid " bzr ignore \"RE:lib/.*\\.o\""
1961
1927
msgstr ""
1962
1928
1963
#: bzrlib/builtins.py:3170
1929
#: bzrlib/builtins.py:3141
1964
1930
msgid " Ignore everything but the \"debian\" toplevel directory::"
1965
1931
msgstr ""
1966
1932
1967
#: bzrlib/builtins.py:3172
1933
#: bzrlib/builtins.py:3143
1968
1934
msgid ""
1969
1935
" bzr ignore \"RE:(?!debian/).*\"\n"
1970
1936
" \n"
1976
1942
" bzr ignore \"!!*~\""
1977
1943
msgstr ""
1978
1944
1979
#: bzrlib/builtins.py:3186
1945
#: bzrlib/builtins.py:3157
1980
1946
msgid "Display the default ignore rules that bzr uses."
1981
1947
msgstr ""
1982
1948
1983
#: bzrlib/builtins.py:3198
1949
#: bzrlib/builtins.py:3169
1984
1950
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1985
1951
msgstr ""
1986
1952
1987
#: bzrlib/builtins.py:3209
1953
#: bzrlib/builtins.py:3180
1988
1954
#, python-format
1989
1955
msgid "Invalid ignore pattern found. %s"
1990
1956
msgid_plural "Invalid ignore patterns found. %s"
1991
1957
msgstr[0] ""
1992
1958
msgstr[1] ""
1993
1959
1994
#: bzrlib/builtins.py:3218
1960
#: bzrlib/builtins.py:3189
1995
1961
msgid "NAME_PATTERN should not be an absolute path"
1996
1962
msgstr ""
1997
1963
1998
#: bzrlib/builtins.py:3231
1964
#: bzrlib/builtins.py:3202
1999
1965
#, python-format
2000
1966
msgid ""
2001
1967
"Warning: the following files are version controlled and match your ignore "
2005
1971
"them.\n"
2006
1972
msgstr ""
2007
1973
2008
#: bzrlib/builtins.py:3238
1974
#: bzrlib/builtins.py:3209
2009
1975
msgid "List ignored files and the patterns that matched them."
2010
1976
msgstr ""
2011
1977
2012
#: bzrlib/builtins.py:3240
1978
#: bzrlib/builtins.py:3211
2013
1979
msgid ""
2014
1980
"List all the ignored files and the ignore pattern that caused the file to\n"
2015
1981
"be ignored."
2016
1982
msgstr ""
2017
1983
2018
#: bzrlib/builtins.py:3243
1984
#: bzrlib/builtins.py:3214
2019
1985
msgid "Alternatively, to list just the files::"
2020
1986
msgstr ""
2021
1987
2022
#: bzrlib/builtins.py:3245
1988
#: bzrlib/builtins.py:3216
2023
1989
msgid " bzr ls --ignored"
2024
1990
msgstr ""
2025
1991
2026
#: bzrlib/builtins.py:3279
1992
#: bzrlib/builtins.py:3250
2027
1993
#, python-format
2028
1994
msgid "not a valid revision-number: %r"
2029
1995
msgstr ""
2030
1996
2031
#: bzrlib/builtins.py:3286
1997
#: bzrlib/builtins.py:3257
2032
1998
msgid ""
2033
1999
"Export current or past revision to a destination directory or archive."
2034
2000
msgstr ""
2035
2001
2036
#: bzrlib/builtins.py:3288
2002
#: bzrlib/builtins.py:3259
2037
2003
msgid "If no revision is specified this exports the last committed revision."
2038
2004
msgstr ""
2039
2005
2040
#: bzrlib/builtins.py:3290
2006
#: bzrlib/builtins.py:3261
2041
2007
msgid ""
2042
2008
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2043
2009
"given, try to find the format with the extension. If no extension\n"
2044
2010
"is found exports to a directory (equivalent to --format=dir)."
2045
2011
msgstr ""
2046
2012
2047
#: bzrlib/builtins.py:3294
2013
#: bzrlib/builtins.py:3265
2048
2014
msgid ""
2049
2015
"If root is supplied, it will be used as the root directory inside\n"
2050
2016
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2051
2017
"to the exported filename. The root option has no effect for 'dir' format."
2052
2018
msgstr ""
2053
2019
2054
#: bzrlib/builtins.py:3298
2020
#: bzrlib/builtins.py:3269
2055
2021
msgid ""
2056
2022
"If branch is omitted then the branch containing the current working\n"
2057
2023
"directory will be used."
2058
2024
msgstr ""
2059
2025
2060
#: bzrlib/builtins.py:3301
2026
#: bzrlib/builtins.py:3272
2061
2027
msgid ""
2062
2028
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2063
2029
msgstr ""
2064
2030
2065
#: bzrlib/builtins.py:3303
2031
#: bzrlib/builtins.py:3274
2066
2032
msgid ""
2067
2033
" ================= =========================\n"
2068
2034
" Supported formats Autodetected by extension\n"
2075
2041
" ================= ========================="
2076
2042
msgstr ""
2077
2043
2078
#: bzrlib/builtins.py:3317
2044
#: bzrlib/builtins.py:3288
2079
2045
msgid "Type of file to export to."
2080
2046
msgstr ""
2081
2047
2082
#: bzrlib/builtins.py:3320
2048
#: bzrlib/builtins.py:3291
2083
2049
msgid "Apply content filters to export the convenient form."
2084
2050
msgstr ""
2085
2051
2086
#: bzrlib/builtins.py:3324
2052
#: bzrlib/builtins.py:3295
2087
2053
msgid "Name of the root directory inside the exported file."
2088
2054
msgstr ""
2089
2055
2090
#: bzrlib/builtins.py:3326
2056
#: bzrlib/builtins.py:3297
2091
2057
msgid ""
2092
2058
"Set modification time of files to that of the last revision in which it was "
2093
2059
"changed."
2094
2060
msgstr ""
2095
2061
2096
#: bzrlib/builtins.py:3329
2062
#: bzrlib/builtins.py:3300
2097
2063
msgid ""
2098
2064
"Export the working tree contents rather than that of the last revision."
2099
2065
msgstr ""
2100
2066
2101
#: bzrlib/builtins.py:3348
2067
#: bzrlib/builtins.py:3319
2102
2068
msgid "--uncommitted requires a working tree"
2103
2069
msgstr ""
2104
2070
2105
#: bzrlib/builtins.py:3357
2071
#: bzrlib/builtins.py:3328
2106
2072
#, python-format
2107
2073
msgid "Unsupported export format: %s"
2108
2074
msgstr ""
2109
2075
2110
#: bzrlib/builtins.py:3361
2076
#: bzrlib/builtins.py:3332
2111
2077
msgid ""
2112
2078
"Write the contents of a file as of a given revision to standard output."
2113
2079
msgstr ""
2114
2080
2115
#: bzrlib/builtins.py:3363
2081
#: bzrlib/builtins.py:3334
2116
2082
msgid "If no revision is nominated, the last revision is used."
2117
2083
msgstr ""
2118
2084
2119
#: bzrlib/builtins.py:3365
2085
#: bzrlib/builtins.py:3336
2120
2086
msgid ""
2121
2087
"Note: Take care to redirect standard output when using this command on a\n"
2122
2088
"binary file."
2123
2089
msgstr ""
2124
2090
2125
#: bzrlib/builtins.py:3371
2091
#: bzrlib/builtins.py:3342
2126
2092
msgid "The path name in the old tree."
2127
2093
msgstr ""
2128
2094
2129
#: bzrlib/builtins.py:3372
2095
#: bzrlib/builtins.py:3343
2130
2096
msgid "Apply content filters to display the convenience form."
2131
2097
msgstr ""
2132
2098
2133
#: bzrlib/builtins.py:3383
2099
#: bzrlib/builtins.py:3354
2134
2100
msgid "bzr cat --revision takes exactly one revision specifier"
2135
2101
msgstr ""
2136
2102
2137
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2103
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2138
2104
msgid "{0!r} is not present in revision {1}"
2139
2105
msgstr ""
2140
2106
2141
#: bzrlib/builtins.py:3443
2107
#: bzrlib/builtins.py:3414
2142
2108
msgid "Commit changes into a new revision."
2143
2109
msgstr ""
2144
2110
2145
#: bzrlib/builtins.py:3445
2111
#: bzrlib/builtins.py:3416
2146
2112
msgid ""
2147
2113
"An explanatory message needs to be given for each commit. This is\n"
2148
2114
"often done by using the --message option (getting the message from the\n"
2152
2118
"boilerplate text loaded into the editor, use the --show-diff option."
2153
2119
msgstr ""
2154
2120
2155
#: bzrlib/builtins.py:3452
2121
#: bzrlib/builtins.py:3423
2156
2122
msgid ""
2157
2123
"By default, the entire tree is committed and the person doing the\n"
2158
2124
"commit is assumed to be the author. These defaults can be overridden\n"
2159
2125
"as explained below."
2160
2126
msgstr ""
2161
2127
2162
#: bzrlib/builtins.py:3456
2128
#: bzrlib/builtins.py:3427
2163
2129
msgid ":Selective commits:"
2164
2130
msgstr ""
2165
2131
2166
#: bzrlib/builtins.py:3458
2132
#: bzrlib/builtins.py:3429
2167
2133
msgid ""
2168
2134
" If selected files are specified, only changes to those files are\n"
2169
2135
" committed. If a directory is specified then the directory and\n"
2170
2136
" everything within it is committed."
2171
2137
msgstr ""
2172
2138
2173
#: bzrlib/builtins.py:3462
2139
#: bzrlib/builtins.py:3433
2174
2140
msgid ""
2175
2141
" When excludes are given, they take precedence over selected files.\n"
2176
2142
" For example, to commit only changes within foo, but not changes\n"
2177
2143
" within foo/bar::"
2178
2144
msgstr ""
2179
2145
2180
#: bzrlib/builtins.py:3466
2146
#: bzrlib/builtins.py:3437
2181
2147
msgid " bzr commit foo -x foo/bar"
2182
2148
msgstr ""
2183
2149
2184
#: bzrlib/builtins.py:3468
2150
#: bzrlib/builtins.py:3439
2185
2151
msgid " A selective commit after a merge is not yet supported."
2186
2152
msgstr ""
2187
2153
2188
#: bzrlib/builtins.py:3470
2154
#: bzrlib/builtins.py:3441
2189
2155
msgid ":Custom authors:"
2190
2156
msgstr ""
2191
2157
2192
#: bzrlib/builtins.py:3472
2158
#: bzrlib/builtins.py:3443
2193
2159
msgid ""
2194
2160
" If the author of the change is not the same person as the committer,\n"
2195
2161
" you can specify the author's name using the --author option. The\n"
2199
2165
" author."
2200
2166
msgstr ""
2201
2167
2202
#: bzrlib/builtins.py:3479
2168
#: bzrlib/builtins.py:3450
2203
2169
msgid ":Checks:"
2204
2170
msgstr ""
2205
2171
2206
#: bzrlib/builtins.py:3481
2172
#: bzrlib/builtins.py:3452
2207
2173
msgid ""
2208
2174
" A common mistake is to forget to add a new file or directory before\n"
2209
2175
" running the commit command. The --strict option checks for unknown\n"
2212
2178
" for details."
2213
2179
msgstr ""
2214
2180
2215
#: bzrlib/builtins.py:3487
2181
#: bzrlib/builtins.py:3458
2216
2182
msgid ":Things to note:"
2217
2183
msgstr ""
2218
2184
2219
#: bzrlib/builtins.py:3489
2185
#: bzrlib/builtins.py:3460
2220
2186
msgid ""
2221
2187
" If you accidentially commit the wrong changes or make a spelling\n"
2222
2188
" mistake in the commit message say, you can use the uncommit command\n"
2223
2189
" to undo it. See ``bzr help uncommit`` for details."
2224
2190
msgstr ""
2225
2191
2226
#: bzrlib/builtins.py:3493
2192
#: bzrlib/builtins.py:3464
2227
2193
msgid ""
2228
2194
" Hooks can also be configured to run after a commit. This allows you\n"
2229
2195
" to trigger updates to external systems like bug trackers. The --fixes\n"
2231
2197
" one or more bugs. See ``bzr help bugs`` for details."
2232
2198
msgstr ""
2233
2199
2234
#: bzrlib/builtins.py:3503
2200
#: bzrlib/builtins.py:3474
2235
2201
msgid "Do not consider changes made to a given path."
2236
2202
msgstr ""
2237
2203
2238
#: bzrlib/builtins.py:3506
2204
#: bzrlib/builtins.py:3477
2239
2205
msgid "Description of the new revision."
2240
2206
msgstr ""
2241
2207
2242
#: bzrlib/builtins.py:3509
2208
#: bzrlib/builtins.py:3480
2243
2209
msgid "Commit even if nothing has changed."
2244
2210
msgstr ""
2245
2211
2246
#: bzrlib/builtins.py:3513
2212
#: bzrlib/builtins.py:3484
2247
2213
msgid "Take commit message from this file."
2248
2214
msgstr ""
2249
2215
2250
#: bzrlib/builtins.py:3515
2216
#: bzrlib/builtins.py:3486
2251
2217
msgid "Refuse to commit if there are unknown files in the working tree."
2252
2218
msgstr ""
2253
2219
2254
#: bzrlib/builtins.py:3518
2220
#: bzrlib/builtins.py:3489
2255
2221
msgid ""
2256
2222
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2257
2223
"08:00:00 +0100'."
2258
2224
msgstr ""
2259
2225
2260
#: bzrlib/builtins.py:3521
2226
#: bzrlib/builtins.py:3492
2261
2227
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2262
2228
msgstr ""
2263
2229
2264
#: bzrlib/builtins.py:3524
2230
#: bzrlib/builtins.py:3495
2265
2231
msgid "Set the author's name, if it's different from the committer."
2266
2232
msgstr ""
2267
2233
2268
#: bzrlib/builtins.py:3527
2234
#: bzrlib/builtins.py:3498
2269
2235
msgid ""
2270
2236
"Perform a local commit in a bound branch. Local commits are not pushed to "
2271
2237
"the master branch until a normal commit is performed."
2272
2238
msgstr ""
2273
2239
2274
#: bzrlib/builtins.py:3533
2240
#: bzrlib/builtins.py:3504
2275
2241
msgid ""
2276
2242
"When no message is supplied, show the diff along with the status summary in "
2277
2243
"the message editor."
2278
2244
msgstr ""
2279
2245
2280
#: bzrlib/builtins.py:3536
2246
#: bzrlib/builtins.py:3507
2281
2247
msgid ""
2282
2248
"When committing to a foreign version control system do not push data that "
2283
2249
"can not be natively represented."
2284
2250
msgstr ""
2285
2251
2286
#: bzrlib/builtins.py:3554
2252
#: bzrlib/builtins.py:3525
2287
2253
#, python-format
2288
2254
msgid ""
2289
2255
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2291
2257
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2292
2258
msgstr ""
2293
2259
2294
#: bzrlib/builtins.py:3563
2260
#: bzrlib/builtins.py:3534
2295
2261
#, python-format
2296
2262
msgid ""
2297
2263
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2299
2265
"Commit refused."
2300
2266
msgstr ""
2301
2267
2302
#: bzrlib/builtins.py:3572
2268
#: bzrlib/builtins.py:3543
2303
2269
#, python-format
2304
2270
msgid "Unrecognized bug %s. Commit refused."
2305
msgstr "Unrecognised bug %s. Commit refused."
2271
msgstr ""
2306
2272
2307
#: bzrlib/builtins.py:3575
2273
#: bzrlib/builtins.py:3546
2308
2274
#, python-format
2309
2275
msgid ""
2310
2276
"%s\n"
2311
2277
"Commit refused."
2312
2278
msgstr ""
2313
2279
2314
#: bzrlib/builtins.py:3599
2280
#: bzrlib/builtins.py:3570
2315
2281
msgid "Could not parse --commit-time: "
2316
2282
msgstr ""
2317
2283
2284
#: bzrlib/builtins.py:3610
2285
msgid "please specify either --message or --file"
2286
msgstr ""
2287
2318
2288
#: bzrlib/builtins.py:3639
2319
msgid "please specify either --message or --file"
2320
msgstr ""
2321
2322
#: bzrlib/builtins.py:3668
2323
2289
msgid "please specify a commit message with either --message or --file"
2324
2290
msgstr ""
2325
2291
2326
#: bzrlib/builtins.py:3671
2292
#: bzrlib/builtins.py:3642
2327
2293
msgid ""
2328
2294
"Empty commit message specified. Please specify a commit message with either -"
2329
2295
"-message or --file or leave a blank message with --message \"\"."
2330
2296
msgstr ""
2331
2297
2332
#: bzrlib/builtins.py:3691
2298
#: bzrlib/builtins.py:3662
2333
2299
msgid ""
2334
2300
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2335
2301
"-unchanged to force an empty commit."
2336
2302
msgstr ""
2337
2303
2338
#: bzrlib/builtins.py:3695
2304
#: bzrlib/builtins.py:3666
2339
2305
msgid ""
2340
2306
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2341
2307
"resolve FILE\" to resolve."
2342
2308
msgstr ""
2343
2309
2344
#: bzrlib/builtins.py:3699
2310
#: bzrlib/builtins.py:3670
2345
2311
msgid "Commit refused because there are unknown files in the working tree."
2346
2312
msgstr ""
2347
2313
2348
#: bzrlib/builtins.py:3702
2314
#: bzrlib/builtins.py:3673
2349
2315
msgid ""
2350
2316
"\n"
2351
2317
"To commit to master branch, run update and then commit.\n"
2352
2318
"You can also pass --local to commit to continue working disconnected."
2353
2319
msgstr ""
2354
2320
2355
#: bzrlib/builtins.py:3710
2321
#: bzrlib/builtins.py:3681
2356
2322
msgid ""
2357
2323
"Validate working tree structure, branch consistency and repository history."
2358
2324
msgstr ""
2359
2325
2360
#: bzrlib/builtins.py:3712
2326
#: bzrlib/builtins.py:3683
2361
2327
msgid ""
2362
2328
"This command checks various invariants about branch and repository storage\n"
2363
2329
"to detect data corruption or bzr bugs."
2364
2330
msgstr ""
2365
2331
2366
#: bzrlib/builtins.py:3715
2332
#: bzrlib/builtins.py:3686
2367
2333
msgid ""
2368
2334
"The working tree and branch checks will only give output if a problem is\n"
2369
2335
"detected. The output fields of the repository check are:"
2370
2336
msgstr ""
2371
2337
2372
#: bzrlib/builtins.py:3718
2338
#: bzrlib/builtins.py:3689
2373
2339
msgid ""
2374
2340
"revisions\n"
2375
2341
" This is just the number of revisions checked. It doesn't\n"
2376
2342
" indicate a problem."
2377
2343
msgstr ""
2378
2344
2379
#: bzrlib/builtins.py:3722
2345
#: bzrlib/builtins.py:3693
2380
2346
msgid ""
2381
2347
"versionedfiles\n"
2382
2348
" This is just the number of versionedfiles checked. It\n"
2383
2349
" doesn't indicate a problem."
2384
2350
msgstr ""
2385
2351
2386
#: bzrlib/builtins.py:3726
2352
#: bzrlib/builtins.py:3697
2387
2353
msgid ""
2388
2354
"unreferenced ancestors\n"
2389
2355
" Texts that are ancestors of other texts, but\n"
2391
2357
" subtle problem that Bazaar can work around."
2392
2358
msgstr ""
2393
2359
2394
#: bzrlib/builtins.py:3731
2360
#: bzrlib/builtins.py:3702
2395
2361
msgid ""
2396
2362
"unique file texts\n"
2397
2363
" This is the total number of unique file contents\n"
2398
2364
" seen in the checked revisions. It does not indicate a problem."
2399
2365
msgstr ""
2400
2366
2401
#: bzrlib/builtins.py:3735
2367
#: bzrlib/builtins.py:3706
2402
2368
msgid ""
2403
2369
"repeated file texts\n"
2404
2370
" This is the total number of repeated texts seen\n"
2407
2373
" indicate a problem."
2408
2374
msgstr ""
2409
2375
2410
#: bzrlib/builtins.py:3741
2376
#: bzrlib/builtins.py:3712
2411
2377
msgid ""
2412
2378
"If no restrictions are specified, all Bazaar data that is found at the "
2413
2379
"given\n"
2414
2380
"location will be checked."
2415
2381
msgstr ""
2416
2382
2417
#: bzrlib/builtins.py:3746
2383
#: bzrlib/builtins.py:3717
2418
2384
msgid " Check the tree and branch at 'foo'::"
2419
2385
msgstr ""
2420
2386
2421
#: bzrlib/builtins.py:3748
2387
#: bzrlib/builtins.py:3719
2422
2388
msgid " bzr check --tree --branch foo"
2423
2389
msgstr ""
2424
2390
2425
#: bzrlib/builtins.py:3750
2391
#: bzrlib/builtins.py:3721
2426
2392
msgid " Check only the repository at 'bar'::"
2427
2393
msgstr ""
2428
2394
2429
#: bzrlib/builtins.py:3752
2395
#: bzrlib/builtins.py:3723
2430
2396
msgid " bzr check --repo bar"
2431
2397
msgstr ""
2432
2398
2433
#: bzrlib/builtins.py:3754
2399
#: bzrlib/builtins.py:3725
2434
2400
msgid " Check everything at 'baz'::"
2435
2401
msgstr ""
2436
2402
2437
#: bzrlib/builtins.py:3756
2403
#: bzrlib/builtins.py:3727
2438
2404
msgid " bzr check baz"
2439
2405
msgstr ""
2440
2406
2441
#: bzrlib/builtins.py:3762
2407
#: bzrlib/builtins.py:3733
2442
2408
msgid "Check the branch related to the current directory."
2443
2409
msgstr ""
2444
2410
2445
#: bzrlib/builtins.py:3764
2411
#: bzrlib/builtins.py:3735
2446
2412
msgid "Check the repository related to the current directory."
2447
2413
msgstr ""
2448
2414
2449
#: bzrlib/builtins.py:3766
2415
#: bzrlib/builtins.py:3737
2450
2416
msgid "Check the working tree related to the current directory."
2451
2417
msgstr ""
2452
2418
2453
#: bzrlib/builtins.py:3780
2419
#: bzrlib/builtins.py:3751
2454
2420
msgid "Upgrade a repository, branch or working tree to a newer format."
2455
2421
msgstr ""
2456
2422
2457
#: bzrlib/builtins.py:3782
2423
#: bzrlib/builtins.py:3753
2458
2424
msgid ""
2459
2425
"When the default format has changed after a major new release of\n"
2460
2426
"Bazaar, you may be informed during certain operations that you\n"
2463
2429
"with older repositories or with older versions of Bazaar."
2464
2430
msgstr ""
2465
2431
2466
#: bzrlib/builtins.py:3788
2432
#: bzrlib/builtins.py:3759
2467
2433
msgid ""
2468
2434
"If you wish to upgrade to a particular format rather than the\n"
2469
2435
"current default, that can be specified using the --format option.\n"
2473
2439
"2.x default) so downgrading is not always possible."
2474
2440
msgstr ""
2475
2441
2476
#: bzrlib/builtins.py:3795
2442
#: bzrlib/builtins.py:3766
2477
2443
msgid ""
2478
2444
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2479
2445
"process (where # is a number). By default, this is left there on\n"
2484
2450
"afterwards."
2485
2451
msgstr ""
2486
2452
2487
#: bzrlib/builtins.py:3803
2453
#: bzrlib/builtins.py:3774
2488
2454
msgid ""
2489
2455
"If the location given is a shared repository, dependent branches\n"
2490
2456
"are also converted provided the repository converts successfully.\n"
2492
2458
"tried."
2493
2459
msgstr ""
2494
2460
2495
#: bzrlib/builtins.py:3808
2461
#: bzrlib/builtins.py:3779
2496
2462
msgid ""
2497
2463
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2498
2464
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2499
2465
msgstr ""
2500
2466
2501
#: bzrlib/builtins.py:3816
2467
#: bzrlib/builtins.py:3787
2502
2468
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2503
2469
msgstr ""
2504
2470
2505
#: bzrlib/builtins.py:3820
2471
#: bzrlib/builtins.py:3791
2506
2472
msgid "Branch format"
2507
2473
msgstr ""
2508
2474
2509
#: bzrlib/builtins.py:3822
2475
#: bzrlib/builtins.py:3793
2510
2476
msgid "Remove the backup.bzr directory if successful."
2511
2477
msgstr ""
2512
2478
2513
#: bzrlib/builtins.py:3824
2479
#: bzrlib/builtins.py:3795
2514
2480
msgid "Show what would be done, but don't actually do anything."
2515
2481
msgstr ""
2516
2482
2517
#: bzrlib/builtins.py:3839
2483
#: bzrlib/builtins.py:3810
2518
2484
msgid "Show or set bzr user id."
2519
2485
msgstr ""
2520
2486
2521
#: bzrlib/builtins.py:3841
2487
#: bzrlib/builtins.py:3812
2522
2488
msgid ""
2523
2489
":Examples:\n"
2524
2490
" Show the email of the current user::"
2525
2491
msgstr ""
2526
2492
2527
#: bzrlib/builtins.py:3844
2493
#: bzrlib/builtins.py:3815
2528
2494
msgid " bzr whoami --email"
2529
2495
msgstr ""
2530
2496
2531
#: bzrlib/builtins.py:3846
2497
#: bzrlib/builtins.py:3817
2532
2498
msgid " Set the current user::"
2533
2499
msgstr ""
2534
2500
2535
#: bzrlib/builtins.py:3848
2501
#: bzrlib/builtins.py:3819
2536
2502
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2537
2503
msgstr ""
2538
2504
2539
#: bzrlib/builtins.py:3852
2505
#: bzrlib/builtins.py:3823
2540
2506
msgid "Display email address only."
2541
2507
msgstr ""
2542
2508
2543
#: bzrlib/builtins.py:3854
2509
#: bzrlib/builtins.py:3825
2544
2510
msgid "Set identity for the current branch instead of globally."
2545
2511
msgstr ""
2546
2512
2547
#: bzrlib/builtins.py:3880
2513
#: bzrlib/builtins.py:3851
2548
2514
msgid "--email can only be used to display existing identity"
2549
2515
msgstr ""
2550
2516
2551
#: bzrlib/builtins.py:3904
2517
#: bzrlib/builtins.py:3873
2552
2518
msgid "Print or set the branch nickname."
2553
2519
msgstr ""
2554
2520
2555
#: bzrlib/builtins.py:3906
2521
#: bzrlib/builtins.py:3875
2556
2522
msgid ""
2557
"If unset, the colocated branch name is used for colocated branches, and\n"
2558
"the branch directory name is used for other branches. To print the\n"
2559
"current nickname, execute with no argument."
2523
"If unset, the tree root directory name is used as the nickname.\n"
2524
"To print the current nickname, execute with no argument."
2560
2525
msgstr ""
2561
2526
2562
#: bzrlib/builtins.py:3910
2527
#: bzrlib/builtins.py:3878
2563
2528
msgid ""
2564
2529
"Bound branches use the nickname of its master branch unless it is set\n"
2565
2530
"locally."
2566
2531
msgstr ""
2567
2532
2568
#: bzrlib/builtins.py:3930
2533
#: bzrlib/builtins.py:3898
2569
2534
msgid "Set/unset and display aliases."
2570
2535
msgstr ""
2571
2536
2572
#: bzrlib/builtins.py:3932
2537
#: bzrlib/builtins.py:3900
2573
2538
msgid ""
2574
2539
":Examples:\n"
2575
2540
" Show the current aliases::"
2576
2541
msgstr ""
2577
2542
2578
#: bzrlib/builtins.py:3935
2543
#: bzrlib/builtins.py:3903
2579
2544
msgid " bzr alias"
2580
2545
msgstr ""
2581
2546
2582
#: bzrlib/builtins.py:3937
2547
#: bzrlib/builtins.py:3905
2583
2548
msgid " Show the alias specified for 'll'::"
2584
2549
msgstr ""
2585
2550
2586
#: bzrlib/builtins.py:3939
2551
#: bzrlib/builtins.py:3907
2587
2552
msgid " bzr alias ll"
2588
2553
msgstr ""
2589
2554
2590
#: bzrlib/builtins.py:3941
2555
#: bzrlib/builtins.py:3909
2591
2556
msgid " Set an alias for 'll'::"
2592
2557
msgstr ""
2593
2558
2594
#: bzrlib/builtins.py:3943
2559
#: bzrlib/builtins.py:3911
2595
2560
msgid " bzr alias ll=\"log --line -r-10..-1\""
2596
2561
msgstr ""
2597
2562
2598
#: bzrlib/builtins.py:3945
2563
#: bzrlib/builtins.py:3913
2599
2564
msgid " To remove an alias for 'll'::"
2600
2565
msgstr ""
2601
2566
2602
#: bzrlib/builtins.py:3947
2567
#: bzrlib/builtins.py:3915
2603
2568
msgid " bzr alias --remove ll"
2604
2569
msgstr ""
2605
2570
2606
#: bzrlib/builtins.py:3952
2571
#: bzrlib/builtins.py:3920
2607
2572
msgid "Remove the alias."
2608
2573
msgstr ""
2609
2574
2610
#: bzrlib/builtins.py:3970
2575
#: bzrlib/builtins.py:3938
2611
2576
msgid "bzr alias --remove expects an alias to remove."
2612
2577
msgstr ""
2613
2578
2614
#: bzrlib/builtins.py:4151
2579
#: bzrlib/builtins.py:4119
2615
2580
msgid ""
2616
2581
"subunit not available. subunit needs to be installed to use --subunit."
2617
2582
msgstr ""
2618
2583
2619
#: bzrlib/builtins.py:4168
2584
#: bzrlib/builtins.py:4136
2620
2585
msgid ""
2621
2586
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2622
2587
msgstr ""
2623
2588
2624
#: bzrlib/builtins.py:4215
2589
#: bzrlib/builtins.py:4183
2625
2590
msgid "Show version of bzr."
2626
2591
msgstr ""
2627
2592
2628
#: bzrlib/builtins.py:4219
2593
#: bzrlib/builtins.py:4187
2629
2594
msgid "Print just the version number."
2630
2595
msgstr ""
2631
2596
2632
#: bzrlib/builtins.py:4238
2597
#: bzrlib/builtins.py:4206
2633
2598
msgid "It sure does!\n"
2634
2599
msgstr ""
2635
2600
2636
#: bzrlib/builtins.py:4262
2601
#: bzrlib/builtins.py:4230
2637
2602
#, python-format
2638
2603
msgid "merge base is revision %s\n"
2639
2604
msgstr ""
2640
2605
2641
#: bzrlib/builtins.py:4266
2606
#: bzrlib/builtins.py:4234
2642
2607
msgid "Perform a three-way merge."
2643
2608
msgstr ""
2644
2609
2645
#: bzrlib/builtins.py:4268
2610
#: bzrlib/builtins.py:4236
2646
2611
msgid ""
2647
2612
"The source of the merge can be specified either in the form of a branch,\n"
2648
2613
"or in the form of a path to a file containing a merge directive generated\n"
2653
2618
"the current working tree."
2654
2619
msgstr ""
2655
2620
2656
#: bzrlib/builtins.py:4276
2621
#: bzrlib/builtins.py:4244
2657
2622
msgid ""
2658
2623
"When merging from a branch, by default bzr will try to merge in all new\n"
2659
2624
"work from the other branch, automatically determining an appropriate base\n"
2660
2625
"revision. If this fails, you may need to give an explicit base."
2661
2626
msgstr ""
2662
2627
2663
#: bzrlib/builtins.py:4280
2628
#: bzrlib/builtins.py:4248
2664
2629
msgid ""
2665
2630
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2666
2631
"try to merge in all new work up to and including revision OTHER."
2667
2632
msgstr ""
2668
2633
2669
#: bzrlib/builtins.py:4283
2634
#: bzrlib/builtins.py:4251
2670
2635
msgid ""
2671
2636
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2672
2637
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2677
2642
"changes from the other branch is not stored in the commit."
2678
2643
msgstr ""
2679
2644
2680
#: bzrlib/builtins.py:4291
2645
#: bzrlib/builtins.py:4259
2681
2646
msgid "Revision numbers are always relative to the source branch."
2682
2647
msgstr ""
2683
2648
2684
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2649
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2685
2650
msgid ""
2686
2651
"Merge will do its best to combine the changes in two branches, but there\n"
2687
2652
"are some kinds of problems only a human can fix. When it encounters those,\n"
2689
2654
"before you can commit."
2690
2655
msgstr ""
2691
2656
2692
#: bzrlib/builtins.py:4298
2657
#: bzrlib/builtins.py:4266
2693
2658
msgid ""
2694
2659
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2695
2660
msgstr ""
2696
2661
2697
#: bzrlib/builtins.py:4300
2662
#: bzrlib/builtins.py:4268
2698
2663
msgid ""
2699
2664
"If there is no default branch set, the first merge will set it (use\n"
2700
2665
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2702
2667
"only be saved if the remote location can be accessed."
2703
2668
msgstr ""
2704
2669
2705
#: bzrlib/builtins.py:4305
2670
#: bzrlib/builtins.py:4273
2706
2671
msgid ""
2707
2672
"The results of the merge are placed into the destination working\n"
2708
2673
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2709
2674
"committed to record the result of the merge."
2710
2675
msgstr ""
2711
2676
2712
#: bzrlib/builtins.py:4309
2677
#: bzrlib/builtins.py:4277
2713
2678
msgid ""
2714
2679
"merge refuses to run if there are any uncommitted changes, unless\n"
2715
2680
"--force is given. If --force is given, then the changes from the source \n"
2718
2683
"merge revision which has more than two parents."
2719
2684
msgstr ""
2720
2685
2721
#: bzrlib/builtins.py:4315
2686
#: bzrlib/builtins.py:4283
2722
2687
msgid ""
2723
2688
"If one would like to merge changes from the working tree of the other\n"
2724
2689
"branch without merging any committed revisions, the --uncommitted option\n"
2725
2690
"can be given."
2726
2691
msgstr ""
2727
2692
2728
#: bzrlib/builtins.py:4319
2693
#: bzrlib/builtins.py:4287
2729
2694
msgid ""
2730
2695
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2731
2696
"you to apply each diff hunk and file change, similar to \"shelve\"."
2732
2697
msgstr ""
2733
2698
2734
#: bzrlib/builtins.py:4322
2699
#: bzrlib/builtins.py:4290
2735
2700
msgid ""
2736
2701
":Examples:\n"
2737
2702
" To merge all new revisions from bzr.dev::"
2738
2703
msgstr ""
2739
2704
2740
#: bzrlib/builtins.py:4325
2705
#: bzrlib/builtins.py:4293
2741
2706
msgid " bzr merge ../bzr.dev"
2742
2707
msgstr ""
2743
2708
2744
#: bzrlib/builtins.py:4327
2709
#: bzrlib/builtins.py:4295
2745
2710
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2746
2711
msgstr ""
2747
2712
2748
#: bzrlib/builtins.py:4329
2713
#: bzrlib/builtins.py:4297
2749
2714
msgid " bzr merge -r 82 ../bzr.dev"
2750
2715
msgstr ""
2751
2716
2752
#: bzrlib/builtins.py:4331
2717
#: bzrlib/builtins.py:4299
2753
2718
msgid " To merge the changes introduced by 82, without previous changes::"
2754
2719
msgstr ""
2755
2720
2756
#: bzrlib/builtins.py:4333
2721
#: bzrlib/builtins.py:4301
2757
2722
msgid " bzr merge -r 81..82 ../bzr.dev"
2758
2723
msgstr ""
2759
2724
2760
#: bzrlib/builtins.py:4335
2725
#: bzrlib/builtins.py:4303
2761
2726
msgid " To apply a merge directive contained in /tmp/merge::"
2762
2727
msgstr ""
2763
2728
2764
#: bzrlib/builtins.py:4337
2729
#: bzrlib/builtins.py:4305
2765
2730
msgid " bzr merge /tmp/merge"
2766
2731
msgstr ""
2767
2732
2768
#: bzrlib/builtins.py:4339
2733
#: bzrlib/builtins.py:4307
2769
2734
msgid ""
2770
2735
" To create a merge revision with three parents from two branches\n"
2771
2736
" feature1a and feature1b:"
2772
2737
msgstr ""
2773
2738
2774
#: bzrlib/builtins.py:4342
2739
#: bzrlib/builtins.py:4310
2775
2740
msgid ""
2776
2741
" bzr merge ../feature1a\n"
2777
2742
" bzr merge ../feature1b --force\n"
2778
2743
" bzr commit -m 'revision with three parents'"
2779
2744
msgstr ""
2780
2745
2781
#: bzrlib/builtins.py:4354
2746
#: bzrlib/builtins.py:4322
2782
2747
msgid "Merge even if the destination tree has uncommitted changes."
2783
2748
msgstr ""
2784
2749
2785
#: bzrlib/builtins.py:4360
2750
#: bzrlib/builtins.py:4328
2786
2751
msgid ""
2787
2752
"Apply uncommitted changes from a working copy, instead of branch changes."
2788
2753
msgstr ""
2789
2754
2790
#: bzrlib/builtins.py:4362
2755
#: bzrlib/builtins.py:4330
2791
2756
msgid ""
2792
2757
"If the destination is already completely merged into the source, pull from "
2793
2758
"the source rather than merging. When this happens, you do not need to "
2794
2759
"commit the result."
2795
2760
msgstr ""
2796
2761
2797
#: bzrlib/builtins.py:4367
2762
#: bzrlib/builtins.py:4335
2798
2763
msgid ""
2799
2764
"Branch to merge into, rather than the one containing the working directory."
2800
2765
msgstr ""
2801
2766
2802
#: bzrlib/builtins.py:4369
2767
#: bzrlib/builtins.py:4337
2803
2768
msgid "Instead of merging, show a diff of the merge."
2804
2769
msgstr ""
2805
2770
2806
#: bzrlib/builtins.py:4371
2771
#: bzrlib/builtins.py:4339
2807
2772
msgid "Select changes interactively."
2808
2773
msgstr ""
2809
2774
2810
#: bzrlib/builtins.py:4393
2775
#: bzrlib/builtins.py:4361
2811
2776
msgid ""
2812
2777
"Merging into empty branches not currently supported, "
2813
2778
"https://bugs.launchpad.net/bzr/+bug/308562"
2814
2779
msgstr ""
2815
2780
2816
#: bzrlib/builtins.py:4420
2781
#: bzrlib/builtins.py:4388
2817
2782
msgid "Cannot use --uncommitted with bundles or merge directives."
2818
2783
msgstr ""
2819
2784
2820
#: bzrlib/builtins.py:4431
2785
#: bzrlib/builtins.py:4399
2821
2786
msgid "Cannot use --uncommitted and --revision at the same time."
2822
2787
msgstr ""
2823
2788
2824
#: bzrlib/builtins.py:4451
2789
#: bzrlib/builtins.py:4419
2825
2790
msgid "merger: "
2826
2791
msgstr ""
2827
2792
2828
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2793
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2829
2794
msgid "Nothing to do."
2830
2795
msgstr ""
2831
2796
2832
#: bzrlib/builtins.py:4457
2797
#: bzrlib/builtins.py:4425
2833
2798
msgid "Cannot pull individual files"
2834
2799
msgstr ""
2835
2800
2836
#: bzrlib/builtins.py:4465
2801
#: bzrlib/builtins.py:4433
2837
2802
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2838
2803
msgstr ""
2839
2804
2840
#: bzrlib/builtins.py:4523
2805
#: bzrlib/builtins.py:4491
2841
2806
#, python-format
2842
2807
msgid "Show-base is not supported for this merge type. %s"
2843
2808
msgstr ""
2844
2809
2845
#: bzrlib/builtins.py:4532
2810
#: bzrlib/builtins.py:4500
2846
2811
#, python-format
2847
2812
msgid "Conflict reduction is not supported for merge type %s."
2848
2813
msgstr ""
2849
2814
2850
#: bzrlib/builtins.py:4536
2815
#: bzrlib/builtins.py:4504
2851
2816
msgid "Cannot do conflict reduction and show base."
2852
2817
msgstr ""
2853
2818
2854
#: bzrlib/builtins.py:4647
2819
#: bzrlib/builtins.py:4615
2855
2820
msgid "No location specified or remembered"
2856
2821
msgstr ""
2857
2822
2858
#: bzrlib/builtins.py:4649
2823
#: bzrlib/builtins.py:4617
2859
2824
msgid "{0} remembered {1} location {2}"
2860
2825
msgstr ""
2861
2826
2862
#: bzrlib/builtins.py:4655
2827
#: bzrlib/builtins.py:4623
2863
2828
msgid "Redo a merge."
2864
2829
msgstr ""
2865
2830
2866
#: bzrlib/builtins.py:4657
2831
#: bzrlib/builtins.py:4625
2867
2832
msgid ""
2868
2833
"Use this if you want to try a different merge technique while resolving\n"
2869
2834
"conflicts. Some merge techniques are better than others, and remerge\n"
2870
2835
"lets you try different ones on different files."
2871
2836
msgstr ""
2872
2837
2873
#: bzrlib/builtins.py:4661
2838
#: bzrlib/builtins.py:4629
2874
2839
msgid ""
2875
2840
"The options for remerge have the same meaning and defaults as the ones for\n"
2876
2841
"merge. The difference is that remerge can (only) be run when there is a\n"
2877
2842
"pending merge, and it lets you specify particular files."
2878
2843
msgstr ""
2879
2844
2880
#: bzrlib/builtins.py:4665
2845
#: bzrlib/builtins.py:4633
2881
2846
msgid ""
2882
2847
":Examples:\n"
2883
2848
" Re-do the merge of all conflicted files, and show the base text in\n"
2884
2849
" conflict regions, in addition to the usual THIS and OTHER texts::"
2885
2850
msgstr ""
2886
2851
2887
#: bzrlib/builtins.py:4669
2852
#: bzrlib/builtins.py:4637
2888
2853
msgid " bzr remerge --show-base"
2889
2854
msgstr ""
2890
2855
2891
#: bzrlib/builtins.py:4671
2856
#: bzrlib/builtins.py:4639
2892
2857
msgid ""
2893
2858
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2894
2859
" additional processing to reduce the size of conflict regions::"
2895
2860
msgstr ""
2896
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2897
" additional processing to reduce the size of conflict regions::"
2898
2861
2899
#: bzrlib/builtins.py:4674
2862
#: bzrlib/builtins.py:4642
2900
2863
msgid " bzr remerge --merge-type weave --reprocess foobar"
2901
2864
msgstr ""
2902
2865
2903
#: bzrlib/builtins.py:4681
2866
#: bzrlib/builtins.py:4649
2904
2867
msgid "Show base revision text in conflicts."
2905
2868
msgstr ""
2906
2869
2907
#: bzrlib/builtins.py:4693
2870
#: bzrlib/builtins.py:4661
2908
2871
msgid ""
2909
2872
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2910
2873
"merges."
2911
2874
msgstr ""
2912
2875
2913
#: bzrlib/builtins.py:4751
2914
msgid ""
2915
"Set files in the working tree back to the contents of a previous revision."
2876
#: bzrlib/builtins.py:4717
2877
msgid "Revert files to a previous revision."
2916
2878
msgstr ""
2917
2879
2918
#: bzrlib/builtins.py:4753
2880
#: bzrlib/builtins.py:4719
2919
2881
msgid ""
2920
2882
"Giving a list of files will revert only those files. Otherwise, all files\n"
2921
2883
"will be reverted. If the revision is not specified with '--revision', the\n"
2922
"working tree basis revision is used. A revert operation affects only the\n"
2923
"working tree, not any revision history like the branch and repository or\n"
2924
"the working tree basis revision."
2884
"last committed revision is used."
2925
2885
msgstr ""
2926
2886
2927
#: bzrlib/builtins.py:4759
2887
#: bzrlib/builtins.py:4723
2928
2888
msgid ""
2929
2889
"To remove only some changes, without reverting to a prior version, use\n"
2930
2890
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2931
2891
"will remove the changes introduced by the second last commit (-2), without\n"
2932
2892
"affecting the changes introduced by the last commit (-1). To remove\n"
2933
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2934
"To update the branch to a specific revision or the latest revision and\n"
2935
"update the working tree accordingly while preserving local changes, see the\n"
2936
"update command."
2893
"certain changes on a hunk-by-hunk basis, see the shelve command."
2937
2894
msgstr ""
2938
2895
2939
#: bzrlib/builtins.py:4768
2896
#: bzrlib/builtins.py:4729
2940
2897
msgid ""
2941
"Uncommitted changes to files that are reverted will be discarded.\n"
2942
"Howver, by default, any files that have been manually changed will be\n"
2943
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2944
"files have '.~#~' appended to their name, where # is a number."
2898
"By default, any files that have been manually changed will be backed up\n"
2899
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2900
"'.~#~' appended to their name, where # is a number."
2945
2901
msgstr ""
2946
2902
2947
#: bzrlib/builtins.py:4773
2903
#: bzrlib/builtins.py:4733
2948
2904
msgid ""
2949
2905
"When you provide files, you can use their current pathname or the pathname\n"
2950
2906
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2952
2908
"reverted."
2953
2909
msgstr ""
2954
2910
2955
#: bzrlib/builtins.py:4778
2911
#: bzrlib/builtins.py:4738
2956
2912
msgid ""
2957
2913
"If you have newly added files since the target revision, they will be\n"
2958
2914
"removed. If the files to be removed have been changed, backups will be\n"
2960
2916
"deleted."
2961
2917
msgstr ""
2962
2918
2963
#: bzrlib/builtins.py:4783
2919
#: bzrlib/builtins.py:4743
2964
2920
msgid ""
2965
2921
"The working tree contains a list of revisions that have been merged but\n"
2966
2922
"not yet committed. These revisions will be included as additional parents\n"
2972
2928
"reverting any files."
2973
2929
msgstr ""
2974
2930
2975
#: bzrlib/builtins.py:4792
2931
#: bzrlib/builtins.py:4752
2976
2932
msgid ""
2977
2933
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2978
2934
"changes from a branch in a single revision. To do this, perform the merge\n"
2986
2942
"target branches."
2987
2943
msgstr ""
2988
2944
2989
#: bzrlib/builtins.py:4806
2945
#: bzrlib/builtins.py:4766
2990
2946
msgid "Do not save backups of reverted files."
2991
2947
msgstr ""
2992
2948
2993
#: bzrlib/builtins.py:4808
2949
#: bzrlib/builtins.py:4768
2994
2950
msgid "Remove pending merge marker, without changing any files."
2995
2951
msgstr ""
2996
2952
2997
#: bzrlib/builtins.py:4839
2953
#: bzrlib/builtins.py:4799
2998
2954
msgid ""
2999
2955
"Show help on a command or other topic.\n"
3000
2956
" "
3001
2957
msgstr ""
3002
2958
3003
#: bzrlib/builtins.py:4844
2959
#: bzrlib/builtins.py:4804
3004
2960
msgid "Show help on all commands."
3005
2961
msgstr ""
3006
2962
3007
#: bzrlib/builtins.py:4873
2963
#: bzrlib/builtins.py:4833
3008
2964
msgid "Show unmerged/unpulled revisions between two branches."
3009
2965
msgstr ""
3010
2966
3011
#: bzrlib/builtins.py:4875
2967
#: bzrlib/builtins.py:4835
3012
2968
msgid "OTHER_BRANCH may be local or remote."
3013
2969
msgstr ""
3014
2970
3015
#: bzrlib/builtins.py:4877
2971
#: bzrlib/builtins.py:4837
3016
2972
msgid ""
3017
2973
"To filter on a range of revisions, you can use the command -r begin..end\n"
3018
2974
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3023
2979
" 0 - no missing revisions"
3024
2980
msgstr ""
3025
2981
3026
#: bzrlib/builtins.py:4887
2982
#: bzrlib/builtins.py:4847
3027
2983
msgid ""
3028
2984
" Determine the missing revisions between this and the branch at the\n"
3029
2985
" remembered pull location::"
3030
2986
msgstr ""
3031
2987
3032
#: bzrlib/builtins.py:4890
2988
#: bzrlib/builtins.py:4850
3033
2989
msgid " bzr missing"
3034
2990
msgstr ""
3035
2991
3036
#: bzrlib/builtins.py:4892
2992
#: bzrlib/builtins.py:4852
3037
2993
msgid " Determine the missing revisions between this and another branch::"
3038
2994
msgstr ""
3039
2995
3040
#: bzrlib/builtins.py:4894
2996
#: bzrlib/builtins.py:4854
3041
2997
msgid " bzr missing http://server/branch"
3042
2998
msgstr ""
3043
2999
3044
#: bzrlib/builtins.py:4896
3000
#: bzrlib/builtins.py:4856
3045
3001
msgid ""
3046
3002
" Determine the missing revisions up to a specific revision on the other\n"
3047
3003
" branch::"
3048
3004
msgstr ""
3049
3005
3050
#: bzrlib/builtins.py:4899
3006
#: bzrlib/builtins.py:4859
3051
3007
msgid " bzr missing -r ..-10"
3052
3008
msgstr ""
3053
3009
3054
#: bzrlib/builtins.py:4901
3010
#: bzrlib/builtins.py:4861
3055
3011
msgid ""
3056
3012
" Determine the missing revisions up to a specific revision on this\n"
3057
3013
" branch::"
3058
3014
msgstr ""
3059
3015
3060
#: bzrlib/builtins.py:4904
3016
#: bzrlib/builtins.py:4864
3061
3017
msgid " bzr missing --my-revision ..-10"
3062
3018
msgstr ""
3063
3019
3064
#: bzrlib/builtins.py:4911
3020
#: bzrlib/builtins.py:4871
3065
3021
msgid "Reverse the order of revisions."
3066
3022
msgstr ""
3067
3023
3068
#: bzrlib/builtins.py:4913
3024
#: bzrlib/builtins.py:4873
3069
3025
msgid "Display changes in the local branch only."
3070
3026
msgstr ""
3071
3027
3072
#: bzrlib/builtins.py:4914
3028
#: bzrlib/builtins.py:4874
3073
3029
msgid "Same as --mine-only."
3074
3030
msgstr ""
3075
3031
3076
#: bzrlib/builtins.py:4916
3032
#: bzrlib/builtins.py:4876
3077
3033
msgid "Display changes in the remote branch only."
3078
3034
msgstr ""
3079
3035
3080
#: bzrlib/builtins.py:4917
3036
#: bzrlib/builtins.py:4877
3081
3037
msgid "Same as --theirs-only."
3082
3038
msgstr ""
3083
3039
3084
#: bzrlib/builtins.py:4922
3040
#: bzrlib/builtins.py:4882
3085
3041
msgid ""
3086
3042
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3087
3043
"details."
3088
3044
msgstr ""
3089
3045
3090
#: bzrlib/builtins.py:4926
3046
#: bzrlib/builtins.py:4886
3091
3047
msgid ""
3092
3048
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3093
3049
"details."
3094
3050
msgstr ""
3095
3051
3096
#: bzrlib/builtins.py:4929
3052
#: bzrlib/builtins.py:4889
3097
3053
msgid "Show all revisions in addition to the mainline ones."
3098
3054
msgstr ""
3099
3055
3100
#: bzrlib/builtins.py:4983
3056
#: bzrlib/builtins.py:4943
3101
3057
msgid "No peer location known or specified."
3102
3058
msgstr ""
3103
3059
3104
#: bzrlib/builtins.py:4987
3060
#: bzrlib/builtins.py:4947
3105
3061
msgid "Using saved parent location: {0}\n"
3106
3062
msgstr ""
3107
3063
3108
#: bzrlib/builtins.py:5020
3064
#: bzrlib/builtins.py:4980
3109
3065
#, python-format
3110
3066
msgid "You have %d extra revision:\n"
3111
3067
msgid_plural "You have %d extra revisions:\n"
3112
3068
msgstr[0] ""
3113
3069
msgstr[1] ""
3114
3070
3115
#: bzrlib/builtins.py:5040
3071
#: bzrlib/builtins.py:4996
3116
3072
#, python-format
3117
3073
msgid "You are missing %d revision:\n"
3118
3074
msgid_plural "You are missing %d revisions:\n"
3119
3075
msgstr[0] ""
3120
3076
msgstr[1] ""
3121
3077
3122
#: bzrlib/builtins.py:5055
3078
#: bzrlib/builtins.py:5008
3123
3079
msgid "This branch has no new revisions.\n"
3124
3080
msgstr ""
3125
3081
3126
#: bzrlib/builtins.py:5058
3082
#: bzrlib/builtins.py:5011
3127
3083
msgid "Other branch has no new revisions.\n"
3128
3084
msgstr ""
3129
3085
3130
#: bzrlib/builtins.py:5063
3086
#: bzrlib/builtins.py:5016
3131
3087
msgid "Branches are up to date.\n"
3132
3088
msgstr ""
3133
3089
3134
#: bzrlib/builtins.py:5074
3090
#: bzrlib/builtins.py:5027
3135
3091
msgid "Compress the data within a repository."
3136
3092
msgstr ""
3137
3093
3138
#: bzrlib/builtins.py:5076
3094
#: bzrlib/builtins.py:5029
3139
3095
msgid ""
3140
3096
"This operation compresses the data within a bazaar repository. As\n"
3141
3097
"bazaar supports automatic packing of repository, this operation is\n"
3142
3098
"normally not required to be done manually."
3143
3099
msgstr ""
3144
3100
3145
#: bzrlib/builtins.py:5080
3101
#: bzrlib/builtins.py:5033
3146
3102
msgid ""
3147
3103
"During the pack operation, bazaar takes a backup of existing repository\n"
3148
3104
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3151
3107
"used."
3152
3108
msgstr ""
3153
3109
3154
#: bzrlib/builtins.py:5086
3110
#: bzrlib/builtins.py:5039
3155
3111
msgid ""
3156
3112
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3157
3113
"during or immediately after repacking, you may be left with a state\n"
3159
3115
"been. In this case the repository may be unusable."
3160
3116
msgstr ""
3161
3117
3162
#: bzrlib/builtins.py:5095
3118
#: bzrlib/builtins.py:5048
3163
3119
msgid "Delete obsolete packs to save disk space."
3164
3120
msgstr ""
3165
3121
3166
#: bzrlib/builtins.py:5109
3122
#: bzrlib/builtins.py:5062
3167
3123
msgid "List the installed plugins."
3168
3124
msgstr ""
3169
3125
3170
#: bzrlib/builtins.py:5111
3126
#: bzrlib/builtins.py:5064
3171
3127
msgid ""
3172
3128
"This command displays the list of installed plugins including\n"
3173
3129
"version of plugin and a short description of each."
3174
3130
msgstr ""
3175
3131
3176
#: bzrlib/builtins.py:5114
3132
#: bzrlib/builtins.py:5067
3177
3133
msgid "--verbose shows the path where each plugin is located."
3178
3134
msgstr ""
3179
3135
3180
#: bzrlib/builtins.py:5116
3136
#: bzrlib/builtins.py:5069
3181
3137
msgid ""
3182
3138
"A plugin is an external component for Bazaar that extends the\n"
3183
3139
"revision control system, by adding or replacing code in Bazaar.\n"
3186
3142
"customizing log output."
3187
3143
msgstr ""
3188
3144
3189
#: bzrlib/builtins.py:5122
3145
#: bzrlib/builtins.py:5075
3190
3146
msgid ""
3191
3147
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3192
3148
"for further information on plugins including where to find them and how to\n"
3194
3150
"plugins using the Python programming language."
3195
3151
msgstr ""
3196
3152
3197
#: bzrlib/builtins.py:5138
3153
#: bzrlib/builtins.py:5091
3198
3154
msgid "Show testament (signing-form) of a revision."
3199
3155
msgstr ""
3200
3156
3201
#: bzrlib/builtins.py:5141
3157
#: bzrlib/builtins.py:5094
3202
3158
msgid "Produce long-format testament."
3203
3159
msgstr ""
3204
3160
3205
#: bzrlib/builtins.py:5143
3161
#: bzrlib/builtins.py:5096
3206
3162
msgid "Produce a strict-format testament."
3207
3163
msgstr ""
3208
3164
3209
#: bzrlib/builtins.py:5169
3165
#: bzrlib/builtins.py:5122
3210
3166
msgid "Show the origin of each line in a file."
3211
3167
msgstr ""
3212
3168
3213
#: bzrlib/builtins.py:5171
3169
#: bzrlib/builtins.py:5124
3214
3170
msgid ""
3215
3171
"This prints out the given file with an annotation on the left side\n"
3216
3172
"indicating which revision, author and date introduced the change."
3217
3173
msgstr ""
3218
3174
3219
#: bzrlib/builtins.py:5174
3175
#: bzrlib/builtins.py:5127
3220
3176
msgid ""
3221
3177
"If the origin is the same for a run of consecutive lines, it is\n"
3222
3178
"shown only at the top, unless the --all option is given."
3223
3179
msgstr ""
3224
3180
3225
#: bzrlib/builtins.py:5182
3181
#: bzrlib/builtins.py:5135
3226
3182
msgid "Show annotations on all lines."
3227
3183
msgstr ""
3228
3184
3229
#: bzrlib/builtins.py:5183
3185
#: bzrlib/builtins.py:5136
3230
3186
msgid "Show commit date in annotations."
3231
3187
msgstr ""
3232
3188
3233
#: bzrlib/builtins.py:5270
3189
#: bzrlib/builtins.py:5223
3234
3190
msgid "Cannot sign a range of non-revision-history revisions"
3235
3191
msgstr ""
3236
3192
3237
#: bzrlib/builtins.py:5282
3193
#: bzrlib/builtins.py:5235
3238
3194
msgid "Please supply either one revision, or a range."
3239
3195
msgstr ""
3240
3196
3241
#: bzrlib/builtins.py:5286
3197
#: bzrlib/builtins.py:5239
3242
3198
msgid ""
3243
3199
"Convert the current branch into a checkout of the supplied branch.\n"
3244
3200
"If no branch is supplied, rebind to the last bound location."
3245
3201
msgstr ""
3246
3202
3247
#: bzrlib/builtins.py:5289
3203
#: bzrlib/builtins.py:5242
3248
3204
msgid ""
3249
3205
"Once converted into a checkout, commits must succeed on the master branch\n"
3250
3206
"before they will be applied to the local branch."
3251
3207
msgstr ""
3252
3208
3253
#: bzrlib/builtins.py:5292
3209
#: bzrlib/builtins.py:5245
3254
3210
msgid ""
3255
3211
"Bound branches use the nickname of its master branch unless it is set\n"
3256
3212
"locally, in which case binding will update the local nickname to be\n"
3257
3213
"that of the master."
3258
3214
msgstr ""
3259
3215
3260
#: bzrlib/builtins.py:5307
3216
#: bzrlib/builtins.py:5260
3261
3217
msgid "No location supplied. This format does not remember old locations."
3262
3218
msgstr ""
3263
3219
3264
#: bzrlib/builtins.py:5313
3220
#: bzrlib/builtins.py:5265
3265
3221
msgid "Branch is already bound"
3266
3222
msgstr ""
3267
3223
3268
#: bzrlib/builtins.py:5316
3224
#: bzrlib/builtins.py:5267
3269
3225
msgid "No location supplied and no previous location known"
3270
3226
msgstr ""
3271
3227
3272
#: bzrlib/builtins.py:5322
3228
#: bzrlib/builtins.py:5273
3273
3229
msgid "These branches have diverged. Try merging, and then bind again."
3274
3230
msgstr ""
3275
3231
3276
#: bzrlib/builtins.py:5329
3232
#: bzrlib/builtins.py:5280
3277
3233
msgid "Convert the current checkout into a regular branch."
3278
3234
msgstr ""
3279
3235
3280
#: bzrlib/builtins.py:5331
3236
#: bzrlib/builtins.py:5282
3281
3237
msgid ""
3282
3238
"After unbinding, the local branch is considered independent and subsequent\n"
3283
3239
"commits will be local only."
3284
3240
msgstr ""
3285
3241
3286
#: bzrlib/builtins.py:5342
3242
#: bzrlib/builtins.py:5293
3287
3243
msgid "Local branch is not bound"
3288
3244
msgstr ""
3289
3245
3290
#: bzrlib/builtins.py:5346
3246
#: bzrlib/builtins.py:5297
3291
3247
msgid "Remove the last committed revision."
3292
3248
msgstr ""
3293
3249
3294
#: bzrlib/builtins.py:5348
3250
#: bzrlib/builtins.py:5299
3295
3251
msgid ""
3296
3252
"--verbose will print out what is being removed.\n"
3297
3253
"--dry-run will go through all the motions, but not actually\n"
3298
3254
"remove anything."
3299
3255
msgstr ""
3300
3256
3301
#: bzrlib/builtins.py:5352
3257
#: bzrlib/builtins.py:5303
3302
3258
msgid ""
3303
3259
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3304
3260
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3305
3261
"branch at revision 15."
3306
3262
msgstr ""
3307
3263
3308
#: bzrlib/builtins.py:5356
3264
#: bzrlib/builtins.py:5307
3309
3265
msgid ""
3310
3266
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3311
3267
"it may make is to restore any pending merges that were present before\n"
3312
3268
"the commit."
3313
3269
msgstr ""
3314
3270
3315
#: bzrlib/builtins.py:5367
3271
#: bzrlib/builtins.py:5318
3316
3272
msgid "Don't actually make changes."
3317
3273
msgstr ""
3318
3274
3319
#: bzrlib/builtins.py:5368
3275
#: bzrlib/builtins.py:5319
3320
3276
msgid "Say yes to all questions."
3321
3277
msgstr ""
3322
3278
3323
#: bzrlib/builtins.py:5370
3279
#: bzrlib/builtins.py:5321
3324
3280
msgid "Keep tags that point to removed revisions."
3325
3281
msgstr ""
3326
3282
3283
#: bzrlib/builtins.py:5323
3284
msgid "Only remove the commits from the local branch when in a checkout."
3285
msgstr ""
3286
3327
3287
#: bzrlib/builtins.py:5372
3328
msgid "Only remove the commits from the local branch when in a checkout."
3329
msgstr ""
3330
3331
#: bzrlib/builtins.py:5421
3332
3288
msgid "No revisions to uncommit.\n"
3333
3289
msgstr ""
3334
3290
3335
#: bzrlib/builtins.py:5436
3291
#: bzrlib/builtins.py:5387
3336
3292
msgid "Dry-run, pretending to remove the above revisions.\n"
3337
3293
msgstr ""
3338
3294
3339
#: bzrlib/builtins.py:5439
3295
#: bzrlib/builtins.py:5390
3340
3296
msgid "The above revision(s) will be removed.\n"
3341
3297
msgstr ""
3342
3298
3343
#: bzrlib/builtins.py:5443
3299
#: bzrlib/builtins.py:5394
3344
3300
msgid "Uncommit these revisions"
3345
3301
msgstr ""
3346
3302
3347
#: bzrlib/builtins.py:5446
3303
#: bzrlib/builtins.py:5397
3348
3304
msgid "Canceled\n"
3349
3305
msgstr ""
3350
3306
3351
#: bzrlib/builtins.py:5453
3307
#: bzrlib/builtins.py:5404
3352
3308
#, python-format
3353
3309
msgid ""
3354
3310
"You can restore the old tip by running:\n"
3355
3311
" bzr pull . -r revid:%s\n"
3356
3312
msgstr ""
3357
3313
3358
#: bzrlib/builtins.py:5458
3314
#: bzrlib/builtins.py:5409
3359
3315
msgid "Break a dead lock."
3360
3316
msgstr ""
3361
3317
3362
#: bzrlib/builtins.py:5460
3318
#: bzrlib/builtins.py:5411
3363
3319
msgid ""
3364
3320
"This command breaks a lock on a repository, branch, working directory or\n"
3365
3321
"config file."
3366
3322
msgstr ""
3367
3323
3368
#: bzrlib/builtins.py:5463
3324
#: bzrlib/builtins.py:5414
3369
3325
msgid ""
3370
3326
"CAUTION: Locks should only be broken when you are sure that the process\n"
3371
3327
"holding the lock has been stopped."
3372
3328
msgstr ""
3373
3329
3374
#: bzrlib/builtins.py:5466
3330
#: bzrlib/builtins.py:5417
3375
3331
msgid ""
3376
3332
"You can get information on what locks are open via the 'bzr info\n"
3377
3333
"[location]' command."
3378
3334
msgstr ""
3379
3335
3380
#: bzrlib/builtins.py:5469
3336
#: bzrlib/builtins.py:5420
3381
3337
msgid ""
3382
3338
":Examples:\n"
3383
3339
" bzr break-lock\n"
3385
3341
" bzr break-lock --conf ~/.bazaar"
3386
3342
msgstr ""
3387
3343
3388
#: bzrlib/builtins.py:5478
3344
#: bzrlib/builtins.py:5429
3389
3345
msgid "LOCATION is the directory where the config lock is."
3390
3346
msgstr ""
3391
3347
3392
#: bzrlib/builtins.py:5480
3348
#: bzrlib/builtins.py:5431
3393
3349
msgid "Do not ask for confirmation before breaking the lock."
3394
3350
msgstr ""
3395
3351
3396
#: bzrlib/builtins.py:5515
3352
#: bzrlib/builtins.py:5466
3397
3353
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3398
3354
msgstr ""
3399
3355
3400
#: bzrlib/builtins.py:5516
3356
#: bzrlib/builtins.py:5467
3401
3357
msgid "Run the bzr server."
3402
3358
msgstr ""
3403
3359
3404
#: bzrlib/builtins.py:5522
3360
#: bzrlib/builtins.py:5473
3405
3361
msgid "Serve on stdin/out for use from inetd or sshd."
3406
3362
msgstr ""
3407
3363
3408
#: bzrlib/builtins.py:5523
3364
#: bzrlib/builtins.py:5474
3409
3365
msgid "protocol"
3410
3366
msgstr ""
3411
3367
3412
#: bzrlib/builtins.py:5524
3368
#: bzrlib/builtins.py:5475
3413
3369
msgid "Protocol to serve."
3414
3370
msgstr ""
3415
3371
3416
#: bzrlib/builtins.py:5528
3417
msgid "Listen for connections on nominated address."
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5530
3372
#: bzrlib/builtins.py:5479
3421
3373
msgid ""
3422
"Listen for connections on nominated port. Passing 0 as the port number will "
3423
"result in a dynamically allocated port. The default port depends on the "
3424
"protocol."
3374
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3375
"Passing 0 as the port number will result in a dynamically allocated port. "
3376
"The default port depends on the protocol."
3425
3377
msgstr ""
3426
3378
3427
#: bzrlib/builtins.py:5535
3379
#: bzrlib/builtins.py:5485
3428
3380
msgid "Serve contents of this directory."
3429
3381
msgstr ""
3430
3382
3431
#: bzrlib/builtins.py:5537
3383
#: bzrlib/builtins.py:5487
3432
3384
msgid ""
3433
3385
"By default the server is a readonly server. Supplying --allow-writes "
3434
3386
"enables write access to the contents of the served directory and below. "
3437
3389
"uncontrolled write access to your file system."
3438
3390
msgstr ""
3439
3391
3392
#: bzrlib/builtins.py:5496
3393
msgid "Override the default idle client timeout (5min)."
3394
msgstr ""
3395
3440
3396
#: bzrlib/builtins.py:5546
3441
msgid "Override the default idle client timeout (5min)."
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:5564
3445
3397
msgid "Combine a tree into its containing tree."
3446
3398
msgstr ""
3447
3399
3448
#: bzrlib/builtins.py:5566
3400
#: bzrlib/builtins.py:5548
3449
3401
msgid "This command requires the target tree to be in a rich-root format."
3450
3402
msgstr ""
3451
3403
3452
#: bzrlib/builtins.py:5568
3404
#: bzrlib/builtins.py:5550
3453
3405
msgid ""
3454
3406
"The TREE argument should be an independent tree, inside another tree, but\n"
3455
3407
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3456
3408
"running \"bzr branch\" with the target inside a tree.)"
3457
3409
msgstr ""
3458
3410
3459
#: bzrlib/builtins.py:5572
3411
#: bzrlib/builtins.py:5554
3460
3412
msgid ""
3461
3413
"The result is a combined tree, with the subtree no longer an independent\n"
3462
3414
"part. This is marked as a merge of the subtree into the containing tree,\n"
3463
3415
"and all history is preserved."
3464
3416
msgstr ""
3465
3417
3466
#: bzrlib/builtins.py:5590
3418
#: bzrlib/builtins.py:5572
3467
3419
#, python-format
3468
3420
msgid ""
3469
3421
"Can't join trees because %s doesn't support rich root data.\n"
3470
3422
"You can use bzr upgrade on the repository."
3471
3423
msgstr ""
3472
3424
3473
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3425
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3474
3426
msgid "Cannot join {0}. {1}"
3475
3427
msgstr ""
3476
3428
3477
#: bzrlib/builtins.py:5610
3429
#: bzrlib/builtins.py:5592
3478
3430
msgid "Split a subdirectory of a tree into a separate tree."
3479
3431
msgstr ""
3480
3432
3481
#: bzrlib/builtins.py:5612
3433
#: bzrlib/builtins.py:5594
3482
3434
msgid ""
3483
3435
"This command will produce a target tree in a format that supports\n"
3484
3436
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3485
3437
"converted into earlier formats like 'dirstate-tags'."
3486
3438
msgstr ""
3487
3439
3488
#: bzrlib/builtins.py:5616
3440
#: bzrlib/builtins.py:5598
3489
3441
msgid ""
3490
3442
"The TREE argument should be a subdirectory of a working tree. That\n"
3491
3443
"subdirectory will be converted into an independent tree, with its own\n"
3492
3444
"branch. Commits in the top-level tree will not apply to the new subtree."
3493
3445
msgstr ""
3494
3446
3495
#: bzrlib/builtins.py:5696
3447
#: bzrlib/builtins.py:5678
3496
3448
msgid "No submit branch specified or known"
3497
3449
msgstr ""
3498
3450
3499
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3451
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3500
3452
msgid "No public branch specified or known"
3501
3453
msgstr ""
3502
3454
3503
#: bzrlib/builtins.py:5710
3455
#: bzrlib/builtins.py:5691
3504
3456
msgid "bzr merge-directive takes at most two one revision identifiers"
3505
3457
msgstr ""
3506
3458
3459
#: bzrlib/builtins.py:5700
3460
msgid "No revisions to bundle."
3461
msgstr ""
3462
3507
3463
#: bzrlib/builtins.py:5719
3508
msgid "No revisions to bundle."
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5738
3512
3464
msgid "Mail or create a merge-directive for submitting changes."
3513
3465
msgstr ""
3514
3466
3515
#: bzrlib/builtins.py:5740
3467
#: bzrlib/builtins.py:5721
3516
3468
msgid "A merge directive provides many things needed for requesting merges:"
3517
3469
msgstr ""
3518
3470
3519
#: bzrlib/builtins.py:5742
3471
#: bzrlib/builtins.py:5723
3520
3472
msgid "* A machine-readable description of the merge to perform"
3521
3473
msgstr ""
3522
3474
3523
#: bzrlib/builtins.py:5744
3475
#: bzrlib/builtins.py:5725
3524
3476
msgid "* An optional patch that is a preview of the changes requested"
3525
3477
msgstr ""
3526
3478
3527
#: bzrlib/builtins.py:5746
3479
#: bzrlib/builtins.py:5727
3528
3480
msgid ""
3529
3481
"* An optional bundle of revision data, so that the changes can be applied\n"
3530
3482
" directly from the merge directive, without retrieving data from a\n"
3531
3483
" branch."
3532
3484
msgstr ""
3533
3485
3534
#: bzrlib/builtins.py:5750
3486
#: bzrlib/builtins.py:5731
3535
3487
msgid ""
3536
3488
"`bzr send` creates a compact data set that, when applied using bzr\n"
3537
3489
"merge, has the same effect as merging from the source branch. "
3538
3490
msgstr ""
3539
3491
3540
#: bzrlib/builtins.py:5753
3492
#: bzrlib/builtins.py:5734
3541
3493
msgid ""
3542
3494
"By default the merge directive is self-contained and can be applied to any\n"
3543
3495
"branch containing submit_branch in its ancestory without needing access to\n"
3544
3496
"the source branch."
3545
3497
msgstr ""
3546
3498
3547
#: bzrlib/builtins.py:5757
3499
#: bzrlib/builtins.py:5738
3548
3500
msgid ""
3549
3501
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3550
3502
"revisions, but only a structured request to merge from the\n"
3553
3505
"included if known, so that people can check it later."
3554
3506
msgstr ""
3555
3507
3556
#: bzrlib/builtins.py:5763
3508
#: bzrlib/builtins.py:5744
3557
3509
msgid ""
3558
3510
"The submit branch defaults to the parent of the source branch, but can be\n"
3559
3511
"overridden. Both submit branch and public branch will be remembered in\n"
3562
3514
"be changed using --from."
3563
3515
msgstr ""
3564
3516
3565
#: bzrlib/builtins.py:5769
3517
#: bzrlib/builtins.py:5750
3566
3518
msgid ""
3567
3519
"Both the submit branch and the public branch follow the usual behavior with\n"
3568
3520
"respect to --remember: If there is no default location set, the first send\n"
3571
3523
"--remember. The value will only be saved if the location can be accessed."
3572
3524
msgstr ""
3573
3525
3574
#: bzrlib/builtins.py:5775
3526
#: bzrlib/builtins.py:5756
3575
3527
msgid ""
3576
3528
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3577
3529
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3579
3531
"in the merge directive."
3580
3532
msgstr ""
3581
3533
3582
#: bzrlib/builtins.py:5780
3534
#: bzrlib/builtins.py:5761
3583
3535
msgid ""
3584
3536
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3585
3537
"given, in which case it is sent to a file."
3586
3538
msgstr ""
3587
3539
3588
#: bzrlib/builtins.py:5783
3540
#: bzrlib/builtins.py:5764
3589
3541
msgid ""
3590
3542
"Mail is sent using your preferred mail program. This should be transparent\n"
3591
3543
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3592
3544
"If the preferred client can't be found (or used), your editor will be used."
3593
3545
msgstr ""
3594
3546
3595
#: bzrlib/builtins.py:5787
3547
#: bzrlib/builtins.py:5768
3596
3548
msgid ""
3597
3549
"To use a specific mail program, set the mail_client configuration option.\n"
3598
3550
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3604
3556
"supported clients."
3605
3557
msgstr ""
3606
3558
3607
#: bzrlib/builtins.py:5794
3559
#: bzrlib/builtins.py:5775
3608
3560
msgid ""
3609
3561
"If mail is being sent, a to address is required. This can be supplied\n"
3610
3562
"either on the commandline, by setting the submit_to configuration\n"
3612
3564
"in the submit branch."
3613
3565
msgstr ""
3614
3566
3615
#: bzrlib/builtins.py:5799
3567
#: bzrlib/builtins.py:5780
3616
3568
msgid ""
3617
3569
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3618
3570
"and\n"
3622
3574
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3623
3575
msgstr ""
3624
3576
3625
#: bzrlib/builtins.py:5805
3577
#: bzrlib/builtins.py:5786
3626
3578
msgid ""
3627
3579
"The merge directives created by bzr send may be applied using bzr merge or\n"
3628
3580
"bzr pull by specifying a file containing a merge directive as the location."
3629
3581
msgstr ""
3630
3582
3631
#: bzrlib/builtins.py:5808
3583
#: bzrlib/builtins.py:5789
3632
3584
msgid ""
3633
3585
"bzr send makes extensive use of public locations to map local locations "
3634
3586
"into\n"
3636
3588
"set them, and use `bzr info` to display them."
3637
3589
msgstr ""
3638
3590
3639
#: bzrlib/builtins.py:5832
3591
#: bzrlib/builtins.py:5813
3640
3592
msgid "Write merge directive to this file or directory; use - for stdout."
3641
3593
msgstr ""
3642
3594
3643
#: bzrlib/builtins.py:5836
3595
#: bzrlib/builtins.py:5817
3644
3596
msgid ""
3645
3597
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3646
3598
"strict disables the check."
3647
3599
msgstr ""
3648
3600
3649
#: bzrlib/builtins.py:5838
3601
#: bzrlib/builtins.py:5819
3650
3602
msgid "Mail the request to this address."
3651
3603
msgstr ""
3652
3604
3653
#: bzrlib/builtins.py:5842
3605
#: bzrlib/builtins.py:5823
3654
3606
msgid "Body for the email."
3655
3607
msgstr ""
3656
3608
3657
#: bzrlib/builtins.py:5895
3609
#: bzrlib/builtins.py:5876
3658
3610
msgid "Do not include a bundle in the merge directive."
3659
3611
msgstr ""
3660
3612
3661
#: bzrlib/builtins.py:5896
3613
#: bzrlib/builtins.py:5877
3662
3614
msgid "Do not include a preview patch in the merge directive."
3663
3615
msgstr ""
3664
3616
3665
#: bzrlib/builtins.py:5899
3617
#: bzrlib/builtins.py:5880
3666
3618
msgid "Remember submit and public branch."
3667
3619
msgstr ""
3668
3620
3669
#: bzrlib/builtins.py:5901
3621
#: bzrlib/builtins.py:5882
3670
3622
msgid ""
3671
3623
"Branch to generate the submission from, rather than the one containing the "
3672
3624
"working directory."
3673
3625
msgstr ""
3674
3626
3675
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3627
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3676
3628
msgid "format"
3677
3629
msgstr ""
3678
3630
3679
#: bzrlib/builtins.py:5912
3631
#: bzrlib/builtins.py:5893
3680
3632
msgid "Use the specified output format."
3681
3633
msgstr ""
3682
3634
3683
#: bzrlib/builtins.py:5934
3635
#: bzrlib/builtins.py:5915
3684
3636
msgid "Create, remove or modify a tag naming a revision."
3685
3637
msgstr ""
3686
3638
3687
#: bzrlib/builtins.py:5936
3639
#: bzrlib/builtins.py:5917
3688
3640
msgid ""
3689
3641
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3690
3642
"(--revision) option can be given -rtag:X, where X is any previously\n"
3691
3643
"created tag."
3692
3644
msgstr ""
3693
3645
3694
#: bzrlib/builtins.py:5940
3646
#: bzrlib/builtins.py:5921
3695
3647
msgid ""
3696
3648
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3697
3649
"along when you branch, push, pull or merge."
3698
3650
msgstr ""
3699
3651
3700
#: bzrlib/builtins.py:5943
3652
#: bzrlib/builtins.py:5924
3701
3653
msgid ""
3702
3654
"It is an error to give a tag name that already exists unless you pass\n"
3703
3655
"--force, in which case the tag is moved to point to the new revision."
3704
3656
msgstr ""
3705
3657
3706
#: bzrlib/builtins.py:5946
3658
#: bzrlib/builtins.py:5927
3707
3659
msgid ""
3708
3660
"To rename a tag (change the name but keep it on the same revsion), run "
3709
3661
"``bzr\n"
3710
3662
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3711
3663
msgstr ""
3712
3664
3713
#: bzrlib/builtins.py:5949
3665
#: bzrlib/builtins.py:5930
3714
3666
msgid ""
3715
3667
"If no tag name is specified it will be determined through the \n"
3716
3668
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3718
3670
"details."
3719
3671
msgstr ""
3720
3672
3721
#: bzrlib/builtins.py:5959
3673
#: bzrlib/builtins.py:5940
3722
3674
msgid "Delete this tag rather than placing it."
3723
3675
msgstr ""
3724
3676
3725
#: bzrlib/builtins.py:5962
3677
#: bzrlib/builtins.py:5943
3726
3678
msgid "Branch in which to place the tag."
3727
3679
msgstr ""
3728
3680
3729
#: bzrlib/builtins.py:5964
3681
#: bzrlib/builtins.py:5945
3730
3682
msgid "Replace existing tags."
3731
3683
msgstr ""
3732
3684
3733
#: bzrlib/builtins.py:5979
3685
#: bzrlib/builtins.py:5960
3734
3686
msgid "No tag specified to delete."
3735
3687
msgstr ""
3736
3688
3737
#: bzrlib/builtins.py:5981
3689
#: bzrlib/builtins.py:5962
3738
3690
#, python-format
3739
3691
msgid "Deleted tag %s."
3740
3692
msgstr ""
3741
3693
3742
#: bzrlib/builtins.py:5995
3694
#: bzrlib/builtins.py:5976
3743
3695
msgid "Please specify a tag name."
3744
3696
msgstr ""
3745
3697
3746
#: bzrlib/builtins.py:6003
3698
#: bzrlib/builtins.py:5984
3747
3699
#, python-format
3748
3700
msgid "Tag %s already exists for that revision."
3749
3701
msgstr ""
3750
3702
3751
#: bzrlib/builtins.py:6007
3703
#: bzrlib/builtins.py:5988
3752
3704
#, python-format
3753
3705
msgid "Created tag %s."
3754
3706
msgstr ""
3755
3707
3756
#: bzrlib/builtins.py:6009
3708
#: bzrlib/builtins.py:5990
3757
3709
#, python-format
3758
3710
msgid "Updated tag %s."
3759
3711
msgstr ""
3760
3712
3761
#: bzrlib/builtins.py:6013
3713
#: bzrlib/builtins.py:5994
3762
3714
msgid "List tags."
3763
3715
msgstr ""
3764
3716
3765
#: bzrlib/builtins.py:6015
3717
#: bzrlib/builtins.py:5996
3766
3718
msgid ""
3767
3719
"This command shows a table of tag names and the revisions they reference."
3768
3720
msgstr ""
3769
3721
3770
#: bzrlib/builtins.py:6021
3722
#: bzrlib/builtins.py:6002
3771
3723
msgid "Branch whose tags should be displayed."
3772
3724
msgstr ""
3773
3725
3774
#: bzrlib/builtins.py:6023
3726
#: bzrlib/builtins.py:6004
3775
3727
msgid "Sort tags by different criteria."
3776
3728
msgstr ""
3777
3729
3778
#: bzrlib/builtins.py:6023
3730
#: bzrlib/builtins.py:6004
3779
3731
msgid "Sorting"
3780
3732
msgstr ""
3781
3733
3782
#: bzrlib/builtins.py:6092
3734
#: bzrlib/builtins.py:6073
3783
3735
msgid "Reconfigure the type of a bzr directory."
3784
3736
msgstr ""
3785
3737
3786
#: bzrlib/builtins.py:6094
3738
#: bzrlib/builtins.py:6075
3787
3739
msgid "A target configuration must be specified."
3788
3740
msgstr ""
3789
3741
3790
#: bzrlib/builtins.py:6096
3742
#: bzrlib/builtins.py:6077
3791
3743
msgid ""
3792
3744
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3793
3745
"The order of preference is\n"
3798
3750
"If none of these is available, --bind-to must be specified."
3799
3751
msgstr ""
3800
3752
3801
#: bzrlib/builtins.py:6110
3753
#: bzrlib/builtins.py:6091
3802
3754
msgid "Tree type"
3803
3755
msgstr ""
3804
3756
3805
#: bzrlib/builtins.py:6111
3757
#: bzrlib/builtins.py:6092
3806
3758
msgid "The relation between branch and tree."
3807
3759
msgstr ""
3808
3760
3809
#: bzrlib/builtins.py:6113
3761
#: bzrlib/builtins.py:6094
3810
3762
msgid "Reconfigure to be an unbound branch with no working tree."
3811
3763
msgstr ""
3812
3764
3813
#: bzrlib/builtins.py:6114
3765
#: bzrlib/builtins.py:6095
3814
3766
msgid "Reconfigure to be an unbound branch with a working tree."
3815
3767
msgstr ""
3816
3768
3817
#: bzrlib/builtins.py:6115
3769
#: bzrlib/builtins.py:6096
3818
3770
msgid "Reconfigure to be a bound branch with a working tree."
3819
3771
msgstr ""
3820
3772
3821
#: bzrlib/builtins.py:6116
3773
#: bzrlib/builtins.py:6097
3822
3774
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3823
3775
msgstr ""
3824
3776
3825
#: bzrlib/builtins.py:6121
3777
#: bzrlib/builtins.py:6102
3826
3778
msgid "Repository type"
3827
3779
msgstr ""
3828
3780
3829
#: bzrlib/builtins.py:6122
3781
#: bzrlib/builtins.py:6103
3830
3782
msgid "Location fo the repository."
3831
3783
msgstr ""
3832
3784
3833
#: bzrlib/builtins.py:6124
3785
#: bzrlib/builtins.py:6105
3834
3786
msgid ""
3835
3787
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3836
3788
msgstr ""
3837
3789
3838
#: bzrlib/builtins.py:6126
3790
#: bzrlib/builtins.py:6107
3839
3791
msgid "Reconfigure to use a shared repository."
3840
3792
msgstr ""
3841
3793
3842
#: bzrlib/builtins.py:6130
3794
#: bzrlib/builtins.py:6111
3843
3795
msgid "Trees in Repository"
3844
3796
msgstr ""
3845
3797
3846
#: bzrlib/builtins.py:6131
3798
#: bzrlib/builtins.py:6112
3847
3799
msgid "Whether new branches in the repository have trees."
3848
3800
msgstr ""
3849
3801
3850
#: bzrlib/builtins.py:6133
3802
#: bzrlib/builtins.py:6114
3851
3803
msgid ""
3852
3804
"Reconfigure repository to create working trees on branches by default."
3853
3805
msgstr ""
3854
3806
3855
#: bzrlib/builtins.py:6135
3807
#: bzrlib/builtins.py:6116
3856
3808
msgid ""
3857
3809
"Reconfigure repository to not create working trees on branches by default."
3858
3810
msgstr ""
3859
3811
3860
#: bzrlib/builtins.py:6138
3812
#: bzrlib/builtins.py:6119
3861
3813
msgid "Branch to bind checkout to."
3862
3814
msgstr ""
3863
3815
3864
#: bzrlib/builtins.py:6140
3816
#: bzrlib/builtins.py:6121
3865
3817
msgid "Perform reconfiguration even if local changes will be lost."
3866
3818
msgstr ""
3867
3819
3868
#: bzrlib/builtins.py:6143
3820
#: bzrlib/builtins.py:6124
3869
3821
msgid "Reconfigure a branch to be stacked on another branch."
3870
3822
msgstr ""
3871
3823
3872
#: bzrlib/builtins.py:6147
3824
#: bzrlib/builtins.py:6128
3873
3825
msgid ""
3874
3826
"Reconfigure a branch to be unstacked. This may require copying substantial "
3875
3827
"data into it."
3876
3828
msgstr ""
3877
3829
3878
#: bzrlib/builtins.py:6157
3830
#: bzrlib/builtins.py:6138
3879
3831
msgid "Can't use both --stacked-on and --unstacked"
3880
3832
msgstr ""
3881
3833
3882
#: bzrlib/builtins.py:6171
3834
#: bzrlib/builtins.py:6152
3883
3835
msgid "No target configuration specified"
3884
3836
msgstr ""
3885
3837
3886
#: bzrlib/builtins.py:6206
3838
#: bzrlib/builtins.py:6187
3887
3839
msgid "Set the branch of a checkout and update."
3888
3840
msgstr ""
3889
3841
3890
#: bzrlib/builtins.py:6208
3842
#: bzrlib/builtins.py:6189
3891
3843
msgid ""
3892
3844
"For lightweight checkouts, this changes the branch being referenced.\n"
3893
3845
"For heavyweight checkouts, this checks that there are no local commits\n"
3895
3847
"of the new location and binds to it."
3896
3848
msgstr ""
3897
3849
3898
#: bzrlib/builtins.py:6213
3850
#: bzrlib/builtins.py:6194
3899
3851
msgid ""
3900
3852
"In both cases, the working tree is updated and uncommitted changes\n"
3901
3853
"are merged. The user can commit or revert these as they desire."
3902
3854
msgstr ""
3903
3855
3904
#: bzrlib/builtins.py:6216
3856
#: bzrlib/builtins.py:6197
3905
3857
msgid "Pending merges need to be committed or reverted before using switch."
3906
3858
msgstr ""
3907
3859
3908
#: bzrlib/builtins.py:6218
3860
#: bzrlib/builtins.py:6199
3909
3861
msgid ""
3910
3862
"The path to the branch to switch to can be specified relative to the parent\n"
3911
3863
"directory of the current branch. For example, if you are currently in a\n"
3913
3865
"/path/to/newbranch."
3914
3866
msgstr ""
3915
3867
3916
#: bzrlib/builtins.py:6223
3868
#: bzrlib/builtins.py:6204
3917
3869
msgid ""
3918
3870
"Bound branches use the nickname of its master branch unless it is set\n"
3919
3871
"locally, in which case switching will update the local nickname to be\n"
3920
3872
"that of the master."
3921
3873
msgstr ""
3922
3874
3923
#: bzrlib/builtins.py:6231
3875
#: bzrlib/builtins.py:6212
3924
3876
msgid "Switch even if local commits will be lost."
3925
3877
msgstr ""
3926
3878
3927
#: bzrlib/builtins.py:6234
3879
#: bzrlib/builtins.py:6215
3928
3880
msgid "Create the target branch from this one before switching to it."
3929
3881
msgstr ""
3930
3882
3931
#: bzrlib/builtins.py:6248
3883
#: bzrlib/builtins.py:6229
3932
3884
msgid "You must supply either a revision or a location"
3933
3885
msgstr ""
3934
3886
3935
#: bzrlib/builtins.py:6261
3887
#: bzrlib/builtins.py:6242
3936
3888
msgid "cannot create branch without source branch"
3937
3889
msgstr ""
3938
3890
3939
#: bzrlib/builtins.py:6286
3891
#: bzrlib/builtins.py:6262
3940
3892
msgid "Manage filtered views."
3941
3893
msgstr ""
3942
3894
3943
#: bzrlib/builtins.py:6288
3895
#: bzrlib/builtins.py:6264
3944
3896
msgid ""
3945
3897
"Views provide a mask over the tree so that users can focus on\n"
3946
3898
"a subset of a tree when doing their work. After creating a view,\n"
3950
3902
"must be within the current view."
3951
3903
msgstr ""
3952
3904
3953
#: bzrlib/builtins.py:6295
3905
#: bzrlib/builtins.py:6271
3954
3906
msgid ""
3955
3907
"In most cases, a view has a short life-span: it is created to make\n"
3956
3908
"a selected change and is deleted once that change is committed.\n"
3958
3910
"and switch between them."
3959
3911
msgstr ""
3960
3912
3961
#: bzrlib/builtins.py:6300
3913
#: bzrlib/builtins.py:6276
3962
3914
msgid ""
3963
3915
"To disable the current view without deleting it, you can switch to\n"
3964
3916
"the pseudo view called ``off``. This can be useful when you need\n"
3966
3918
"want to switch back to your view after that."
3967
3919
msgstr ""
3968
3920
3969
#: bzrlib/builtins.py:6305
3921
#: bzrlib/builtins.py:6281
3970
3922
msgid ""
3971
3923
":Examples:\n"
3972
3924
" To define the current view::"
3973
3925
msgstr ""
3974
3926
3975
#: bzrlib/builtins.py:6308
3927
#: bzrlib/builtins.py:6284
3976
3928
msgid " bzr view file1 dir1 ..."
3977
3929
msgstr ""
3978
3930
3979
#: bzrlib/builtins.py:6310
3931
#: bzrlib/builtins.py:6286
3980
3932
msgid " To list the current view::"
3981
3933
msgstr ""
3982
3934
3983
#: bzrlib/builtins.py:6312
3935
#: bzrlib/builtins.py:6288
3984
3936
msgid " bzr view"
3985
3937
msgstr ""
3986
3938
3987
#: bzrlib/builtins.py:6314
3939
#: bzrlib/builtins.py:6290
3988
3940
msgid " To delete the current view::"
3989
3941
msgstr ""
3990
3942
3991
#: bzrlib/builtins.py:6316
3943
#: bzrlib/builtins.py:6292
3992
3944
msgid " bzr view --delete"
3993
3945
msgstr ""
3994
3946
3995
#: bzrlib/builtins.py:6318
3947
#: bzrlib/builtins.py:6294
3996
3948
msgid " To disable the current view without deleting it::"
3997
3949
msgstr ""
3998
3950
3999
#: bzrlib/builtins.py:6320
3951
#: bzrlib/builtins.py:6296
4000
3952
msgid " bzr view --switch off"
4001
3953
msgstr ""
4002
3954
4003
#: bzrlib/builtins.py:6322
3955
#: bzrlib/builtins.py:6298
4004
3956
msgid " To define a named view and switch to it::"
4005
3957
msgstr ""
4006
3958
4007
#: bzrlib/builtins.py:6324
3959
#: bzrlib/builtins.py:6300
4008
3960
msgid " bzr view --name view-name file1 dir1 ..."
4009
3961
msgstr ""
4010
3962
4011
#: bzrlib/builtins.py:6326
3963
#: bzrlib/builtins.py:6302
4012
3964
msgid " To list a named view::"
4013
3965
msgstr ""
4014
3966
4015
#: bzrlib/builtins.py:6328
3967
#: bzrlib/builtins.py:6304
4016
3968
msgid " bzr view --name view-name"
4017
3969
msgstr ""
4018
3970
4019
#: bzrlib/builtins.py:6330
3971
#: bzrlib/builtins.py:6306
4020
3972
msgid " To delete a named view::"
4021
3973
msgstr ""
4022
3974
4023
#: bzrlib/builtins.py:6332
3975
#: bzrlib/builtins.py:6308
4024
3976
msgid " bzr view --name view-name --delete"
4025
3977
msgstr ""
4026
3978
4027
#: bzrlib/builtins.py:6334
3979
#: bzrlib/builtins.py:6310
4028
3980
msgid " To switch to a named view::"
4029
3981
msgstr ""
4030
3982
4031
#: bzrlib/builtins.py:6336
3983
#: bzrlib/builtins.py:6312
4032
3984
msgid " bzr view --switch view-name"
4033
3985
msgstr ""
4034
3986
4035
#: bzrlib/builtins.py:6338
3987
#: bzrlib/builtins.py:6314
4036
3988
msgid " To list all views defined::"
4037
3989
msgstr ""
4038
3990
4039
#: bzrlib/builtins.py:6340
3991
#: bzrlib/builtins.py:6316
4040
3992
msgid " bzr view --all"
4041
3993
msgstr ""
4042
3994
4043
#: bzrlib/builtins.py:6342
3995
#: bzrlib/builtins.py:6318
4044
3996
msgid " To delete all views::"
4045
3997
msgstr ""
4046
3998
4047
#: bzrlib/builtins.py:6344
3999
#: bzrlib/builtins.py:6320
4048
4000
msgid " bzr view --delete --all"
4049
4001
msgstr ""
4050
4002
4051
#: bzrlib/builtins.py:6351
4003
#: bzrlib/builtins.py:6327
4052
4004
msgid "Apply list or delete action to all views."
4053
4005
msgstr ""
4054
4006
4055
#: bzrlib/builtins.py:6354
4007
#: bzrlib/builtins.py:6330
4056
4008
msgid "Delete the view."
4057
4009
msgstr ""
4058
4010
4059
#: bzrlib/builtins.py:6357
4011
#: bzrlib/builtins.py:6333
4060
4012
msgid "Name of the view to define, list or delete."
4061
4013
msgstr ""
4062
4014
4063
#: bzrlib/builtins.py:6361
4015
#: bzrlib/builtins.py:6337
4064
4016
msgid "Name of the view to switch to."
4065
4017
msgstr ""
4066
4018
4067
#: bzrlib/builtins.py:6380
4019
#: bzrlib/builtins.py:6356
4068
4020
msgid "Both --delete and a file list specified"
4069
4021
msgstr ""
4070
4022
4071
#: bzrlib/builtins.py:6383
4023
#: bzrlib/builtins.py:6359
4072
4024
msgid "Both --delete and --switch specified"
4073
4025
msgstr ""
4074
4026
4075
#: bzrlib/builtins.py:6386
4027
#: bzrlib/builtins.py:6362
4076
4028
msgid "Deleted all views.\n"
4077
4029
msgstr ""
4078
4030
4079
#: bzrlib/builtins.py:6388
4031
#: bzrlib/builtins.py:6364
4080
4032
msgid "No current view to delete"
4081
4033
msgstr ""
4082
4034
4083
#: bzrlib/builtins.py:6391
4035
#: bzrlib/builtins.py:6367
4084
4036
#, python-format
4085
4037
msgid "Deleted '%s' view.\n"
4086
4038
msgstr ""
4087
4039
4088
#: bzrlib/builtins.py:6395
4040
#: bzrlib/builtins.py:6371
4089
4041
msgid "Both --switch and a file list specified"
4090
4042
msgstr ""
4091
4043
4092
#: bzrlib/builtins.py:6398
4044
#: bzrlib/builtins.py:6374
4093
4045
msgid "Both --switch and --all specified"
4094
4046
msgstr ""
4095
4047
4096
#: bzrlib/builtins.py:6401
4048
#: bzrlib/builtins.py:6377
4097
4049
msgid "No current view to disable"
4098
4050
msgstr ""
4099
4051
4100
#: bzrlib/builtins.py:6403
4052
#: bzrlib/builtins.py:6379
4101
4053
#, python-format
4102
4054
msgid "Disabled '%s' view.\n"
4103
4055
msgstr ""
4104
4056
4105
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4057
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4106
4058
msgid "Using '{0}' view: {1}\n"
4107
4059
msgstr ""
4108
4060
4109
#: bzrlib/builtins.py:6410
4061
#: bzrlib/builtins.py:6386
4110
4062
msgid "Views defined:\n"
4111
4063
msgstr ""
4112
4064
4113
#: bzrlib/builtins.py:6419
4065
#: bzrlib/builtins.py:6395
4114
4066
msgid "No views defined.\n"
4115
4067
msgstr ""
4116
4068
4117
#: bzrlib/builtins.py:6426
4069
#: bzrlib/builtins.py:6402
4118
4070
msgid "Cannot change the 'off' pseudo view"
4119
4071
msgstr ""
4120
4072
4121
#: bzrlib/builtins.py:6434
4073
#: bzrlib/builtins.py:6410
4122
4074
msgid "No current view.\n"
4123
4075
msgstr ""
4124
4076
4125
#: bzrlib/builtins.py:6437
4077
#: bzrlib/builtins.py:6413
4126
4078
msgid "'{0}' view is: {1}\n"
4127
4079
msgstr ""
4128
4080
4129
#: bzrlib/builtins.py:6457
4081
#: bzrlib/builtins.py:6433
4130
4082
msgid " <no hooks installed>\n"
4131
4083
msgstr ""
4132
4084
4133
#: bzrlib/builtins.py:6461
4085
#: bzrlib/builtins.py:6437
4134
4086
msgid "Remove a branch."
4135
4087
msgstr ""
4136
4088
4137
#: bzrlib/builtins.py:6463
4089
#: bzrlib/builtins.py:6439
4138
4090
msgid ""
4139
4091
"This will remove the branch from the specified location but \n"
4140
4092
"will keep any working tree or repository in place."
4141
4093
msgstr ""
4142
4094
4143
#: bzrlib/builtins.py:6468
4095
#: bzrlib/builtins.py:6444
4144
4096
msgid " Remove the branch at repo/trunk::"
4145
4097
msgstr ""
4146
4098
4147
#: bzrlib/builtins.py:6470
4099
#: bzrlib/builtins.py:6446
4148
4100
msgid " bzr remove-branch repo/trunk"
4149
4101
msgstr ""
4150
4102
4151
#: bzrlib/builtins.py:6477
4152
msgid "Remove branch even if it is the active branch."
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6491
4156
msgid "Branch is active. Use --force to remove it."
4157
msgstr ""
4158
4159
#: bzrlib/builtins.py:6495
4103
#: bzrlib/builtins.py:6461
4160
4104
msgid "Plaintext diff output."
4161
4105
msgstr ""
4162
4106
4163
#: bzrlib/builtins.py:6496
4107
#: bzrlib/builtins.py:6462
4164
4108
msgid "Temporarily set aside some changes from the current tree."
4165
4109
msgstr ""
4166
4110
4167
#: bzrlib/builtins.py:6498
4111
#: bzrlib/builtins.py:6464
4168
4112
msgid ""
4169
4113
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4170
4114
"ie. out of the way, until a later time when you can bring them back from\n"
4173
4117
"will they survive its deletion."
4174
4118
msgstr ""
4175
4119
4176
#: bzrlib/builtins.py:6504
4120
#: bzrlib/builtins.py:6470
4177
4121
msgid "If shelve --list is specified, previously-shelved changes are listed."
4178
4122
msgstr ""
4179
4123
4180
#: bzrlib/builtins.py:6506
4124
#: bzrlib/builtins.py:6472
4181
4125
msgid ""
4182
4126
"Shelve is intended to help separate several sets of changes that have\n"
4183
4127
"been inappropriately mingled. If you just want to get rid of all changes\n"
4185
4129
"shelve all text changes at once, use shelve --all."
4186
4130
msgstr ""
4187
4131
4188
#: bzrlib/builtins.py:6511
4132
#: bzrlib/builtins.py:6477
4189
4133
msgid ""
4190
4134
"If filenames are specified, only the changes to those files will be\n"
4191
4135
"shelved. Other files will be left untouched."
4192
4136
msgstr ""
4193
4137
4194
#: bzrlib/builtins.py:6514
4138
#: bzrlib/builtins.py:6480
4195
4139
msgid ""
4196
4140
"If a revision is specified, changes since that revision will be shelved."
4197
4141
msgstr ""
4198
4142
4199
#: bzrlib/builtins.py:6516
4143
#: bzrlib/builtins.py:6482
4200
4144
msgid ""
4201
4145
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4202
4146
"restore the most recently shelved changes."
4203
4147
msgstr ""
4204
4148
4205
#: bzrlib/builtins.py:6519
4149
#: bzrlib/builtins.py:6485
4206
4150
msgid ""
4207
4151
"For complicated changes, it is possible to edit the changes in a separate\n"
4208
4152
"editor program to decide what the file remaining in the working copy\n"
4209
4153
"should look like. To do this, add the configuration option"
4210
4154
msgstr ""
4211
4155
4212
#: bzrlib/builtins.py:6523
4156
#: bzrlib/builtins.py:6489
4213
4157
msgid " change_editor = PROGRAM @new_path @old_path"
4214
4158
msgstr ""
4215
4159
4216
#: bzrlib/builtins.py:6525
4160
#: bzrlib/builtins.py:6491
4217
4161
msgid ""
4218
4162
"where @new_path is replaced with the path of the new version of the \n"
4219
4163
"file and @old_path is replaced with the path of the old version of \n"
4222
4166
" "
4223
4167
msgstr ""
4224
4168
4225
#: bzrlib/builtins.py:6537
4169
#: bzrlib/builtins.py:6503
4226
4170
msgid "Shelve all changes."
4227
4171
msgstr ""
4228
4172
4229
#: bzrlib/builtins.py:6539
4173
#: bzrlib/builtins.py:6505
4230
4174
msgid "Method to use for writing diffs."
4231
4175
msgstr ""
4232
4176
4233
#: bzrlib/builtins.py:6539
4177
#: bzrlib/builtins.py:6505
4234
4178
msgid "writer"
4235
4179
msgstr ""
4236
4180
4237
#: bzrlib/builtins.py:6543
4181
#: bzrlib/builtins.py:6509
4238
4182
msgid "List shelved changes."
4239
4183
msgstr ""
4240
4184
4241
#: bzrlib/builtins.py:6545
4185
#: bzrlib/builtins.py:6511
4242
4186
msgid "Destroy removed changes instead of shelving them."
4243
4187
msgstr ""
4244
4188
4245
#: bzrlib/builtins.py:6574
4189
#: bzrlib/builtins.py:6540
4246
4190
msgid "No shelved changes."
4247
4191
msgstr ""
4248
4192
4249
#: bzrlib/builtins.py:6585
4193
#: bzrlib/builtins.py:6551
4250
4194
msgid "Restore shelved changes."
4251
4195
msgstr ""
4252
4196
4253
#: bzrlib/builtins.py:6587
4197
#: bzrlib/builtins.py:6553
4254
4198
msgid ""
4255
4199
"By default, the most recently shelved changes are restored. However if you\n"
4256
4200
"specify a shelf by id those changes will be restored instead. This works\n"
4257
4201
"best when the changes don't depend on each other."
4258
4202
msgstr ""
4259
4203
4260
#: bzrlib/builtins.py:6596
4204
#: bzrlib/builtins.py:6562
4261
4205
msgid "The action to perform."
4262
4206
msgstr ""
4263
4207
4264
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4208
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4265
4209
msgid "action"
4266
4210
msgstr ""
4267
4211
4268
#: bzrlib/builtins.py:6598
4212
#: bzrlib/builtins.py:6564
4269
4213
msgid "Apply changes and remove from the shelf."
4270
4214
msgstr ""
4271
4215
4272
#: bzrlib/builtins.py:6599
4216
#: bzrlib/builtins.py:6565
4273
4217
msgid "Show changes, but do not apply or remove them."
4274
4218
msgstr ""
4275
4219
4276
#: bzrlib/builtins.py:6600
4220
#: bzrlib/builtins.py:6566
4277
4221
msgid ""
4278
4222
"Instead of unshelving the changes, show the diff that would result from "
4279
4223
"unshelving."
4280
4224
msgstr ""
4281
4225
4282
#: bzrlib/builtins.py:6602
4226
#: bzrlib/builtins.py:6568
4283
4227
msgid "Delete changes without applying them."
4284
4228
msgstr ""
4285
4229
4286
#: bzrlib/builtins.py:6603
4230
#: bzrlib/builtins.py:6569
4287
4231
msgid "Apply changes but don't delete them."
4288
4232
msgstr ""
4289
4233
4290
#: bzrlib/builtins.py:6618
4234
#: bzrlib/builtins.py:6584
4291
4235
msgid "Remove unwanted files from working tree."
4292
4236
msgstr ""
4293
4237
4294
#: bzrlib/builtins.py:6620
4238
#: bzrlib/builtins.py:6586
4295
4239
msgid ""
4296
4240
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4297
4241
"files are never deleted."
4298
4242
msgstr ""
4299
4243
4300
#: bzrlib/builtins.py:6623
4244
#: bzrlib/builtins.py:6589
4301
4245
msgid ""
4302
4246
"Another class is 'detritus', which includes files emitted by bzr during\n"
4303
4247
"normal operations and selftests. (The value of these files decreases with\n"
4304
4248
"time.)"
4305
4249
msgstr ""
4306
4250
4307
#: bzrlib/builtins.py:6627
4251
#: bzrlib/builtins.py:6593
4308
4252
msgid ""
4309
4253
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4310
4254
"flags are respected, and may be combined."
4311
4255
msgstr ""
4312
4256
4313
#: bzrlib/builtins.py:6630
4257
#: bzrlib/builtins.py:6596
4314
4258
msgid "To check what clean-tree will do, use --dry-run."
4315
4259
msgstr ""
4316
4260
4317
#: bzrlib/builtins.py:6633
4261
#: bzrlib/builtins.py:6599
4318
4262
msgid "Delete all ignored files."
4319
4263
msgstr ""
4320
4264
4321
#: bzrlib/builtins.py:6634
4265
#: bzrlib/builtins.py:6600
4322
4266
msgid ""
4323
4267
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4324
4268
msgstr ""
4325
4269
4326
#: bzrlib/builtins.py:6637
4270
#: bzrlib/builtins.py:6603
4327
4271
msgid "Delete files unknown to bzr (default)."
4328
4272
msgstr ""
4329
4273
4330
#: bzrlib/builtins.py:6638
4274
#: bzrlib/builtins.py:6604
4331
4275
msgid "Show files to delete instead of deleting them."
4332
4276
msgstr ""
4333
4277
4334
#: bzrlib/builtins.py:6640
4278
#: bzrlib/builtins.py:6606
4335
4279
msgid "Do not prompt before deleting."
4336
4280
msgstr ""
4337
4281
4391
4335
msgstr[0] ""
4392
4336
msgstr[1] ""
4393
4337
4394
#: bzrlib/bzrdir.py:487
4338
#: bzrlib/bzrdir.py:490
4395
4339
msgid ""
4396
4340
"making backup of {0}\n"
4397
4341
" to {1}"
4398
4342
msgstr ""
4399
4343
4400
#: bzrlib/bzrdir.py:510
4344
#: bzrlib/bzrdir.py:513
4401
4345
msgid "renamed {0} to {1}"
4402
4346
msgstr ""
4403
4347
4404
#: bzrlib/bzrdir.py:1639
4348
#: bzrlib/bzrdir.py:1652
4405
4349
#, python-format
4406
4350
msgid ""
4407
4351
"Source repository format does not support stacking, using format:\n"
4408
4352
" %s"
4409
4353
msgstr ""
4410
4354
4411
#: bzrlib/bzrdir.py:1659
4355
#: bzrlib/bzrdir.py:1672
4412
4356
#, python-format
4413
4357
msgid ""
4414
4358
"Source branch format does not support stacking, using format:\n"
4415
4359
" %s"
4416
4360
msgstr ""
4417
4361
4418
#: bzrlib/bzrdir.py:1805
4362
#: bzrlib/bzrdir.py:1818
4419
4363
msgid "starting repository conversion"
4420
4364
msgstr ""
4421
4365
4422
#: bzrlib/bzrdir.py:2026
4366
#: bzrlib/bzrdir.py:2039
4423
4367
msgid "Using default stacking branch {0} at {1}"
4424
4368
msgstr ""
4425
4369
4602
4546
"supported formats or in a custom format based on a template."
4603
4547
msgstr ""
4604
4548
4605
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4606
#: en/help_topics/configuration.txt:722
4549
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4550
#: en/help_topics/configuration.txt:710
4607
4551
msgid "For example::"
4608
4552
msgstr ""
4609
4553
4722
4666
msgid ":See also: %s"
4723
4667
msgstr ""
4724
4668
4725
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4669
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4726
4670
msgid "Only ASCII permitted in option names"
4727
4671
msgstr ""
4728
4672
4729
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4673
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4730
4674
msgid "command {0!r} needs one or more {1}"
4731
4675
msgstr ""
4732
4676
4733
#: bzrlib/commands.py:868
4677
#: bzrlib/commands.py:858
4734
4678
msgid "command {0!r} requires argument {1}"
4735
4679
msgstr ""
4736
4680
4737
#: bzrlib/commands.py:875
4681
#: bzrlib/commands.py:865
4738
4682
msgid "extra argument to command {0}: {1}"
4739
4683
msgstr ""
4740
4684
4741
#: bzrlib/commands.py:972
4685
#: bzrlib/commands.py:962
4742
4686
#, python-format
4743
4687
msgid "Profile data written to \"%s\"."
4744
4688
msgstr ""
4781
4725
msgid "renamed"
4782
4726
msgstr ""
4783
4727
4784
#: bzrlib/commit.py:976
4728
#: bzrlib/commit.py:977
4785
4729
msgid "unchanged"
4786
4730
msgstr ""
4787
4731
4788
#: bzrlib/commit.py:998
4732
#: bzrlib/commit.py:999
4789
4733
msgid "{0} [{1}] - Stage"
4790
4734
msgstr ""
4791
4735
4792
#: bzrlib/commit.py:1001
4736
#: bzrlib/commit.py:1002
4793
4737
#, python-format
4794
4738
msgid "%s - Stage"
4795
4739
msgstr ""
4796
4740
4797
#: bzrlib/commit_signature_commands.py:34
4741
#: bzrlib/commit_signature_commands.py:36
4798
4742
msgid "Sign all commits by a given committer."
4799
4743
msgstr ""
4800
4744
4801
#: bzrlib/commit_signature_commands.py:36
4745
#: bzrlib/commit_signature_commands.py:38
4802
4746
msgid ""
4803
4747
"If location is not specified the local tree is used.\n"
4804
4748
"If committer is not specified the default committer is used."
4805
4749
msgstr ""
4806
4750
4807
#: bzrlib/commit_signature_commands.py:39
4751
#: bzrlib/commit_signature_commands.py:41
4808
4752
msgid "This does not sign commits that already have signatures."
4809
4753
msgstr ""
4810
4754
4811
#: bzrlib/commit_signature_commands.py:47
4755
#: bzrlib/commit_signature_commands.py:49
4812
4756
msgid ""
4813
4757
"Don't actually sign anything, just print the revisions that would be signed."
4814
4758
msgstr ""
4815
4759
4816
#: bzrlib/commit_signature_commands.py:98
4817
#, python-format
4818
msgid "Signed %d revision.\n"
4819
msgid_plural "Signed %d revisions.\n"
4820
msgstr[0] ""
4821
msgstr[1] ""
4822
4823
4760
#: bzrlib/commit_signature_commands.py:103
4824
4761
msgid "Verify all commit signatures."
4825
4762
msgstr ""
4835
4772
"verification."
4836
4773
msgstr ""
4837
4774
4838
#: bzrlib/commit_signature_commands.py:148
4775
#: bzrlib/commit_signature_commands.py:147
4839
4776
msgid "Cannot verify a range of non-revision-history revisions"
4840
4777
msgstr ""
4841
4778
4842
#: bzrlib/commit_signature_commands.py:166
4779
#: bzrlib/commit_signature_commands.py:168
4843
4780
msgid "All commits signed with verifiable keys"
4844
4781
msgstr ""
4845
4782
4846
#: bzrlib/config.py:436
4783
#: bzrlib/config.py:475
4847
4784
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4848
4785
msgstr ""
4849
4786
4850
#: bzrlib/config.py:2452
4787
#: bzrlib/config.py:2485
4851
4788
msgid "{0} is not an SI unit."
4852
4789
msgstr ""
4853
4790
4854
#: bzrlib/config.py:2971
4791
#: bzrlib/config.py:2949
4855
4792
msgid ""
4856
4793
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4857
4794
"will be saved."
4858
4795
msgstr ""
4859
4796
4860
#: bzrlib/config.py:3116
4797
#: bzrlib/config.py:3093
4861
4798
#, python-format
4862
4799
msgid "Invalid '%s', should be of the form 'name=value'"
4863
4800
msgstr ""
4864
4801
4865
#: bzrlib/config.py:4018
4802
#: bzrlib/config.py:3962
4866
4803
msgid "Display, set or remove a configuration option."
4867
4804
msgstr ""
4868
4805
4869
#: bzrlib/config.py:4020
4806
#: bzrlib/config.py:3964
4870
4807
msgid "Display the active value for a given option."
4871
4808
msgstr ""
4872
4809
4873
#: bzrlib/config.py:4022
4810
#: bzrlib/config.py:3966
4874
4811
msgid ""
4875
4812
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4876
4813
"matching options are displayed mentioning their scope. The active value\n"
4877
4814
"that bzr will take into account is the first one displayed for each option."
4878
4815
msgstr ""
4879
4816
4880
#: bzrlib/config.py:4026
4817
#: bzrlib/config.py:3970
4881
4818
msgid "If no NAME is given, --all .* is implied."
4882
4819
msgstr ""
4883
4820
4884
#: bzrlib/config.py:4028
4821
#: bzrlib/config.py:3972
4885
4822
msgid ""
4886
4823
"Setting a value is achieved by using name=value without spaces. The value\n"
4887
4824
"is set in the most relevant scope and can be checked by displaying the\n"
4888
4825
"option again."
4889
4826
msgstr ""
4890
4827
4891
#: bzrlib/config.py:4040
4828
#: bzrlib/config.py:3984
4892
4829
msgid "Reduce the scope to the specified configuration file."
4893
4830
msgstr ""
4894
4831
4895
#: bzrlib/config.py:4044
4832
#: bzrlib/config.py:3988
4896
4833
msgid "Display all the defined values for the matching options."
4897
4834
msgstr ""
4898
4835
4899
#: bzrlib/config.py:4046
4836
#: bzrlib/config.py:3990
4900
4837
msgid "Remove the option from the configuration file."
4901
4838
msgstr ""
4902
4839
4976
4913
msgstr[0] ""
4977
4914
msgstr[1] ""
4978
4915
4979
#: bzrlib/controldir.py:712
4916
#: bzrlib/controldir.py:710
4980
4917
msgid "{0} is{1} redirected to {2}"
4981
4918
msgstr ""
4982
4919
5174
5111
5175
5112
#: bzrlib/errors.py:646
5176
5113
msgid "Path \"%(path)s\" is not unicode normalized"
5177
msgstr "Path \"%(path)s\" is not unicode normalised"
5114
msgstr ""
5178
5115
5179
5116
#: bzrlib/errors.py:654
5180
5117
msgid "Not a branch: \"%(path)s\"%(detail)s."
5193
5130
msgstr ""
5194
5131
5195
5132
#: bzrlib/errors.py:715
5196
msgid "Invalid branch name: %(name)s"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:724
5200
5133
msgid "Parent branch already exists: \"%(path)s\"."
5201
5134
msgstr ""
5202
5135
5203
#: bzrlib/errors.py:730
5136
#: bzrlib/errors.py:721
5204
5137
msgid ""
5205
5138
"Directory contains a branch, but no working tree (use bzr checkout if you "
5206
5139
"wish to build a working tree): \"%(path)s\""
5207
5140
msgstr ""
5208
5141
5209
#: bzrlib/errors.py:735
5142
#: bzrlib/errors.py:726
5210
5143
msgid ""
5211
5144
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5212
5145
msgstr ""
5213
5146
5214
#: bzrlib/errors.py:745
5147
#: bzrlib/errors.py:736
5215
5148
msgid ""
5216
5149
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5217
5150
msgstr ""
5218
5151
5219
#: bzrlib/errors.py:755
5152
#: bzrlib/errors.py:746
5220
5153
msgid "No repository present: \"%(path)s\""
5221
5154
msgstr ""
5222
5155
5223
#: bzrlib/errors.py:762
5156
#: bzrlib/errors.py:753
5224
5157
msgid ""
5225
5158
"Unsupported branch format: %(format)s\n"
5226
5159
"Please run 'bzr upgrade'"
5227
5160
msgstr ""
5228
5161
5229
#: bzrlib/errors.py:768
5162
#: bzrlib/errors.py:759
5230
5163
msgid "Unknown %(kind)s format: %(format)r"
5231
5164
msgstr "Unknown %(kind)s format: %(format)r"
5232
5165
5233
#: bzrlib/errors.py:777
5166
#: bzrlib/errors.py:768
5234
5167
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5235
5168
msgstr ""
5236
5169
5237
#: bzrlib/errors.py:787
5170
#: bzrlib/errors.py:778
5238
5171
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5239
5172
msgstr ""
5240
5173
5241
#: bzrlib/errors.py:802
5174
#: bzrlib/errors.py:793
5242
5175
msgid ""
5243
5176
"%(target)s\n"
5244
5177
"is not compatible with\n"
5246
5179
"%(details)s"
5247
5180
msgstr ""
5248
5181
5249
#: bzrlib/errors.py:818
5182
#: bzrlib/errors.py:809
5250
5183
msgid "Revision is not compatible with %(repo_format)s"
5251
5184
msgstr ""
5252
5185
5253
#: bzrlib/errors.py:828
5186
#: bzrlib/errors.py:819
5254
5187
msgid "%(context_info)s%(path)s is already versioned."
5255
5188
msgstr ""
5256
5189
5257
#: bzrlib/errors.py:849
5190
#: bzrlib/errors.py:840
5258
5191
msgid "%(context_info)s%(path)s is not versioned."
5259
5192
msgstr ""
5260
5193
5261
#: bzrlib/errors.py:870
5194
#: bzrlib/errors.py:861
5262
5195
msgid "Path(s) are not versioned: %(paths_as_string)s"
5263
5196
msgstr ""
5264
5197
5265
#: bzrlib/errors.py:881
5198
#: bzrlib/errors.py:872
5266
5199
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5267
5200
msgstr ""
5268
5201
5269
#: bzrlib/errors.py:900
5202
#: bzrlib/errors.py:891
5270
5203
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5271
5204
msgstr "Cannot operate on \"%(filename)s\" of unsupported type \"%(kind)s\""
5272
5205
5273
#: bzrlib/errors.py:908
5206
#: bzrlib/errors.py:899
5274
5207
msgid ""
5275
5208
"Filename %(filename)r is not valid in your current filesystem encoding "
5276
5209
"%(fs_encoding)s"
5277
5210
msgstr ""
5278
5211
5279
#: bzrlib/errors.py:919
5212
#: bzrlib/errors.py:910
5280
5213
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5281
5214
msgstr ""
5282
5215
5283
#: bzrlib/errors.py:937
5216
#: bzrlib/errors.py:928
5284
5217
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5285
5218
msgstr ""
5286
5219
5287
#: bzrlib/errors.py:976
5220
#: bzrlib/errors.py:967
5288
5221
msgid "Cannot lock %(lock)s: %(why)s"
5289
5222
msgstr ""
5290
5223
5291
#: bzrlib/errors.py:986
5224
#: bzrlib/errors.py:977
5292
5225
msgid ""
5293
5226
"A transaction related operation was attempted after the transaction finished."
5294
5227
msgstr ""
5295
5228
5296
#: bzrlib/errors.py:1013
5229
#: bzrlib/errors.py:1004
5297
5230
msgid "Cannot lock: transport is read only: %(transport)s"
5298
5231
msgstr ""
5299
5232
5300
#: bzrlib/errors.py:1021
5233
#: bzrlib/errors.py:1012
5301
5234
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5302
5235
msgstr ""
5303
5236
5304
#: bzrlib/errors.py:1032
5237
#: bzrlib/errors.py:1023
5305
5238
msgid ""
5306
5239
"Lock was broken while still open: %(lock)s - check storage consistency!"
5307
5240
msgstr ""
5308
5241
5309
#: bzrlib/errors.py:1043
5242
#: bzrlib/errors.py:1034
5310
5243
msgid ""
5311
5244
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5312
5245
"%(holder)r, wanted to break %(target)r"
5313
5246
msgstr ""
5314
5247
5315
#: bzrlib/errors.py:1055
5248
#: bzrlib/errors.py:1046
5316
5249
msgid ""
5317
5250
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5318
5251
"Use 'bzr break-lock' to clear it"
5319
5252
msgstr ""
5320
5253
5321
#: bzrlib/errors.py:1068
5254
#: bzrlib/errors.py:1059
5322
5255
msgid "Lock not held: %(lock)s"
5323
5256
msgstr ""
5324
5257
5325
#: bzrlib/errors.py:1097
5258
#: bzrlib/errors.py:1088
5326
5259
msgid "No changes to commit"
5327
5260
msgstr ""
5328
5261
5329
#: bzrlib/errors.py:1102
5262
#: bzrlib/errors.py:1093
5330
5263
msgid ""
5331
5264
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5332
5265
msgstr ""
5333
5266
5334
#: bzrlib/errors.py:1112
5267
#: bzrlib/errors.py:1103
5335
5268
msgid ""
5336
5269
"Excluding paths during commit is not supported by repository at "
5337
5270
"%(repository)r."
5338
5271
msgstr ""
5339
5272
5340
#: bzrlib/errors.py:1121
5273
#: bzrlib/errors.py:1112
5341
5274
msgid ""
5342
5275
"The specified commit message contains characters unsupported by the current "
5343
5276
"encoding."
5344
5277
msgstr ""
5345
5278
5346
#: bzrlib/errors.py:1127
5279
#: bzrlib/errors.py:1118
5347
5280
msgid "Upgrade URL cannot work with readonly URLs."
5348
5281
msgstr ""
5349
5282
5350
#: bzrlib/errors.py:1132
5283
#: bzrlib/errors.py:1123
5351
5284
msgid "The branch format %(format)s is already at the most recent format."
5352
5285
msgstr ""
5353
5286
5354
#: bzrlib/errors.py:1155
5287
#: bzrlib/errors.py:1146
5355
5288
msgid "Option --change does not accept revision ranges"
5356
5289
msgstr ""
5357
5290
5358
#: bzrlib/errors.py:1160
5291
#: bzrlib/errors.py:1151
5359
5292
msgid "No namespace registered for string: %(spec)r"
5360
5293
msgstr ""
5361
5294
5362
#: bzrlib/errors.py:1179
5295
#: bzrlib/errors.py:1170
5363
5296
msgid ""
5364
5297
"Requested revision: '%(spec)s' does not exist in branch: "
5365
5298
"%(branch_url)s%(extra)s"
5366
5299
msgstr ""
5367
5300
5368
#: bzrlib/errors.py:1193
5301
#: bzrlib/errors.py:1184
5369
5302
msgid ""
5370
5303
"Operation denied because it would change the main history, which is not "
5371
5304
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5372
5305
msgstr ""
5373
5306
5374
#: bzrlib/errors.py:1204
5307
#: bzrlib/errors.py:1195
5375
5308
msgid ""
5376
5309
"These branches have diverged. Use the missing command to see how.\n"
5377
5310
"Use the merge command to reconcile them."
5378
5311
msgstr ""
5379
5312
5380
#: bzrlib/errors.py:1224
5313
#: bzrlib/errors.py:1215
5381
5314
msgid ""
5382
5315
"Branches have no common ancestor, and no merge base revision was specified."
5383
5316
msgstr ""
5384
5317
5385
#: bzrlib/errors.py:1230
5318
#: bzrlib/errors.py:1221
5386
5319
msgid ""
5387
5320
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5388
5321
msgstr ""
5389
5322
5323
#: bzrlib/errors.py:1227
5324
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5325
msgstr ""
5326
5390
5327
#: bzrlib/errors.py:1236
5391
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5328
msgid ""
5329
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5392
5330
msgstr ""
5393
5331
5394
5332
#: bzrlib/errors.py:1245
5395
msgid ""
5396
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5333
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5397
5334
msgstr ""
5398
5335
5399
5336
#: bzrlib/errors.py:1254
5400
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:1263
5404
5337
msgid "Branch %(branch)s has no commits."
5405
5338
msgstr ""
5406
5339
5407
#: bzrlib/errors.py:1281
5340
#: bzrlib/errors.py:1272
5408
5341
msgid ""
5409
5342
"Bound branch %(branch)s is out of date with master branch "
5410
5343
"%(master)s.%(extra_help)s"
5411
5344
msgstr ""
5412
5345
5413
#: bzrlib/errors.py:1293
5346
#: bzrlib/errors.py:1284
5414
5347
msgid ""
5415
5348
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5416
5349
"bound to %(remote)s."
5417
5350
msgstr ""
5418
5351
5352
#: bzrlib/errors.py:1296
5353
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5354
msgstr ""
5355
5419
5356
#: bzrlib/errors.py:1305
5420
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5421
msgstr ""
5422
5423
#: bzrlib/errors.py:1314
5424
5357
msgid ""
5425
5358
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5426
5359
"%(error)s"
5427
5360
msgstr ""
5428
5361
5362
#: bzrlib/errors.py:1317
5363
msgid "Error in processing weave: %(msg)s"
5364
msgstr ""
5365
5429
5366
#: bzrlib/errors.py:1326
5430
msgid "Error in processing weave: %(msg)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1335
5434
5367
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5435
5368
msgstr ""
5436
5369
5437
#: bzrlib/errors.py:1346
5370
#: bzrlib/errors.py:1337
5438
5371
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5439
5372
msgstr ""
5440
5373
5374
#: bzrlib/errors.py:1347
5375
msgid "Weave invariant violated: %(what)s"
5376
msgstr ""
5377
5441
5378
#: bzrlib/errors.py:1356
5442
msgid "Weave invariant violated: %(what)s"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1365
5446
5379
msgid "Parents are mismatched between two revisions. %(msg)s"
5447
5380
msgstr ""
5448
5381
5449
#: bzrlib/errors.py:1387
5382
#: bzrlib/errors.py:1378
5450
5383
msgid ""
5451
5384
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5452
5385
"%(weave_b)s"
5453
5386
msgstr ""
5454
5387
5455
#: bzrlib/errors.py:1399
5388
#: bzrlib/errors.py:1390
5456
5389
msgid "Versioned file error"
5457
5390
msgstr ""
5458
5391
5459
#: bzrlib/errors.py:1404
5392
#: bzrlib/errors.py:1395
5460
5393
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5461
5394
msgstr ""
5462
5395
5463
#: bzrlib/errors.py:1414
5396
#: bzrlib/errors.py:1405
5464
5397
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5465
5398
msgstr ""
5466
5399
5467
#: bzrlib/errors.py:1424
5400
#: bzrlib/errors.py:1415
5468
5401
msgid "Text did not match its checksum: %(msg)s"
5469
5402
msgstr ""
5470
5403
5404
#: bzrlib/errors.py:1541
5405
msgid "Export format %(format)r not supported"
5406
msgstr ""
5407
5471
5408
#: bzrlib/errors.py:1550
5472
msgid "Export format %(format)r not supported"
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1559
5476
5409
msgid "Transport error: %(msg)s %(orig_error)s"
5477
5410
msgstr ""
5478
5411
5479
#: bzrlib/errors.py:1585
5412
#: bzrlib/errors.py:1576
5480
5413
msgid "Generic bzr smart protocol error: %(details)s"
5481
5414
msgstr ""
5482
5415
5483
#: bzrlib/errors.py:1593
5416
#: bzrlib/errors.py:1584
5484
5417
msgid "Received bad protocol version marker: %(marker)r"
5485
5418
msgstr ""
5486
5419
5487
#: bzrlib/errors.py:1625
5420
#: bzrlib/errors.py:1616
5488
5421
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5489
5422
msgstr ""
5490
5423
5491
#: bzrlib/errors.py:1630
5424
#: bzrlib/errors.py:1621
5492
5425
msgid "Connection error: %(msg)s %(orig_error)s"
5493
5426
msgstr ""
5494
5427
5495
#: bzrlib/errors.py:1635
5428
#: bzrlib/errors.py:1626
5496
5429
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5497
5430
msgstr ""
5498
5431
5499
#: bzrlib/errors.py:1656
5432
#: bzrlib/errors.py:1647
5500
5433
msgid "Connection closed: %(msg)s %(orig_error)s"
5501
5434
msgstr ""
5502
5435
5503
#: bzrlib/errors.py:1661
5436
#: bzrlib/errors.py:1652
5504
5437
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5505
5438
msgstr ""
5506
5439
5507
#: bzrlib/errors.py:1666
5440
#: bzrlib/errors.py:1657
5508
5441
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5509
5442
msgstr ""
5510
5443
5511
#: bzrlib/errors.py:1676
5444
#: bzrlib/errors.py:1667
5512
5445
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5513
5446
msgstr ""
5514
5447
5515
#: bzrlib/errors.py:1691
5448
#: bzrlib/errors.py:1682
5516
5449
msgid "Certificate error: %(error)s"
5517
5450
msgstr ""
5518
5451
5519
#: bzrlib/errors.py:1699
5452
#: bzrlib/errors.py:1690
5520
5453
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5521
5454
msgstr ""
5522
5455
5523
#: bzrlib/errors.py:1713
5456
#: bzrlib/errors.py:1704
5524
5457
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5525
5458
msgstr ""
5526
5459
5460
#: bzrlib/errors.py:1712
5461
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5462
msgstr ""
5463
5527
5464
#: bzrlib/errors.py:1721
5528
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1730
5532
5465
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5533
5466
msgstr ""
5534
5467
5535
#: bzrlib/errors.py:1744
5468
#: bzrlib/errors.py:1735
5536
5469
msgid "Too many redirections"
5537
5470
msgstr ""
5538
5471
5539
#: bzrlib/errors.py:1749
5472
#: bzrlib/errors.py:1740
5540
5473
msgid "Working tree has conflicts."
5541
5474
msgstr ""
5542
5475
5476
#: bzrlib/errors.py:1744
5477
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5478
msgstr ""
5479
5543
5480
#: bzrlib/errors.py:1753
5544
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:1762
5548
5481
msgid ""
5549
5482
"Error(s) parsing config file %(filename)s:\n"
5550
5483
"%(errors)s"
5551
5484
msgstr ""
5552
5485
5553
#: bzrlib/errors.py:1772
5486
#: bzrlib/errors.py:1763
5554
5487
msgid ""
5555
5488
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5556
5489
"See ``bzr help %(name)s``"
5557
5490
msgstr ""
5558
5491
5492
#: bzrlib/errors.py:1773
5493
msgid "%(username)r does not seem to contain a reasonable email address"
5494
msgstr ""
5495
5559
5496
#: bzrlib/errors.py:1782
5560
msgid "%(username)r does not seem to contain a reasonable email address"
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:1791
5564
5497
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5565
5498
msgstr ""
5566
5499
5567
#: bzrlib/errors.py:1799
5500
#: bzrlib/errors.py:1790
5568
5501
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5569
5502
msgstr ""
5570
5503
5571
#: bzrlib/errors.py:1807
5504
#: bzrlib/errors.py:1798
5572
5505
msgid "Unable to import library \"%(library)s\": %(error)s"
5573
5506
msgstr ""
5574
5507
5575
#: bzrlib/errors.py:1815
5508
#: bzrlib/errors.py:1806
5576
5509
msgid "python-gpgme is not installed, it is needed to verify signatures"
5577
5510
msgstr ""
5578
5511
5579
#: bzrlib/errors.py:1823
5512
#: bzrlib/errors.py:1814
5580
5513
msgid ""
5581
5514
"The working tree for %(basedir)s has changed since the last commit, but "
5582
5515
"weave merge requires that it be unchanged"
5583
5516
msgstr ""
5584
5517
5585
#: bzrlib/errors.py:1833
5518
#: bzrlib/errors.py:1824
5586
5519
msgid ""
5587
5520
"Can't reprocess and show base, because reprocessing obscures the "
5588
5521
"relationship of conflicting lines to the base"
5589
5522
msgstr ""
5590
5523
5591
#: bzrlib/errors.py:1839
5524
#: bzrlib/errors.py:1830
5592
5525
msgid "Cycle in graph %(graph)r"
5593
5526
msgstr ""
5594
5527
5595
#: bzrlib/errors.py:1867
5528
#: bzrlib/errors.py:1858
5596
5529
msgid "File %(filename)s is not conflicted."
5597
5530
msgstr ""
5598
5531
5532
#: bzrlib/errors.py:1880
5533
msgid "No bundle was found in \"%(filename)s\"."
5534
msgstr ""
5535
5599
5536
#: bzrlib/errors.py:1889
5600
msgid "No bundle was found in \"%(filename)s\"."
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:1898
5604
5537
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5605
5538
msgstr ""
5606
5539
5607
#: bzrlib/errors.py:1908
5540
#: bzrlib/errors.py:1899
5608
5541
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5609
5542
msgstr ""
5610
5543
5611
#: bzrlib/errors.py:1921
5544
#: bzrlib/errors.py:1912
5612
5545
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5613
5546
msgstr ""
5614
5547
5615
#: bzrlib/errors.py:1931
5548
#: bzrlib/errors.py:1922
5616
5549
msgid "Key %(key)s is already present in map"
5617
5550
msgstr ""
5618
5551
5619
#: bzrlib/errors.py:1936
5552
#: bzrlib/errors.py:1927
5620
5553
msgid "The prefix %(prefix)s is in the help search path twice."
5621
5554
msgstr ""
5622
5555
5623
#: bzrlib/errors.py:1946
5556
#: bzrlib/errors.py:1937
5624
5557
msgid ""
5625
5558
"No final name for trans_id %(trans_id)r\n"
5626
5559
"file-id: %(file_id)r\n"
5627
5560
"root trans-id: %(root_trans_id)r\n"
5628
5561
msgstr ""
5629
5562
5630
#: bzrlib/errors.py:1978
5563
#: bzrlib/errors.py:1969
5631
5564
msgid "Attempt to reuse a transform that has already been applied."
5632
5565
msgstr ""
5633
5566
5634
#: bzrlib/errors.py:1983
5567
#: bzrlib/errors.py:1974
5635
5568
msgid "Moving the root directory is not supported at this time"
5636
5569
msgstr ""
5637
5570
5638
#: bzrlib/errors.py:1988
5571
#: bzrlib/errors.py:1979
5639
5572
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5640
5573
msgstr ""
5641
5574
5642
#: bzrlib/errors.py:1999
5575
#: bzrlib/errors.py:1990
5643
5576
msgid ""
5644
5577
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5645
5578
msgstr ""
5646
5579
5647
#: bzrlib/errors.py:2035
5580
#: bzrlib/errors.py:2026
5648
5581
msgid ""
5649
5582
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5650
5583
msgstr ""
5651
5584
5652
#: bzrlib/errors.py:2065
5585
#: bzrlib/errors.py:2056
5653
5586
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5654
5587
msgstr ""
5655
5588
5656
#: bzrlib/errors.py:2073
5589
#: bzrlib/errors.py:2064
5657
5590
msgid "Nothing to merge."
5658
5591
msgstr ""
5659
5592
5593
#: bzrlib/errors.py:2069
5594
msgid "Format %(format)s cannot be initialised by this version of bzr."
5595
msgstr ""
5596
5660
5597
#: bzrlib/errors.py:2078
5661
msgid "Format %(format)s cannot be initialised by this version of bzr."
5662
msgstr ""
5663
5664
#: bzrlib/errors.py:2087
5665
5598
msgid ""
5666
5599
"Cannot convert from format %(from_format)s to format %(format)s. "
5667
5600
"%(problem)s"
5668
5601
msgstr ""
5669
5602
5670
#: bzrlib/errors.py:2099
5603
#: bzrlib/errors.py:2090
5671
5604
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5672
5605
msgstr ""
5673
5606
5674
#: bzrlib/errors.py:2107
5607
#: bzrlib/errors.py:2098
5675
5608
msgid "%(exe_name)s could not be found on this machine"
5676
5609
msgstr ""
5677
5610
5678
#: bzrlib/errors.py:2115
5611
#: bzrlib/errors.py:2106
5679
5612
msgid "Diff is not installed on this machine: %(msg)s"
5680
5613
msgstr ""
5681
5614
5682
#: bzrlib/errors.py:2123
5615
#: bzrlib/errors.py:2114
5683
5616
msgid "Diff3 is not installed on this machine."
5684
5617
msgstr ""
5685
5618
5686
#: bzrlib/errors.py:2129
5619
#: bzrlib/errors.py:2120
5687
5620
msgid "The content being inserted is already present."
5688
5621
msgstr ""
5689
5622
5690
#: bzrlib/errors.py:2134
5623
#: bzrlib/errors.py:2125
5691
5624
msgid ""
5692
5625
"This tree contains left-over files from a failed operation.\n"
5693
5626
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5695
5628
" keep, and delete it when you are done."
5696
5629
msgstr ""
5697
5630
5698
#: bzrlib/errors.py:2145
5631
#: bzrlib/errors.py:2136
5699
5632
msgid ""
5700
5633
"This tree contains left-over files from a failed operation.\n"
5701
5634
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5702
5635
" wish to keep, and delete it when you are done."
5703
5636
msgstr ""
5704
5637
5705
#: bzrlib/errors.py:2155
5638
#: bzrlib/errors.py:2146
5706
5639
msgid ""
5707
5640
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5708
5641
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5710
5643
" keep, and delete it when you are done."
5711
5644
msgstr ""
5712
5645
5713
#: bzrlib/errors.py:2166
5646
#: bzrlib/errors.py:2157
5714
5647
msgid ""
5715
5648
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5716
5649
"examine %(pending_deletion)s to see if it contains any files you wish to "
5717
5650
"keep, and delete it when you are done."
5718
5651
msgstr ""
5719
5652
5720
#: bzrlib/errors.py:2176
5653
#: bzrlib/errors.py:2167
5721
5654
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5722
5655
msgstr ""
5723
5656
5724
#: bzrlib/errors.py:2190
5657
#: bzrlib/errors.py:2181
5725
5658
msgid ""
5726
5659
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5727
5660
msgstr ""
5728
5661
5729
#: bzrlib/errors.py:2203
5662
#: bzrlib/errors.py:2194
5730
5663
msgid "Error in merge modified format"
5731
5664
msgstr ""
5732
5665
5733
#: bzrlib/errors.py:2208
5666
#: bzrlib/errors.py:2199
5734
5667
msgid "Format error in conflict listings"
5735
5668
msgstr ""
5736
5669
5737
#: bzrlib/errors.py:2212
5670
#: bzrlib/errors.py:2203
5738
5671
msgid ""
5739
5672
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5740
5673
"Error: %(description)s"
5741
5674
msgstr ""
5742
5675
5743
#: bzrlib/errors.py:2223
5676
#: bzrlib/errors.py:2214
5744
5677
msgid ""
5745
5678
"An error has been detected in the repository %(repo_path)s.\n"
5746
5679
"Please run bzr reconcile on this repository."
5747
5680
msgstr ""
5748
5681
5749
#: bzrlib/errors.py:2234
5682
#: bzrlib/errors.py:2225
5750
5683
msgid ""
5751
5684
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5752
5685
"reason: %(reason)s"
5753
5686
msgstr ""
5754
5687
5755
#: bzrlib/errors.py:2247
5688
#: bzrlib/errors.py:2238
5756
5689
msgid ""
5757
5690
"An inconsistent delta was supplied: %(delta)r\n"
5758
5691
"reason: %(reason)s"
5759
5692
msgstr ""
5760
5693
5694
#: bzrlib/errors.py:2250
5695
msgid "To use this feature you must upgrade your branch at %(path)s."
5696
msgstr ""
5697
5761
5698
#: bzrlib/errors.py:2259
5762
msgid "To use this feature you must upgrade your branch at %(path)s."
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:2268
5766
5699
msgid "To use this feature you must upgrade your repository at %(path)s."
5767
5700
msgstr ""
5768
5701
5769
#: bzrlib/errors.py:2273
5702
#: bzrlib/errors.py:2264
5770
5703
msgid ""
5771
5704
"To use this feature you must upgrade your branch at %(path)s to a format "
5772
5705
"which supports rich roots."
5773
5706
msgstr ""
5774
5707
5775
#: bzrlib/errors.py:2279
5708
#: bzrlib/errors.py:2270
5776
5709
msgid "Cannot perform local-only commits on unbound branches."
5777
5710
msgstr ""
5778
5711
5779
#: bzrlib/errors.py:2284
5712
#: bzrlib/errors.py:2275
5780
5713
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5781
5714
msgstr ""
5782
5715
5783
#: bzrlib/errors.py:2305
5716
#: bzrlib/errors.py:2296
5784
5717
msgid "Ghost tags not supported by format %(format)r."
5785
5718
msgstr ""
5786
5719
5787
#: bzrlib/errors.py:2313
5720
#: bzrlib/errors.py:2304
5788
5721
msgid "File is binary but should be text."
5789
5722
msgstr ""
5790
5723
5724
#: bzrlib/errors.py:2309
5725
msgid "The path %(path)s is not permitted on this platform"
5726
msgstr ""
5727
5791
5728
#: bzrlib/errors.py:2318
5792
msgid "The path %(path)s is not permitted on this platform"
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:2327
5796
5729
msgid ""
5797
5730
"Testament did not match expected value.\n"
5798
5731
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5799
5732
" {%(measured)s}"
5800
5733
msgstr ""
5801
5734
5735
#: bzrlib/errors.py:2330
5736
msgid "Not a bzr revision-bundle: %(text)r"
5737
msgstr ""
5738
5802
5739
#: bzrlib/errors.py:2339
5803
msgid "Not a bzr revision-bundle: %(text)r"
5740
msgid "Bad bzr revision-bundle: %(text)r"
5804
5741
msgstr ""
5805
5742
5806
5743
#: bzrlib/errors.py:2348
5807
msgid "Bad bzr revision-bundle: %(text)r"
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2357
5811
5744
msgid "Malformed bzr revision-bundle header: %(text)r"
5812
5745
msgstr ""
5813
5746
5814
#: bzrlib/errors.py:2362
5747
#: bzrlib/errors.py:2353
5815
5748
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5816
5749
msgstr ""
5817
5750
5818
#: bzrlib/errors.py:2367
5751
#: bzrlib/errors.py:2358
5819
5752
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5820
5753
msgstr ""
5821
5754
5822
#: bzrlib/errors.py:2372
5755
#: bzrlib/errors.py:2363
5823
5756
msgid "End of line marker was not \\n in bzr revision-bundle"
5824
5757
msgstr ""
5825
5758
5826
#: bzrlib/errors.py:2382
5759
#: bzrlib/errors.py:2373
5827
5760
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5828
5761
msgstr ""
5829
5762
5830
#: bzrlib/errors.py:2392
5763
#: bzrlib/errors.py:2383
5831
5764
msgid "Root class for inventory serialization errors"
5832
msgstr "Root class for inventory serialisation errors"
5765
msgstr ""
5833
5766
5834
#: bzrlib/errors.py:2396
5767
#: bzrlib/errors.py:2387
5835
5768
msgid ""
5836
5769
"The inventory was not in the expected format:\n"
5837
5770
" %(msg)s"
5838
5771
msgstr ""
5839
5772
5840
#: bzrlib/errors.py:2405
5773
#: bzrlib/errors.py:2396
5841
5774
msgid "This operation requires rich root data storage"
5842
5775
msgstr ""
5843
5776
5777
#: bzrlib/errors.py:2409
5778
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5779
msgstr ""
5780
5844
5781
#: bzrlib/errors.py:2418
5845
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5846
msgstr ""
5847
5848
#: bzrlib/errors.py:2427
5849
5782
msgid ""
5850
5783
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5851
5784
"variable."
5852
5785
msgstr ""
5853
5786
5854
#: bzrlib/errors.py:2434
5787
#: bzrlib/errors.py:2425
5855
5788
msgid ""
5856
5789
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5857
5790
"ghost at {%(ghost_revision_id)s}"
5858
5791
msgstr ""
5859
5792
5860
#: bzrlib/errors.py:2444
5793
#: bzrlib/errors.py:2435
5861
5794
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5862
5795
msgstr ""
5863
5796
5864
#: bzrlib/errors.py:2495
5797
#: bzrlib/errors.py:2486
5865
5798
msgid ""
5866
5799
"A merge directive must provide either a bundle or a public branch location."
5867
5800
msgstr ""
5868
5801
5869
#: bzrlib/errors.py:2502
5802
#: bzrlib/errors.py:2493
5870
5803
msgid "Bad merge directive payload %(start)r"
5871
5804
msgstr ""
5872
5805
5873
#: bzrlib/errors.py:2512
5806
#: bzrlib/errors.py:2503
5874
5807
msgid "Preview patch does not match requested changes."
5875
5808
msgstr ""
5876
5809
5877
#: bzrlib/errors.py:2518
5810
#: bzrlib/errors.py:2509
5878
5811
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5879
5812
msgstr ""
5880
5813
5881
#: bzrlib/errors.py:2528
5814
#: bzrlib/errors.py:2519
5882
5815
msgid ""
5883
5816
"Your branch does not have all of the revisions required in order to merge "
5884
5817
"this merge directive and the target location specified in the merge "
5885
5818
"directive is not a branch: %(location)s."
5886
5819
msgstr ""
5887
5820
5888
#: bzrlib/errors.py:2540
5821
#: bzrlib/errors.py:2531
5889
5822
msgid "Unsupported entry kind %(kind)s"
5890
5823
msgstr "Unsupported entry type %(kind)s"
5891
5824
5892
#: bzrlib/errors.py:2548
5825
#: bzrlib/errors.py:2539
5893
5826
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5894
5827
msgstr ""
5895
5828
5896
#: bzrlib/errors.py:2558
5829
#: bzrlib/errors.py:2549
5897
5830
msgid "Subsume target %(other_tree)s needs to be upgraded."
5898
5831
msgstr ""
5899
5832
5900
#: bzrlib/errors.py:2577
5833
#: bzrlib/errors.py:2568
5901
5834
msgid "No such tag: %(tag_name)s"
5902
5835
msgstr ""
5903
5836
5837
#: bzrlib/errors.py:2576
5838
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5839
msgstr ""
5840
5904
5841
#: bzrlib/errors.py:2585
5905
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:2594
5909
5842
msgid "Tag %(tag_name)s already exists."
5910
5843
msgstr ""
5911
5844
5912
#: bzrlib/errors.py:2602
5845
#: bzrlib/errors.py:2593
5913
5846
msgid ""
5914
5847
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5915
5848
"bugs\" for more information on this feature."
5916
5849
msgstr ""
5917
5850
5918
#: bzrlib/errors.py:2612
5851
#: bzrlib/errors.py:2603
5919
5852
msgid ""
5920
5853
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5921
5854
msgstr ""
5922
5855
5923
#: bzrlib/errors.py:2622
5856
#: bzrlib/errors.py:2613
5924
5857
msgid ""
5925
5858
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5926
5859
msgstr ""
5927
5860
5928
#: bzrlib/errors.py:2632
5861
#: bzrlib/errors.py:2623
5929
5862
msgid "Invalid line in bugs property: '%(line)s'"
5930
5863
msgstr ""
5931
5864
5932
#: bzrlib/errors.py:2640
5865
#: bzrlib/errors.py:2631
5933
5866
msgid "Invalid bug status: '%(status)s'"
5934
5867
msgstr ""
5935
5868
5936
#: bzrlib/errors.py:2648
5869
#: bzrlib/errors.py:2639
5937
5870
msgid "Could not understand response from smart server: %(response_tuple)r"
5938
5871
msgstr ""
5939
5872
5940
#: bzrlib/errors.py:2687
5873
#: bzrlib/errors.py:2678
5941
5874
msgid "Server sent an unexpected error: %(error_tuple)r"
5942
5875
msgstr ""
5943
5876
5944
#: bzrlib/errors.py:2706
5877
#: bzrlib/errors.py:2697
5945
5878
msgid "Unrecognised container format: %(container_format)r"
5946
5879
msgstr ""
5947
5880
5948
#: bzrlib/errors.py:2714
5881
#: bzrlib/errors.py:2705
5949
5882
msgid "Unexpected end of container stream"
5950
5883
msgstr ""
5951
5884
5952
#: bzrlib/errors.py:2719
5885
#: bzrlib/errors.py:2710
5953
5886
msgid "Unknown record type: %(record_type)r"
5954
5887
msgstr ""
5955
5888
5956
#: bzrlib/errors.py:2727
5889
#: bzrlib/errors.py:2718
5957
5890
msgid "Invalid record: %(reason)s"
5958
5891
msgstr ""
5959
5892
5960
#: bzrlib/errors.py:2735
5893
#: bzrlib/errors.py:2726
5961
5894
msgid "Container has data after end marker: %(excess)r"
5962
5895
msgstr ""
5963
5896
5964
#: bzrlib/errors.py:2743
5897
#: bzrlib/errors.py:2734
5965
5898
msgid "Container has multiple records with the same name: %(name)s"
5966
5899
msgstr ""
5967
5900
5968
#: bzrlib/errors.py:2756
5901
#: bzrlib/errors.py:2747
5969
5902
msgid "Corrupt or incompatible data stream: %(reason)s"
5970
5903
msgstr ""
5971
5904
5972
#: bzrlib/errors.py:2764
5905
#: bzrlib/errors.py:2755
5973
5906
msgid "SMTP error: %(error)s"
5974
5907
msgstr ""
5975
5908
5976
#: bzrlib/errors.py:2772
5909
#: bzrlib/errors.py:2763
5977
5910
msgid "No message supplied."
5978
5911
msgstr ""
5979
5912
5980
#: bzrlib/errors.py:2777
5913
#: bzrlib/errors.py:2768
5981
5914
msgid "No mail-to address (--mail-to) or output (-o) specified."
5982
5915
msgstr ""
5983
5916
5984
#: bzrlib/errors.py:2782
5917
#: bzrlib/errors.py:2773
5918
msgid "Unknown mail client: %(mail_client)s"
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2781
5985
5922
msgid ""
5986
5923
"Unable to find mail client with the following names: "
5987
5924
"%(mail_command_list_string)s"
5988
5925
msgstr ""
5989
5926
5990
#: bzrlib/errors.py:2792
5927
#: bzrlib/errors.py:2791
5991
5928
msgid "SMTP connection to %(host)s refused"
5992
5929
msgstr ""
5993
5930
5994
#: bzrlib/errors.py:2801
5931
#: bzrlib/errors.py:2800
5995
5932
msgid "Please specify smtp_server. No server at default %(host)s."
5996
5933
msgstr ""
5997
5934
5998
#: bzrlib/errors.py:2815
5935
#: bzrlib/errors.py:2814
5999
5936
msgid ""
6000
5937
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6001
5938
"reconfigure."
6002
5939
msgstr ""
6003
5940
6004
#: bzrlib/errors.py:2827
5941
#: bzrlib/errors.py:2826
6005
5942
msgid "'%(display_url)s' is already a branch."
6006
5943
msgstr ""
6007
5944
6008
#: bzrlib/errors.py:2832
5945
#: bzrlib/errors.py:2831
6009
5946
msgid "'%(display_url)s' is already a tree."
6010
5947
msgstr ""
6011
5948
6012
#: bzrlib/errors.py:2837
5949
#: bzrlib/errors.py:2836
6013
5950
msgid "'%(display_url)s' is already a checkout."
6014
5951
msgstr ""
6015
5952
6016
#: bzrlib/errors.py:2842
5953
#: bzrlib/errors.py:2841
6017
5954
msgid "'%(display_url)s' is already a lightweight checkout."
6018
5955
msgstr ""
6019
5956
6020
#: bzrlib/errors.py:2847
5957
#: bzrlib/errors.py:2846
6021
5958
msgid "'%(display_url)s' is already using a shared repository."
6022
5959
msgstr ""
6023
5960
6024
#: bzrlib/errors.py:2852
5961
#: bzrlib/errors.py:2851
6025
5962
msgid "'%(display_url)s' is already standalone."
6026
5963
msgstr ""
6027
5964
6028
#: bzrlib/errors.py:2857
5965
#: bzrlib/errors.py:2856
6029
5966
msgid "Shared repository '%(display_url)s' already creates working trees."
6030
5967
msgstr ""
6031
5968
6032
#: bzrlib/errors.py:2863
5969
#: bzrlib/errors.py:2862
6033
5970
msgid ""
6034
5971
"Shared repository '%(display_url)s' already doesn't create working trees."
6035
5972
msgstr ""
6036
5973
6037
#: bzrlib/errors.py:2869
5974
#: bzrlib/errors.py:2868
6038
5975
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6039
5976
msgstr ""
6040
5977
6041
#: bzrlib/errors.py:2874
5978
#: bzrlib/errors.py:2873
6042
5979
msgid "No location could be found to bind to at %(display_url)s."
6043
5980
msgstr ""
6044
5981
6045
#: bzrlib/errors.py:2879
5982
#: bzrlib/errors.py:2878
6046
5983
msgid ""
6047
5984
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6048
5985
"status).%(more)s"
6049
5986
msgstr ""
6050
5987
6051
#: bzrlib/errors.py:2898
5988
#: bzrlib/errors.py:2897
6052
5989
msgid ""
6053
5990
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6054
5991
"list).%(more)s"
6055
5992
msgstr ""
6056
5993
6057
#: bzrlib/errors.py:2904
5994
#: bzrlib/errors.py:2903
6058
5995
msgid "Variable {%(name)s} is not available."
6059
5996
msgstr ""
6060
5997
6061
#: bzrlib/errors.py:2912
5998
#: bzrlib/errors.py:2911
6062
5999
msgid "No template specified."
6063
6000
msgstr ""
6064
6001
6065
#: bzrlib/errors.py:2917
6002
#: bzrlib/errors.py:2916
6066
6003
msgid "Unable to create symlink %(path_str)son this platform"
6067
6004
msgstr ""
6068
6005
6069
#: bzrlib/errors.py:2932
6006
#: bzrlib/errors.py:2931
6070
6007
msgid ""
6071
6008
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6072
6009
"\"original\", \"local\"."
6073
6010
msgstr ""
6074
6011
6075
#: bzrlib/errors.py:2966
6012
#: bzrlib/errors.py:2965
6076
6013
msgid ""
6077
6014
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6078
6015
msgstr ""
6079
6016
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6080
6017
6081
#: bzrlib/errors.py:2978
6018
#: bzrlib/errors.py:2977
6082
6019
msgid "The \"%(config_id)s\" configuration does not exist."
6083
6020
msgstr ""
6084
6021
6085
#: bzrlib/errors.py:2986
6022
#: bzrlib/errors.py:2985
6086
6023
msgid "The \"%(option_name)s\" configuration option does not exist."
6087
6024
msgstr ""
6088
6025
6089
#: bzrlib/errors.py:2994
6026
#: bzrlib/errors.py:2993
6090
6027
msgid "The alias \"%(alias_name)s\" does not exist."
6091
6028
msgstr ""
6092
6029
6093
#: bzrlib/errors.py:3008
6030
#: bzrlib/errors.py:3007
6094
6031
msgid "\"%(alias_name)s\" is not a valid location alias."
6095
6032
msgstr ""
6096
6033
6097
#: bzrlib/errors.py:3016
6034
#: bzrlib/errors.py:3015
6098
6035
msgid "No %(alias_name)s location assigned."
6099
6036
msgstr ""
6100
6037
6101
#: bzrlib/errors.py:3024
6038
#: bzrlib/errors.py:3023
6102
6039
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6103
6040
msgstr ""
6104
6041
6105
#: bzrlib/errors.py:3034
6042
#: bzrlib/errors.py:3033
6106
6043
msgid "Unknown rules detected: %(unknowns_str)s."
6107
6044
msgstr ""
6108
6045
6109
#: bzrlib/errors.py:3045
6046
#: bzrlib/errors.py:3044
6110
6047
msgid "Tip change rejected: %(msg)s"
6111
6048
msgstr ""
6112
6049
6113
#: bzrlib/errors.py:3053
6050
#: bzrlib/errors.py:3052
6114
6051
msgid "Shelf corrupt."
6115
6052
msgstr ""
6116
6053
6117
#: bzrlib/errors.py:3058
6054
#: bzrlib/errors.py:3057
6118
6055
msgid "Corruption while decompressing repository file%(orig_error)s"
6119
6056
msgstr ""
6120
6057
6121
#: bzrlib/errors.py:3070
6058
#: bzrlib/errors.py:3069
6122
6059
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6123
6060
msgstr ""
6124
6061
6125
#: bzrlib/errors.py:3078
6062
#: bzrlib/errors.py:3077
6126
6063
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6127
6064
msgstr ""
6128
6065
6129
#: bzrlib/errors.py:3086
6066
#: bzrlib/errors.py:3085
6130
6067
msgid ""
6131
6068
"An attempt to access a url outside the server jail was made: '%(url)s'."
6132
6069
msgstr ""
6133
6070
6134
#: bzrlib/errors.py:3094
6071
#: bzrlib/errors.py:3093
6135
6072
msgid "The user aborted the operation."
6136
6073
msgstr ""
6137
6074
6138
#: bzrlib/errors.py:3099
6075
#: bzrlib/errors.py:3098
6139
6076
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6140
6077
msgstr ""
6141
6078
6142
#: bzrlib/errors.py:3109
6079
#: bzrlib/errors.py:3108
6143
6080
msgid "No such view: %(view_name)s."
6144
6081
msgstr ""
6145
6082
6146
#: bzrlib/errors.py:3119
6083
#: bzrlib/errors.py:3118
6147
6084
msgid ""
6148
6085
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6149
6086
"to a later format."
6150
6087
msgstr ""
6151
6088
6152
#: bzrlib/errors.py:3128
6089
#: bzrlib/errors.py:3127
6153
6090
msgid ""
6154
6091
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6155
6092
msgstr ""
6156
6093
6157
#: bzrlib/errors.py:3195
6094
#: bzrlib/errors.py:3194
6158
6095
msgid "%(bzrdir)r does not support co-located branches."
6159
6096
msgstr ""
6160
6097
6161
#: bzrlib/errors.py:3201
6098
#: bzrlib/errors.py:3200
6162
6099
msgid ""
6163
6100
"Unable to determine your name.\n"
6164
6101
"Please, set your name with the 'whoami' command.\n"
6165
6102
"E.g. bzr whoami \"Your Name <name@example.com>\""
6166
6103
msgstr ""
6167
6104
6168
#: bzrlib/errors.py:3210
6105
#: bzrlib/errors.py:3209
6169
6106
msgid "Invalid pattern(s) found. %(msg)s"
6170
6107
msgstr ""
6171
6108
6172
#: bzrlib/errors.py:3218
6109
#: bzrlib/errors.py:3217
6173
6110
msgid ""
6174
6111
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6175
6112
"unbind` to fix."
6176
6113
msgstr ""
6177
6114
6178
#: bzrlib/errors.py:3229
6115
#: bzrlib/errors.py:3228
6179
6116
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6180
6117
msgstr ""
6181
6118
6182
#: bzrlib/errors.py:3238
6119
#: bzrlib/errors.py:3237
6183
6120
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6184
6121
msgstr ""
6185
6122
6186
#: bzrlib/errors.py:3247
6123
#: bzrlib/errors.py:3246
6187
6124
msgid ""
6188
6125
"No compatible object available for operations from %(source)r to %(target)r."
6189
6126
msgstr ""
6190
6127
6191
#: bzrlib/errors.py:3257
6128
#: bzrlib/errors.py:3256
6192
6129
msgid ""
6193
6130
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6194
6131
"%(arguments)s."
6195
6132
msgstr ""
6196
6133
6197
#: bzrlib/errors.py:3267
6134
#: bzrlib/errors.py:3266
6198
6135
msgid ""
6199
6136
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6200
6137
"format %(format)r"
6202
6139
"Type change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6203
6140
"format %(format)r"
6204
6141
6205
#: bzrlib/errors.py:3279
6142
#: bzrlib/errors.py:3278
6206
6143
msgid ""
6207
6144
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6208
6145
"plugin."
6209
6146
msgstr ""
6210
6147
6211
#: bzrlib/errors.py:3292
6148
#: bzrlib/errors.py:3291
6212
6149
msgid "Binary files section encountered."
6213
6150
msgstr ""
6214
6151
6215
#: bzrlib/errors.py:3300
6152
#: bzrlib/errors.py:3299
6216
6153
msgid ""
6217
6154
"Malformed patch header. %(desc)s\n"
6218
6155
"%(line)r"
6219
6156
msgstr ""
6220
6157
6221
#: bzrlib/errors.py:3309
6158
#: bzrlib/errors.py:3308
6222
6159
msgid ""
6223
6160
"Malformed hunk header. %(desc)s\n"
6224
6161
"%(line)r"
6225
6162
msgstr ""
6226
6163
6227
#: bzrlib/errors.py:3318
6164
#: bzrlib/errors.py:3317
6228
6165
msgid ""
6229
6166
"Malformed line. %(desc)s\n"
6230
6167
"%(line)r"
6231
6168
msgstr ""
6232
6169
6233
#: bzrlib/errors.py:3328
6170
#: bzrlib/errors.py:3327
6234
6171
msgid ""
6235
6172
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6236
6173
"but patch says it should be \"%(patch_line)s\""
6237
6174
msgstr ""
6238
6175
6239
#: bzrlib/errors.py:3339
6176
#: bzrlib/errors.py:3338
6240
6177
msgid "The feature %(feature)s has already been registered."
6241
6178
msgstr ""
6242
6179
6288
6225
"regular push."
6289
6226
msgstr ""
6290
6227
6291
#: bzrlib/gpg.py:366
6292
msgid "No GnuPG key results for pattern: {0}"
6293
msgstr ""
6294
6295
#: bzrlib/gpg.py:439
6228
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6296
6229
msgid "{0} commits with valid signatures"
6297
6230
msgstr ""
6298
6231
6299
#: bzrlib/gpg.py:445
6232
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6300
6233
msgid "{0} commit with unknown key"
6301
6234
msgid_plural "{0} commits with unknown keys"
6302
6235
msgstr[0] ""
6303
6236
msgstr[1] ""
6304
6237
6305
#: bzrlib/gpg.py:453
6238
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6306
6239
msgid "{0} commit not valid"
6307
6240
msgid_plural "{0} commits not valid"
6308
6241
msgstr[0] ""
6309
6242
msgstr[1] ""
6310
6243
6311
#: bzrlib/gpg.py:461
6244
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6312
6245
msgid "{0} commit not signed"
6313
6246
msgid_plural "{0} commits not signed"
6314
6247
msgstr[0] ""
6315
6248
msgstr[1] ""
6316
6249
6317
#: bzrlib/gpg.py:469
6250
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6318
6251
msgid "{0} commit with key now expired"
6319
6252
msgid_plural "{0} commits with key now expired"
6320
6253
msgstr[0] ""
6321
6254
msgstr[1] ""
6322
6255
6323
#: bzrlib/gpg.py:489
6324
msgid "{0} commit by author {1} with key {2} now expired"
6325
msgid_plural "{0} commits by author {1} with key {2} now expired"
6326
msgstr[0] ""
6327
msgstr[1] ""
6256
#: bzrlib/gpg.py:343
6257
msgid "No GnuPG key results for pattern: {0}"
6258
msgstr ""
6328
6259
6329
#: bzrlib/gpg.py:505
6260
#: bzrlib/gpg.py:386
6330
6261
msgid "{0} signed {1} commit"
6331
6262
msgid_plural "{0} signed {1} commits"
6332
6263
msgstr[0] ""
6333
6264
msgstr[1] ""
6334
6265
6335
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6266
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6336
6267
msgid "{0} commit by author {1}"
6337
6268
msgid_plural "{0} commits by author {1}"
6338
6269
msgstr[0] ""
6339
6270
msgstr[1] ""
6340
6271
6341
#: bzrlib/gpg.py:554
6272
#: bzrlib/gpg.py:433
6342
6273
msgid "Unknown key {0} signed {1} commit"
6343
6274
msgid_plural "Unknown key {0} signed {1} commits"
6344
6275
msgstr[0] ""
6345
6276
msgstr[1] ""
6346
6277
6278
#: bzrlib/gpg.py:452
6279
msgid "{0} commit by author {1} with key {2} now expired"
6280
msgid_plural "{0} commits by author {1} with key {2} now expired"
6281
msgstr[0] ""
6282
msgstr[1] ""
6283
6347
6284
#: bzrlib/groupcompress.py:1739
6348
6285
#, python-format
6349
6286
msgid "Insert claimed random_id=True, but then inserted %r two times"
6350
6287
msgstr ""
6351
6288
6352
#: bzrlib/hooks.py:313
6289
#: bzrlib/hooks.py:331
6353
6290
#, python-format
6354
6291
msgid "Introduced in: %s"
6355
6292
msgstr ""
6356
6293
6357
#: bzrlib/hooks.py:316
6294
#: bzrlib/hooks.py:334
6358
6295
#, python-format
6359
6296
msgid "Deprecated in: %s"
6360
6297
msgstr ""
6403
6340
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6404
6341
msgstr ""
6405
6342
6406
#: bzrlib/log.py:563
6343
#: bzrlib/log.py:572
6407
6344
msgid "--exclude-common-ancestry requires two different revisions"
6408
6345
msgstr ""
6409
6346
6410
#: bzrlib/log.py:565
6347
#: bzrlib/log.py:574
6411
6348
#, python-format
6412
6349
msgid "invalid direction %r"
6413
6350
msgstr ""
6414
6351
6415
#: bzrlib/log.py:653
6352
#: bzrlib/log.py:662
6416
6353
msgid "Start revision not found in history of end revision."
6417
6354
msgstr ""
6418
6355
6419
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6356
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6420
6357
msgid "Logging revision 0 is invalid."
6421
6358
msgstr ""
6422
6359
6423
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6360
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6424
6361
msgid "Start revision must be older than the end revision."
6425
6362
msgstr ""
6426
6363
6427
#: bzrlib/log.py:1818
6364
#: bzrlib/log.py:1827
6428
6365
#, python-format
6429
6366
msgid "unknown log formatter: %r"
6430
6367
msgstr ""
6431
6368
6432
#: bzrlib/log.py:2114
6369
#: bzrlib/log.py:2123
6433
6370
msgid "fixes bug"
6434
6371
msgid_plural "fixes bugs"
6435
6372
msgstr[0] ""
6444
6381
msgid "%d conflicts encountered."
6445
6382
msgstr ""
6446
6383
6447
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6384
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6448
6385
msgid "Preparing file merge"
6449
6386
msgstr ""
6450
6387
6566
6503
msgid "lstat/stat of ({0!r}): {1!r}"
6567
6504
msgstr ""
6568
6505
6569
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6506
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6570
6507
#, python-format
6571
6508
msgid "sorry, %r not allowed in path"
6572
6509
msgstr ""
6573
6510
6574
#: bzrlib/osutils.py:1259
6511
#: bzrlib/osutils.py:1237
6575
6512
#, python-format
6576
6513
msgid "%r is too short to calculate a relative path"
6577
6514
msgstr ""
6610
6547
msgid "Generate only the shell function, don't enable it"
6611
6548
msgstr ""
6612
6549
6613
#: bzrlib/plugins/launchpad/account.py:66
6614
msgid "Setting ssh/sftp usernames for launchpad.net."
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/cmds.py:44
6550
#: bzrlib/plugins/launchpad/__init__.py:81
6618
6551
msgid "Register a branch with launchpad.net."
6619
6552
msgstr ""
6620
6553
6621
#: bzrlib/plugins/launchpad/cmds.py:46
6554
#: bzrlib/plugins/launchpad/__init__.py:83
6622
6555
msgid ""
6623
6556
"This command lists a bzr branch in the directory of branches on\n"
6624
6557
"launchpad.net. Registration allows the branch to be associated with\n"
6625
6558
"bugs or specifications."
6626
6559
msgstr ""
6627
6560
6628
#: bzrlib/plugins/launchpad/cmds.py:50
6561
#: bzrlib/plugins/launchpad/__init__.py:87
6629
6562
msgid ""
6630
6563
"Before using this command you must register the project to which the\n"
6631
6564
"branch belongs, and create an account for yourself on launchpad.net."
6632
6565
msgstr ""
6633
6566
6634
#: bzrlib/plugins/launchpad/cmds.py:53
6567
#: bzrlib/plugins/launchpad/__init__.py:90
6635
6568
msgid ""
6636
6569
"arguments:\n"
6637
6570
" public_url: The publicly visible url for the branch to register.\n"
6643
6576
" otherwise error."
6644
6577
msgstr ""
6645
6578
6646
#: bzrlib/plugins/launchpad/cmds.py:62
6579
#: bzrlib/plugins/launchpad/__init__.py:99
6647
6580
msgid ""
6648
6581
"example:\n"
6649
6582
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6650
6583
" --project fooproject"
6651
6584
msgstr ""
6652
6585
6653
#: bzrlib/plugins/launchpad/cmds.py:69
6586
#: bzrlib/plugins/launchpad/__init__.py:106
6654
6587
msgid "Launchpad project short name to associate with the branch."
6655
6588
msgstr ""
6656
6589
6657
#: bzrlib/plugins/launchpad/cmds.py:76
6590
#: bzrlib/plugins/launchpad/__init__.py:113
6658
6591
msgid ""
6659
6592
"Short name for the branch; by default taken from the last component of the "
6660
6593
"url."
6661
6594
msgstr ""
6662
6595
6663
#: bzrlib/plugins/launchpad/cmds.py:80
6596
#: bzrlib/plugins/launchpad/__init__.py:117
6664
6597
msgid "One-sentence description of the branch."
6665
6598
msgstr ""
6666
6599
6667
#: bzrlib/plugins/launchpad/cmds.py:83
6600
#: bzrlib/plugins/launchpad/__init__.py:120
6668
6601
msgid "Longer description of the purpose or contents of the branch."
6669
6602
msgstr ""
6670
6603
6671
#: bzrlib/plugins/launchpad/cmds.py:86
6604
#: bzrlib/plugins/launchpad/__init__.py:123
6672
6605
msgid "Branch author's email address, if not yourself."
6673
6606
msgstr ""
6674
6607
6675
#: bzrlib/plugins/launchpad/cmds.py:89
6608
#: bzrlib/plugins/launchpad/__init__.py:126
6676
6609
msgid "The bug this branch fixes."
6677
6610
msgstr ""
6678
6611
6679
#: bzrlib/plugins/launchpad/cmds.py:92
6612
#: bzrlib/plugins/launchpad/__init__.py:129
6680
6613
msgid "Prepare the request but don't actually send it."
6681
6614
msgstr ""
6682
6615
6683
#: bzrlib/plugins/launchpad/cmds.py:114
6616
#: bzrlib/plugins/launchpad/__init__.py:151
6684
6617
msgid ""
6685
6618
"register-branch requires a public branch url - see bzr help register-branch."
6686
6619
msgstr ""
6687
6620
6688
#: bzrlib/plugins/launchpad/cmds.py:122
6621
#: bzrlib/plugins/launchpad/__init__.py:159
6689
6622
msgid "--product is deprecated; please use --project."
6690
6623
msgstr ""
6691
6624
6692
#: bzrlib/plugins/launchpad/cmds.py:152
6625
#: bzrlib/plugins/launchpad/__init__.py:191
6693
6626
msgid "Open a Launchpad branch page in your web browser."
6694
6627
msgstr ""
6695
6628
6696
#: bzrlib/plugins/launchpad/cmds.py:157
6629
#: bzrlib/plugins/launchpad/__init__.py:196
6697
6630
msgid "Do not actually open the browser. Just say the URL we would use."
6698
6631
msgstr ""
6699
6632
6700
#: bzrlib/plugins/launchpad/cmds.py:192
6633
#: bzrlib/plugins/launchpad/__init__.py:231
6701
6634
#, python-format
6702
6635
msgid "Opening %s in web browser"
6703
6636
msgstr ""
6704
6637
6705
#: bzrlib/plugins/launchpad/cmds.py:200
6638
#: bzrlib/plugins/launchpad/__init__.py:241
6706
6639
msgid "Show or set the Launchpad user ID."
6707
6640
msgstr ""
6708
6641
6709
#: bzrlib/plugins/launchpad/cmds.py:202
6642
#: bzrlib/plugins/launchpad/__init__.py:243
6710
6643
msgid ""
6711
6644
"When communicating with Launchpad, some commands need to know your\n"
6712
6645
"Launchpad user ID. This command can be used to set or show the\n"
6713
6646
"user ID that Bazaar will use for such communication."
6714
6647
msgstr ""
6715
6648
6716
#: bzrlib/plugins/launchpad/cmds.py:206
6649
#: bzrlib/plugins/launchpad/__init__.py:247
6717
6650
msgid ""
6718
6651
":Examples:\n"
6719
6652
" Show the Launchpad ID of the current user::"
6720
6653
msgstr ""
6721
6654
6722
#: bzrlib/plugins/launchpad/cmds.py:209
6655
#: bzrlib/plugins/launchpad/__init__.py:250
6723
6656
msgid " bzr launchpad-login"
6724
6657
msgstr ""
6725
6658
6726
#: bzrlib/plugins/launchpad/cmds.py:211
6659
#: bzrlib/plugins/launchpad/__init__.py:252
6727
6660
msgid " Set the Launchpad ID of the current user to 'bob'::"
6728
6661
msgstr ""
6729
6662
6730
#: bzrlib/plugins/launchpad/cmds.py:213
6663
#: bzrlib/plugins/launchpad/__init__.py:254
6731
6664
msgid " bzr launchpad-login bob"
6732
6665
msgstr ""
6733
6666
6734
#: bzrlib/plugins/launchpad/cmds.py:220
6667
#: bzrlib/plugins/launchpad/__init__.py:261
6735
6668
msgid "Don't check that the user name is valid."
6736
6669
msgstr ""
6737
6670
6738
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6671
#: bzrlib/plugins/launchpad/__init__.py:276
6672
#: bzrlib/plugins/launchpad/__init__.py:287
6739
6673
msgid "Launchpad user ID exists and has SSH keys.\n"
6740
6674
msgstr ""
6741
6675
6742
#: bzrlib/plugins/launchpad/cmds.py:238
6676
#: bzrlib/plugins/launchpad/__init__.py:279
6743
6677
msgid "No Launchpad user ID configured.\n"
6744
6678
msgstr ""
6745
6679
6746
#: bzrlib/plugins/launchpad/cmds.py:249
6680
#: bzrlib/plugins/launchpad/__init__.py:290
6747
6681
#, python-format
6748
6682
msgid "Launchpad user ID set to '%s'.\n"
6749
6683
msgstr ""
6750
6684
6751
#: bzrlib/plugins/launchpad/cmds.py:255
6685
#: bzrlib/plugins/launchpad/__init__.py:298
6752
6686
msgid "Ask Launchpad to mirror a branch now."
6753
6687
msgstr ""
6754
6688
6755
#: bzrlib/plugins/launchpad/cmds.py:272
6689
#: bzrlib/plugins/launchpad/__init__.py:318
6756
6690
msgid "Propose merging a branch on Launchpad."
6757
6691
msgstr ""
6758
6692
6759
#: bzrlib/plugins/launchpad/cmds.py:274
6693
#: bzrlib/plugins/launchpad/__init__.py:320
6760
6694
msgid ""
6761
6695
"This will open your usual editor to provide the initial comment. When it\n"
6762
6696
"has created the proposal, it will open it in your default web browser."
6763
6697
msgstr ""
6764
6698
6765
#: bzrlib/plugins/launchpad/cmds.py:277
6699
#: bzrlib/plugins/launchpad/__init__.py:323
6766
6700
msgid ""
6767
6701
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6768
6702
"is not supplied, the remembered submit branch will be used. If no submit\n"
6769
6703
"branch is remembered, the development focus will be used."
6770
6704
msgstr ""
6771
6705
6772
#: bzrlib/plugins/launchpad/cmds.py:281
6706
#: bzrlib/plugins/launchpad/__init__.py:327
6773
6707
msgid ""
6774
6708
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6775
6709
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6777
6711
"may optionally be followed by '=' and the review type. For example:"
6778
6712
msgstr ""
6779
6713
6780
#: bzrlib/plugins/launchpad/cmds.py:286
6714
#: bzrlib/plugins/launchpad/__init__.py:332
6781
6715
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6782
6716
msgstr ""
6783
6717
6784
#: bzrlib/plugins/launchpad/cmds.py:288
6718
#: bzrlib/plugins/launchpad/__init__.py:334
6785
6719
msgid ""
6786
6720
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6787
6721
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6788
6722
msgstr ""
6789
6723
6790
#: bzrlib/plugins/launchpad/cmds.py:293
6724
#: bzrlib/plugins/launchpad/__init__.py:339
6791
6725
msgid "Propose the merge on staging."
6792
6726
msgstr ""
6793
6727
6794
#: bzrlib/plugins/launchpad/cmds.py:295
6728
#: bzrlib/plugins/launchpad/__init__.py:341
6795
6729
msgid "Commit message."
6796
6730
msgstr ""
6797
6731
6798
#: bzrlib/plugins/launchpad/cmds.py:297
6732
#: bzrlib/plugins/launchpad/__init__.py:343
6799
6733
msgid "Mark the proposal as approved immediately."
6800
6734
msgstr ""
6801
6735
6802
#: bzrlib/plugins/launchpad/cmds.py:298
6803
msgid "The bug this proposal fixes."
6804
msgstr ""
6805
6806
#: bzrlib/plugins/launchpad/cmds.py:300
6736
#: bzrlib/plugins/launchpad/__init__.py:345
6807
6737
msgid "Requested reviewer and optional type."
6808
6738
msgstr ""
6809
6739
6810
#: bzrlib/plugins/launchpad/cmds.py:335
6740
#: bzrlib/plugins/launchpad/__init__.py:382
6811
6741
msgid "Find the proposal to merge this revision."
6812
6742
msgstr ""
6813
6743
6814
#: bzrlib/plugins/launchpad/cmds.py:337
6744
#: bzrlib/plugins/launchpad/__init__.py:384
6815
6745
msgid ""
6816
6746
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6817
6747
"This works only if the selected branch was the merge proposal target, and\n"
6819
6749
"are opened in a web browser."
6820
6750
msgstr ""
6821
6751
6822
#: bzrlib/plugins/launchpad/cmds.py:342
6752
#: bzrlib/plugins/launchpad/__init__.py:389
6823
6753
msgid ""
6824
6754
"Any revision involved in the merge may be specified-- the revision in\n"
6825
6755
"which the merge was performed, or one of the revisions that was merged."
6826
6756
msgstr ""
6827
6757
6828
#: bzrlib/plugins/launchpad/cmds.py:345
6758
#: bzrlib/plugins/launchpad/__init__.py:392
6829
6759
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6830
6760
msgstr ""
6831
6761
6832
#: bzrlib/plugins/launchpad/cmds.py:347
6762
#: bzrlib/plugins/launchpad/__init__.py:394
6833
6763
msgid " bzr lp-find-proposal -r annotate:README:1"
6834
6764
msgstr ""
6835
6765
6836
#: bzrlib/plugins/launchpad/cmds.py:363
6766
#: bzrlib/plugins/launchpad/__init__.py:409
6837
6767
msgid "No review found."
6838
6768
msgstr ""
6839
6769
6840
#: bzrlib/plugins/launchpad/cmds.py:364
6770
#: bzrlib/plugins/launchpad/__init__.py:410
6841
6771
#, python-format
6842
6772
msgid "%d proposals(s) found."
6843
6773
msgstr ""
6844
6774
6845
#: bzrlib/plugins/launchpad/cmds.py:374
6775
#: bzrlib/plugins/launchpad/__init__.py:420
6846
6776
msgid "Finding revision-id"
6847
6777
msgstr ""
6848
6778
6849
#: bzrlib/plugins/launchpad/cmds.py:381
6779
#: bzrlib/plugins/launchpad/__init__.py:427
6850
6780
msgid "Finding merge"
6851
6781
msgstr ""
6852
6782
6853
#: bzrlib/plugins/launchpad/cmds.py:386
6783
#: bzrlib/plugins/launchpad/__init__.py:432
6854
6784
msgid "Finding revno"
6855
6785
msgstr ""
6856
6786
6857
#: bzrlib/plugins/launchpad/cmds.py:392
6787
#: bzrlib/plugins/launchpad/__init__.py:437
6858
6788
msgid "Finding Launchpad branch"
6859
6789
msgstr ""
6860
6790
6861
#: bzrlib/plugins/launchpad/cmds.py:395
6791
#: bzrlib/plugins/launchpad/__init__.py:440
6862
6792
msgid "Finding proposals"
6863
6793
msgstr ""
6864
6794
6795
#: bzrlib/plugins/launchpad/account.py:66
6796
msgid "Setting ssh/sftp usernames for launchpad.net."
6797
msgstr ""
6798
6865
6799
#: bzrlib/plugins/launchpad/lp_api.py:241
6866
6800
#: bzrlib/plugins/launchpad/lp_api.py:246
6867
6801
#, python-format
6905
6839
" remote: {2}"
6906
6840
msgstr ""
6907
6841
6908
#: bzrlib/plugins/launchpad/lp_propose.py:150
6842
#: bzrlib/plugins/launchpad/lp_propose.py:149
6909
6843
#, python-format
6910
6844
msgid "There is already a branch merge proposal: %s"
6911
6845
msgstr ""
6912
6846
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6847
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6914
6848
msgid "pb parameter to convert() is deprecated"
6915
6849
msgstr ""
6916
6850
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6851
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6918
6852
msgid "starting upgrade from format 4 to 5"
6919
6853
msgstr ""
6920
6854
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6855
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6922
6856
msgid "note: upgrade may be faster if all store files are ungzipped first"
6923
6857
msgstr ""
6924
6858
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6859
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6926
6860
msgid "converting revision"
6927
6861
msgstr ""
6928
6862
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6864
msgid "upgraded to weaves:"
6865
msgstr ""
6866
6929
6867
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6930
msgid "upgraded to weaves:"
6931
msgstr ""
6932
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6934
6868
#, python-format
6935
6869
msgid "%6d revisions and inventories"
6936
6870
msgstr ""
6937
6871
6938
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6939
6873
#, python-format
6940
6874
msgid "%6d revisions not present"
6941
6875
msgstr ""
6942
6876
6943
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6877
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6944
6878
#, python-format
6945
6879
msgid "%6d texts"
6946
6880
msgstr ""
6947
6881
6948
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6882
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6949
6883
msgid "writing weave"
6950
6884
msgstr ""
6951
6885
6952
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6953
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6886
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6954
6888
msgid "inventory"
6955
6889
msgstr ""
6956
6890
6957
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6958
6892
msgid "write revision"
6959
6893
msgstr ""
6960
6894
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6962
6896
msgid "loading revision"
6963
6897
msgstr ""
6964
6898
6965
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6966
6900
#, python-format
6967
6901
msgid "revision {%s} not present in branch; will be converted as a ghost"
6968
6902
msgstr ""
6969
6903
6970
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6971
6905
msgid "starting upgrade from format 5 to 6"
6972
6906
msgstr ""
6973
6907
6974
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6975
6909
#, python-format
6976
6910
msgid "adding prefixes to %s"
6977
6911
msgstr ""
6978
6912
6979
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6980
6914
msgid "starting upgrade from format 6 to metadir"
6981
6915
msgstr ""
6982
6916
6983
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6984
6918
msgid "Removing ancestry.weave"
6985
6919
msgstr ""
6986
6920
6987
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6988
6922
msgid "Finding branch files"
6989
6923
msgstr ""
6990
6924
6991
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6992
6926
msgid "Upgrading repository"
6993
6927
msgstr ""
6994
6928
6995
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6996
6930
msgid "Upgrading branch"
6997
6931
msgstr ""
6998
6932
6999
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7000
6934
msgid "No working tree."
7001
6935
msgstr ""
7002
6936
7003
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6937
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7004
6938
msgid "Upgrading working tree"
7005
6939
msgstr ""
7006
6940
7007
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7008
6942
#, python-format
7009
6943
msgid "Make %s lock"
7010
6944
msgstr ""
7011
6945
7012
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6946
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7013
6947
#, python-format
7014
6948
msgid "Moving %s"
7015
6949
msgstr ""
7036
6970
msgid "Too many redirections trying to make %s."
7037
6971
msgstr ""
7038
6972
7039
#: bzrlib/push.py:148
6973
#: bzrlib/push.py:147
7040
6974
msgid ""
7041
6975
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7042
6976
"information."
7043
6977
msgstr ""
7044
6978
7045
#: bzrlib/push.py:152
6979
#: bzrlib/push.py:151
7046
6980
#, python-format
7047
6981
msgid ""
7048
6982
"It is not possible to losslessly push to %s. You may want to use dpush "
7049
6983
"instead."
7050
6984
msgstr ""
7051
6985
7052
#: bzrlib/push.py:158
6986
#: bzrlib/push.py:157
7053
6987
#, python-format
7054
6988
msgid ""
7055
6989
"At %s you have a valid .bzr control directory, but not a branch or "
7074
7008
#: bzrlib/reconcile.py:111
7075
7009
#, python-format
7076
7010
msgid "%s cannot canonicalize CHKs."
7077
msgstr "%s cannot canonicalise CHKs."
7011
msgstr ""
7078
7012
7079
7013
#: bzrlib/reconcile.py:119
7080
7014
msgid "Reconcile aborted: revision index has inconsistent parents."
7150
7084
msgid "bzr: ERROR (ignored): %s"
7151
7085
msgstr ""
7152
7086
7153
#: bzrlib/remote.py:2534
7087
#: bzrlib/remote.py:2541
7154
7088
msgid "Copying repository content as tarball..."
7155
7089
msgstr ""
7156
7090
7166
7100
msgid "{0} => {1}"
7167
7101
msgstr ""
7168
7102
7169
#: bzrlib/repository.py:1738
7103
#: bzrlib/repository.py:1787
7170
7104
msgid "Moving repository to repository.backup"
7171
7105
msgstr ""
7172
7106
7173
#: bzrlib/repository.py:1745
7107
#: bzrlib/repository.py:1794
7174
7108
msgid "Creating new repository"
7175
7109
msgstr ""
7176
7110
7177
#: bzrlib/repository.py:1750
7111
#: bzrlib/repository.py:1799
7178
7112
msgid "Copying content"
7179
7113
msgstr ""
7180
7114
7181
#: bzrlib/repository.py:1754
7115
#: bzrlib/repository.py:1803
7182
7116
msgid "Deleting old repository content"
7183
7117
msgstr ""
7184
7118
7185
#: bzrlib/repository.py:1756
7119
#: bzrlib/repository.py:1805
7186
7120
msgid "repository converted"
7187
7121
msgstr ""
7188
7122
7190
7124
msgid "Using {0} {1}"
7191
7125
msgstr ""
7192
7126
7193
#: bzrlib/send.py:59
7127
#: bzrlib/send.py:58
7194
7128
#, python-format
7195
7129
msgid "Mail client \"%s\" does not support specifying body"
7196
7130
msgstr ""
7197
7131
7198
#: bzrlib/send.py:63
7132
#: bzrlib/send.py:62
7199
7133
msgid "--remember requires a branch to be specified."
7200
7134
msgstr ""
7201
7135
7202
#: bzrlib/send.py:78
7136
#: bzrlib/send.py:77
7203
7137
msgid "No submit branch known or specified"
7204
7138
msgstr ""
7205
7139
7206
#: bzrlib/send.py:81
7140
#: bzrlib/send.py:80
7207
7141
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7208
7142
msgstr ""
7209
7143
7210
#: bzrlib/send.py:99
7144
#: bzrlib/send.py:98
7211
7145
#, python-format
7212
7146
msgid "No such send format '%s'."
7213
7147
msgstr ""
7214
7148
7215
#: bzrlib/send.py:115
7149
#: bzrlib/send.py:114
7216
7150
msgid "bzr send takes at most two one revision identifiers"
7217
7151
msgstr ""
7218
7152
7219
#: bzrlib/send.py:128
7153
#: bzrlib/send.py:127
7220
7154
msgid "No revisions to submit."
7221
7155
msgstr ""
7222
7156
7223
#: bzrlib/send.py:140
7157
#: bzrlib/send.py:139
7224
7158
msgid ""
7225
7159
"- not supported for merge directives that use more than one output file."
7226
7160
msgstr ""
7227
7161
7228
#: bzrlib/send.py:186
7162
#: bzrlib/send.py:185
7229
7163
msgid "Format 0.9 does not permit bundle with no patch"
7230
7164
msgstr ""
7231
7165
7382
7316
"anyway, use --force."
7383
7317
msgstr ""
7384
7318
7385
#: bzrlib/switch.py:129
7319
#: bzrlib/switch.py:125
7386
7320
msgid "Cannot switch a branch, only a checkout."
7387
7321
msgstr ""
7388
7322
7389
#: bzrlib/switch.py:167
7323
#: bzrlib/switch.py:163
7390
7324
#, python-format
7391
7325
msgid "Tree is up to date at revision %d."
7392
7326
msgstr ""
7393
7327
7394
#: bzrlib/switch.py:173
7328
#: bzrlib/switch.py:169
7395
7329
#, python-format
7396
7330
msgid "Updated to revision %d."
7397
7331
msgstr ""
7398
7332
7399
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7333
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7400
7334
msgid "Apply phase"
7401
7335
msgstr ""
7402
7336
7403
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7337
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7404
7338
msgid "removing file"
7405
7339
msgstr ""
7406
7340
7407
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7341
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7408
7342
msgid "adding file"
7409
7343
msgstr ""
7410
7344
7411
#: bzrlib/transform.py:2598
7345
#: bzrlib/transform.py:2591
7412
7346
msgid "Building tree"
7413
7347
msgstr ""
7414
7348
7415
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7349
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7416
7350
msgid "Adding file contents"
7417
7351
msgstr ""
7418
7352
7419
#: bzrlib/transform.py:3017
7353
#: bzrlib/transform.py:3028
7420
7354
msgid "Resolution pass"
7421
7355
msgstr ""
7422
7356
7425
7359
msgid "Authenticated as %s"
7426
7360
msgstr ""
7427
7361
7428
#: bzrlib/tree.py:647
7362
#: bzrlib/tree.py:634
7429
7363
msgid "*** {0} content-filter: {1} => {2!r}"
7430
7364
msgstr ""
7431
7365
7484
7418
msgid "failed to clean-up {0}: {1}"
7485
7419
msgstr ""
7486
7420
7487
#: bzrlib/vf_repository.py:1091
7421
#: bzrlib/vf_repository.py:1090
7488
7422
msgid "inventories"
7489
7423
msgstr ""
7490
7424
7491
#: bzrlib/vf_repository.py:1117
7425
#: bzrlib/vf_repository.py:1116
7492
7426
msgid "texts"
7493
7427
msgstr ""
7494
7428
7495
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7429
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7496
7430
msgid "Calculating text parents"
7497
7431
msgstr ""
7498
7432
7499
#: bzrlib/vf_repository.py:1707
7433
#: bzrlib/vf_repository.py:1706
7500
7434
msgid "Fetch texts"
7501
7435
msgstr ""
7502
7436
7503
#: bzrlib/vf_repository.py:2536
7437
#: bzrlib/vf_repository.py:2535
7504
7438
msgid "loading text store"
7505
7439
msgstr ""
7506
7440
7507
#: bzrlib/vf_repository.py:2542
7441
#: bzrlib/vf_repository.py:2541
7508
7442
msgid "checking text graph"
7509
7443
msgstr ""
7510
7444
7511
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7512
#: bzrlib/vf_repository.py:3127
7445
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7446
#: bzrlib/vf_repository.py:3124
7513
7447
msgid "Transferring revisions"
7514
7448
msgstr ""
7515
7449
7523
7457
7524
7458
#: bzrlib/win32utils.py:172
7525
7459
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7526
msgstr "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7460
msgstr ""
7527
7461
7528
7462
#: bzrlib/win32utils.py:180
7529
7463
#, python-format
7530
7464
msgid "WorkingSize %8d KiB"
7531
msgstr "WorkingSize %8d KiB"
7465
msgstr ""
7532
7466
7533
7467
#: bzrlib/win32utils.py:181
7534
7468
#, python-format
7555
7489
msgid "PageFaultCount %8d"
7556
7490
msgstr ""
7557
7491
7558
#: bzrlib/workingtree.py:1482
7492
#: bzrlib/workingtree.py:1478
7559
7493
msgid "Rerun update after fixing the conflicts."
7560
7494
msgstr ""
7561
7495
7565
7499
7566
7500
#: dummy/help_topics/basic/detail.txt:1
7567
7501
msgid ""
7568
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7502
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7569
7503
"http://bazaar.canonical.com/"
7570
7504
msgstr ""
7571
7505
7588
7522
" bzr status summarize changes in working copy\n"
7589
7523
" bzr diff show detailed diffs"
7590
7524
msgstr ""
7591
" bzr status summarise changes in working copy\n"
7592
" bzr diff show detailed diffs"
7593
7525
7594
7526
#: dummy/help_topics/basic/detail.txt:15
7595
7527
msgid ""
7673
7605
"doesn't have the same restrictions. And using checkouts still allows\n"
7674
7606
"others working on the project to use whatever workflow they like."
7675
7607
msgstr ""
7676
"Checkouts are source trees that are connected to a branch, so that when\n"
7677
"you commit in the source tree, the commit goes into that branch. They\n"
7678
"allow you to use a simpler, more centralised workflow, ignoring some of\n"
7679
"Bazaar's decentralised features until you want them.\n"
7680
"Using checkouts with shared repositories is very similar to working with \n"
7681
"SVN or CVS, but doesn't have the same restrictions. \n"
7682
"And using checkouts still allows others working on the project to use \n"
7683
"whatever workflow they like."
7684
7608
7685
7609
#: dummy/help_topics/checkouts/detail.txt:11
7686
7610
msgid ""
7893
7817
msgid "How to fix diverged branches"
7894
7818
msgstr ""
7895
7819
7820
#: dummy/help_topics/env-variables/detail.txt:1
7821
msgid "Environment Variables"
7822
msgstr ""
7823
7824
#: dummy/help_topics/env-variables/detail.txt:3
7825
msgid ""
7826
"=================== "
7827
"===========================================================\n"
7828
"BZRPATH Path where bzr is to look for shell plugin external\n"
7829
" commands.\n"
7830
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7831
"EMAIL E-Mail address of the user.\n"
7832
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7833
"EDITOR Editor for editing commit messages.\n"
7834
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7835
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7836
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7837
"BZR_PLUGIN_PATH.\n"
7838
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7839
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7840
"and\n"
7841
" HOME.\n"
7842
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7843
"URLs).\n"
7844
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7845
"sshcorp,\n"
7846
" plink or lsh.\n"
7847
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7848
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7849
"BZR_COLUMNS Override implicit terminal width.\n"
7850
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7851
"(selftest)\n"
7852
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7853
"'text'.\n"
7854
"BZR_PDB Control whether to launch a debugger on error.\n"
7855
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7856
" breakin debugger.\n"
7857
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7858
"(instead\n"
7859
" of char-based).\n"
7860
"=================== "
7861
"===========================================================\n"
7862
msgstr ""
7863
7896
7864
#: dummy/help_topics/env-variables/summary.txt:1
7897
7865
msgid "Environment variable names and values"
7898
7866
msgstr ""
8493
8461
msgid ""
8494
8462
"The intent is to make this file as small as possible to minimize maintenance."
8495
8463
msgstr ""
8496
"The intent is to make this file as small as possible to minimise maintenance."
8497
8464
8498
8465
#: en/help_topics/authentication.txt:21
8499
8466
msgid ""
8877
8844
"but\n"
8878
8845
"ignored in the actual implementation.\n"
8879
8846
msgstr ""
8880
"The ``password_encoding`` and ``verify_certificates`` fields are recognised "
8881
"but\n"
8882
"ignored in the actual implementation.\n"
8883
8847
8884
8848
#: en/help_topics/bugs.txt:1
8885
8849
msgid "Bug Tracker Settings"
8904
8868
msgid " bzr commit --fixes <tracker>:<id>"
8905
8869
msgstr ""
8906
8870
8907
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8871
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8908
8872
msgid "or::"
8909
8873
msgstr ""
8910
8874
9139
9103
"remove-tree Remove the working tree from a given branch/checkout.\n"
9140
9104
"renames Show list of renamed files.\n"
9141
9105
"resolve Mark a conflict as resolved.\n"
9142
"revert Set files in the working tree back to the contents of a\n"
9143
" previous revision.\n"
9106
"revert Revert files to a previous revision.\n"
9144
9107
"revno Show current revision number.\n"
9145
9108
"root Show the tree root directory.\n"
9146
9109
"send Mail or create a merge-directive for submitting changes.\n"
9798
9761
9799
9762
#: en/help_topics/configuration.txt:336
9800
9763
msgid ""
9801
"Another such option is ``branchname``, which refers to the name of a "
9802
"colocated\n"
9803
"branch. For non-colocated branches, it behaves like basename. It can be "
9804
"used\n"
9805
"like this::"
9806
msgstr ""
9807
9808
#: en/help_topics/configuration.txt:340
9809
msgid ""
9810
" [/home/vila/src/bzr/bugs]\n"
9811
" mypush = lp:~vila/bzr/{branchname}"
9812
msgstr ""
9813
9814
#: en/help_topics/configuration.txt:343
9815
msgid ""
9816
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9817
"get::"
9818
msgstr ""
9819
9820
#: en/help_topics/configuration.txt:345
9821
msgid ""
9822
" bzr config mypush\n"
9823
" lp:~vila/bzr/832013-expand-in-stack"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:348
9827
msgid ""
9828
9764
"When an option is local to a Section, it cannot be referred to from option\n"
9829
9765
"values in any other section from the same ``Store`` nor from any other\n"
9830
9766
"``Store``."
9831
9767
msgstr ""
9832
9768
9833
#: en/help_topics/configuration.txt:352
9769
#: en/help_topics/configuration.txt:340
9834
9770
msgid ""
9835
9771
"\n"
9836
9772
"The main configuration file, bazaar.conf\n"
9837
9773
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9838
9774
msgstr ""
9839
9775
9840
#: en/help_topics/configuration.txt:356
9776
#: en/help_topics/configuration.txt:344
9841
9777
msgid ""
9842
9778
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9843
9779
"The default section contains the default\n"
9845
9781
"overriden by providing a branch-specific section in ``locations.conf``."
9846
9782
msgstr ""
9847
9783
9848
#: en/help_topics/configuration.txt:361
9784
#: en/help_topics/configuration.txt:349
9849
9785
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9850
9786
msgstr ""
9851
9787
9852
#: en/help_topics/configuration.txt:363
9788
#: en/help_topics/configuration.txt:351
9853
9789
msgid ""
9854
9790
" [DEFAULT]\n"
9855
9791
" email = John Doe <jdoe@isp.com>\n"
9857
9793
" create_signatures = when-required"
9858
9794
msgstr ""
9859
9795
9860
#: en/help_topics/configuration.txt:368
9796
#: en/help_topics/configuration.txt:356
9861
9797
msgid ""
9862
9798
"\n"
9863
9799
"The branch location configuration file, locations.conf\n"
9864
9800
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9865
9801
msgstr ""
9866
9802
9867
#: en/help_topics/configuration.txt:372
9803
#: en/help_topics/configuration.txt:360
9868
9804
msgid ""
9869
9805
"``locations.conf`` allows one to specify overriding settings for\n"
9870
9806
"a specific branch. The format is almost identical to the default section in\n"
9874
9810
"for. The '?' and '*' wildcards are supported::"
9875
9811
msgstr ""
9876
9812
9877
#: en/help_topics/configuration.txt:378
9813
#: en/help_topics/configuration.txt:366
9878
9814
msgid ""
9879
9815
" [/home/jdoe/branches/nethack]\n"
9880
9816
" email = Nethack Admin <nethack@nethack.com>"
9881
9817
msgstr ""
9882
9818
9883
#: en/help_topics/configuration.txt:381
9819
#: en/help_topics/configuration.txt:369
9884
9820
msgid ""
9885
9821
" [http://hypothetical.site.com/branches/devel-branch]\n"
9886
9822
" create_signatures = always"
9887
9823
msgstr ""
9888
9824
9889
#: en/help_topics/configuration.txt:384
9825
#: en/help_topics/configuration.txt:372
9890
9826
msgid ""
9891
9827
"The authentication configuration file, authentication.conf\n"
9892
9828
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9893
9829
msgstr ""
9894
9830
9895
#: en/help_topics/configuration.txt:387
9831
#: en/help_topics/configuration.txt:375
9896
9832
msgid ""
9897
9833
"``authentication.conf`` allows one to specify credentials for\n"
9898
9834
"remote servers. This can be used for all the supported transports and any "
9900
9836
"of bzr that requires authentication (smtp for example)."
9901
9837
msgstr ""
9902
9838
9903
#: en/help_topics/configuration.txt:391
9839
#: en/help_topics/configuration.txt:379
9904
9840
msgid ""
9905
9841
"The syntax of the file obeys the same rules as the others except for the\n"
9906
9842
"option policies which don't apply."
9907
9843
msgstr ""
9908
9844
9909
#: en/help_topics/configuration.txt:394
9845
#: en/help_topics/configuration.txt:382
9910
9846
msgid ""
9911
9847
"For more information on the possible uses of the authentication "
9912
9848
"configuration\n"
9913
9849
"file see :doc:`authentication-help`."
9914
9850
msgstr ""
9915
9851
9916
#: en/help_topics/configuration.txt:397
9852
#: en/help_topics/configuration.txt:385
9917
9853
msgid ""
9918
9854
"\n"
9919
9855
"Common options\n"
9920
9856
"--------------"
9921
9857
msgstr ""
9922
9858
9923
#: en/help_topics/configuration.txt:401
9859
#: en/help_topics/configuration.txt:389
9924
9860
msgid ""
9925
9861
"debug_flags\n"
9926
9862
"~~~~~~~~~~~"
9927
9863
msgstr ""
9928
9864
9929
#: en/help_topics/configuration.txt:404
9865
#: en/help_topics/configuration.txt:392
9930
9866
msgid ""
9931
9867
"A comma-separated list of debugging options to turn on. The same values\n"
9932
9868
"can be used as with the -D command-line option (see `help global-options`).\n"
9933
9869
"For example::"
9934
9870
msgstr ""
9935
9871
9936
#: en/help_topics/configuration.txt:408
9872
#: en/help_topics/configuration.txt:396
9937
9873
msgid " debug_flags = hpss"
9938
9874
msgstr ""
9939
9875
9940
#: en/help_topics/configuration.txt:412
9876
#: en/help_topics/configuration.txt:400
9941
9877
msgid " debug_flags = hpss,evil"
9942
9878
msgstr ""
9943
9879
9944
#: en/help_topics/configuration.txt:414
9880
#: en/help_topics/configuration.txt:402
9945
9881
msgid ""
9946
9882
"email\n"
9947
9883
"~~~~~"
9948
9884
msgstr ""
9949
9885
9950
#: en/help_topics/configuration.txt:417
9886
#: en/help_topics/configuration.txt:405
9951
9887
msgid ""
9952
9888
"The email address to use when committing a branch. Typically takes the form\n"
9953
9889
"of::"
9954
9890
msgstr ""
9955
9891
9956
#: en/help_topics/configuration.txt:420
9892
#: en/help_topics/configuration.txt:408
9957
9893
msgid " email = Full Name <account@hostname.tld>"
9958
9894
msgstr ""
9959
9895
9960
#: en/help_topics/configuration.txt:422
9896
#: en/help_topics/configuration.txt:410
9961
9897
msgid ""
9962
9898
"editor\n"
9963
9899
"~~~~~~"
9964
9900
msgstr ""
9965
9901
9966
#: en/help_topics/configuration.txt:425
9902
#: en/help_topics/configuration.txt:413
9967
9903
msgid ""
9968
9904
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9969
9905
"a commit message. This setting is trumped by the environment variable\n"
9971
9907
"variables."
9972
9908
msgstr ""
9973
9909
9974
#: en/help_topics/configuration.txt:430
9910
#: en/help_topics/configuration.txt:418
9975
9911
msgid ""
9976
9912
"log_format\n"
9977
9913
"~~~~~~~~~~"
9978
9914
msgstr ""
9979
9915
9980
#: en/help_topics/configuration.txt:433
9916
#: en/help_topics/configuration.txt:421
9981
9917
msgid ""
9982
9918
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9983
9919
"and ``line``. Additional formats may be provided by plugins. The default\n"
9984
9920
"value is ``long``."
9985
9921
msgstr ""
9986
9922
9987
#: en/help_topics/configuration.txt:437
9923
#: en/help_topics/configuration.txt:425
9988
9924
msgid ""
9989
9925
"check_signatures\n"
9990
9926
"~~~~~~~~~~~~~~~~"
9991
9927
msgstr ""
9992
9928
9993
#: en/help_topics/configuration.txt:440
9929
#: en/help_topics/configuration.txt:428
9994
9930
msgid ""
9995
9931
"Reserved for future use. These options will allow a policy for branches to\n"
9996
9932
"require signatures."
9997
9933
msgstr ""
9998
9934
9999
#: en/help_topics/configuration.txt:443
9935
#: en/help_topics/configuration.txt:431
10000
9936
msgid ""
10001
9937
"require\n"
10002
9938
" The gnupg signature for revisions must be present and must be valid."
10003
9939
msgstr ""
10004
9940
10005
#: en/help_topics/configuration.txt:446
9941
#: en/help_topics/configuration.txt:434
10006
9942
msgid ""
10007
9943
"ignore\n"
10008
9944
" Do not check gnupg signatures of revisions."
10009
9945
msgstr ""
10010
9946
10011
#: en/help_topics/configuration.txt:449
9947
#: en/help_topics/configuration.txt:437
10012
9948
msgid ""
10013
9949
"check-available\n"
10014
9950
" (default) If gnupg signatures for revisions are present, check them.\n"
10016
9952
" no signature is present."
10017
9953
msgstr ""
10018
9954
10019
#: en/help_topics/configuration.txt:454
9955
#: en/help_topics/configuration.txt:442
10020
9956
msgid ""
10021
9957
"create_signatures\n"
10022
9958
"~~~~~~~~~~~~~~~~~"
10023
9959
msgstr ""
10024
9960
10025
#: en/help_topics/configuration.txt:457
9961
#: en/help_topics/configuration.txt:445
10026
9962
msgid ""
10027
9963
"Defines the behaviour of signing revisions on commits. By default bzr will "
10028
9964
"not\n"
10029
9965
"sign new commits."
10030
9966
msgstr ""
10031
9967
10032
#: en/help_topics/configuration.txt:460
9968
#: en/help_topics/configuration.txt:448
10033
9969
msgid ""
10034
9970
"always\n"
10035
9971
" Sign every new revision that is committed. If the signing fails then "
10037
9973
" commit will not be made."
10038
9974
msgstr ""
10039
9975
10040
#: en/help_topics/configuration.txt:464
9976
#: en/help_topics/configuration.txt:452
10041
9977
msgid ""
10042
9978
"when-required\n"
10043
9979
" Reserved for future use."
10044
9980
msgstr ""
10045
9981
10046
#: en/help_topics/configuration.txt:467
9982
#: en/help_topics/configuration.txt:455
10047
9983
msgid ""
10048
9984
"never\n"
10049
9985
" Reserved for future use."
10050
9986
msgstr ""
10051
9987
10052
#: en/help_topics/configuration.txt:470
9988
#: en/help_topics/configuration.txt:458
10053
9989
msgid ""
10054
9990
"In future it is planned that ``when-required`` will sign newly\n"
10055
9991
"committed revisions only when the branch requires them. ``never`` will "
10057
9993
"to sign newly committed revisions, even if the branch requires signatures."
10058
9994
msgstr ""
10059
9995
10060
#: en/help_topics/configuration.txt:474
9996
#: en/help_topics/configuration.txt:462
10061
9997
msgid ""
10062
9998
"dirstate.fdatasync\n"
10063
9999
"~~~~~~~~~~~~~~~~~~"
10064
10000
msgstr ""
10065
10001
10066
#: en/help_topics/configuration.txt:477
10002
#: en/help_topics/configuration.txt:465
10067
10003
msgid ""
10068
10004
"If true (default), working tree metadata changes are flushed through the\n"
10069
10005
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10070
10006
"should not be lost if the machine crashes. See also repository.fdatasync."
10071
10007
msgstr ""
10072
10008
10073
#: en/help_topics/configuration.txt:481
10009
#: en/help_topics/configuration.txt:469
10074
10010
msgid ""
10075
10011
"gpg_signing_key\n"
10076
10012
"~~~~~~~~~~~~~~~"
10077
10013
msgstr ""
10078
10014
10079
#: en/help_topics/configuration.txt:484
10015
#: en/help_topics/configuration.txt:472
10080
10016
msgid ""
10081
10017
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10082
10018
"address, key fingerprint or full key ID. When unset or when set to\n"
10083
10019
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10084
10020
msgstr ""
10085
10021
10086
#: en/help_topics/configuration.txt:488
10022
#: en/help_topics/configuration.txt:476
10087
10023
msgid ""
10088
10024
"recurse\n"
10089
10025
"~~~~~~~"
10090
10026
msgstr ""
10091
10027
10092
#: en/help_topics/configuration.txt:491
10028
#: en/help_topics/configuration.txt:479
10093
10029
msgid ""
10094
10030
"Only useful in ``locations.conf``. Defines whether or not the\n"
10095
10031
"configuration for this section applies to subdirectories:"
10096
10032
msgstr ""
10097
10033
10098
#: en/help_topics/configuration.txt:494
10034
#: en/help_topics/configuration.txt:482
10099
10035
msgid ""
10100
10036
"true\n"
10101
10037
" (default) This section applies to subdirectories as well."
10102
10038
msgstr ""
10103
10039
10104
#: en/help_topics/configuration.txt:497
10040
#: en/help_topics/configuration.txt:485
10105
10041
msgid ""
10106
10042
"false\n"
10107
10043
" This section only applies to the branch at this directory and not\n"
10108
10044
" branches below it."
10109
10045
msgstr ""
10110
10046
10111
#: en/help_topics/configuration.txt:501
10047
#: en/help_topics/configuration.txt:489
10112
10048
msgid ""
10113
10049
"gpg_signing_command\n"
10114
10050
"~~~~~~~~~~~~~~~~~~~"
10115
10051
msgstr ""
10116
10052
10117
#: en/help_topics/configuration.txt:504
10053
#: en/help_topics/configuration.txt:492
10118
10054
msgid ""
10119
10055
"(Default: \"gpg\"). Which program should be used to sign and check "
10120
10056
"revisions.\n"
10121
10057
"For example::"
10122
10058
msgstr ""
10123
10059
10124
#: en/help_topics/configuration.txt:507
10060
#: en/help_topics/configuration.txt:495
10125
10061
msgid " gpg_signing_command = /usr/bin/gnpg"
10126
10062
msgstr ""
10127
10063
10128
#: en/help_topics/configuration.txt:509
10064
#: en/help_topics/configuration.txt:497
10129
10065
msgid ""
10130
10066
"The specified command must accept the options \"--clearsign\" and \"-u "
10131
10067
"<email>\"."
10132
10068
msgstr ""
10133
10069
10134
#: en/help_topics/configuration.txt:511
10070
#: en/help_topics/configuration.txt:499
10135
10071
msgid ""
10136
10072
"bzr_remote_path\n"
10137
10073
"~~~~~~~~~~~~~~~"
10138
10074
msgstr ""
10139
10075
10140
#: en/help_topics/configuration.txt:514
10076
#: en/help_topics/configuration.txt:502
10141
10077
msgid ""
10142
10078
"(Default: \"bzr\"). The path to the command that should be used to run the "
10143
10079
"smart\n"
10144
10080
"server for bzr. This value may only be specified in locations.conf, because:"
10145
10081
msgstr ""
10146
10082
10147
#: en/help_topics/configuration.txt:517
10083
#: en/help_topics/configuration.txt:505
10148
10084
msgid ""
10149
10085
"- it's needed before branch.conf is accessible\n"
10150
10086
"- allowing remote branch.conf files to specify commands would be a security\n"
10151
10087
" risk"
10152
10088
msgstr ""
10153
10089
10154
#: en/help_topics/configuration.txt:521
10090
#: en/help_topics/configuration.txt:509
10155
10091
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10156
10092
msgstr ""
10157
10093
10158
#: en/help_topics/configuration.txt:523
10094
#: en/help_topics/configuration.txt:511
10159
10095
msgid ""
10160
10096
"smtp_server\n"
10161
10097
"~~~~~~~~~~~"
10162
10098
msgstr ""
10163
10099
10164
#: en/help_topics/configuration.txt:526
10100
#: en/help_topics/configuration.txt:514
10165
10101
msgid ""
10166
10102
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10167
10103
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10168
10104
msgstr ""
10169
10105
10170
#: en/help_topics/configuration.txt:529
10106
#: en/help_topics/configuration.txt:517
10171
10107
msgid ""
10172
10108
"smtp_username, smtp_password\n"
10173
10109
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10174
10110
msgstr ""
10175
10111
10176
#: en/help_topics/configuration.txt:532
10112
#: en/help_topics/configuration.txt:520
10177
10113
msgid ""
10178
10114
"User and password to authenticate to the SMTP server. If smtp_username\n"
10179
10115
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10181
10117
"to send mail."
10182
10118
msgstr ""
10183
10119
10184
#: en/help_topics/configuration.txt:537
10120
#: en/help_topics/configuration.txt:525
10185
10121
msgid ""
10186
10122
"locks.steal_dead\n"
10187
10123
"~~~~~~~~~~~~~~~~"
10188
10124
msgstr ""
10189
10125
10190
#: en/help_topics/configuration.txt:540
10126
#: en/help_topics/configuration.txt:528
10191
10127
msgid ""
10192
10128
"If set to true, bzr will automatically break locks held by processes from\n"
10193
10129
"the same machine and user that are no longer alive. Otherwise, it will\n"
10195
10131
"the object is no longer in use."
10196
10132
msgstr ""
10197
10133
10198
#: en/help_topics/configuration.txt:545
10134
#: en/help_topics/configuration.txt:533
10199
10135
msgid ""
10200
10136
"mail_client\n"
10201
10137
"~~~~~~~~~~~"
10202
10138
msgstr ""
10203
10139
10204
#: en/help_topics/configuration.txt:548
10140
#: en/help_topics/configuration.txt:536
10205
10141
msgid ""
10206
10142
"A mail client to use for sending merge requests.\n"
10207
10143
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10210
10146
"``editor``."
10211
10147
msgstr ""
10212
10148
10213
#: en/help_topics/configuration.txt:553
10149
#: en/help_topics/configuration.txt:541
10214
10150
msgid "Supported values for specific clients:"
10215
10151
msgstr ""
10216
10152
10217
#: en/help_topics/configuration.txt:555
10153
#: en/help_topics/configuration.txt:543
10218
10154
msgid ""
10219
10155
":claws: Use Claws. This skips a dialog for attaching files.\n"
10220
10156
":evolution: Use Evolution.\n"
10225
10161
" this works around some bugs that xdg-email doesn't handle."
10226
10162
msgstr ""
10227
10163
10228
#: en/help_topics/configuration.txt:562
10164
#: en/help_topics/configuration.txt:550
10229
10165
msgid "Supported generic values are:"
10230
10166
msgstr ""
10231
10167
10232
#: en/help_topics/configuration.txt:564
10168
#: en/help_topics/configuration.txt:552
10233
10169
msgid ""
10234
10170
":default: See above.\n"
10235
10171
":editor: Use your editor to compose the merge request. This also uses\n"
10239
10175
":xdg-email: Use xdg-email to run your preferred mail program"
10240
10176
msgstr ""
10241
10177
10242
#: en/help_topics/configuration.txt:571
10178
#: en/help_topics/configuration.txt:559
10243
10179
msgid ""
10244
10180
"repository.fdatasync\n"
10245
10181
"~~~~~~~~~~~~~~~~~~~~"
10246
10182
msgstr ""
10247
10183
10248
#: en/help_topics/configuration.txt:574
10184
#: en/help_topics/configuration.txt:562
10249
10185
msgid ""
10250
10186
"If true (default), repository changes are flushed through the OS buffers\n"
10251
10187
"to physical disk. This is somewhat slower, but means data should not be\n"
10252
10188
"lost if the machine crashes. See also dirstate.fdatasync."
10253
10189
msgstr ""
10254
10190
10255
#: en/help_topics/configuration.txt:578
10191
#: en/help_topics/configuration.txt:566
10256
10192
msgid ""
10257
10193
"submit_branch\n"
10258
10194
"~~~~~~~~~~~~~"
10259
10195
msgstr ""
10260
10196
10261
#: en/help_topics/configuration.txt:581
10197
#: en/help_topics/configuration.txt:569
10262
10198
msgid ""
10263
10199
"The branch you intend to submit your current work to. This is "
10264
10200
"automatically\n"
10267
10203
"should usually be set on a per-branch or per-location basis."
10268
10204
msgstr ""
10269
10205
10270
#: en/help_topics/configuration.txt:585
10206
#: en/help_topics/configuration.txt:573
10271
10207
msgid ""
10272
10208
"public_branch\n"
10273
10209
"~~~~~~~~~~~~~"
10274
10210
msgstr ""
10275
10211
10276
#: en/help_topics/configuration.txt:588
10212
#: en/help_topics/configuration.txt:576
10277
10213
msgid ""
10278
10214
"A publically-accessible version of this branch (implying that this version "
10279
10215
"is\n"
10280
10216
"not publically-accessible). Used (and set) by ``bzr send``."
10281
10217
msgstr ""
10282
10218
10283
#: en/help_topics/configuration.txt:591
10219
#: en/help_topics/configuration.txt:579
10284
10220
msgid ""
10285
10221
"suppress_warnings\n"
10286
10222
"~~~~~~~~~~~~~~~~~"
10287
10223
msgstr ""
10288
10224
10289
#: en/help_topics/configuration.txt:594
10225
#: en/help_topics/configuration.txt:582
10290
10226
msgid ""
10291
10227
"A list of strings, each string represent a warning that can be emitted by\n"
10292
10228
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10293
10229
msgstr ""
10294
10230
10295
#: en/help_topics/configuration.txt:597
10231
#: en/help_topics/configuration.txt:585
10296
10232
msgid "Valid values:"
10297
10233
msgstr ""
10298
10234
10299
#: en/help_topics/configuration.txt:599
10235
#: en/help_topics/configuration.txt:587
10300
10236
msgid ""
10301
10237
"* ``format_deprecation``:\n"
10302
10238
" whether the format deprecation warning is shown on repositories that "
10304
10240
" using deprecated formats."
10305
10241
msgstr ""
10306
10242
10307
#: en/help_topics/configuration.txt:603
10243
#: en/help_topics/configuration.txt:591
10308
10244
msgid ""
10309
10245
"default_format\n"
10310
10246
"~~~~~~~~~~~~~~"
10311
10247
msgstr ""
10312
10248
10313
#: en/help_topics/configuration.txt:606
10249
#: en/help_topics/configuration.txt:594
10314
10250
msgid ""
10315
10251
"A format name for the default format used when creating branches. See "
10316
10252
"``bzr\n"
10317
10253
"help formats`` for possible values."
10318
10254
msgstr ""
10319
10255
10320
#: en/help_topics/configuration.txt:609
10256
#: en/help_topics/configuration.txt:597
10321
10257
msgid ""
10322
10258
"\n"
10323
10259
"Unicode options\n"
10324
10260
"---------------"
10325
10261
msgstr ""
10326
10262
10327
#: en/help_topics/configuration.txt:613
10263
#: en/help_topics/configuration.txt:601
10328
10264
msgid ""
10329
10265
"output_encoding\n"
10330
10266
"~~~~~~~~~~~~~~~"
10331
10267
msgstr ""
10332
10268
10333
#: en/help_topics/configuration.txt:616
10269
#: en/help_topics/configuration.txt:604
10334
10270
msgid ""
10335
10271
"A Python unicode encoding name for text output from bzr, such as log\n"
10336
10272
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10337
10273
"is the terminal encoding prefered by the operating system."
10338
10274
msgstr ""
10339
10275
10340
#: en/help_topics/configuration.txt:620
10276
#: en/help_topics/configuration.txt:608
10341
10277
msgid ""
10342
10278
"\n"
10343
10279
"Branch type specific options\n"
10344
10280
"----------------------------"
10345
10281
msgstr ""
10346
10282
10347
#: en/help_topics/configuration.txt:624
10283
#: en/help_topics/configuration.txt:612
10348
10284
msgid ""
10349
10285
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10350
10286
"later format. They\n"
10352
10288
"manually set in ``locations.conf`` or ``bazaar.conf``."
10353
10289
msgstr ""
10354
10290
10355
#: en/help_topics/configuration.txt:629
10291
#: en/help_topics/configuration.txt:617
10356
10292
msgid ""
10357
10293
"append_revisions_only\n"
10358
10294
"~~~~~~~~~~~~~~~~~~~~~"
10359
10295
msgstr ""
10360
10296
10361
#: en/help_topics/configuration.txt:632
10297
#: en/help_topics/configuration.txt:620
10362
10298
msgid ""
10363
10299
"If set to \"True\" then revisions can only be appended to the log, not\n"
10364
10300
"removed. A branch with this setting enabled can only pull from another\n"
10368
10304
"compatibility with previous bzr versions (older than 2.2)."
10369
10305
msgstr ""
10370
10306
10371
#: en/help_topics/configuration.txt:639
10307
#: en/help_topics/configuration.txt:627
10372
10308
msgid ""
10373
10309
"parent_location\n"
10374
10310
"~~~~~~~~~~~~~~~"
10375
10311
msgstr ""
10376
10312
10377
#: en/help_topics/configuration.txt:642
10313
#: en/help_topics/configuration.txt:630
10378
10314
msgid ""
10379
10315
"If present, the location of the default branch for pull or merge. This "
10380
10316
"option\n"
10382
10318
"--remember``."
10383
10319
msgstr ""
10384
10320
10385
#: en/help_topics/configuration.txt:646
10321
#: en/help_topics/configuration.txt:634
10386
10322
msgid ""
10387
10323
"push_location\n"
10388
10324
"~~~~~~~~~~~~~"
10389
10325
msgstr ""
10390
10326
10391
#: en/help_topics/configuration.txt:649
10327
#: en/help_topics/configuration.txt:637
10392
10328
msgid ""
10393
10329
"If present, the location of the default branch for push. This option\n"
10394
10330
"is normally set by the first ``push`` or ``push --remember``."
10395
10331
msgstr ""
10396
10332
10397
#: en/help_topics/configuration.txt:652
10333
#: en/help_topics/configuration.txt:640
10398
10334
msgid ""
10399
10335
"push_strict\n"
10400
10336
"~~~~~~~~~~~"
10401
10337
msgstr ""
10402
10338
10403
#: en/help_topics/configuration.txt:655
10339
#: en/help_topics/configuration.txt:643
10404
10340
msgid ""
10405
10341
"If present, defines the ``--strict`` option default value for checking\n"
10406
10342
"uncommitted changes before pushing."
10407
10343
msgstr ""
10408
10344
10409
#: en/help_topics/configuration.txt:658
10345
#: en/help_topics/configuration.txt:646
10410
10346
msgid ""
10411
10347
"dpush_strict\n"
10412
10348
"~~~~~~~~~~~~"
10413
10349
msgstr ""
10414
10350
10415
#: en/help_topics/configuration.txt:661
10351
#: en/help_topics/configuration.txt:649
10416
10352
msgid ""
10417
10353
"If present, defines the ``--strict`` option default value for checking\n"
10418
10354
"uncommitted changes before pushing into a different VCS without any\n"
10419
10355
"custom bzr metadata."
10420
10356
msgstr ""
10421
10357
10422
#: en/help_topics/configuration.txt:665
10358
#: en/help_topics/configuration.txt:653
10423
10359
msgid ""
10424
10360
"bound_location\n"
10425
10361
"~~~~~~~~~~~~~~"
10426
10362
msgstr ""
10427
10363
10428
#: en/help_topics/configuration.txt:668
10364
#: en/help_topics/configuration.txt:656
10429
10365
msgid ""
10430
10366
"The location that commits should go to when acting as a checkout.\n"
10431
10367
"This option is normally set by ``bind``."
10432
10368
msgstr ""
10433
10369
10434
#: en/help_topics/configuration.txt:671
10370
#: en/help_topics/configuration.txt:659
10435
10371
msgid ""
10436
10372
"bound\n"
10437
10373
"~~~~~"
10438
10374
msgstr ""
10439
10375
10440
#: en/help_topics/configuration.txt:674
10376
#: en/help_topics/configuration.txt:662
10441
10377
msgid ""
10442
10378
"If set to \"True\", the branch should act as a checkout, and push each "
10443
10379
"commit to\n"
10444
10380
"the bound_location. This option is normally set by ``bind``/``unbind``."
10445
10381
msgstr ""
10446
10382
10447
#: en/help_topics/configuration.txt:677
10383
#: en/help_topics/configuration.txt:665
10448
10384
msgid ""
10449
10385
"send_strict\n"
10450
10386
"~~~~~~~~~~~"
10451
10387
msgstr ""
10452
10388
10389
#: en/help_topics/configuration.txt:668
10390
msgid ""
10391
"If present, defines the ``--strict`` option default value for checking\n"
10392
"uncommitted changes before sending a merge directive."
10393
msgstr ""
10394
10395
#: en/help_topics/configuration.txt:671
10396
msgid ""
10397
"add.maximum_file_size\n"
10398
"~~~~~~~~~~~~~~~~~~~~~"
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:674
10402
msgid ""
10403
"Defines the maximum file size the command line \"add\" operation will allow\n"
10404
"in recursive mode, with files larger than this value being skipped. You may "
10405
"\n"
10406
"specify this value as an integer (in which case it is interpreted as bytes), "
10407
"\n"
10408
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10409
"0 \n"
10410
"will disable skipping."
10411
msgstr ""
10412
10453
10413
#: en/help_topics/configuration.txt:680
10454
10414
msgid ""
10455
"If present, defines the ``--strict`` option default value for checking\n"
10456
"uncommitted changes before sending a merge directive."
10415
"External Merge Tools\n"
10416
"--------------------"
10457
10417
msgstr ""
10458
10418
10459
10419
#: en/help_topics/configuration.txt:683
10460
10420
msgid ""
10461
"add.maximum_file_size\n"
10462
"~~~~~~~~~~~~~~~~~~~~~"
10421
"bzr.mergetool.<name>\n"
10422
"~~~~~~~~~~~~~~~~~~~~"
10463
10423
msgstr ""
10464
"add.maximum_file_size\n"
10465
"~~~~~~~~~~~~~~~~~~~~~"
10466
10424
10467
10425
#: en/help_topics/configuration.txt:686
10468
10426
msgid ""
10469
"Defines the maximum file size the command line \"add\" operation will allow\n"
10470
"in recursive mode, with files larger than this value being skipped. You may "
10471
"\n"
10472
"specify this value as an integer (in which case it is interpreted as bytes), "
10473
"\n"
10474
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10475
"0 \n"
10476
"will disable skipping."
10477
msgstr ""
10478
"Defines the maximum file size the command line \"add\" operation will allow\n"
10479
"in recursive mode, with files larger than this value being skipped. You may "
10480
"\n"
10481
"specify this value as an integer (in which case it is interpreted as bytes), "
10482
"\n"
10483
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10484
"0 \n"
10485
"will disable skipping."
10486
10487
#: en/help_topics/configuration.txt:692
10488
msgid ""
10489
"External Merge Tools\n"
10490
"--------------------"
10491
msgstr ""
10492
10493
#: en/help_topics/configuration.txt:695
10494
msgid ""
10495
"bzr.mergetool.<name>\n"
10496
"~~~~~~~~~~~~~~~~~~~~"
10497
msgstr ""
10498
10499
#: en/help_topics/configuration.txt:698
10500
msgid ""
10501
10427
"Defines an external merge tool called <name> with the given command-line.\n"
10502
10428
"Arguments containing spaces should be quoted using single or double quotes. "
10503
10429
"The\n"
10504
10430
"executable may omit its path if it can be found on the PATH."
10505
10431
msgstr ""
10506
10432
10507
#: en/help_topics/configuration.txt:702
10433
#: en/help_topics/configuration.txt:690
10508
10434
msgid ""
10509
10435
"The following markers can be used in the command-line to substitute "
10510
10436
"filenames\n"
10511
10437
"involved in the merge conflict::"
10512
10438
msgstr ""
10513
10439
10514
#: en/help_topics/configuration.txt:705
10440
#: en/help_topics/configuration.txt:693
10515
10441
msgid ""
10516
10442
" {base} file.BASE\n"
10517
10443
" {this} file.THIS\n"
10522
10448
" succeeds."
10523
10449
msgstr ""
10524
10450
10525
#: en/help_topics/configuration.txt:714
10451
#: en/help_topics/configuration.txt:702
10526
10452
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10527
10453
msgstr ""
10528
10454
10529
#: en/help_topics/configuration.txt:716
10455
#: en/help_topics/configuration.txt:704
10530
10456
msgid ""
10531
10457
"bzr.default_mergetool\n"
10532
10458
"~~~~~~~~~~~~~~~~~~~~~"
10533
10459
msgstr ""
10534
10460
10535
#: en/help_topics/configuration.txt:719
10461
#: en/help_topics/configuration.txt:707
10536
10462
msgid ""
10537
10463
"Specifies which external merge tool (as defined above) should be selected "
10538
10464
"by\n"
10539
10465
"default in tools such as ``bzr qconflicts``."
10540
10466
msgstr ""
10541
10467
10542
#: en/help_topics/configuration.txt:724
10468
#: en/help_topics/configuration.txt:712
10543
10469
msgid " bzr.default_mergetool = kdiff3\n"
10544
10470
msgstr ""
10545
10471
10834
10760
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10835
10761
#: en/help_topics/conflict-types.txt:361
10836
10762
msgid "``bzr resolve`` recognizes the following actions:"
10837
msgstr "``bzr resolve`` recognises the following actions:"
10763
msgstr ""
10838
10764
10839
10765
#: en/help_topics/conflict-types.txt:139
10840
10766
msgid ""
11236
11162
11237
11163
#: en/help_topics/content-filters.txt:16
11238
11164
msgid "To generalize, there are two content formats supported by Bazaar:"
11239
msgstr "To generalise, there are two content formats supported by Bazaar:"
11165
msgstr ""
11240
11166
11241
11167
#: en/help_topics/content-filters.txt:18
11242
11168
msgid ""
11444
11370
"appropriate\n"
11445
11371
" for the format, even for non-local fetches.\n"
11446
11372
msgstr ""
11447
"-Dauth Trace authentication sections used.\n"
11448
"-Dbytes Print out how many bytes were transferred\n"
11449
"-Ddirstate Trace dirstate activity (verbose!)\n"
11450
"-Derror Instead of normal error handling, always print a "
11451
"traceback\n"
11452
" on error.\n"
11453
"-Devil Capture call sites that do expensive or badly-scaling\n"
11454
" operations.\n"
11455
"-Dfetch Trace history copying between repositories.\n"
11456
"-Dfilters Emit information for debugging content filtering.\n"
11457
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11458
"fetch.\n"
11459
"-Dgraph Trace graph traversal.\n"
11460
"-Dhashcache Log every time a working file is read to determine its "
11461
"hash.\n"
11462
"-Dhooks Trace hook execution.\n"
11463
"-Dhpss Trace smart protocol requests and responses.\n"
11464
"-Dhpssdetail More hpss details.\n"
11465
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11466
"-Dhttp Trace http connections, requests and responses.\n"
11467
"-Dindex Trace major index operations.\n"
11468
"-Dknit Trace knit operations.\n"
11469
"-Dlock Trace when lockdir locks are taken or released.\n"
11470
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11471
" retrying the request.\n"
11472
"-Dprogress Trace progress bar operations.\n"
11473
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11474
"-Dmerge Emit information for debugging merges.\n"
11475
"-Dno_apport Don't use apport to report crashes.\n"
11476
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11477
"-Dpack Emit information about pack operations.\n"
11478
"-Drelock Emit a message every time a branch or repository object "
11479
"is\n"
11480
" unlocked then relocked the same way.\n"
11481
"-Dsftp Trace SFTP internals.\n"
11482
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11483
"expected\n"
11484
"-Dstream Trace fetch streams.\n"
11485
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11486
"portable\n"
11487
" manner.\n"
11488
"-Dunlock Some errors during unlock are treated as warnings.\n"
11489
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11490
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11491
"appropriate\n"
11492
" for the format, even for non-local fetches.\n"
11493
11373
11494
11374
#: en/help_topics/diverged-branches.txt:1
11495
11375
msgid ""
11519
11399
"last pull and you have local commits that have not yet been pushed to the\n"
11520
11400
"mainline, then your local branch and the mainline have diverged."
11521
11401
msgstr ""
11522
"This situation commonly arises when using a centralised workflow with local\n"
11523
"commits. If someone else has committed new work to the mainline since your\n"
11524
"last pull and you have local commits that have not yet been pushed to the\n"
11525
"mainline, then your local branch and the mainline have diverged."
11526
11402
11527
11403
#: en/help_topics/diverged-branches.txt:17
11528
11404
msgid ""
11569
11445
"branch can now be pushed to the mainline.\n"
11570
11446
msgstr ""
11571
11447
11572
#: en/help_topics/env-variables.txt:1
11573
msgid "Environment Variables"
11574
msgstr ""
11575
11576
#: en/help_topics/env-variables.txt:3
11577
msgid ""
11578
"=================== "
11579
"===========================================================\n"
11580
"BZRPATH Path where bzr is to look for shell plugin external\n"
11581
" commands.\n"
11582
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11583
"EMAIL E-Mail address of the user.\n"
11584
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11585
"EDITOR Editor for editing commit messages.\n"
11586
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11587
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11588
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11589
"BZR_PLUGIN_PATH.\n"
11590
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11591
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11592
"and\n"
11593
" HOME.\n"
11594
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11595
"URLs).\n"
11596
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11597
"sshcorp,\n"
11598
" plink or lsh.\n"
11599
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11600
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11601
"BZR_COLUMNS Override implicit terminal width.\n"
11602
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11603
"(selftest)\n"
11604
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11605
"'text'.\n"
11606
"BZR_PDB Control whether to launch a debugger on error.\n"
11607
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11608
" breakin debugger.\n"
11609
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11610
"(instead\n"
11611
" of char-based).\n"
11612
"=================== "
11613
"===========================================================\n"
11614
msgstr ""
11615
11616
11448
#: en/help_topics/eol.txt:1
11617
11449
msgid ""
11618
11450
"End of Line Conversion\n"
11920
11752
msgstr ""
11921
11753
11922
11754
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11923
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11755
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11924
11756
msgid "Introduced in: 2.2"
11925
11757
msgstr ""
11926
11758
11938
11770
"~~~~"
11939
11771
msgstr ""
11940
11772
11941
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11942
#: en/help_topics/hooks.txt:307
11773
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11774
#: en/help_topics/hooks.txt:304
11943
11775
msgid "Introduced in: 1.8"
11944
11776
msgstr ""
11945
11777
11962
11794
"branch and checkout (both heavyweight and lightweight) will all\n"
11963
11795
"trigger this hook."
11964
11796
msgstr ""
11965
"Called after new branch initialisation completes. post_branch_init is\n"
11966
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11967
"branch and checkout (both heavyweight and lightweight) will all\n"
11968
"trigger this hook."
11969
11797
11970
11798
#: en/help_topics/hooks.txt:63
11971
11799
msgid ""
11973
11801
"~~~~~~~~~~~~~~~~~~~~~~"
11974
11802
msgstr ""
11975
11803
11976
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11804
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11977
11805
msgid "Introduced in: 1.4"
11978
11806
msgstr ""
11979
11807
11985
11813
"uncommit will all trigger this hook."
11986
11814
msgstr ""
11987
11815
11988
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11816
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11989
11817
msgid ""
11990
11818
"post_commit\n"
11991
11819
"~~~~~~~~~~~"
11993
11821
11994
11822
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11995
11823
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11824
#: en/help_topics/hooks.txt:145
11996
11825
msgid "Introduced in: 0.15"
11997
11826
msgstr ""
11998
11827
12097
11926
12098
11927
#: en/help_topics/hooks.txt:142
12099
11928
msgid ""
11929
"set_rh\n"
11930
"~~~~~~"
11931
msgstr ""
11932
11933
#: en/help_topics/hooks.txt:147
11934
msgid ""
11935
"Invoked whenever the revision history has been set via\n"
11936
"set_revision_history. The api signature is (branch, revision_history),\n"
11937
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11938
"for bzr to trigger, a better hook to use is\n"
11939
"Branch.post_change_branch_tip."
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:153
11943
msgid ""
12100
11944
"transform_fallback_location\n"
12101
11945
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12102
11946
msgstr ""
12103
11947
12104
#: en/help_topics/hooks.txt:145
11948
#: en/help_topics/hooks.txt:156
12105
11949
msgid "Introduced in: 1.9"
12106
11950
msgstr ""
12107
11951
12108
#: en/help_topics/hooks.txt:147
11952
#: en/help_topics/hooks.txt:158
12109
11953
msgid ""
12110
11954
"Called when a stacked branch is activating its fallback locations.\n"
12111
11955
"transform_fallback_location is called with (branch, url), and should\n"
12119
11963
"however undefined."
12120
11964
msgstr ""
12121
11965
12122
#: en/help_topics/hooks.txt:158
11966
#: en/help_topics/hooks.txt:169
12123
11967
msgid ""
12124
11968
"CommandHooks\n"
12125
11969
"------------"
12126
11970
msgstr ""
12127
11971
12128
#: en/help_topics/hooks.txt:161
11972
#: en/help_topics/hooks.txt:172
12129
11973
msgid ""
12130
11974
"extend_command\n"
12131
11975
"~~~~~~~~~~~~~~"
12132
11976
msgstr ""
12133
11977
12134
#: en/help_topics/hooks.txt:164
11978
#: en/help_topics/hooks.txt:175
12135
11979
msgid "Introduced in: 1.13"
12136
11980
msgstr ""
12137
11981
12138
#: en/help_topics/hooks.txt:166
11982
#: en/help_topics/hooks.txt:177
12139
11983
msgid ""
12140
11984
"Called after creating a command object to allow modifications such as\n"
12141
11985
"adding or removing options, docs etc. Called with the new\n"
12142
11986
"bzrlib.commands.Command object."
12143
11987
msgstr ""
12144
11988
12145
#: en/help_topics/hooks.txt:170
11989
#: en/help_topics/hooks.txt:181
12146
11990
msgid ""
12147
11991
"get_command\n"
12148
11992
"~~~~~~~~~~~"
12149
11993
msgstr ""
12150
11994
12151
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12152
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11995
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11996
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12153
11997
msgid "Introduced in: 1.17"
12154
11998
msgstr ""
12155
11999
12156
#: en/help_topics/hooks.txt:175
12000
#: en/help_topics/hooks.txt:186
12157
12001
msgid ""
12158
12002
"Called when creating a single command. Called with (cmd_or_None,\n"
12159
12003
"command_name). get_command should either return the cmd_or_None\n"
12163
12007
"plugin_cmds.register_lazy."
12164
12008
msgstr ""
12165
12009
12166
#: en/help_topics/hooks.txt:182
12010
#: en/help_topics/hooks.txt:193
12167
12011
msgid ""
12168
12012
"get_missing_command\n"
12169
12013
"~~~~~~~~~~~~~~~~~~~"
12170
12014
msgstr ""
12171
12015
12172
#: en/help_topics/hooks.txt:187
12016
#: en/help_topics/hooks.txt:198
12173
12017
msgid ""
12174
12018
"Called when creating a single command if no command could be found.\n"
12175
12019
"Called with (command_name). get_missing_command should either return\n"
12176
12020
"None, or a Command object to be used for the command."
12177
12021
msgstr ""
12178
12022
12179
#: en/help_topics/hooks.txt:191
12023
#: en/help_topics/hooks.txt:202
12180
12024
msgid ""
12181
12025
"list_commands\n"
12182
12026
"~~~~~~~~~~~~~"
12183
12027
msgstr ""
12184
12028
12185
#: en/help_topics/hooks.txt:196
12029
#: en/help_topics/hooks.txt:207
12186
12030
msgid ""
12187
12031
"Called when enumerating commands. Called with a set of cmd_name\n"
12188
12032
"strings for all the commands found so far. This set is safe to mutate\n"
12190
12034
"set of command names."
12191
12035
msgstr ""
12192
12036
12193
#: en/help_topics/hooks.txt:201
12194
msgid ""
12195
"post_command\n"
12196
"~~~~~~~~~~~~"
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12200
msgid "Introduced in: 2.6"
12201
msgstr ""
12202
12203
#: en/help_topics/hooks.txt:206
12204
msgid "Called after executing a command. Called with the command object."
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:208
12208
msgid ""
12209
"pre_command\n"
12210
"~~~~~~~~~~~"
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:213
12214
msgid "Called prior to executing a command. Called with the command object."
12037
#: en/help_topics/hooks.txt:212
12038
msgid ""
12039
"_ConfigHooks\n"
12040
"------------"
12215
12041
msgstr ""
12216
12042
12217
12043
#: en/help_topics/hooks.txt:215
12218
12044
msgid ""
12219
"_ConfigHooks\n"
12220
"------------"
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:218
12224
msgid ""
12225
12045
"get\n"
12226
12046
"~~~"
12227
12047
msgstr ""
12228
12048
12229
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12230
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12231
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12232
#: en/help_topics/hooks.txt:446
12049
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12050
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12051
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12052
#: en/help_topics/hooks.txt:443
12233
12053
msgid "Introduced in: 2.4"
12234
12054
msgstr ""
12235
12055
12056
#: en/help_topics/hooks.txt:220
12057
msgid ""
12058
"Invoked when a config option is read. The signature is (stack, name,\n"
12059
"value)."
12060
msgstr ""
12061
12236
12062
#: en/help_topics/hooks.txt:223
12237
12063
msgid ""
12238
"Invoked when a config option is read. The signature is (stack, name,\n"
12239
"value)."
12240
msgstr ""
12241
12242
#: en/help_topics/hooks.txt:226
12243
msgid ""
12244
12064
"load\n"
12245
12065
"~~~~"
12246
12066
msgstr ""
12247
12067
12248
#: en/help_topics/hooks.txt:231
12068
#: en/help_topics/hooks.txt:228
12249
12069
msgid "Invoked when a config store is loaded. The signature is (store)."
12250
12070
msgstr ""
12251
12071
12252
#: en/help_topics/hooks.txt:233
12072
#: en/help_topics/hooks.txt:230
12253
12073
msgid ""
12254
12074
"remove\n"
12255
12075
"~~~~~~"
12256
12076
msgstr ""
12257
12077
12258
#: en/help_topics/hooks.txt:238
12078
#: en/help_topics/hooks.txt:235
12259
12079
msgid ""
12260
12080
"Invoked when a config option is removed. The signature is (stack,\n"
12261
12081
"name)."
12262
12082
msgstr ""
12263
12083
12264
#: en/help_topics/hooks.txt:241
12084
#: en/help_topics/hooks.txt:238
12265
12085
msgid ""
12266
12086
"save\n"
12267
12087
"~~~~"
12268
12088
msgstr ""
12269
12089
12270
#: en/help_topics/hooks.txt:246
12090
#: en/help_topics/hooks.txt:243
12271
12091
msgid "Invoked when a config store is saved. The signature is (store)."
12272
12092
msgstr ""
12273
12093
12274
#: en/help_topics/hooks.txt:248
12094
#: en/help_topics/hooks.txt:245
12275
12095
msgid ""
12276
12096
"set\n"
12277
12097
"~~~"
12278
12098
msgstr ""
12279
12099
12100
#: en/help_topics/hooks.txt:250
12101
msgid ""
12102
"Invoked when a config option is set. The signature is (stack, name,\n"
12103
"value)."
12104
msgstr ""
12105
12280
12106
#: en/help_topics/hooks.txt:253
12281
12107
msgid ""
12282
"Invoked when a config option is set. The signature is (stack, name,\n"
12283
"value)."
12108
"ControlDirHooks\n"
12109
"---------------"
12284
12110
msgstr ""
12285
12111
12286
12112
#: en/help_topics/hooks.txt:256
12287
12113
msgid ""
12288
"ControlDirHooks\n"
12289
"---------------"
12290
msgstr ""
12291
12292
#: en/help_topics/hooks.txt:259
12293
msgid ""
12294
12114
"post_repo_init\n"
12295
12115
"~~~~~~~~~~~~~~"
12296
12116
msgstr ""
12297
12117
12118
#: en/help_topics/hooks.txt:261
12119
msgid ""
12120
"Invoked after a repository has been initialized. post_repo_init is\n"
12121
"called with a bzrlib.controldir.RepoInitHookParams."
12122
msgstr ""
12123
12298
12124
#: en/help_topics/hooks.txt:264
12299
12125
msgid ""
12300
"Invoked after a repository has been initialized. post_repo_init is\n"
12301
"called with a bzrlib.controldir.RepoInitHookParams."
12126
"pre_open\n"
12127
"~~~~~~~~"
12302
12128
msgstr ""
12303
"Invoked after a repository has been initialised. post_repo_init is\n"
12304
"called with a bzrlib.controldir.RepoInitHookParams."
12305
12129
12306
12130
#: en/help_topics/hooks.txt:267
12307
msgid ""
12308
"pre_open\n"
12309
"~~~~~~~~"
12310
msgstr ""
12311
12312
#: en/help_topics/hooks.txt:270
12313
12131
msgid "Introduced in: 1.14"
12314
12132
msgstr ""
12315
12133
12316
#: en/help_topics/hooks.txt:272
12134
#: en/help_topics/hooks.txt:269
12317
12135
msgid ""
12318
12136
"Invoked before attempting to open a ControlDir with the transport that\n"
12319
12137
"the open will use."
12320
12138
msgstr ""
12321
12139
12140
#: en/help_topics/hooks.txt:272
12141
msgid ""
12142
"InfoHooks\n"
12143
"---------"
12144
msgstr ""
12145
12322
12146
#: en/help_topics/hooks.txt:275
12323
12147
msgid ""
12324
"InfoHooks\n"
12325
"---------"
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:278
12329
msgid ""
12330
12148
"repository\n"
12331
12149
"~~~~~~~~~~"
12332
12150
msgstr ""
12333
12151
12334
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12335
#: en/help_topics/hooks.txt:524
12152
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12153
#: en/help_topics/hooks.txt:521
12336
12154
msgid "Introduced in: 1.15"
12337
12155
msgstr ""
12338
12156
12339
#: en/help_topics/hooks.txt:283
12157
#: en/help_topics/hooks.txt:280
12340
12158
msgid ""
12341
12159
"Invoked when displaying the statistics for a repository. repository is\n"
12342
12160
"called with a statistics dictionary as returned by the repository and\n"
12343
12161
"a file-like object to write to."
12344
12162
msgstr ""
12345
12163
12164
#: en/help_topics/hooks.txt:284
12165
msgid ""
12166
"LockHooks\n"
12167
"---------"
12168
msgstr ""
12169
12346
12170
#: en/help_topics/hooks.txt:287
12347
12171
msgid ""
12348
"LockHooks\n"
12349
"---------"
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:290
12353
msgid ""
12354
12172
"lock_acquired\n"
12355
12173
"~~~~~~~~~~~~~"
12356
12174
msgstr ""
12357
12175
12358
#: en/help_topics/hooks.txt:295
12176
#: en/help_topics/hooks.txt:292
12359
12177
msgid ""
12360
12178
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12361
12179
msgstr ""
12362
12180
12363
#: en/help_topics/hooks.txt:297
12181
#: en/help_topics/hooks.txt:294
12364
12182
msgid ""
12365
12183
"lock_broken\n"
12366
12184
"~~~~~~~~~~~"
12367
12185
msgstr ""
12368
12186
12369
#: en/help_topics/hooks.txt:302
12187
#: en/help_topics/hooks.txt:299
12370
12188
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12371
12189
msgstr ""
12372
12190
12373
#: en/help_topics/hooks.txt:304
12191
#: en/help_topics/hooks.txt:301
12374
12192
msgid ""
12375
12193
"lock_released\n"
12376
12194
"~~~~~~~~~~~~~"
12377
12195
msgstr ""
12378
12196
12379
#: en/help_topics/hooks.txt:309
12197
#: en/help_topics/hooks.txt:306
12380
12198
msgid ""
12381
12199
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12382
12200
msgstr ""
12383
12201
12202
#: en/help_topics/hooks.txt:308
12203
msgid ""
12204
"MergeHooks\n"
12205
"----------"
12206
msgstr ""
12207
12384
12208
#: en/help_topics/hooks.txt:311
12385
12209
msgid ""
12386
"MergeHooks\n"
12387
"----------"
12210
"merge_file_content\n"
12211
"~~~~~~~~~~~~~~~~~~"
12388
12212
msgstr ""
12389
12213
12390
12214
#: en/help_topics/hooks.txt:314
12391
msgid ""
12392
"merge_file_content\n"
12393
"~~~~~~~~~~~~~~~~~~"
12394
msgstr ""
12395
12396
#: en/help_topics/hooks.txt:317
12397
12215
msgid "Introduced in: 2.1"
12398
12216
msgstr ""
12399
12217
12400
#: en/help_topics/hooks.txt:319
12218
#: en/help_topics/hooks.txt:316
12401
12219
msgid ""
12402
12220
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12403
12221
"object when starting a merge. Should return either None or a subclass\n"
12407
12225
"AbstractPerFileMerger API docs for details on how it is used by merge."
12408
12226
msgstr ""
12409
12227
12410
#: en/help_topics/hooks.txt:326
12228
#: en/help_topics/hooks.txt:323
12411
12229
msgid ""
12412
12230
"post_merge\n"
12413
12231
"~~~~~~~~~~"
12414
12232
msgstr ""
12415
12233
12416
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12417
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12418
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12234
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12235
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12236
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12419
12237
msgid "Introduced in: 2.5"
12420
12238
msgstr ""
12421
12239
12422
#: en/help_topics/hooks.txt:331
12240
#: en/help_topics/hooks.txt:328
12423
12241
msgid ""
12424
12242
"Called after a merge. Receives a Merger object as the single argument.\n"
12425
12243
"The return value is ignored."
12426
12244
msgstr ""
12427
12245
12428
#: en/help_topics/hooks.txt:334
12246
#: en/help_topics/hooks.txt:331
12429
12247
msgid ""
12430
12248
"pre_merge\n"
12431
12249
"~~~~~~~~~"
12432
12250
msgstr ""
12433
12251
12434
#: en/help_topics/hooks.txt:339
12252
#: en/help_topics/hooks.txt:336
12435
12253
msgid ""
12436
12254
"Called before a merge. Receives a Merger object as the single\n"
12437
12255
"argument."
12438
12256
msgstr ""
12439
12257
12258
#: en/help_topics/hooks.txt:339
12259
msgid ""
12260
"MergeDirectiveHooks\n"
12261
"-------------------"
12262
msgstr ""
12263
12440
12264
#: en/help_topics/hooks.txt:342
12441
12265
msgid ""
12442
"MergeDirectiveHooks\n"
12443
"-------------------"
12266
"merge_request_body\n"
12267
"~~~~~~~~~~~~~~~~~~"
12444
12268
msgstr ""
12445
12269
12446
12270
#: en/help_topics/hooks.txt:345
12447
msgid ""
12448
"merge_request_body\n"
12449
"~~~~~~~~~~~~~~~~~~"
12450
msgstr ""
12451
12452
#: en/help_topics/hooks.txt:348
12453
12271
msgid "Introduced in: 1.15.0"
12454
12272
msgstr ""
12455
12273
12456
#: en/help_topics/hooks.txt:350
12274
#: en/help_topics/hooks.txt:347
12457
12275
msgid ""
12458
12276
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12459
12277
"request. Callbacks must return a body. If more than one callback is\n"
12460
12278
"registered, the output of one callback is provided to the next."
12461
12279
msgstr ""
12462
12280
12281
#: en/help_topics/hooks.txt:351
12282
msgid ""
12283
"MessageEditorHooks\n"
12284
"------------------"
12285
msgstr ""
12286
12463
12287
#: en/help_topics/hooks.txt:354
12464
12288
msgid ""
12465
"MessageEditorHooks\n"
12466
"------------------"
12289
"commit_message_template\n"
12290
"~~~~~~~~~~~~~~~~~~~~~~~"
12467
12291
msgstr ""
12468
12292
12469
12293
#: en/help_topics/hooks.txt:357
12470
msgid ""
12471
"commit_message_template\n"
12472
"~~~~~~~~~~~~~~~~~~~~~~~"
12473
msgstr ""
12474
12475
#: en/help_topics/hooks.txt:360
12476
12294
msgid "Introduced in: 1.10"
12477
12295
msgstr ""
12478
12296
12479
#: en/help_topics/hooks.txt:362
12297
#: en/help_topics/hooks.txt:359
12480
12298
msgid ""
12481
12299
"Called when a commit message is being generated.\n"
12482
12300
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12487
12305
"second, and so on."
12488
12306
msgstr ""
12489
12307
12490
#: en/help_topics/hooks.txt:370
12308
#: en/help_topics/hooks.txt:367
12491
12309
msgid ""
12492
12310
"set_commit_message\n"
12493
12311
"~~~~~~~~~~~~~~~~~~"
12494
12312
msgstr ""
12495
12313
12496
#: en/help_topics/hooks.txt:375
12314
#: en/help_topics/hooks.txt:372
12497
12315
msgid ""
12498
12316
"Set a fixed commit message. set_commit_message is called with the\n"
12499
12317
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12502
12320
"should use the message editor as normal."
12503
12321
msgstr ""
12504
12322
12323
#: en/help_topics/hooks.txt:378
12324
msgid ""
12325
"MutableTreeHooks\n"
12326
"----------------"
12327
msgstr ""
12328
12505
12329
#: en/help_topics/hooks.txt:381
12506
12330
msgid ""
12507
"MutableTreeHooks\n"
12508
"----------------"
12509
msgstr ""
12510
12511
#: en/help_topics/hooks.txt:384
12512
msgid ""
12513
12331
"post_build_tree\n"
12514
12332
"~~~~~~~~~~~~~~~"
12515
12333
msgstr ""
12516
12334
12517
#: en/help_topics/hooks.txt:389
12335
#: en/help_topics/hooks.txt:386
12518
12336
msgid ""
12519
12337
"Called after a completely new tree is built. The hook is called with\n"
12520
12338
"the tree as its only argument."
12521
12339
msgstr ""
12522
12340
12523
#: en/help_topics/hooks.txt:395
12341
#: en/help_topics/hooks.txt:392
12524
12342
msgid "Introduced in: 2.0"
12525
12343
msgstr ""
12526
12344
12527
#: en/help_topics/hooks.txt:397
12345
#: en/help_topics/hooks.txt:394
12528
12346
msgid ""
12529
12347
"Called after a commit is performed on a tree. The hook is called with\n"
12530
12348
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12532
12350
"that object."
12533
12351
msgstr ""
12534
12352
12535
#: en/help_topics/hooks.txt:402
12353
#: en/help_topics/hooks.txt:399
12536
12354
msgid ""
12537
12355
"post_transform\n"
12538
12356
"~~~~~~~~~~~~~~"
12539
12357
msgstr ""
12540
12358
12541
#: en/help_topics/hooks.txt:407
12359
#: en/help_topics/hooks.txt:404
12542
12360
msgid ""
12543
12361
"Called after a tree transform has been performed on a tree. The hook\n"
12544
12362
"is called with the tree that is being transformed and the transform."
12545
12363
msgstr ""
12546
12364
12547
#: en/help_topics/hooks.txt:410
12365
#: en/help_topics/hooks.txt:407
12548
12366
msgid ""
12549
12367
"pre_transform\n"
12550
12368
"~~~~~~~~~~~~~"
12551
12369
msgstr ""
12552
12370
12553
#: en/help_topics/hooks.txt:415
12371
#: en/help_topics/hooks.txt:412
12554
12372
msgid ""
12555
12373
"Called before a tree transform on this tree. The hook is called with\n"
12556
12374
"the tree that is being transformed and the transform."
12557
12375
msgstr ""
12558
12376
12559
#: en/help_topics/hooks.txt:418
12377
#: en/help_topics/hooks.txt:415
12560
12378
msgid ""
12561
12379
"start_commit\n"
12562
12380
"~~~~~~~~~~~~"
12563
12381
msgstr ""
12564
12382
12565
#: en/help_topics/hooks.txt:423
12383
#: en/help_topics/hooks.txt:420
12566
12384
msgid ""
12567
12385
"Called before a commit is performed on a tree. The start commit hook\n"
12568
12386
"is able to change the tree before the commit takes place. start_commit\n"
12570
12388
"being performed on."
12571
12389
msgstr ""
12572
12390
12391
#: en/help_topics/hooks.txt:425
12392
msgid ""
12393
"SmartClientHooks\n"
12394
"----------------"
12395
msgstr ""
12396
12573
12397
#: en/help_topics/hooks.txt:428
12574
12398
msgid ""
12575
"SmartClientHooks\n"
12576
"----------------"
12399
"call\n"
12400
"~~~~"
12577
12401
msgstr ""
12578
12402
12579
12403
#: en/help_topics/hooks.txt:431
12580
msgid ""
12581
"call\n"
12582
"~~~~"
12583
msgstr ""
12584
12585
#: en/help_topics/hooks.txt:434
12586
12404
msgid "Introduced in: unknown"
12587
12405
msgstr ""
12588
12406
12589
#: en/help_topics/hooks.txt:436
12407
#: en/help_topics/hooks.txt:433
12590
12408
msgid ""
12591
12409
"Called when the smart client is submitting a request to the smart\n"
12592
12410
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12593
12411
"Streaming request bodies, and responses, are not accessible."
12594
12412
msgstr ""
12595
12413
12414
#: en/help_topics/hooks.txt:437
12415
msgid ""
12416
"SmartServerHooks\n"
12417
"----------------"
12418
msgstr ""
12419
12596
12420
#: en/help_topics/hooks.txt:440
12597
12421
msgid ""
12598
"SmartServerHooks\n"
12599
"----------------"
12600
msgstr ""
12601
12602
#: en/help_topics/hooks.txt:443
12603
msgid ""
12604
12422
"server_exception\n"
12605
12423
"~~~~~~~~~~~~~~~~"
12606
12424
msgstr ""
12607
12425
12608
#: en/help_topics/hooks.txt:448
12426
#: en/help_topics/hooks.txt:445
12609
12427
msgid ""
12610
12428
"Called by the bzr server when an exception occurs. server_exception is\n"
12611
12429
"called with the sys.exc_info() tuple return true for the hook if the\n"
12613
12431
"normally."
12614
12432
msgstr ""
12615
12433
12616
#: en/help_topics/hooks.txt:453
12434
#: en/help_topics/hooks.txt:450
12617
12435
msgid ""
12618
12436
"server_started\n"
12619
12437
"~~~~~~~~~~~~~~"
12620
12438
msgstr ""
12621
12439
12622
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12440
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12623
12441
msgid "Introduced in: 0.16"
12624
12442
msgstr ""
12625
12443
12626
#: en/help_topics/hooks.txt:458
12444
#: en/help_topics/hooks.txt:455
12627
12445
msgid ""
12628
12446
"Called by the bzr server when it starts serving a directory.\n"
12629
12447
"server_started is called with (backing urls, public url), where\n"
12632
12450
"served."
12633
12451
msgstr ""
12634
12452
12635
#: en/help_topics/hooks.txt:464
12453
#: en/help_topics/hooks.txt:461
12636
12454
msgid ""
12637
12455
"server_started_ex\n"
12638
12456
"~~~~~~~~~~~~~~~~~"
12639
12457
msgstr ""
12640
12458
12459
#: en/help_topics/hooks.txt:466
12460
msgid ""
12461
"Called by the bzr server when it starts serving a directory.\n"
12462
"server_started is called with (backing_urls, server_obj)."
12463
msgstr ""
12464
12641
12465
#: en/help_topics/hooks.txt:469
12642
12466
msgid ""
12643
"Called by the bzr server when it starts serving a directory.\n"
12644
"server_started is called with (backing_urls, server_obj)."
12645
msgstr ""
12646
12647
#: en/help_topics/hooks.txt:472
12648
msgid ""
12649
12467
"server_stopped\n"
12650
12468
"~~~~~~~~~~~~~~"
12651
12469
msgstr ""
12652
12470
12653
#: en/help_topics/hooks.txt:477
12471
#: en/help_topics/hooks.txt:474
12654
12472
msgid ""
12655
12473
"Called by the bzr server when it stops serving a directory.\n"
12656
12474
"server_stopped is called with the same parameters as the\n"
12657
12475
"server_started hook: (backing_urls, public_url)."
12658
12476
msgstr ""
12659
12477
12478
#: en/help_topics/hooks.txt:478
12479
msgid ""
12480
"StatusHooks\n"
12481
"-----------"
12482
msgstr ""
12483
12660
12484
#: en/help_topics/hooks.txt:481
12661
12485
msgid ""
12662
"StatusHooks\n"
12663
"-----------"
12664
msgstr ""
12665
12666
#: en/help_topics/hooks.txt:484
12667
msgid ""
12668
12486
"post_status\n"
12669
12487
"~~~~~~~~~~~"
12670
12488
msgstr ""
12671
12489
12672
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12490
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12673
12491
msgid "Introduced in: 2.3"
12674
12492
msgstr ""
12675
12493
12676
#: en/help_topics/hooks.txt:489
12494
#: en/help_topics/hooks.txt:486
12677
12495
msgid ""
12678
12496
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12679
12497
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12682
12500
"status command. to_file is the output stream for writing."
12683
12501
msgstr ""
12684
12502
12685
#: en/help_topics/hooks.txt:495
12503
#: en/help_topics/hooks.txt:492
12686
12504
msgid ""
12687
12505
"pre_status\n"
12688
12506
"~~~~~~~~~~"
12689
12507
msgstr ""
12690
12508
12691
#: en/help_topics/hooks.txt:500
12509
#: en/help_topics/hooks.txt:497
12692
12510
msgid ""
12693
12511
"Called with argument StatusHookParams before Bazaar displays the\n"
12694
12512
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12697
12515
"status command. to_file is the output stream for writing."
12698
12516
msgstr ""
12699
12517
12518
#: en/help_topics/hooks.txt:503
12519
msgid ""
12520
"TransportHooks\n"
12521
"--------------"
12522
msgstr ""
12523
12700
12524
#: en/help_topics/hooks.txt:506
12701
12525
msgid ""
12702
"TransportHooks\n"
12703
"--------------"
12704
msgstr ""
12705
12706
#: en/help_topics/hooks.txt:509
12707
msgid ""
12708
12526
"post_connect\n"
12709
12527
"~~~~~~~~~~~~"
12710
12528
msgstr ""
12711
12529
12712
#: en/help_topics/hooks.txt:514
12530
#: en/help_topics/hooks.txt:511
12713
12531
msgid ""
12714
12532
"Called after a new connection is established or a reconnect occurs.\n"
12715
12533
"The sole argument passed is either the connected transport or smart\n"
12716
12534
"medium instance."
12717
12535
msgstr ""
12718
12536
12537
#: en/help_topics/hooks.txt:515
12538
msgid ""
12539
"RioVersionInfoBuilderHooks\n"
12540
"--------------------------"
12541
msgstr ""
12542
12719
12543
#: en/help_topics/hooks.txt:518
12720
12544
msgid ""
12721
"RioVersionInfoBuilderHooks\n"
12722
"--------------------------"
12723
msgstr ""
12724
12725
#: en/help_topics/hooks.txt:521
12726
msgid ""
12727
12545
"revision\n"
12728
12546
"~~~~~~~~"
12729
12547
msgstr ""
12730
12548
12731
#: en/help_topics/hooks.txt:526
12549
#: en/help_topics/hooks.txt:523
12732
12550
msgid ""
12733
12551
"Invoked when adding information about a revision to the RIO stanza\n"
12734
12552
"that is printed. revision is called with a revision object and a RIO\n"
13500
13318
"Many commands that accept URLs also accept location aliases too.\n"
13501
13319
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13502
13320
msgstr ""
13321
13322
#~ msgid ""
13323
#~ "Merge will do its best to combine the changes in two branches, but there\n"
13324
#~ "are some kinds of problems only a human can fix. When it encounters those,\n"
13325
#~ "it will mark a conflict. A conflict means that you need to fix something,\n"
13326
#~ "before you should commit."
13327
#~ msgstr ""
13328
#~ "Merge will do its best to combine the changes in two branches, but there\n"
13329
#~ "are some kinds of problems only a human can fix. When it encounters those,\n"
13330
#~ "it will mark a conflict. A conflict means that you need to fix something,\n"
13331
#~ "before you should commit."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1