« back to all changes in this revision
Viewing changes to po/en_GB.po
- browse files at revision 6472.2.4
- compare with another revision
- compare with revision 5452
- download diff
- download tarball
- view history from revision 6472.2.4
- Committer: Jelmer Vernooij
- Date: 2012-03-06 17:17:27 UTC
- mfrom: (6481 +trunk)
- mto: This revision was merged to the branch mainline in revision 6486.
- Revision ID: jelmer@samba.org-20120306171727-jx9dsy122hsivepo
Merge bzr.dev.
- files added:
- po/ar.po
- files modified:
- bzrlib/builtins.py
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-01-16 15:18+0100\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
"Language-Team: English (United Kingdom) <en_GB@li.org>\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-01-17 05:18+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
20
21
21
#: bzrlib/add.py:95
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
23
msgstr "skipping {0} (larger than {1} of {2} bytes)"
24
24
25
25
#: bzrlib/branch.py:872
26
26
msgid "Unstacking"
27
msgstr ""
27
msgstr "Unstacking"
28
28
29
#: bzrlib/branch.py:3183
29
#: bzrlib/branch.py:3205
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
msgstr ""
32
msgstr "Pushed up to revision %d."
33
33
34
#: bzrlib/branch.py:3185
34
#: bzrlib/branch.py:3207
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
38
msgstr[0] "%d tag updated."
39
msgstr[1] "%d tags updated."
40
40
41
#: bzrlib/branch.py:3188
41
#: bzrlib/branch.py:3210
42
42
msgid "No new revisions or tags to push."
43
msgstr ""
43
msgstr "No new revisions or tags to push."
44
44
45
#: bzrlib/branch.py:3190
45
#: bzrlib/branch.py:3212
46
46
msgid "No new revisions to push."
47
msgstr ""
47
msgstr "No new revisions to push."
48
48
49
#: bzrlib/branch.py:3210
49
#: bzrlib/branch.py:3232
50
50
msgid "checked branch {0} format {1}"
51
msgstr ""
51
msgstr "checked branch {0} format {1}"
52
52
53
#: bzrlib/branch.py:3213
53
#: bzrlib/branch.py:3235
54
54
#, python-format
55
55
msgid "found error:%s"
56
msgstr ""
56
msgstr "found error:%s"
57
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
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
msgstr ""
61
msgstr "Ignoring files outside view. View is %s"
62
62
63
#: bzrlib/builtins.py:130
63
#: bzrlib/builtins.py:218
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
66
msgstr "bzr %s --revision takes exactly one revision identifier"
67
67
68
#: bzrlib/builtins.py:215
68
#: bzrlib/builtins.py:303
69
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:217
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
78
#: bzrlib/builtins.py:220
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:223
85
msgid ""
86
"removed\n"
87
" Versioned in the previous revision but removed or deleted\n"
88
" in the working copy."
89
msgstr ""
90
91
#: bzrlib/builtins.py:227
92
msgid ""
93
"renamed\n"
94
" Path of this file changed from the previous revision;\n"
95
" the text may also have changed. This includes files whose\n"
96
" parent directory was renamed."
97
msgstr ""
98
99
#: bzrlib/builtins.py:232
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:235
70
msgstr "Display status summary."
71
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."
109
110
#: bzrlib/builtins.py:320
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:323
106
119
msgid ""
107
120
"kind changed\n"
108
121
" File kind has been changed (e.g. from file to directory)."
109
122
msgstr ""
110
111
#: bzrlib/builtins.py:238
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:241
118
msgid ""
119
"Additionally for directories, symlinks and files with a changed\n"
120
"executable bit, Bazaar indicates their type using a trailing\n"
121
"character: '/', '@' or '*' respectively. These decorations can be\n"
122
"disabled using the '--no-classify' option."
123
msgstr ""
124
125
#: bzrlib/builtins.py:246
123
"type changed\n"
124
" File type has been changed (e.g. from file to directory)."
125
126
#: bzrlib/builtins.py:326
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
134
#: bzrlib/builtins.py:329
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Additionally for directories, symlinks and files with a changed\n"
142
"executable bit, Bazaar indicates their type using a trailing\n"
143
"character: '/', '@' or '*' respectively. These decorations can be\n"
144
"disabled using the '--no-classify' option."
145
146
#: bzrlib/builtins.py:334
126
147
msgid ""
127
148
"To see ignored files use 'bzr ignored'. For details on the\n"
128
149
"changes to file texts, use 'bzr diff'."
129
150
msgstr ""
130
131
#: bzrlib/builtins.py:249
132
msgid ""
133
"Note that --short or -S gives status flags for each item, similar\n"
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
"use bzr status -SV."
136
msgstr ""
137
138
#: bzrlib/builtins.py:253
139
msgid ""
140
"If no arguments are specified, the status of the entire working\n"
141
"directory is shown. Otherwise, only the status of the specified\n"
142
"files or directories is reported. If a directory is given, status\n"
143
"is reported for everything inside that directory."
144
msgstr ""
145
146
#: bzrlib/builtins.py:258
147
msgid ""
148
"Before merges are committed, the pending merge tip revisions are\n"
149
"shown. To see all pending merge revisions, use the -v option.\n"
150
"To skip the display of pending merge information altogether, use\n"
151
"the no-pending option or specify a file/directory."
152
msgstr ""
153
154
#: bzrlib/builtins.py:263
155
msgid ""
156
"To compare the working directory to a specific revision, pass a\n"
157
"single revision to the revision argument."
158
msgstr ""
159
160
#: bzrlib/builtins.py:266
161
msgid ""
162
"To see which files have changed in a specific revision, or between\n"
163
"two revisions, pass a revision range to the revision argument.\n"
164
"This will produce the same results as calling 'bzr diff --summarize'."
165
msgstr ""
166
167
#: bzrlib/builtins.py:275
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."
163
164
#: bzrlib/builtins.py:341
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:346
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."
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'."
205
206
#: bzrlib/builtins.py:363
168
207
msgid "Use short status indicators."
169
msgstr ""
208
msgstr "Use short status indicators."
170
209
171
#: bzrlib/builtins.py:277
210
#: bzrlib/builtins.py:365
172
211
msgid "Only show versioned files."
173
msgstr ""
212
msgstr "Only show versioned files."
174
213
175
#: bzrlib/builtins.py:279
214
#: bzrlib/builtins.py:367
176
215
msgid "Don't show pending merges."
177
msgstr ""
216
msgstr "Don't show pending merges."
178
217
179
#: bzrlib/builtins.py:282
218
#: bzrlib/builtins.py:370
180
219
msgid "Do not mark object type using indicator."
181
msgstr ""
220
msgstr "Do not mark object type using indicator."
182
221
183
#: bzrlib/builtins.py:297
222
#: bzrlib/builtins.py:385
184
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
185
msgstr ""
224
msgstr "bzr status --revision takes exactly one or two revision specifiers"
186
225
187
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
226
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
188
227
msgid "You can only supply one of revision_id or --revision"
189
msgstr ""
228
msgstr "You can only supply one of revision_id or --revision"
190
229
191
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
230
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
192
231
msgid "You must supply either --revision or a revision_id"
193
232
msgstr ""
194
233
195
#: bzrlib/builtins.py:351
234
#: bzrlib/builtins.py:439
196
235
#, python-format
197
236
msgid "Repository %r does not support access to raw revision texts"
198
237
msgstr ""
199
238
200
#: bzrlib/builtins.py:362
239
#: bzrlib/builtins.py:450
201
240
msgid "The repository {0} contains no revision {1}."
202
241
msgstr ""
203
242
204
#: bzrlib/builtins.py:369
243
#: bzrlib/builtins.py:457
205
244
msgid "You cannot specify a NULL revision."
206
msgstr ""
245
msgstr "You cannot specify a NULL revision."
207
246
208
#: bzrlib/builtins.py:461
247
#: bzrlib/builtins.py:549
209
248
msgid "Remove the working tree from a given branch/checkout."
210
249
msgstr ""
211
250
212
#: bzrlib/builtins.py:463
251
#: bzrlib/builtins.py:551
213
252
msgid ""
214
253
"Since a lightweight checkout is little more than a working tree\n"
215
254
"this will refuse to run against one."
216
255
msgstr ""
217
256
218
#: bzrlib/builtins.py:466
257
#: bzrlib/builtins.py:554
219
258
msgid "To re-create the working tree, use \"bzr checkout\"."
220
259
msgstr ""
221
260
222
#: bzrlib/builtins.py:472
261
#: bzrlib/builtins.py:560
223
262
msgid ""
224
263
"Remove the working tree even if it has uncommitted or shelved changes."
225
264
msgstr ""
265
"Remove the working tree even if it has uncommitted or shelved changes."
226
266
227
#: bzrlib/builtins.py:486
267
#: bzrlib/builtins.py:574
228
268
msgid "No working tree to remove"
229
269
msgstr ""
230
270
231
#: bzrlib/builtins.py:488
271
#: bzrlib/builtins.py:576
232
272
msgid "You cannot remove the working tree of a remote path"
233
msgstr ""
273
msgstr "You cannot remove the working tree of a remote path"
234
274
235
#: bzrlib/builtins.py:497
275
#: bzrlib/builtins.py:585
236
276
msgid "You cannot remove the working tree from a lightweight checkout"
237
msgstr ""
277
msgstr "You cannot remove the working tree from a lightweight checkout"
238
278
239
#: bzrlib/builtins.py:537
279
#: bzrlib/builtins.py:625
240
280
msgid ""
241
281
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
242
282
"instead. Use \"--force\" if you are sure you want to reset the working tree."
243
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."
244
286
245
#: bzrlib/builtins.py:548
287
#: bzrlib/builtins.py:636
246
288
msgid ""
247
289
", the header appears corrupt, try passing -r -1 to set the state to the last "
248
290
"commit"
249
291
msgstr ""
250
292
251
#: bzrlib/builtins.py:552
293
#: bzrlib/builtins.py:640
252
294
msgid "failed to reset the tree state{0}"
253
msgstr ""
295
msgstr "failed to reset the tree state{0}"
254
296
255
#: bzrlib/builtins.py:556
297
#: bzrlib/builtins.py:644
256
298
msgid "Show current revision number."
257
msgstr ""
299
msgstr "Show current revision number."
258
300
259
#: bzrlib/builtins.py:558
301
#: bzrlib/builtins.py:646
260
302
msgid "This is equal to the number of revisions on this branch."
261
303
msgstr ""
262
304
263
#: bzrlib/builtins.py:571
305
#: bzrlib/builtins.py:659
264
306
msgid "--tree and --revision can not be used together"
265
307
msgstr ""
266
308
267
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
309
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
268
310
msgid "Tags can only be placed on a single revision, not on a range"
269
311
msgstr ""
270
312
271
#: bzrlib/builtins.py:612
313
#: bzrlib/builtins.py:700
272
314
msgid "Show revno of working tree."
273
msgstr ""
315
msgstr "Show revno of working tree."
274
316
275
#: bzrlib/builtins.py:660
317
#: bzrlib/builtins.py:748
276
318
msgid "Add specified files or directories."
277
msgstr ""
319
msgstr "Add specified files or directories."
278
320
279
#: bzrlib/builtins.py:662
321
#: bzrlib/builtins.py:750
280
322
msgid ""
281
323
"In non-recursive mode, all the named items are added, regardless\n"
282
324
"of whether they were previously ignored. A warning is given if\n"
283
325
"any of the named files are already versioned."
284
326
msgstr ""
285
327
286
#: bzrlib/builtins.py:666
328
#: bzrlib/builtins.py:754
287
329
msgid ""
288
330
"In recursive mode (the default), files are treated the same way\n"
289
331
"but the behaviour for directories is different. Directories that\n"
294
336
"directories. If no names are given '.' is assumed."
295
337
msgstr ""
296
338
297
#: bzrlib/builtins.py:674
339
#: bzrlib/builtins.py:762
298
340
msgid ""
299
341
"A warning will be printed when nested trees are encountered,\n"
300
342
"unless they are explicitly ignored."
301
343
msgstr ""
302
344
303
#: bzrlib/builtins.py:677
345
#: bzrlib/builtins.py:765
304
346
msgid ""
305
347
"Therefore simply saying 'bzr add' will version all files that\n"
306
348
"are currently unknown."
307
349
msgstr ""
308
350
309
#: bzrlib/builtins.py:680
351
#: bzrlib/builtins.py:768
310
352
msgid ""
311
353
"Adding a file whose parent directory is not versioned will\n"
312
354
"implicitly add the parent, and so on up to the root. This means\n"
314
356
"get added when you add a file in the directory."
315
357
msgstr ""
316
358
317
#: bzrlib/builtins.py:685
359
#: bzrlib/builtins.py:773
318
360
msgid ""
319
361
"--dry-run will show which files would be added, but not actually\n"
320
362
"add them."
321
363
msgstr ""
364
"--dry-run will show which files would be added, but not actually\n"
365
"add them."
322
366
323
#: bzrlib/builtins.py:688
367
#: bzrlib/builtins.py:776
324
368
msgid ""
325
369
"--file-ids-from will try to use the file ids from the supplied path.\n"
326
370
"It looks up ids trying to find a matching parent directory with the\n"
331
375
"into a subdirectory of this one."
332
376
msgstr ""
333
377
334
#: bzrlib/builtins.py:696
378
#: bzrlib/builtins.py:784
335
379
msgid ""
336
380
"Any files matching patterns in the ignore list will not be added\n"
337
381
"unless they are explicitly mentioned."
338
382
msgstr ""
339
383
340
#: bzrlib/builtins.py:699
384
#: bzrlib/builtins.py:787
341
385
msgid ""
342
386
"In recursive mode, files larger than the configuration option \n"
343
387
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
344
388
"to file size."
345
389
msgstr ""
346
390
347
#: bzrlib/builtins.py:706
391
#: bzrlib/builtins.py:794
348
392
msgid "Don't recursively add the contents of directories."
349
393
msgstr ""
350
394
351
#: bzrlib/builtins.py:712
395
#: bzrlib/builtins.py:800
352
396
msgid "Lookup file ids from this tree."
353
msgstr ""
397
msgstr "Lookup file ids from this tree."
354
398
355
#: bzrlib/builtins.py:748
399
#: bzrlib/builtins.py:836
356
400
msgid "ignored {0} matching \"{1}\"\n"
357
401
msgstr ""
358
402
359
#: bzrlib/builtins.py:753
403
#: bzrlib/builtins.py:841
360
404
msgid "Create a new versioned directory."
361
msgstr ""
405
msgstr "Create a new versioned directory."
362
406
363
#: bzrlib/builtins.py:755
407
#: bzrlib/builtins.py:843
364
408
msgid "This is equivalent to creating the directory and then adding it."
365
409
msgstr ""
366
410
367
#: bzrlib/builtins.py:762
411
#: bzrlib/builtins.py:850
368
412
msgid "No error if existing, make parent directories as needed."
369
msgstr ""
413
msgstr "No error if existing, make parent directories as needed."
370
414
371
#: bzrlib/builtins.py:796
415
#: bzrlib/builtins.py:884
372
416
#, python-format
373
417
msgid "added %s\n"
374
418
msgstr ""
375
419
376
#: bzrlib/builtins.py:838
420
#: bzrlib/builtins.py:926
377
421
#, python-format
378
422
msgid "invalid kind %r specified"
379
msgstr ""
423
msgstr "invalid type %r specified"
380
424
381
#: bzrlib/builtins.py:875
425
#: bzrlib/builtins.py:963
382
426
msgid "Move or rename a file."
383
msgstr ""
427
msgstr "Move or rename a file."
384
428
385
#: bzrlib/builtins.py:877
429
#: bzrlib/builtins.py:965
386
430
msgid " bzr mv SOURCE... DESTINATION"
387
msgstr ""
431
msgstr " bzr mv SOURCE... DESTINATION"
388
432
389
#: bzrlib/builtins.py:879
433
#: bzrlib/builtins.py:967
390
434
msgid ""
391
435
"If the last argument is a versioned directory, all the other names\n"
392
436
"are moved into it. Otherwise, there must be exactly two arguments\n"
393
437
"and the file is changed to a new name."
394
438
msgstr ""
395
439
396
#: bzrlib/builtins.py:883
440
#: bzrlib/builtins.py:971
397
441
msgid ""
398
442
"If OLDNAME does not exist on the filesystem but is versioned and\n"
399
443
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
402
446
"The same is valid when moving many SOURCE files to a DESTINATION."
403
447
msgstr ""
404
448
405
#: bzrlib/builtins.py:889
449
#: bzrlib/builtins.py:977
406
450
msgid "Files cannot be moved between branches."
407
msgstr ""
451
msgstr "Files cannot be moved between branches."
408
452
409
#: bzrlib/builtins.py:896
453
#: bzrlib/builtins.py:984
410
454
msgid ""
411
455
"Move only the bzr identifier of the file, because the file has already been "
412
456
"moved."
413
457
msgstr ""
414
458
415
#: bzrlib/builtins.py:898
459
#: bzrlib/builtins.py:986
416
460
msgid "Automatically guess renames."
417
msgstr ""
461
msgstr "Automatically guess renames."
418
462
419
#: bzrlib/builtins.py:899
463
#: bzrlib/builtins.py:987
420
464
msgid "Avoid making changes when guessing renames."
421
msgstr ""
465
msgstr "Avoid making changes when guessing renames."
422
466
423
#: bzrlib/builtins.py:908
467
#: bzrlib/builtins.py:996
424
468
msgid "--dry-run requires --auto."
425
469
msgstr ""
426
470
427
#: bzrlib/builtins.py:912
471
#: bzrlib/builtins.py:1000
428
472
msgid "missing file argument"
429
msgstr ""
473
msgstr "missing file argument"
430
474
431
#: bzrlib/builtins.py:916
475
#: bzrlib/builtins.py:1004
432
476
msgid "can not move root of branch"
433
msgstr ""
477
msgstr "cannot move root of branch"
434
478
435
#: bzrlib/builtins.py:922
479
#: bzrlib/builtins.py:1010
436
480
msgid "Only one path may be specified to --auto."
437
481
msgstr ""
438
482
439
#: bzrlib/builtins.py:925
483
#: bzrlib/builtins.py:1013
440
484
msgid "--after cannot be specified with --auto."
441
485
msgstr ""
442
486
443
#: bzrlib/builtins.py:962
487
#: bzrlib/builtins.py:1050
444
488
msgid "to mv multiple files the destination must be a versioned directory"
445
489
msgstr ""
446
490
447
#: bzrlib/builtins.py:1014
491
#: bzrlib/builtins.py:1102
448
492
msgid "Turn this branch into a mirror of another branch."
449
493
msgstr ""
450
494
451
#: bzrlib/builtins.py:1016
495
#: bzrlib/builtins.py:1104
452
496
msgid ""
453
497
"By default, this command only works on branches that have not diverged.\n"
454
498
"Branches are considered diverged if the destination branch's most recent \n"
456
500
"parent."
457
501
msgstr ""
458
502
459
#: bzrlib/builtins.py:1021
503
#: bzrlib/builtins.py:1109
460
504
msgid ""
461
505
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
462
506
"from one into the other. Once one branch has merged, the other should\n"
463
507
"be able to pull it again."
464
508
msgstr ""
465
509
466
#: bzrlib/builtins.py:1025
510
#: bzrlib/builtins.py:1113
467
511
msgid ""
468
512
"If you want to replace your local changes and just want your branch to\n"
469
513
"match the remote one, use pull --overwrite. This will work even if the two\n"
470
514
"branches have diverged."
471
515
msgstr ""
472
516
473
#: bzrlib/builtins.py:1029
517
#: bzrlib/builtins.py:1117
474
518
msgid ""
475
519
"If there is no default location set, the first pull will set it (use\n"
476
520
"--no-remember to avoid setting it). After that, you can omit the\n"
478
522
"value will only be saved if the remote location can be accessed."
479
523
msgstr ""
480
524
481
#: bzrlib/builtins.py:1034
525
#: bzrlib/builtins.py:1122
482
526
msgid ""
483
527
"The --verbose option will display the revisions pulled using the log_format\n"
484
528
"configuration option. You can use a different format by overriding it with\n"
485
529
"-Olog_format=<other_format>."
486
530
msgstr ""
487
531
488
#: bzrlib/builtins.py:1038
532
#: bzrlib/builtins.py:1126
489
533
msgid ""
490
534
"Note: The location can be specified either in the form of a branch,\n"
491
535
"or in the form of a path to a file containing a merge directive generated\n"
492
536
"with bzr send."
493
537
msgstr ""
494
538
495
#: bzrlib/builtins.py:1046
539
#: bzrlib/builtins.py:1134
496
540
msgid "Show logs of pulled revisions."
497
541
msgstr ""
498
542
499
#: bzrlib/builtins.py:1048
543
#: bzrlib/builtins.py:1136
500
544
msgid ""
501
545
"Branch to pull into, rather than the one containing the working directory."
502
546
msgstr ""
503
547
504
#: bzrlib/builtins.py:1051
548
#: bzrlib/builtins.py:1139
505
549
msgid ""
506
550
"Perform a local pull in a bound branch. Local pulls are not applied to the "
507
551
"master branch."
508
552
msgstr ""
509
553
510
#: bzrlib/builtins.py:1080
554
#: bzrlib/builtins.py:1168
511
555
msgid "Need working tree for --show-base."
512
556
msgstr ""
513
557
514
#: bzrlib/builtins.py:1096
558
#: bzrlib/builtins.py:1184
515
559
msgid "No pull location known or specified."
516
560
msgstr ""
517
561
518
#: bzrlib/builtins.py:1102
562
#: bzrlib/builtins.py:1190
519
563
#, python-format
520
564
msgid "Using saved parent location: %s\n"
521
565
msgstr ""
522
566
523
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
567
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
524
568
msgid "Cannot use -r with merge directives or bundles"
525
569
msgstr ""
526
570
527
#: bzrlib/builtins.py:1150
571
#: bzrlib/builtins.py:1238
528
572
msgid "Update a mirror of this branch."
529
573
msgstr ""
530
574
531
#: bzrlib/builtins.py:1152
575
#: bzrlib/builtins.py:1240
532
576
msgid ""
533
577
"The target branch will not have its working tree populated because this\n"
534
578
"is both expensive, and is not supported on remote file systems."
535
579
msgstr ""
536
580
537
#: bzrlib/builtins.py:1155
581
#: bzrlib/builtins.py:1243
538
582
msgid ""
539
583
"Some smart servers or protocols *may* put the working tree in place in\n"
540
584
"the future."
541
585
msgstr ""
542
586
543
#: bzrlib/builtins.py:1158
587
#: bzrlib/builtins.py:1246
544
588
msgid ""
545
589
"This command only works on branches that have not diverged. Branches are\n"
546
590
"considered diverged if the destination branch's most recent commit is one\n"
547
591
"that has not been merged (directly or indirectly) by the source branch."
548
592
msgstr ""
549
593
550
#: bzrlib/builtins.py:1162
594
#: bzrlib/builtins.py:1250
551
595
msgid ""
552
596
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
553
597
"the other branch completely, discarding its unmerged changes."
554
598
msgstr ""
555
599
556
#: bzrlib/builtins.py:1165
600
#: bzrlib/builtins.py:1253
557
601
msgid ""
558
602
"If you want to ensure you have the different changes in the other branch,\n"
559
603
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
560
604
"After that you will be able to do a push without '--overwrite'."
561
605
msgstr ""
562
606
563
#: bzrlib/builtins.py:1169
607
#: bzrlib/builtins.py:1257
564
608
msgid ""
565
609
"If there is no default push location set, the first push will set it (use\n"
566
610
"--no-remember to avoid setting it). After that, you can omit the\n"
568
612
"value will only be saved if the remote location can be accessed."
569
613
msgstr ""
570
614
571
#: bzrlib/builtins.py:1174
615
#: bzrlib/builtins.py:1262
572
616
msgid ""
573
617
"The --verbose option will display the revisions pushed using the log_format\n"
574
618
"configuration option. You can use a different format by overriding it with\n"
575
619
"-Olog_format=<other_format>."
576
620
msgstr ""
577
621
578
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
622
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
579
623
msgid ""
580
624
"Branch to push from, rather than the one containing the working directory."
581
625
msgstr ""
582
626
583
#: bzrlib/builtins.py:1188
627
#: bzrlib/builtins.py:1276
584
628
msgid ""
585
629
"By default push will fail if the target directory exists, but does not "
586
630
"already have a control directory. This flag will allow push to proceed."
587
631
msgstr ""
588
632
589
#: bzrlib/builtins.py:1193
633
#: bzrlib/builtins.py:1281
590
634
msgid ""
591
635
"Create a stacked branch that references the public location of the parent "
592
636
"branch."
593
637
msgstr ""
594
638
595
#: bzrlib/builtins.py:1196
639
#: bzrlib/builtins.py:1284
596
640
msgid ""
597
641
"Create a stacked branch that refers to another branch for the commit "
598
642
"history. Only the work not present in the referenced branch is included in "
599
643
"the branch created."
600
644
msgstr ""
601
645
602
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
646
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
603
647
msgid ""
604
648
"Refuse to push if there are uncommitted changes in the working tree, --no-"
605
649
"strict disables the check."
606
650
msgstr ""
607
651
608
#: bzrlib/builtins.py:1204
652
#: bzrlib/builtins.py:1292
609
653
msgid "Don't populate the working tree, even for protocols that support it."
610
654
msgstr ""
611
655
612
#: bzrlib/builtins.py:1248
656
#: bzrlib/builtins.py:1336
613
657
msgid "Could not determine branch to refer to."
614
658
msgstr ""
615
659
616
#: bzrlib/builtins.py:1257
660
#: bzrlib/builtins.py:1345
617
661
#, python-format
618
662
msgid ""
619
663
"No push location known or specified. To push to the parent branch (at %s), "
620
664
"use 'bzr push :parent'."
621
665
msgstr ""
622
666
623
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
667
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
624
668
msgid "No push location known or specified."
625
669
msgstr ""
626
670
627
#: bzrlib/builtins.py:1267
671
#: bzrlib/builtins.py:1355
628
672
#, python-format
629
673
msgid "Using saved push location: %s"
630
674
msgstr ""
631
675
632
#: bzrlib/builtins.py:1277
676
#: bzrlib/builtins.py:1365
633
677
msgid "Create a new branch that is a copy of an existing branch."
634
678
msgstr ""
635
679
636
#: bzrlib/builtins.py:1279
680
#: bzrlib/builtins.py:1367
637
681
msgid ""
638
682
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
639
683
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
644
688
"create ./foo-bar."
645
689
msgstr ""
646
690
647
#: bzrlib/builtins.py:1286
691
#: bzrlib/builtins.py:1374
648
692
msgid ""
649
693
"To retrieve the branch as of a particular revision, supply the --revision\n"
650
694
"parameter, as in \"branch foo/bar -r 5\"."
651
695
msgstr ""
652
696
653
#: bzrlib/builtins.py:1289
697
#: bzrlib/builtins.py:1377
654
698
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
655
699
msgstr ""
656
700
657
#: bzrlib/builtins.py:1299
701
#: bzrlib/builtins.py:1387
658
702
msgid "Create a branch without a working-tree."
659
703
msgstr ""
660
704
661
#: bzrlib/builtins.py:1301
705
#: bzrlib/builtins.py:1389
662
706
msgid "Switch the checkout in the current directory to the new branch."
663
707
msgstr ""
664
708
665
#: bzrlib/builtins.py:1304
709
#: bzrlib/builtins.py:1392
666
710
msgid ""
667
711
"Create a stacked branch referring to the source branch. The new branch will "
668
712
"depend on the availability of the source branch for all operations."
669
713
msgstr ""
670
714
671
#: bzrlib/builtins.py:1308
715
#: bzrlib/builtins.py:1396
672
716
msgid "Do not use a shared repository, even if available."
673
717
msgstr ""
674
718
675
#: bzrlib/builtins.py:1310
719
#: bzrlib/builtins.py:1398
676
720
msgid ""
677
721
"By default branch will fail if the target directory exists, but does not "
678
722
"already have a control directory. This flag will allow branch to proceed."
679
723
msgstr ""
680
724
681
#: bzrlib/builtins.py:1315
725
#: bzrlib/builtins.py:1403
682
726
msgid "Bind new branch to from location."
683
727
msgstr ""
684
728
685
#: bzrlib/builtins.py:1362
729
#: bzrlib/builtins.py:1450
686
730
#, python-format
687
731
msgid "Target directory \"%s\" already exists."
688
732
msgstr ""
689
733
690
#: bzrlib/builtins.py:1374
734
#: bzrlib/builtins.py:1462
691
735
#, python-format
692
736
msgid "Parent of \"%s\" does not exist."
693
737
msgstr ""
694
738
695
#: bzrlib/builtins.py:1393
739
#: bzrlib/builtins.py:1481
696
740
msgid "The branch {0} has no revision {1}."
697
741
msgstr ""
698
742
699
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
743
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
700
744
#, python-format
701
745
msgid "Created new stacked branch referring to %s."
702
746
msgstr ""
703
747
704
#: bzrlib/builtins.py:1407
748
#: bzrlib/builtins.py:1500
705
749
#, python-format
706
750
msgid "Branched %d revision."
707
751
msgid_plural "Branched %d revisions."
708
752
msgstr[0] ""
709
753
msgstr[1] ""
710
754
711
#: bzrlib/builtins.py:1412
755
#: bzrlib/builtins.py:1505
712
756
#, python-format
713
757
msgid "New branch bound to %s"
714
758
msgstr ""
715
759
716
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
760
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
717
761
#, python-format
718
762
msgid "Switched to branch: %s"
719
763
msgstr ""
720
764
721
#: bzrlib/builtins.py:1422
765
#: bzrlib/builtins.py:1515
722
766
msgid "List the branches available at the current location."
723
767
msgstr ""
724
768
725
#: bzrlib/builtins.py:1424
769
#: bzrlib/builtins.py:1517
726
770
msgid ""
727
771
"This command will print the names of all the branches at the current\n"
728
772
"location."
729
773
msgstr ""
730
774
731
#: bzrlib/builtins.py:1431
775
#: bzrlib/builtins.py:1524
732
776
msgid ""
733
777
"Recursively scan for branches rather than just looking in the specified "
734
778
"location."
735
779
msgstr ""
736
780
737
#: bzrlib/builtins.py:1461
781
#: bzrlib/builtins.py:1554
738
782
msgid "(default)"
739
783
msgstr ""
740
784
741
#: bzrlib/builtins.py:1473
785
#: bzrlib/builtins.py:1566
742
786
msgid "Create a new checkout of an existing branch."
743
787
msgstr ""
744
788
745
#: bzrlib/builtins.py:1475
789
#: bzrlib/builtins.py:1568
746
790
msgid ""
747
791
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
748
792
"for\n"
752
796
"location using SFTP."
753
797
msgstr ""
754
798
755
#: bzrlib/builtins.py:1480
799
#: bzrlib/builtins.py:1573
756
800
msgid ""
757
801
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
758
802
"will\n"
764
808
"create ./foo-bar."
765
809
msgstr ""
766
810
767
#: bzrlib/builtins.py:1487
811
#: bzrlib/builtins.py:1580
768
812
msgid ""
769
813
"To retrieve the branch as of a particular revision, supply the --revision\n"
770
814
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
774
818
"code.)"
775
819
msgstr ""
776
820
777
#: bzrlib/builtins.py:1497
821
#: bzrlib/builtins.py:1590
778
822
msgid ""
779
823
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
780
824
"the branch for every operation. Normal checkouts can perform common "
782
826
"commits."
783
827
msgstr ""
784
828
785
#: bzrlib/builtins.py:1504
829
#: bzrlib/builtins.py:1597
786
830
msgid "Get file contents from this tree."
787
831
msgstr ""
788
832
789
#: bzrlib/builtins.py:1506
833
#: bzrlib/builtins.py:1599
790
834
msgid "Hard-link working tree files where possible."
791
835
msgstr ""
792
836
793
#: bzrlib/builtins.py:1547
837
#: bzrlib/builtins.py:1640
794
838
msgid ""
795
839
"Show list of renamed files.\n"
796
840
" "
797
841
msgstr ""
798
842
799
#: bzrlib/builtins.py:1577
843
#: bzrlib/builtins.py:1670
800
844
msgid "Update a working tree to a new revision."
801
845
msgstr ""
802
846
803
#: bzrlib/builtins.py:1579
847
#: bzrlib/builtins.py:1672
804
848
msgid ""
805
849
"This will perform a merge of the destination revision (the tip of the\n"
806
850
"branch, or the specified revision) into the working tree, and then make\n"
807
851
"that revision the basis revision for the working tree. "
808
852
msgstr ""
809
853
810
#: bzrlib/builtins.py:1583
854
#: bzrlib/builtins.py:1676
811
855
msgid ""
812
856
"You can use this to visit an older revision, or to update a working tree\n"
813
857
"that is out of date from its branch."
814
858
msgstr ""
815
859
816
#: bzrlib/builtins.py:1586
860
#: bzrlib/builtins.py:1679
817
861
msgid ""
818
862
"If there are any uncommitted changes in the tree, they will be carried\n"
819
863
"across and remain as uncommitted changes after the update. To discard\n"
821
865
"with the changes brought in by the change in basis revision."
822
866
msgstr ""
823
867
824
#: bzrlib/builtins.py:1591
868
#: bzrlib/builtins.py:1684
825
869
msgid ""
826
870
"If the tree's branch is bound to a master branch, bzr will also update\n"
827
871
"the branch from the master."
828
872
msgstr ""
829
873
830
#: bzrlib/builtins.py:1594
874
#: bzrlib/builtins.py:1687
831
875
msgid ""
832
876
"You cannot update just a single file or directory, because each Bazaar\n"
833
877
"working tree has just a single basis revision. If you want to restore a\n"
837
881
"out the old content of that file to a new location."
838
882
msgstr ""
839
883
840
#: bzrlib/builtins.py:1601
884
#: bzrlib/builtins.py:1694
841
885
msgid ""
842
886
"The 'dir' argument, if given, must be the location of the root of a\n"
843
887
"working tree to update. By default, the working tree that contains the \n"
844
888
"current working directory is used."
845
889
msgstr ""
846
890
847
#: bzrlib/builtins.py:1617
891
#: bzrlib/builtins.py:1710
848
892
msgid "bzr update --revision takes exactly one revision"
849
893
msgstr ""
850
894
851
#: bzrlib/builtins.py:1625
895
#: bzrlib/builtins.py:1718
852
896
msgid "bzr update can only update a whole tree, not a file or subdirectory"
853
897
msgstr ""
854
898
855
#: bzrlib/builtins.py:1656
899
#: bzrlib/builtins.py:1749
856
900
msgid "Tree is up to date at revision {0} of branch {1}"
857
901
msgstr ""
858
902
859
#: bzrlib/builtins.py:1672
903
#: bzrlib/builtins.py:1765
860
904
#, python-format
861
905
msgid ""
862
906
"branch has no revision %s\n"
863
907
"bzr update --revision only works for a revision in the branch history"
864
908
msgstr ""
865
909
866
#: bzrlib/builtins.py:1678
910
#: bzrlib/builtins.py:1771
867
911
msgid "Updated to revision {0} of branch {1}"
868
912
msgstr ""
869
913
870
#: bzrlib/builtins.py:1682
914
#: bzrlib/builtins.py:1775
871
915
msgid ""
872
916
"Your local commits will now show as pending merges with 'bzr status', and "
873
917
"can be committed with 'bzr commit'."
874
918
msgstr ""
875
919
876
#: bzrlib/builtins.py:1691
920
#: bzrlib/builtins.py:1784
877
921
msgid "Show information about a working tree, branch or repository."
878
922
msgstr ""
879
923
880
#: bzrlib/builtins.py:1693
924
#: bzrlib/builtins.py:1786
881
925
msgid ""
882
926
"This command will show all known locations and formats associated to the\n"
883
927
"tree, branch or repository."
884
928
msgstr ""
885
929
886
#: bzrlib/builtins.py:1696
930
#: bzrlib/builtins.py:1789
887
931
msgid ""
888
932
"In verbose mode, statistical information is included with each report.\n"
889
933
"To see extended statistic information, use a verbosity level of 2 or\n"
890
934
"higher by specifying the verbose option multiple times, e.g. -vv."
891
935
msgstr ""
892
936
893
#: bzrlib/builtins.py:1700
937
#: bzrlib/builtins.py:1793
894
938
msgid "Branches and working trees will also report any missing revisions."
895
939
msgstr ""
896
940
897
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
898
#: bzrlib/builtins.py:6389
941
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
942
#: bzrlib/builtins.py:6442
899
943
msgid ":Examples:"
900
944
msgstr ""
901
945
902
#: bzrlib/builtins.py:1704
946
#: bzrlib/builtins.py:1797
903
947
msgid " Display information on the format and related locations:"
904
948
msgstr ""
905
949
906
#: bzrlib/builtins.py:1706
950
#: bzrlib/builtins.py:1799
907
951
msgid " bzr info"
908
952
msgstr ""
909
953
910
#: bzrlib/builtins.py:1708
954
#: bzrlib/builtins.py:1801
911
955
msgid ""
912
956
" Display the above together with extended format information and\n"
913
957
" basic statistics (like the number of files in the working tree and\n"
914
958
" number of revisions in the branch and repository):"
915
959
msgstr ""
916
960
917
#: bzrlib/builtins.py:1712
961
#: bzrlib/builtins.py:1805
918
962
msgid " bzr info -v"
919
963
msgstr ""
920
964
921
#: bzrlib/builtins.py:1714
965
#: bzrlib/builtins.py:1807
922
966
msgid " Display the above together with number of committers to the branch:"
923
967
msgstr ""
924
968
925
#: bzrlib/builtins.py:1716
969
#: bzrlib/builtins.py:1809
926
970
msgid " bzr info -vv"
927
971
msgstr ""
928
972
929
#: bzrlib/builtins.py:1735
973
#: bzrlib/builtins.py:1828
930
974
msgid "Remove files or directories."
931
975
msgstr ""
932
976
933
#: bzrlib/builtins.py:1737
977
#: bzrlib/builtins.py:1830
934
978
msgid ""
935
979
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
936
980
"delete them if they can easily be recovered using revert otherwise they\n"
939
983
"Bazaar but missing in your tree and stop tracking them for you."
940
984
msgstr ""
941
985
942
#: bzrlib/builtins.py:1745
986
#: bzrlib/builtins.py:1838
943
987
msgid "Only remove files that have never been committed."
944
988
msgstr ""
945
989
946
#: bzrlib/builtins.py:1747
990
#: bzrlib/builtins.py:1840
947
991
msgid "The file deletion mode to be used."
948
992
msgstr ""
949
993
950
#: bzrlib/builtins.py:1748
994
#: bzrlib/builtins.py:1841
951
995
msgid "Deletion Strategy"
952
996
msgstr ""
953
997
954
#: bzrlib/builtins.py:1749
998
#: bzrlib/builtins.py:1842
955
999
msgid "Backup changed files (default)."
956
1000
msgstr ""
957
1001
958
#: bzrlib/builtins.py:1750
1002
#: bzrlib/builtins.py:1843
959
1003
msgid "Delete from bzr but leave the working copy."
960
1004
msgstr ""
961
1005
962
#: bzrlib/builtins.py:1751
1006
#: bzrlib/builtins.py:1844
963
1007
msgid "Don't backup changed files."
964
1008
msgstr ""
965
1009
966
#: bzrlib/builtins.py:1752
1010
#: bzrlib/builtins.py:1845
967
1011
msgid ""
968
1012
"Delete all the specified files, even if they can not be recovered and even "
969
1013
"if they are non-empty directories. (deprecated, use no-backup)"
970
1014
msgstr ""
971
1015
972
#: bzrlib/builtins.py:1761
1016
#: bzrlib/builtins.py:1854
973
1017
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
974
1018
msgstr ""
975
1019
976
#: bzrlib/builtins.py:1778
1020
#: bzrlib/builtins.py:1871
977
1021
msgid "No matching files."
978
1022
msgstr ""
979
1023
980
#: bzrlib/builtins.py:1839
1024
#: bzrlib/builtins.py:1932
981
1025
msgid "Reconcile bzr metadata in a branch."
982
1026
msgstr ""
983
1027
984
#: bzrlib/builtins.py:1841
1028
#: bzrlib/builtins.py:1934
985
1029
msgid ""
986
1030
"This can correct data mismatches that may have been caused by\n"
987
1031
"previous ghost operations or bzr upgrades. You should only\n"
989
1033
"advises you to run it."
990
1034
msgstr ""
991
1035
992
#: bzrlib/builtins.py:1846
1036
#: bzrlib/builtins.py:1939
993
1037
msgid ""
994
1038
"If a second branch is provided, cross-branch reconciliation is\n"
995
1039
"also attempted, which will check that data like the tree root\n"
997
1041
"correctly in both branches."
998
1042
msgstr ""
999
1043
1000
#: bzrlib/builtins.py:1851
1044
#: bzrlib/builtins.py:1944
1001
1045
msgid ""
1002
1046
"At the same time it is run it may recompress data resulting in\n"
1003
1047
"a potential saving in disk space or performance gain."
1004
1048
msgstr ""
1005
1049
1006
#: bzrlib/builtins.py:1854
1050
#: bzrlib/builtins.py:1947
1007
1051
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1008
1052
msgstr ""
1009
1053
1010
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1054
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1011
1055
msgid ""
1012
1056
"Format for the bzr 2.0 series.\n"
1013
1057
"Uses group-compress storage.\n"
1014
1058
"Provides rich roots which are a one-way transition.\n"
1015
1059
msgstr ""
1016
1060
1017
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1061
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1018
1062
msgid ""
1019
1063
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1020
1064
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1021
1065
msgstr ""
1022
1066
1023
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1067
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1024
1068
msgid "The 2a format with experimental support for colocated branches.\n"
1025
1069
msgstr ""
1026
1070
1027
#: bzrlib/builtins.py:1922
1071
#: bzrlib/builtins.py:2015
1028
1072
msgid "Make a directory into a versioned branch."
1029
1073
msgstr ""
1030
1074
1031
#: bzrlib/builtins.py:1924
1075
#: bzrlib/builtins.py:2017
1032
1076
msgid ""
1033
1077
"Use this to create an empty branch, or before importing an\n"
1034
1078
"existing project."
1035
1079
msgstr ""
1036
1080
1037
#: bzrlib/builtins.py:1927
1081
#: bzrlib/builtins.py:2020
1038
1082
msgid ""
1039
1083
"If there is a repository in a parent directory of the location, then\n"
1040
1084
"the history of the branch will be stored in the repository. Otherwise\n"
1042
1086
"in the .bzr directory."
1043
1087
msgstr ""
1044
1088
1045
#: bzrlib/builtins.py:1932
1089
#: bzrlib/builtins.py:2025
1046
1090
msgid ""
1047
1091
"If there is already a branch at the location but it has no working tree,\n"
1048
1092
"the tree can be populated with 'bzr checkout'."
1049
1093
msgstr ""
1050
1094
1051
#: bzrlib/builtins.py:1935
1095
#: bzrlib/builtins.py:2028
1052
1096
msgid "Recipe for importing a tree of files::"
1053
1097
msgstr ""
1054
1098
1055
#: bzrlib/builtins.py:1937
1099
#: bzrlib/builtins.py:2030
1056
1100
msgid ""
1057
1101
" cd ~/project\n"
1058
1102
" bzr init\n"
1061
1105
" bzr commit -m \"imported project\""
1062
1106
msgstr ""
1063
1107
1064
#: bzrlib/builtins.py:1948
1108
#: bzrlib/builtins.py:2041
1065
1109
msgid ""
1066
1110
"Create the path leading up to the branch if it does not already exist."
1067
1111
msgstr ""
1068
1112
1069
#: bzrlib/builtins.py:1951
1113
#: bzrlib/builtins.py:2044
1070
1114
msgid "Specify a format for this branch. See \"help formats\"."
1071
1115
msgstr ""
1072
1116
1073
#: bzrlib/builtins.py:1959
1117
#: bzrlib/builtins.py:2052
1074
1118
msgid ""
1075
1119
"Never change revnos or the existing log. Append revisions to it only."
1076
1120
msgstr ""
1077
1121
1078
#: bzrlib/builtins.py:1962
1122
#: bzrlib/builtins.py:2055
1079
1123
msgid "Create a branch without a working tree."
1080
1124
msgstr ""
1081
1125
1082
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1126
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1083
1127
#, python-format
1084
1128
msgid ""
1085
1129
"Parent directory of %s does not exist.\n"
1086
1130
"You may supply --create-prefix to create all leading parent directories."
1087
1131
msgstr ""
1088
1132
1089
#: bzrlib/builtins.py:2016
1133
#: bzrlib/builtins.py:2109
1090
1134
msgid ""
1091
1135
"This branch format cannot be set to append-revisions-only. Try --default."
1092
1136
msgstr ""
1093
1137
1094
#: bzrlib/builtins.py:2027
1138
#: bzrlib/builtins.py:2120
1095
1139
msgid "Created a {0} (format: {1})\n"
1096
1140
msgstr ""
1097
1141
1098
#: bzrlib/builtins.py:2036
1142
#: bzrlib/builtins.py:2129
1099
1143
#, python-format
1100
1144
msgid "Using shared repository: %s\n"
1101
1145
msgstr ""
1102
1146
1103
#: bzrlib/builtins.py:2040
1147
#: bzrlib/builtins.py:2133
1104
1148
msgid "Create a shared repository for branches to share storage space."
1105
1149
msgstr ""
1106
1150
1107
#: bzrlib/builtins.py:2042
1151
#: bzrlib/builtins.py:2135
1108
1152
msgid ""
1109
1153
"New branches created under the repository directory will store their\n"
1110
1154
"revisions in the repository, not in the branch directory. For branches\n"
1112
1156
"speeds up the creation of new branches."
1113
1157
msgstr ""
1114
1158
1115
#: bzrlib/builtins.py:2047
1159
#: bzrlib/builtins.py:2140
1116
1160
msgid ""
1117
1161
"If the --no-trees option is given then the branches in the repository\n"
1118
1162
"will not have working trees by default. They will still exist as \n"
1122
1166
"branches, such as on a server."
1123
1167
msgstr ""
1124
1168
1125
#: bzrlib/builtins.py:2054
1169
#: bzrlib/builtins.py:2147
1126
1170
msgid ""
1127
1171
":Examples:\n"
1128
1172
" Create a shared repository holding just branches::"
1129
1173
msgstr ""
1130
1174
1131
#: bzrlib/builtins.py:2057
1175
#: bzrlib/builtins.py:2150
1132
1176
msgid ""
1133
1177
" bzr init-repo --no-trees repo\n"
1134
1178
" bzr init repo/trunk"
1135
1179
msgstr ""
1136
1180
1137
#: bzrlib/builtins.py:2060
1181
#: bzrlib/builtins.py:2153
1138
1182
msgid " Make a lightweight checkout elsewhere::"
1139
1183
msgstr ""
1140
1184
1141
#: bzrlib/builtins.py:2062
1185
#: bzrlib/builtins.py:2155
1142
1186
msgid ""
1143
1187
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1144
1188
" cd trunk-checkout\n"
1145
1189
" (add files here)"
1146
1190
msgstr ""
1147
1191
1148
#: bzrlib/builtins.py:2070
1192
#: bzrlib/builtins.py:2163
1149
1193
msgid ""
1150
1194
"Specify a format for this repository. See \"bzr help formats\" for details."
1151
1195
msgstr ""
1152
1196
1153
#: bzrlib/builtins.py:2074
1197
#: bzrlib/builtins.py:2167
1154
1198
msgid "Repository format"
1155
1199
msgstr ""
1156
1200
1157
#: bzrlib/builtins.py:2076
1201
#: bzrlib/builtins.py:2169
1158
1202
msgid "Branches in the repository will default to not having a working tree."
1159
1203
msgstr ""
1160
1204
1161
#: bzrlib/builtins.py:2102
1205
#: bzrlib/builtins.py:2195
1162
1206
msgid "Show differences in the working tree, between revisions or branches."
1163
1207
msgstr ""
1164
1208
1165
#: bzrlib/builtins.py:2104
1209
#: bzrlib/builtins.py:2197
1166
1210
msgid ""
1167
1211
"If no arguments are given, all changes for the current tree are listed.\n"
1168
1212
"If files are given, only the changes in those files are listed.\n"
1172
1216
"given."
1173
1217
msgstr ""
1174
1218
1175
#: bzrlib/builtins.py:2111
1219
#: bzrlib/builtins.py:2204
1176
1220
msgid ""
1177
1221
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1178
1222
"produces patches suitable for \"patch -p1\"."
1179
1223
msgstr ""
1180
1224
1181
#: bzrlib/builtins.py:2114
1225
#: bzrlib/builtins.py:2207
1182
1226
msgid ""
1183
1227
"Note that when using the -r argument with a range of revisions, the\n"
1184
1228
"differences are computed between the two specified revisions. That\n"
1188
1232
"in the range."
1189
1233
msgstr ""
1190
1234
1191
#: bzrlib/builtins.py:2121
1235
#: bzrlib/builtins.py:2214
1192
1236
msgid ""
1193
1237
":Exit values:\n"
1194
1238
" 1 - changed\n"
1197
1241
" 0 - no change"
1198
1242
msgstr ""
1199
1243
1200
#: bzrlib/builtins.py:2127
1244
#: bzrlib/builtins.py:2220
1201
1245
msgid ""
1202
1246
":Examples:\n"
1203
1247
" Shows the difference in the working tree versus the last commit::"
1204
1248
msgstr ""
1205
1249
1206
#: bzrlib/builtins.py:2130
1250
#: bzrlib/builtins.py:2223
1207
1251
msgid " bzr diff"
1208
1252
msgstr ""
1209
1253
1210
#: bzrlib/builtins.py:2132
1254
#: bzrlib/builtins.py:2225
1211
1255
msgid " Difference between the working tree and revision 1::"
1212
1256
msgstr ""
1213
1257
1214
#: bzrlib/builtins.py:2134
1258
#: bzrlib/builtins.py:2227
1215
1259
msgid " bzr diff -r1"
1216
1260
msgstr ""
1217
1261
1218
#: bzrlib/builtins.py:2136
1262
#: bzrlib/builtins.py:2229
1219
1263
msgid " Difference between revision 3 and revision 1::"
1220
1264
msgstr ""
1221
1265
1222
#: bzrlib/builtins.py:2138
1266
#: bzrlib/builtins.py:2231
1223
1267
msgid " bzr diff -r1..3"
1224
1268
msgstr ""
1225
1269
1226
#: bzrlib/builtins.py:2140
1270
#: bzrlib/builtins.py:2233
1227
1271
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1228
1272
msgstr ""
1229
1273
1230
#: bzrlib/builtins.py:2142
1274
#: bzrlib/builtins.py:2235
1231
1275
msgid " bzr diff -r1..3 xxx"
1232
1276
msgstr ""
1233
1277
1234
#: bzrlib/builtins.py:2144
1278
#: bzrlib/builtins.py:2237
1235
1279
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1236
1280
msgstr ""
1237
1281
1238
#: bzrlib/builtins.py:2146
1282
#: bzrlib/builtins.py:2239
1239
1283
msgid " bzr diff -c2"
1240
1284
msgstr ""
1241
1285
1242
#: bzrlib/builtins.py:2148
1286
#: bzrlib/builtins.py:2241
1243
1287
msgid ""
1244
1288
" To see the changes introduced by revision X::\n"
1245
1289
" \n"
1246
1290
" bzr diff -cX"
1247
1291
msgstr ""
1248
1292
1249
#: bzrlib/builtins.py:2152
1293
#: bzrlib/builtins.py:2245
1250
1294
msgid ""
1251
1295
" Note that in the case of a merge, the -c option shows the changes\n"
1252
1296
" compared to the left hand parent. To see the changes against\n"
1253
1297
" another parent, use::"
1254
1298
msgstr ""
1255
1299
1256
#: bzrlib/builtins.py:2156
1300
#: bzrlib/builtins.py:2249
1257
1301
msgid " bzr diff -r<chosen_parent>..X"
1258
1302
msgstr ""
1259
1303
1260
#: bzrlib/builtins.py:2158
1304
#: bzrlib/builtins.py:2251
1261
1305
msgid ""
1262
1306
" The changes between the current revision and the previous revision\n"
1263
1307
" (equivalent to -c-1 and -r-2..-1)"
1264
1308
msgstr ""
1265
1309
1266
#: bzrlib/builtins.py:2161
1310
#: bzrlib/builtins.py:2254
1267
1311
msgid " bzr diff -r-2.."
1268
1312
msgstr ""
1269
1313
1270
#: bzrlib/builtins.py:2163
1314
#: bzrlib/builtins.py:2256
1271
1315
msgid " Show just the differences for file NEWS::"
1272
1316
msgstr ""
1273
1317
1274
#: bzrlib/builtins.py:2165
1318
#: bzrlib/builtins.py:2258
1275
1319
msgid " bzr diff NEWS"
1276
1320
msgstr ""
1277
1321
1278
#: bzrlib/builtins.py:2167
1322
#: bzrlib/builtins.py:2260
1279
1323
msgid " Show the differences in working tree xxx for file NEWS::"
1280
1324
msgstr ""
1281
1325
1282
#: bzrlib/builtins.py:2169
1326
#: bzrlib/builtins.py:2262
1283
1327
msgid " bzr diff xxx/NEWS"
1284
1328
msgstr ""
1285
1329
1286
#: bzrlib/builtins.py:2171
1330
#: bzrlib/builtins.py:2264
1287
1331
msgid " Show the differences from branch xxx to this working tree:"
1288
1332
msgstr ""
1289
1333
1290
#: bzrlib/builtins.py:2173
1334
#: bzrlib/builtins.py:2266
1291
1335
msgid " bzr diff --old xxx"
1292
1336
msgstr ""
1293
1337
1294
#: bzrlib/builtins.py:2175
1338
#: bzrlib/builtins.py:2268
1295
1339
msgid " Show the differences between two branches for file NEWS::"
1296
1340
msgstr ""
1297
1341
1298
#: bzrlib/builtins.py:2177
1342
#: bzrlib/builtins.py:2270
1299
1343
msgid " bzr diff --old xxx --new yyy NEWS"
1300
1344
msgstr ""
1301
1345
1302
#: bzrlib/builtins.py:2179
1346
#: bzrlib/builtins.py:2272
1303
1347
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1304
1348
msgstr ""
1305
1349
1306
#: bzrlib/builtins.py:2181
1350
#: bzrlib/builtins.py:2274
1307
1351
msgid ""
1308
1352
" bzr diff --prefix old/:new/\n"
1309
1353
" \n"
1312
1356
" bzr diff --using /usr/bin/diff --diff-options -wu"
1313
1357
msgstr ""
1314
1358
1315
#: bzrlib/builtins.py:2191
1359
#: bzrlib/builtins.py:2284
1316
1360
msgid "Pass these options to the external diff program."
1317
1361
msgstr ""
1318
1362
1319
#: bzrlib/builtins.py:2194
1363
#: bzrlib/builtins.py:2287
1320
1364
msgid ""
1321
1365
"Set prefixes added to old and new filenames, as two values separated by a "
1322
1366
"colon. (eg \"old/:new/\")."
1323
1367
msgstr ""
1324
1368
1325
#: bzrlib/builtins.py:2197
1369
#: bzrlib/builtins.py:2290
1326
1370
msgid "Branch/tree to compare from."
1327
1371
msgstr ""
1328
1372
1329
#: bzrlib/builtins.py:2201
1373
#: bzrlib/builtins.py:2294
1330
1374
msgid "Branch/tree to compare to."
1331
1375
msgstr ""
1332
1376
1333
#: bzrlib/builtins.py:2207
1377
#: bzrlib/builtins.py:2300
1334
1378
msgid "Use this command to compare files."
1335
1379
msgstr ""
1336
1380
1337
#: bzrlib/builtins.py:2212
1381
#: bzrlib/builtins.py:2305
1338
1382
msgid "Diff format to use."
1339
1383
msgstr ""
1340
1384
1341
#: bzrlib/builtins.py:2214
1385
#: bzrlib/builtins.py:2307
1342
1386
msgid "Diff format"
1343
1387
msgstr ""
1344
1388
1345
#: bzrlib/builtins.py:2236
1389
#: bzrlib/builtins.py:2329
1346
1390
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1347
1391
msgstr ""
1348
1392
1349
#: bzrlib/builtins.py:2240
1393
#: bzrlib/builtins.py:2333
1350
1394
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1351
1395
msgstr ""
1352
1396
1353
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1354
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1397
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1398
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1355
1399
msgid "{0} and {1} are mutually exclusive"
1356
1400
msgstr ""
1357
1401
1358
#: bzrlib/builtins.py:2265
1402
#: bzrlib/builtins.py:2358
1359
1403
msgid ""
1360
1404
"List files deleted in the working tree.\n"
1361
1405
" "
1362
1406
msgstr ""
1363
1407
1364
#: bzrlib/builtins.py:2343
1408
#: bzrlib/builtins.py:2436
1365
1409
msgid "Show the tree root directory."
1366
1410
msgstr ""
1367
1411
1368
#: bzrlib/builtins.py:2345
1412
#: bzrlib/builtins.py:2438
1369
1413
msgid ""
1370
1414
"The root is the nearest enclosing directory with a .bzr control\n"
1371
1415
"directory."
1372
1416
msgstr ""
1373
1417
1374
#: bzrlib/builtins.py:2360
1418
#: bzrlib/builtins.py:2453
1375
1419
msgid "The limit argument must be an integer."
1376
1420
msgstr ""
1377
1421
1378
#: bzrlib/builtins.py:2368
1422
#: bzrlib/builtins.py:2461
1379
1423
msgid "The levels argument must be an integer."
1380
1424
msgstr ""
1381
1425
1382
#: bzrlib/builtins.py:2373
1426
#: bzrlib/builtins.py:2466
1383
1427
msgid "Show historical log for a branch or subset of a branch."
1384
1428
msgstr ""
1385
1429
1386
#: bzrlib/builtins.py:2375
1430
#: bzrlib/builtins.py:2468
1387
1431
msgid ""
1388
1432
"log is bzr's default tool for exploring the history of a branch.\n"
1389
1433
"The branch to use is taken from the first parameter. If no parameters\n"
1391
1435
"Here are some simple examples::"
1392
1436
msgstr ""
1393
1437
1394
#: bzrlib/builtins.py:2380
1438
#: bzrlib/builtins.py:2473
1395
1439
msgid ""
1396
1440
" bzr log log the current branch\n"
1397
1441
" bzr log foo.py log a file in its branch\n"
1398
1442
" bzr log http://server/branch log a branch on a server"
1399
1443
msgstr ""
1400
1444
1401
#: bzrlib/builtins.py:2384
1445
#: bzrlib/builtins.py:2477
1402
1446
msgid ""
1403
1447
"The filtering, ordering and information shown for each revision can\n"
1404
1448
"be controlled as explained below. By default, all revisions are\n"
1408
1452
"were merged."
1409
1453
msgstr ""
1410
1454
1411
#: bzrlib/builtins.py:2391
1455
#: bzrlib/builtins.py:2484
1412
1456
msgid ":Output control:"
1413
1457
msgstr ""
1414
1458
1415
#: bzrlib/builtins.py:2393
1459
#: bzrlib/builtins.py:2486
1416
1460
msgid ""
1417
1461
" The log format controls how information about each revision is\n"
1418
1462
" displayed. The standard log formats are called ``long``, ``short``\n"
1420
1464
" for more details on log formats."
1421
1465
msgstr ""
1422
1466
1423
#: bzrlib/builtins.py:2398
1467
#: bzrlib/builtins.py:2491
1424
1468
msgid ""
1425
1469
" The following options can be used to control what information is\n"
1426
1470
" displayed::"
1427
1471
msgstr ""
1428
1472
1429
#: bzrlib/builtins.py:2401
1473
#: bzrlib/builtins.py:2494
1430
1474
msgid ""
1431
1475
" -l N display a maximum of N revisions\n"
1432
1476
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1435
1479
" --show-ids display revision-ids (and file-ids), not just revnos"
1436
1480
msgstr ""
1437
1481
1438
#: bzrlib/builtins.py:2407
1482
#: bzrlib/builtins.py:2500
1439
1483
msgid ""
1440
1484
" Note that the default number of levels to display is a function of the\n"
1441
1485
" log format. If the -n option is not used, the standard log formats show\n"
1442
1486
" just the top level (mainline)."
1443
1487
msgstr ""
1444
1488
1445
#: bzrlib/builtins.py:2411
1489
#: bzrlib/builtins.py:2504
1446
1490
msgid ""
1447
1491
" Status summaries are shown using status flags like A, M, etc. To see\n"
1448
1492
" the changes explained using words like ``added`` and ``modified``\n"
1449
1493
" instead, use the -vv option."
1450
1494
msgstr ""
1451
1495
1452
#: bzrlib/builtins.py:2415
1496
#: bzrlib/builtins.py:2508
1453
1497
msgid ":Ordering control:"
1454
1498
msgstr ""
1455
1499
1456
#: bzrlib/builtins.py:2417
1500
#: bzrlib/builtins.py:2510
1457
1501
msgid ""
1458
1502
" To display revisions from oldest to newest, use the --forward option.\n"
1459
1503
" In most cases, using this option will have little impact on the total\n"
1461
1505
" display revisions like --reverse does when it can."
1462
1506
msgstr ""
1463
1507
1464
#: bzrlib/builtins.py:2422
1508
#: bzrlib/builtins.py:2515
1465
1509
msgid ":Revision filtering:"
1466
1510
msgstr ""
1467
1511
1468
#: bzrlib/builtins.py:2424
1512
#: bzrlib/builtins.py:2517
1469
1513
msgid ""
1470
1514
" The -r option can be used to specify what revision or range of revisions\n"
1471
1515
" to filter against. The various forms are shown below::"
1472
1516
msgstr ""
1473
1517
1474
#: bzrlib/builtins.py:2427
1518
#: bzrlib/builtins.py:2520
1475
1519
msgid ""
1476
1520
" -rX display revision X\n"
1477
1521
" -rX.. display revision X and later\n"
1479
1523
" -rX..Y display from X to Y inclusive"
1480
1524
msgstr ""
1481
1525
1482
#: bzrlib/builtins.py:2432
1526
#: bzrlib/builtins.py:2525
1483
1527
msgid ""
1484
1528
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1485
1529
" Some common examples are given below::"
1486
1530
msgstr ""
1487
1531
1488
#: bzrlib/builtins.py:2435
1532
#: bzrlib/builtins.py:2528
1489
1533
msgid ""
1490
1534
" -r-1 show just the tip\n"
1491
1535
" -r-10.. show the last 10 mainline revisions\n"
1495
1539
" -rdate:yesterday.. show changes since yesterday"
1496
1540
msgstr ""
1497
1541
1498
#: bzrlib/builtins.py:2442
1542
#: bzrlib/builtins.py:2535
1499
1543
msgid ""
1500
1544
" When logging a range of revisions using -rX..Y, log starts at\n"
1501
1545
" revision Y and searches back in history through the primary\n"
1505
1549
" a nested merge revision and the log will be truncated accordingly."
1506
1550
msgstr ""
1507
1551
1508
#: bzrlib/builtins.py:2449
1552
#: bzrlib/builtins.py:2542
1509
1553
msgid ":Path filtering:"
1510
1554
msgstr ""
1511
1555
1512
#: bzrlib/builtins.py:2451
1556
#: bzrlib/builtins.py:2544
1513
1557
msgid ""
1514
1558
" If parameters are given and the first one is not a branch, the log\n"
1515
1559
" will be filtered to show only those revisions that changed the\n"
1516
1560
" nominated files or directories."
1517
1561
msgstr ""
1518
1562
1519
#: bzrlib/builtins.py:2455
1563
#: bzrlib/builtins.py:2548
1520
1564
msgid ""
1521
1565
" Filenames are interpreted within their historical context. To log a\n"
1522
1566
" deleted file, specify a revision range so that the file existed at\n"
1523
1567
" the end or start of the range."
1524
1568
msgstr ""
1525
1569
1526
#: bzrlib/builtins.py:2459
1570
#: bzrlib/builtins.py:2552
1527
1571
msgid ""
1528
1572
" Historical context is also important when interpreting pathnames of\n"
1529
1573
" renamed files/directories. Consider the following example:"
1530
1574
msgstr ""
1531
1575
1532
#: bzrlib/builtins.py:2462
1576
#: bzrlib/builtins.py:2555
1533
1577
msgid ""
1534
1578
" * revision 1: add tutorial.txt\n"
1535
1579
" * revision 2: modify tutorial.txt\n"
1536
1580
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1537
1581
msgstr ""
1538
1582
1539
#: bzrlib/builtins.py:2466
1583
#: bzrlib/builtins.py:2559
1540
1584
msgid " In this case:"
1541
1585
msgstr ""
1542
1586
1543
#: bzrlib/builtins.py:2468
1587
#: bzrlib/builtins.py:2561
1544
1588
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1545
1589
msgstr ""
1546
1590
1547
#: bzrlib/builtins.py:2470
1591
#: bzrlib/builtins.py:2563
1548
1592
msgid ""
1549
1593
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1550
1594
msgstr ""
1551
1595
1552
#: bzrlib/builtins.py:2472
1596
#: bzrlib/builtins.py:2565
1553
1597
msgid ""
1554
1598
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1555
1599
" the original file in revision 2."
1556
1600
msgstr ""
1557
1601
1558
#: bzrlib/builtins.py:2475
1602
#: bzrlib/builtins.py:2568
1559
1603
msgid ""
1560
1604
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1561
1605
" was no file called guide.txt in revision 2."
1562
1606
msgstr ""
1563
1607
1564
#: bzrlib/builtins.py:2478
1608
#: bzrlib/builtins.py:2571
1565
1609
msgid ""
1566
1610
" Renames are always followed by log. By design, there is no need to\n"
1567
1611
" explicitly ask for this (and no way to stop logging a file back\n"
1568
1612
" until it was last renamed)."
1569
1613
msgstr ""
1570
1614
1571
#: bzrlib/builtins.py:2482
1615
#: bzrlib/builtins.py:2575
1572
1616
msgid ":Other filtering:"
1573
1617
msgstr ""
1574
1618
1575
#: bzrlib/builtins.py:2484
1619
#: bzrlib/builtins.py:2577
1576
1620
msgid ""
1577
1621
" The --match option can be used for finding revisions that match a\n"
1578
1622
" regular expression in a commit message, committer, author or bug.\n"
1581
1625
" --match-message can be used to only match a specific field."
1582
1626
msgstr ""
1583
1627
1584
#: bzrlib/builtins.py:2490
1628
#: bzrlib/builtins.py:2583
1585
1629
msgid ":Tips & tricks:"
1586
1630
msgstr ""
1587
1631
1588
#: bzrlib/builtins.py:2492
1632
#: bzrlib/builtins.py:2585
1589
1633
msgid ""
1590
1634
" GUI tools and IDEs are often better at exploring history than command\n"
1591
1635
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1594
1638
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1595
1639
msgstr ""
1596
1640
1597
#: bzrlib/builtins.py:2498
1641
#: bzrlib/builtins.py:2591
1598
1642
msgid ""
1599
1643
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1600
1644
msgstr ""
1601
1645
1602
#: bzrlib/builtins.py:2500
1646
#: bzrlib/builtins.py:2593
1603
1647
msgid ""
1604
1648
" [ALIASES]\n"
1605
1649
" tip = log -r-1\n"
1607
1651
" show = log -v -p"
1608
1652
msgstr ""
1609
1653
1610
#: bzrlib/builtins.py:2505
1654
#: bzrlib/builtins.py:2598
1611
1655
msgid ""
1612
1656
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1613
1657
" will show the last 10 mainline revisions. To see the details of a\n"
1614
1658
" particular revision X, ``bzr show -rX``."
1615
1659
msgstr ""
1616
1660
1617
#: bzrlib/builtins.py:2509
1661
#: bzrlib/builtins.py:2602
1618
1662
msgid ""
1619
1663
" If you are interested in looking deeper into a particular merge X,\n"
1620
1664
" use ``bzr log -n0 -rX``."
1621
1665
msgstr ""
1622
1666
1623
#: bzrlib/builtins.py:2512
1667
#: bzrlib/builtins.py:2605
1624
1668
msgid ""
1625
1669
" ``bzr log -v`` on a branch with lots of history is currently\n"
1626
1670
" very slow. A fix for this issue is currently under development.\n"
1628
1672
" be given when using the -v option."
1629
1673
msgstr ""
1630
1674
1631
#: bzrlib/builtins.py:2517
1675
#: bzrlib/builtins.py:2610
1632
1676
msgid ""
1633
1677
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1634
1678
" used to find revisions matching user names, commit messages, etc.\n"
1636
1680
" a list of words but not others."
1637
1681
msgstr ""
1638
1682
1639
#: bzrlib/builtins.py:2522
1683
#: bzrlib/builtins.py:2615
1640
1684
msgid ""
1641
1685
" When exploring non-mainline history on large projects with deep\n"
1642
1686
" history, the performance of log can be greatly improved by installing\n"
1644
1688
" trading disk space for faster speed."
1645
1689
msgstr ""
1646
1690
1647
#: bzrlib/builtins.py:2531
1691
#: bzrlib/builtins.py:2624
1648
1692
msgid "Show from oldest to newest."
1649
1693
msgstr ""
1650
1694
1651
#: bzrlib/builtins.py:2534
1695
#: bzrlib/builtins.py:2627
1652
1696
msgid "Show files changed in each revision."
1653
1697
msgstr ""
1654
1698
1655
#: bzrlib/builtins.py:2540
1699
#: bzrlib/builtins.py:2633
1656
1700
msgid "Show just the specified revision. See also \"help revisionspec\"."
1657
1701
msgstr ""
1658
1702
1659
#: bzrlib/builtins.py:2544
1703
#: bzrlib/builtins.py:2637
1660
1704
msgid "What names to list as authors - first, all or committer."
1661
1705
msgstr ""
1662
1706
1663
#: bzrlib/builtins.py:2545
1707
#: bzrlib/builtins.py:2638
1664
1708
msgid "Authors"
1665
1709
msgstr ""
1666
1710
1667
#: bzrlib/builtins.py:2550
1711
#: bzrlib/builtins.py:2643
1668
1712
msgid "Number of levels to display - 0 for all, 1 for flat."
1669
1713
msgstr ""
1670
1714
1671
#: bzrlib/builtins.py:2560
1715
#: bzrlib/builtins.py:2653
1672
1716
msgid "Limit the output to the first N revisions."
1673
1717
msgstr ""
1674
1718
1675
#: bzrlib/builtins.py:2565
1719
#: bzrlib/builtins.py:2658
1676
1720
msgid "Show changes made in each revision as a patch."
1677
1721
msgstr ""
1678
1722
1679
#: bzrlib/builtins.py:2567
1723
#: bzrlib/builtins.py:2660
1680
1724
msgid "Show merged revisions like --levels 0 does."
1681
1725
msgstr ""
1682
1726
1683
#: bzrlib/builtins.py:2571
1727
#: bzrlib/builtins.py:2664
1684
1728
msgid "Do not report commits with more than one parent."
1685
1729
msgstr ""
1686
1730
1687
#: bzrlib/builtins.py:2573
1731
#: bzrlib/builtins.py:2666
1688
1732
msgid ""
1689
1733
"Display only the revisions that are not part of both ancestries (require -"
1690
1734
"rX..Y)."
1691
1735
msgstr ""
1692
1736
1693
#: bzrlib/builtins.py:2577
1737
#: bzrlib/builtins.py:2670
1694
1738
msgid "Show digital signature validity."
1695
1739
msgstr ""
1696
1740
1697
#: bzrlib/builtins.py:2580
1741
#: bzrlib/builtins.py:2673
1698
1742
msgid "Show revisions whose properties match this expression."
1699
1743
msgstr ""
1700
1744
1701
#: bzrlib/builtins.py:2584
1745
#: bzrlib/builtins.py:2677
1702
1746
msgid "Show revisions whose message matches this expression."
1703
1747
msgstr ""
1704
1748
1705
#: bzrlib/builtins.py:2588
1749
#: bzrlib/builtins.py:2681
1706
1750
msgid "Show revisions whose committer matches this expression."
1707
1751
msgstr ""
1708
1752
1709
#: bzrlib/builtins.py:2592
1753
#: bzrlib/builtins.py:2685
1710
1754
msgid "Show revisions whose authors match this expression."
1711
1755
msgstr ""
1712
1756
1713
#: bzrlib/builtins.py:2596
1757
#: bzrlib/builtins.py:2689
1714
1758
msgid "Show revisions whose bugs match this expression."
1715
1759
msgstr ""
1716
1760
1717
#: bzrlib/builtins.py:2650
1761
#: bzrlib/builtins.py:2743
1718
1762
msgid "--exclude-common-ancestry requires -r with two revisions"
1719
1763
msgstr ""
1720
1764
1721
#: bzrlib/builtins.py:2678
1765
#: bzrlib/builtins.py:2771
1722
1766
#, python-format
1723
1767
msgid "Path unknown at end or start of revision range: %s"
1724
1768
msgstr ""
1725
1769
1726
#: bzrlib/builtins.py:2795
1770
#: bzrlib/builtins.py:2888
1727
1771
#, python-format
1728
1772
msgid "bzr %s doesn't accept two revisions in different branches."
1729
1773
msgstr ""
1730
1774
1731
#: bzrlib/builtins.py:2811
1775
#: bzrlib/builtins.py:2904
1732
1776
#, python-format
1733
1777
msgid "bzr %s --revision takes one or two values."
1734
1778
msgstr ""
1735
1779
1736
#: bzrlib/builtins.py:2856
1780
#: bzrlib/builtins.py:2949
1737
1781
msgid ""
1738
1782
"List files in a tree.\n"
1739
1783
" "
1740
1784
msgstr ""
1741
1785
1742
#: bzrlib/builtins.py:2865
1786
#: bzrlib/builtins.py:2958
1743
1787
msgid "Recurse into subdirectories."
1744
1788
msgstr ""
1745
1789
1746
#: bzrlib/builtins.py:2867
1790
#: bzrlib/builtins.py:2960
1747
1791
msgid "Print paths relative to the root of the branch."
1748
1792
msgstr ""
1749
1793
1750
#: bzrlib/builtins.py:2869
1794
#: bzrlib/builtins.py:2962
1751
1795
msgid "Print unknown files."
1752
1796
msgstr ""
1753
1797
1754
#: bzrlib/builtins.py:2870
1798
#: bzrlib/builtins.py:2963
1755
1799
msgid "Print versioned files."
1756
1800
msgstr ""
1757
1801
1758
#: bzrlib/builtins.py:2873
1802
#: bzrlib/builtins.py:2966
1759
1803
msgid "Print ignored files."
1760
1804
msgstr ""
1761
1805
1762
#: bzrlib/builtins.py:2875
1806
#: bzrlib/builtins.py:2968
1763
1807
msgid "List entries of a particular kind: file, directory, symlink."
1764
msgstr ""
1808
msgstr "List entries of a particular type: file, directory, symlink."
1765
1809
1766
#: bzrlib/builtins.py:2888
1810
#: bzrlib/builtins.py:2981
1767
1811
msgid "invalid kind specified"
1768
msgstr ""
1812
msgstr "invalid type specified"
1769
1813
1770
#: bzrlib/builtins.py:2891
1814
#: bzrlib/builtins.py:2984
1771
1815
msgid "Cannot set both --verbose and --null"
1772
1816
msgstr ""
1773
1817
1774
#: bzrlib/builtins.py:2900
1818
#: bzrlib/builtins.py:2993
1775
1819
msgid "cannot specify both --from-root and PATH"
1776
1820
msgstr ""
1777
1821
1778
#: bzrlib/builtins.py:2987
1822
#: bzrlib/builtins.py:3080
1779
1823
msgid "Ignore specified files or patterns."
1780
1824
msgstr ""
1781
1825
1782
#: bzrlib/builtins.py:2989
1826
#: bzrlib/builtins.py:3082
1783
1827
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1784
1828
msgstr ""
1785
1829
1786
#: bzrlib/builtins.py:2991
1830
#: bzrlib/builtins.py:3084
1787
1831
msgid ""
1788
1832
"If a .bzrignore file does not exist, the ignore command\n"
1789
1833
"will create one and add the specified files or patterns to the newly\n"
1792
1836
"the use of the ignore command will require an explicit add command."
1793
1837
msgstr ""
1794
1838
1795
#: bzrlib/builtins.py:2997
1839
#: bzrlib/builtins.py:3090
1796
1840
msgid ""
1797
1841
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1798
1842
"After adding, editing or deleting that file either indirectly by\n"
1800
1844
"it."
1801
1845
msgstr ""
1802
1846
1803
#: bzrlib/builtins.py:3002
1847
#: bzrlib/builtins.py:3095
1804
1848
msgid ""
1805
1849
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1806
1850
"the global ignore file can be found in the application data directory as\n"
1809
1853
"can be edited directly using an editor."
1810
1854
msgstr ""
1811
1855
1812
#: bzrlib/builtins.py:3008
1856
#: bzrlib/builtins.py:3101
1813
1857
msgid ""
1814
1858
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1815
1859
"precedence over regular ignores. Such exceptions are used to specify\n"
1816
1860
"files that should be versioned which would otherwise be ignored."
1817
1861
msgstr ""
1818
1862
1819
#: bzrlib/builtins.py:3012
1863
#: bzrlib/builtins.py:3105
1820
1864
msgid ""
1821
1865
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1822
1866
"precedence over the '!' exception patterns."
1823
1867
msgstr ""
1824
1868
1825
#: bzrlib/builtins.py:3015
1869
#: bzrlib/builtins.py:3108
1826
1870
msgid ""
1827
1871
":Notes: \n"
1828
1872
" \n"
1830
1874
" the shell on Unix."
1831
1875
msgstr ""
1832
1876
1833
#: bzrlib/builtins.py:3020
1877
#: bzrlib/builtins.py:3113
1834
1878
msgid ""
1835
1879
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1836
1880
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1837
1881
msgstr ""
1838
1882
1839
#: bzrlib/builtins.py:3023
1883
#: bzrlib/builtins.py:3116
1840
1884
msgid ""
1841
1885
":Examples:\n"
1842
1886
" Ignore the top level Makefile::"
1843
1887
msgstr ""
1844
1888
1845
#: bzrlib/builtins.py:3026
1889
#: bzrlib/builtins.py:3119
1846
1890
msgid " bzr ignore ./Makefile"
1847
1891
msgstr ""
1848
1892
1849
#: bzrlib/builtins.py:3028
1893
#: bzrlib/builtins.py:3121
1850
1894
msgid " Ignore .class files in all directories...::"
1851
1895
msgstr ""
1852
1896
1853
#: bzrlib/builtins.py:3030
1897
#: bzrlib/builtins.py:3123
1854
1898
msgid " bzr ignore \"*.class\""
1855
1899
msgstr ""
1856
1900
1857
#: bzrlib/builtins.py:3032
1901
#: bzrlib/builtins.py:3125
1858
1902
msgid " ...but do not ignore \"special.class\"::"
1859
1903
msgstr ""
1860
1904
1861
#: bzrlib/builtins.py:3034
1905
#: bzrlib/builtins.py:3127
1862
1906
msgid " bzr ignore \"!special.class\""
1863
1907
msgstr ""
1864
1908
1865
#: bzrlib/builtins.py:3036
1909
#: bzrlib/builtins.py:3129
1866
1910
msgid " Ignore files whose name begins with the \"#\" character::"
1867
1911
msgstr ""
1868
1912
1869
#: bzrlib/builtins.py:3038
1913
#: bzrlib/builtins.py:3131
1870
1914
msgid " bzr ignore \"RE:^#\""
1871
1915
msgstr ""
1872
1916
1873
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1917
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1874
1918
msgid " Ignore .o files under the lib directory::"
1875
1919
msgstr ""
1876
1920
1877
#: bzrlib/builtins.py:3042
1921
#: bzrlib/builtins.py:3135
1878
1922
msgid " bzr ignore \"lib/**/*.o\""
1879
1923
msgstr ""
1880
1924
1881
#: bzrlib/builtins.py:3046
1925
#: bzrlib/builtins.py:3139
1882
1926
msgid " bzr ignore \"RE:lib/.*\\.o\""
1883
1927
msgstr ""
1884
1928
1885
#: bzrlib/builtins.py:3048
1929
#: bzrlib/builtins.py:3141
1886
1930
msgid " Ignore everything but the \"debian\" toplevel directory::"
1887
1931
msgstr ""
1888
1932
1889
#: bzrlib/builtins.py:3050
1933
#: bzrlib/builtins.py:3143
1890
1934
msgid ""
1891
1935
" bzr ignore \"RE:(?!debian/).*\"\n"
1892
1936
" \n"
1898
1942
" bzr ignore \"!!*~\""
1899
1943
msgstr ""
1900
1944
1901
#: bzrlib/builtins.py:3064
1945
#: bzrlib/builtins.py:3157
1902
1946
msgid "Display the default ignore rules that bzr uses."
1903
1947
msgstr ""
1904
1948
1905
#: bzrlib/builtins.py:3076
1949
#: bzrlib/builtins.py:3169
1906
1950
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1907
1951
msgstr ""
1908
1952
1909
#: bzrlib/builtins.py:3087
1953
#: bzrlib/builtins.py:3180
1910
1954
#, python-format
1911
1955
msgid "Invalid ignore pattern found. %s"
1912
1956
msgid_plural "Invalid ignore patterns found. %s"
1913
1957
msgstr[0] ""
1914
1958
msgstr[1] ""
1915
1959
1916
#: bzrlib/builtins.py:3096
1960
#: bzrlib/builtins.py:3189
1917
1961
msgid "NAME_PATTERN should not be an absolute path"
1918
1962
msgstr ""
1919
1963
1920
#: bzrlib/builtins.py:3109
1964
#: bzrlib/builtins.py:3202
1921
1965
#, python-format
1922
1966
msgid ""
1923
1967
"Warning: the following files are version controlled and match your ignore "
1927
1971
"them.\n"
1928
1972
msgstr ""
1929
1973
1930
#: bzrlib/builtins.py:3116
1974
#: bzrlib/builtins.py:3209
1931
1975
msgid "List ignored files and the patterns that matched them."
1932
1976
msgstr ""
1933
1977
1934
#: bzrlib/builtins.py:3118
1978
#: bzrlib/builtins.py:3211
1935
1979
msgid ""
1936
1980
"List all the ignored files and the ignore pattern that caused the file to\n"
1937
1981
"be ignored."
1938
1982
msgstr ""
1939
1983
1940
#: bzrlib/builtins.py:3121
1984
#: bzrlib/builtins.py:3214
1941
1985
msgid "Alternatively, to list just the files::"
1942
1986
msgstr ""
1943
1987
1944
#: bzrlib/builtins.py:3123
1988
#: bzrlib/builtins.py:3216
1945
1989
msgid " bzr ls --ignored"
1946
1990
msgstr ""
1947
1991
1948
#: bzrlib/builtins.py:3157
1992
#: bzrlib/builtins.py:3250
1949
1993
#, python-format
1950
1994
msgid "not a valid revision-number: %r"
1951
1995
msgstr ""
1952
1996
1953
#: bzrlib/builtins.py:3164
1997
#: bzrlib/builtins.py:3257
1954
1998
msgid ""
1955
1999
"Export current or past revision to a destination directory or archive."
1956
2000
msgstr ""
1957
2001
1958
#: bzrlib/builtins.py:3166
2002
#: bzrlib/builtins.py:3259
1959
2003
msgid "If no revision is specified this exports the last committed revision."
1960
2004
msgstr ""
1961
2005
1962
#: bzrlib/builtins.py:3168
2006
#: bzrlib/builtins.py:3261
1963
2007
msgid ""
1964
2008
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1965
2009
"given, try to find the format with the extension. If no extension\n"
1966
2010
"is found exports to a directory (equivalent to --format=dir)."
1967
2011
msgstr ""
1968
2012
1969
#: bzrlib/builtins.py:3172
2013
#: bzrlib/builtins.py:3265
1970
2014
msgid ""
1971
2015
"If root is supplied, it will be used as the root directory inside\n"
1972
2016
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1973
2017
"to the exported filename. The root option has no effect for 'dir' format."
1974
2018
msgstr ""
1975
2019
1976
#: bzrlib/builtins.py:3176
2020
#: bzrlib/builtins.py:3269
1977
2021
msgid ""
1978
2022
"If branch is omitted then the branch containing the current working\n"
1979
2023
"directory will be used."
1980
2024
msgstr ""
1981
2025
1982
#: bzrlib/builtins.py:3179
2026
#: bzrlib/builtins.py:3272
1983
2027
msgid ""
1984
2028
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1985
2029
msgstr ""
1986
2030
1987
#: bzrlib/builtins.py:3181
2031
#: bzrlib/builtins.py:3274
1988
2032
msgid ""
1989
2033
" ================= =========================\n"
1990
2034
" Supported formats Autodetected by extension\n"
1997
2041
" ================= ========================="
1998
2042
msgstr ""
1999
2043
2000
#: bzrlib/builtins.py:3195
2044
#: bzrlib/builtins.py:3288
2001
2045
msgid "Type of file to export to."
2002
2046
msgstr ""
2003
2047
2004
#: bzrlib/builtins.py:3198
2048
#: bzrlib/builtins.py:3291
2005
2049
msgid "Apply content filters to export the convenient form."
2006
2050
msgstr ""
2007
2051
2008
#: bzrlib/builtins.py:3202
2052
#: bzrlib/builtins.py:3295
2009
2053
msgid "Name of the root directory inside the exported file."
2010
2054
msgstr ""
2011
2055
2012
#: bzrlib/builtins.py:3204
2056
#: bzrlib/builtins.py:3297
2013
2057
msgid ""
2014
2058
"Set modification time of files to that of the last revision in which it was "
2015
2059
"changed."
2016
2060
msgstr ""
2017
2061
2018
#: bzrlib/builtins.py:3207
2062
#: bzrlib/builtins.py:3300
2019
2063
msgid ""
2020
2064
"Export the working tree contents rather than that of the last revision."
2021
2065
msgstr ""
2022
2066
2023
#: bzrlib/builtins.py:3226
2067
#: bzrlib/builtins.py:3319
2024
2068
msgid "--uncommitted requires a working tree"
2025
2069
msgstr ""
2026
2070
2027
#: bzrlib/builtins.py:3235
2071
#: bzrlib/builtins.py:3328
2028
2072
#, python-format
2029
2073
msgid "Unsupported export format: %s"
2030
2074
msgstr ""
2031
2075
2032
#: bzrlib/builtins.py:3239
2076
#: bzrlib/builtins.py:3332
2033
2077
msgid ""
2034
2078
"Write the contents of a file as of a given revision to standard output."
2035
2079
msgstr ""
2036
2080
2037
#: bzrlib/builtins.py:3241
2081
#: bzrlib/builtins.py:3334
2038
2082
msgid "If no revision is nominated, the last revision is used."
2039
2083
msgstr ""
2040
2084
2041
#: bzrlib/builtins.py:3243
2085
#: bzrlib/builtins.py:3336
2042
2086
msgid ""
2043
2087
"Note: Take care to redirect standard output when using this command on a\n"
2044
2088
"binary file."
2045
2089
msgstr ""
2046
2090
2047
#: bzrlib/builtins.py:3249
2091
#: bzrlib/builtins.py:3342
2048
2092
msgid "The path name in the old tree."
2049
2093
msgstr ""
2050
2094
2051
#: bzrlib/builtins.py:3250
2095
#: bzrlib/builtins.py:3343
2052
2096
msgid "Apply content filters to display the convenience form."
2053
2097
msgstr ""
2054
2098
2055
#: bzrlib/builtins.py:3261
2099
#: bzrlib/builtins.py:3354
2056
2100
msgid "bzr cat --revision takes exactly one revision specifier"
2057
2101
msgstr ""
2058
2102
2059
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2103
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2060
2104
msgid "{0!r} is not present in revision {1}"
2061
2105
msgstr ""
2062
2106
2063
#: bzrlib/builtins.py:3321
2107
#: bzrlib/builtins.py:3414
2064
2108
msgid "Commit changes into a new revision."
2065
2109
msgstr ""
2066
2110
2067
#: bzrlib/builtins.py:3323
2111
#: bzrlib/builtins.py:3416
2068
2112
msgid ""
2069
2113
"An explanatory message needs to be given for each commit. This is\n"
2070
2114
"often done by using the --message option (getting the message from the\n"
2074
2118
"boilerplate text loaded into the editor, use the --show-diff option."
2075
2119
msgstr ""
2076
2120
2077
#: bzrlib/builtins.py:3330
2121
#: bzrlib/builtins.py:3423
2078
2122
msgid ""
2079
2123
"By default, the entire tree is committed and the person doing the\n"
2080
2124
"commit is assumed to be the author. These defaults can be overridden\n"
2081
2125
"as explained below."
2082
2126
msgstr ""
2083
2127
2084
#: bzrlib/builtins.py:3334
2128
#: bzrlib/builtins.py:3427
2085
2129
msgid ":Selective commits:"
2086
2130
msgstr ""
2087
2131
2088
#: bzrlib/builtins.py:3336
2132
#: bzrlib/builtins.py:3429
2089
2133
msgid ""
2090
2134
" If selected files are specified, only changes to those files are\n"
2091
2135
" committed. If a directory is specified then the directory and\n"
2092
2136
" everything within it is committed."
2093
2137
msgstr ""
2094
2138
2095
#: bzrlib/builtins.py:3340
2139
#: bzrlib/builtins.py:3433
2096
2140
msgid ""
2097
2141
" When excludes are given, they take precedence over selected files.\n"
2098
2142
" For example, to commit only changes within foo, but not changes\n"
2099
2143
" within foo/bar::"
2100
2144
msgstr ""
2101
2145
2102
#: bzrlib/builtins.py:3344
2146
#: bzrlib/builtins.py:3437
2103
2147
msgid " bzr commit foo -x foo/bar"
2104
2148
msgstr ""
2105
2149
2106
#: bzrlib/builtins.py:3346
2150
#: bzrlib/builtins.py:3439
2107
2151
msgid " A selective commit after a merge is not yet supported."
2108
2152
msgstr ""
2109
2153
2110
#: bzrlib/builtins.py:3348
2154
#: bzrlib/builtins.py:3441
2111
2155
msgid ":Custom authors:"
2112
2156
msgstr ""
2113
2157
2114
#: bzrlib/builtins.py:3350
2158
#: bzrlib/builtins.py:3443
2115
2159
msgid ""
2116
2160
" If the author of the change is not the same person as the committer,\n"
2117
2161
" you can specify the author's name using the --author option. The\n"
2121
2165
" author."
2122
2166
msgstr ""
2123
2167
2124
#: bzrlib/builtins.py:3357
2168
#: bzrlib/builtins.py:3450
2125
2169
msgid ":Checks:"
2126
2170
msgstr ""
2127
2171
2128
#: bzrlib/builtins.py:3359
2172
#: bzrlib/builtins.py:3452
2129
2173
msgid ""
2130
2174
" A common mistake is to forget to add a new file or directory before\n"
2131
2175
" running the commit command. The --strict option checks for unknown\n"
2134
2178
" for details."
2135
2179
msgstr ""
2136
2180
2137
#: bzrlib/builtins.py:3365
2181
#: bzrlib/builtins.py:3458
2138
2182
msgid ":Things to note:"
2139
2183
msgstr ""
2140
2184
2141
#: bzrlib/builtins.py:3367
2185
#: bzrlib/builtins.py:3460
2142
2186
msgid ""
2143
2187
" If you accidentially commit the wrong changes or make a spelling\n"
2144
2188
" mistake in the commit message say, you can use the uncommit command\n"
2145
2189
" to undo it. See ``bzr help uncommit`` for details."
2146
2190
msgstr ""
2147
2191
2148
#: bzrlib/builtins.py:3371
2192
#: bzrlib/builtins.py:3464
2149
2193
msgid ""
2150
2194
" Hooks can also be configured to run after a commit. This allows you\n"
2151
2195
" to trigger updates to external systems like bug trackers. The --fixes\n"
2153
2197
" one or more bugs. See ``bzr help bugs`` for details."
2154
2198
msgstr ""
2155
2199
2156
#: bzrlib/builtins.py:3381
2200
#: bzrlib/builtins.py:3474
2157
2201
msgid "Do not consider changes made to a given path."
2158
2202
msgstr ""
2159
2203
2160
#: bzrlib/builtins.py:3384
2204
#: bzrlib/builtins.py:3477
2161
2205
msgid "Description of the new revision."
2162
2206
msgstr ""
2163
2207
2164
#: bzrlib/builtins.py:3387
2208
#: bzrlib/builtins.py:3480
2165
2209
msgid "Commit even if nothing has changed."
2166
2210
msgstr ""
2167
2211
2168
#: bzrlib/builtins.py:3391
2212
#: bzrlib/builtins.py:3484
2169
2213
msgid "Take commit message from this file."
2170
2214
msgstr ""
2171
2215
2172
#: bzrlib/builtins.py:3393
2216
#: bzrlib/builtins.py:3486
2173
2217
msgid "Refuse to commit if there are unknown files in the working tree."
2174
2218
msgstr ""
2175
2219
2176
#: bzrlib/builtins.py:3396
2220
#: bzrlib/builtins.py:3489
2177
2221
msgid ""
2178
2222
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2179
2223
"08:00:00 +0100'."
2180
2224
msgstr ""
2181
2225
2182
#: bzrlib/builtins.py:3399
2226
#: bzrlib/builtins.py:3492
2183
2227
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2184
2228
msgstr ""
2185
2229
2186
#: bzrlib/builtins.py:3402
2230
#: bzrlib/builtins.py:3495
2187
2231
msgid "Set the author's name, if it's different from the committer."
2188
2232
msgstr ""
2189
2233
2190
#: bzrlib/builtins.py:3405
2234
#: bzrlib/builtins.py:3498
2191
2235
msgid ""
2192
2236
"Perform a local commit in a bound branch. Local commits are not pushed to "
2193
2237
"the master branch until a normal commit is performed."
2194
2238
msgstr ""
2195
2239
2196
#: bzrlib/builtins.py:3411
2240
#: bzrlib/builtins.py:3504
2197
2241
msgid ""
2198
2242
"When no message is supplied, show the diff along with the status summary in "
2199
2243
"the message editor."
2200
2244
msgstr ""
2201
2245
2202
#: bzrlib/builtins.py:3414
2246
#: bzrlib/builtins.py:3507
2203
2247
msgid ""
2204
2248
"When committing to a foreign version control system do not push data that "
2205
2249
"can not be natively represented."
2206
2250
msgstr ""
2207
2251
2208
#: bzrlib/builtins.py:3432
2252
#: bzrlib/builtins.py:3525
2209
2253
#, python-format
2210
2254
msgid ""
2211
2255
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2213
2257
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2214
2258
msgstr ""
2215
2259
2216
#: bzrlib/builtins.py:3441
2260
#: bzrlib/builtins.py:3534
2217
2261
#, python-format
2218
2262
msgid ""
2219
2263
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2221
2265
"Commit refused."
2222
2266
msgstr ""
2223
2267
2224
#: bzrlib/builtins.py:3450
2268
#: bzrlib/builtins.py:3543
2225
2269
#, python-format
2226
2270
msgid "Unrecognized bug %s. Commit refused."
2227
2271
msgstr ""
2228
2272
2229
#: bzrlib/builtins.py:3453
2273
#: bzrlib/builtins.py:3546
2230
2274
#, python-format
2231
2275
msgid ""
2232
2276
"%s\n"
2233
2277
"Commit refused."
2234
2278
msgstr ""
2235
2279
2236
#: bzrlib/builtins.py:3477
2280
#: bzrlib/builtins.py:3570
2237
2281
msgid "Could not parse --commit-time: "
2238
2282
msgstr ""
2239
2283
2240
#: bzrlib/builtins.py:3517
2284
#: bzrlib/builtins.py:3610
2241
2285
msgid "please specify either --message or --file"
2242
2286
msgstr ""
2243
2287
2244
#: bzrlib/builtins.py:3546
2288
#: bzrlib/builtins.py:3639
2245
2289
msgid "please specify a commit message with either --message or --file"
2246
2290
msgstr ""
2247
2291
2248
#: bzrlib/builtins.py:3549
2292
#: bzrlib/builtins.py:3642
2249
2293
msgid ""
2250
2294
"Empty commit message specified. Please specify a commit message with either -"
2251
2295
"-message or --file or leave a blank message with --message \"\"."
2252
2296
msgstr ""
2253
2297
2254
#: bzrlib/builtins.py:3569
2298
#: bzrlib/builtins.py:3662
2255
2299
msgid ""
2256
2300
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2257
2301
"-unchanged to force an empty commit."
2258
2302
msgstr ""
2259
2303
2260
#: bzrlib/builtins.py:3573
2304
#: bzrlib/builtins.py:3666
2261
2305
msgid ""
2262
2306
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2263
2307
"resolve FILE\" to resolve."
2264
2308
msgstr ""
2265
2309
2266
#: bzrlib/builtins.py:3577
2310
#: bzrlib/builtins.py:3670
2267
2311
msgid "Commit refused because there are unknown files in the working tree."
2268
2312
msgstr ""
2269
2313
2270
#: bzrlib/builtins.py:3580
2314
#: bzrlib/builtins.py:3673
2271
2315
msgid ""
2272
2316
"\n"
2273
2317
"To commit to master branch, run update and then commit.\n"
2274
2318
"You can also pass --local to commit to continue working disconnected."
2275
2319
msgstr ""
2276
2320
2277
#: bzrlib/builtins.py:3588
2321
#: bzrlib/builtins.py:3681
2278
2322
msgid ""
2279
2323
"Validate working tree structure, branch consistency and repository history."
2280
2324
msgstr ""
2281
2325
2282
#: bzrlib/builtins.py:3590
2326
#: bzrlib/builtins.py:3683
2283
2327
msgid ""
2284
2328
"This command checks various invariants about branch and repository storage\n"
2285
2329
"to detect data corruption or bzr bugs."
2286
2330
msgstr ""
2287
2331
2288
#: bzrlib/builtins.py:3593
2332
#: bzrlib/builtins.py:3686
2289
2333
msgid ""
2290
2334
"The working tree and branch checks will only give output if a problem is\n"
2291
2335
"detected. The output fields of the repository check are:"
2292
2336
msgstr ""
2293
2337
2294
#: bzrlib/builtins.py:3596
2338
#: bzrlib/builtins.py:3689
2295
2339
msgid ""
2296
2340
"revisions\n"
2297
2341
" This is just the number of revisions checked. It doesn't\n"
2298
2342
" indicate a problem."
2299
2343
msgstr ""
2300
2344
2301
#: bzrlib/builtins.py:3600
2345
#: bzrlib/builtins.py:3693
2302
2346
msgid ""
2303
2347
"versionedfiles\n"
2304
2348
" This is just the number of versionedfiles checked. It\n"
2305
2349
" doesn't indicate a problem."
2306
2350
msgstr ""
2307
2351
2308
#: bzrlib/builtins.py:3604
2352
#: bzrlib/builtins.py:3697
2309
2353
msgid ""
2310
2354
"unreferenced ancestors\n"
2311
2355
" Texts that are ancestors of other texts, but\n"
2313
2357
" subtle problem that Bazaar can work around."
2314
2358
msgstr ""
2315
2359
2316
#: bzrlib/builtins.py:3609
2360
#: bzrlib/builtins.py:3702
2317
2361
msgid ""
2318
2362
"unique file texts\n"
2319
2363
" This is the total number of unique file contents\n"
2320
2364
" seen in the checked revisions. It does not indicate a problem."
2321
2365
msgstr ""
2322
2366
2323
#: bzrlib/builtins.py:3613
2367
#: bzrlib/builtins.py:3706
2324
2368
msgid ""
2325
2369
"repeated file texts\n"
2326
2370
" This is the total number of repeated texts seen\n"
2329
2373
" indicate a problem."
2330
2374
msgstr ""
2331
2375
2332
#: bzrlib/builtins.py:3619
2376
#: bzrlib/builtins.py:3712
2333
2377
msgid ""
2334
2378
"If no restrictions are specified, all Bazaar data that is found at the "
2335
2379
"given\n"
2336
2380
"location will be checked."
2337
2381
msgstr ""
2338
2382
2339
#: bzrlib/builtins.py:3624
2383
#: bzrlib/builtins.py:3717
2340
2384
msgid " Check the tree and branch at 'foo'::"
2341
2385
msgstr ""
2342
2386
2343
#: bzrlib/builtins.py:3626
2387
#: bzrlib/builtins.py:3719
2344
2388
msgid " bzr check --tree --branch foo"
2345
2389
msgstr ""
2346
2390
2347
#: bzrlib/builtins.py:3628
2391
#: bzrlib/builtins.py:3721
2348
2392
msgid " Check only the repository at 'bar'::"
2349
2393
msgstr ""
2350
2394
2351
#: bzrlib/builtins.py:3630
2395
#: bzrlib/builtins.py:3723
2352
2396
msgid " bzr check --repo bar"
2353
2397
msgstr ""
2354
2398
2355
#: bzrlib/builtins.py:3632
2399
#: bzrlib/builtins.py:3725
2356
2400
msgid " Check everything at 'baz'::"
2357
2401
msgstr ""
2358
2402
2359
#: bzrlib/builtins.py:3634
2403
#: bzrlib/builtins.py:3727
2360
2404
msgid " bzr check baz"
2361
2405
msgstr ""
2362
2406
2363
#: bzrlib/builtins.py:3640
2407
#: bzrlib/builtins.py:3733
2364
2408
msgid "Check the branch related to the current directory."
2365
2409
msgstr ""
2366
2410
2367
#: bzrlib/builtins.py:3642
2411
#: bzrlib/builtins.py:3735
2368
2412
msgid "Check the repository related to the current directory."
2369
2413
msgstr ""
2370
2414
2371
#: bzrlib/builtins.py:3644
2415
#: bzrlib/builtins.py:3737
2372
2416
msgid "Check the working tree related to the current directory."
2373
2417
msgstr ""
2374
2418
2375
#: bzrlib/builtins.py:3658
2419
#: bzrlib/builtins.py:3751
2376
2420
msgid "Upgrade a repository, branch or working tree to a newer format."
2377
2421
msgstr ""
2378
2422
2379
#: bzrlib/builtins.py:3660
2423
#: bzrlib/builtins.py:3753
2380
2424
msgid ""
2381
2425
"When the default format has changed after a major new release of\n"
2382
2426
"Bazaar, you may be informed during certain operations that you\n"
2385
2429
"with older repositories or with older versions of Bazaar."
2386
2430
msgstr ""
2387
2431
2388
#: bzrlib/builtins.py:3666
2432
#: bzrlib/builtins.py:3759
2389
2433
msgid ""
2390
2434
"If you wish to upgrade to a particular format rather than the\n"
2391
2435
"current default, that can be specified using the --format option.\n"
2395
2439
"2.x default) so downgrading is not always possible."
2396
2440
msgstr ""
2397
2441
2398
#: bzrlib/builtins.py:3673
2442
#: bzrlib/builtins.py:3766
2399
2443
msgid ""
2400
2444
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2401
2445
"process (where # is a number). By default, this is left there on\n"
2406
2450
"afterwards."
2407
2451
msgstr ""
2408
2452
2409
#: bzrlib/builtins.py:3681
2453
#: bzrlib/builtins.py:3774
2410
2454
msgid ""
2411
2455
"If the location given is a shared repository, dependent branches\n"
2412
2456
"are also converted provided the repository converts successfully.\n"
2414
2458
"tried."
2415
2459
msgstr ""
2416
2460
2417
#: bzrlib/builtins.py:3686
2461
#: bzrlib/builtins.py:3779
2418
2462
msgid ""
2419
2463
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2420
2464
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2421
2465
msgstr ""
2422
2466
2423
#: bzrlib/builtins.py:3694
2467
#: bzrlib/builtins.py:3787
2424
2468
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2425
2469
msgstr ""
2426
2470
2427
#: bzrlib/builtins.py:3698
2471
#: bzrlib/builtins.py:3791
2428
2472
msgid "Branch format"
2429
2473
msgstr ""
2430
2474
2431
#: bzrlib/builtins.py:3700
2475
#: bzrlib/builtins.py:3793
2432
2476
msgid "Remove the backup.bzr directory if successful."
2433
2477
msgstr ""
2434
2478
2435
#: bzrlib/builtins.py:3702
2479
#: bzrlib/builtins.py:3795
2436
2480
msgid "Show what would be done, but don't actually do anything."
2437
2481
msgstr ""
2438
2482
2439
#: bzrlib/builtins.py:3717
2483
#: bzrlib/builtins.py:3810
2440
2484
msgid "Show or set bzr user id."
2441
2485
msgstr ""
2442
2486
2443
#: bzrlib/builtins.py:3719
2487
#: bzrlib/builtins.py:3812
2444
2488
msgid ""
2445
2489
":Examples:\n"
2446
2490
" Show the email of the current user::"
2447
2491
msgstr ""
2448
2492
2449
#: bzrlib/builtins.py:3722
2493
#: bzrlib/builtins.py:3815
2450
2494
msgid " bzr whoami --email"
2451
2495
msgstr ""
2452
2496
2453
#: bzrlib/builtins.py:3724
2497
#: bzrlib/builtins.py:3817
2454
2498
msgid " Set the current user::"
2455
2499
msgstr ""
2456
2500
2457
#: bzrlib/builtins.py:3726
2501
#: bzrlib/builtins.py:3819
2458
2502
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2459
2503
msgstr ""
2460
2504
2461
#: bzrlib/builtins.py:3730
2505
#: bzrlib/builtins.py:3823
2462
2506
msgid "Display email address only."
2463
2507
msgstr ""
2464
2508
2465
#: bzrlib/builtins.py:3732
2509
#: bzrlib/builtins.py:3825
2466
2510
msgid "Set identity for the current branch instead of globally."
2467
2511
msgstr ""
2468
2512
2469
#: bzrlib/builtins.py:3758
2513
#: bzrlib/builtins.py:3851
2470
2514
msgid "--email can only be used to display existing identity"
2471
2515
msgstr ""
2472
2516
2473
#: bzrlib/builtins.py:3780
2517
#: bzrlib/builtins.py:3873
2474
2518
msgid "Print or set the branch nickname."
2475
2519
msgstr ""
2476
2520
2477
#: bzrlib/builtins.py:3782
2521
#: bzrlib/builtins.py:3875
2478
2522
msgid ""
2479
2523
"If unset, the tree root directory name is used as the nickname.\n"
2480
2524
"To print the current nickname, execute with no argument."
2481
2525
msgstr ""
2482
2526
2483
#: bzrlib/builtins.py:3785
2527
#: bzrlib/builtins.py:3878
2484
2528
msgid ""
2485
2529
"Bound branches use the nickname of its master branch unless it is set\n"
2486
2530
"locally."
2487
2531
msgstr ""
2488
2532
2489
#: bzrlib/builtins.py:3805
2533
#: bzrlib/builtins.py:3898
2490
2534
msgid "Set/unset and display aliases."
2491
2535
msgstr ""
2492
2536
2493
#: bzrlib/builtins.py:3807
2537
#: bzrlib/builtins.py:3900
2494
2538
msgid ""
2495
2539
":Examples:\n"
2496
2540
" Show the current aliases::"
2497
2541
msgstr ""
2498
2542
2499
#: bzrlib/builtins.py:3810
2543
#: bzrlib/builtins.py:3903
2500
2544
msgid " bzr alias"
2501
2545
msgstr ""
2502
2546
2503
#: bzrlib/builtins.py:3812
2547
#: bzrlib/builtins.py:3905
2504
2548
msgid " Show the alias specified for 'll'::"
2505
2549
msgstr ""
2506
2550
2507
#: bzrlib/builtins.py:3814
2551
#: bzrlib/builtins.py:3907
2508
2552
msgid " bzr alias ll"
2509
2553
msgstr ""
2510
2554
2511
#: bzrlib/builtins.py:3816
2555
#: bzrlib/builtins.py:3909
2512
2556
msgid " Set an alias for 'll'::"
2513
2557
msgstr ""
2514
2558
2515
#: bzrlib/builtins.py:3818
2559
#: bzrlib/builtins.py:3911
2516
2560
msgid " bzr alias ll=\"log --line -r-10..-1\""
2517
2561
msgstr ""
2518
2562
2519
#: bzrlib/builtins.py:3820
2563
#: bzrlib/builtins.py:3913
2520
2564
msgid " To remove an alias for 'll'::"
2521
2565
msgstr ""
2522
2566
2523
#: bzrlib/builtins.py:3822
2567
#: bzrlib/builtins.py:3915
2524
2568
msgid " bzr alias --remove ll"
2525
2569
msgstr ""
2526
2570
2527
#: bzrlib/builtins.py:3827
2571
#: bzrlib/builtins.py:3920
2528
2572
msgid "Remove the alias."
2529
2573
msgstr ""
2530
2574
2531
#: bzrlib/builtins.py:3845
2575
#: bzrlib/builtins.py:3938
2532
2576
msgid "bzr alias --remove expects an alias to remove."
2533
2577
msgstr ""
2534
2578
2535
#: bzrlib/builtins.py:4026
2579
#: bzrlib/builtins.py:4119
2536
2580
msgid ""
2537
2581
"subunit not available. subunit needs to be installed to use --subunit."
2538
2582
msgstr ""
2539
2583
2540
#: bzrlib/builtins.py:4043
2584
#: bzrlib/builtins.py:4136
2541
2585
msgid ""
2542
2586
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2543
2587
msgstr ""
2544
2588
2545
#: bzrlib/builtins.py:4090
2589
#: bzrlib/builtins.py:4183
2546
2590
msgid "Show version of bzr."
2547
2591
msgstr ""
2548
2592
2549
#: bzrlib/builtins.py:4094
2593
#: bzrlib/builtins.py:4187
2550
2594
msgid "Print just the version number."
2551
2595
msgstr ""
2552
2596
2553
#: bzrlib/builtins.py:4113
2597
#: bzrlib/builtins.py:4206
2554
2598
msgid "It sure does!\n"
2555
2599
msgstr ""
2556
2600
2557
#: bzrlib/builtins.py:4137
2601
#: bzrlib/builtins.py:4230
2558
2602
#, python-format
2559
2603
msgid "merge base is revision %s\n"
2560
2604
msgstr ""
2561
2605
2562
#: bzrlib/builtins.py:4141
2606
#: bzrlib/builtins.py:4234
2563
2607
msgid "Perform a three-way merge."
2564
2608
msgstr ""
2565
2609
2566
#: bzrlib/builtins.py:4143
2610
#: bzrlib/builtins.py:4236
2567
2611
msgid ""
2568
2612
"The source of the merge can be specified either in the form of a branch,\n"
2569
2613
"or in the form of a path to a file containing a merge directive generated\n"
2574
2618
"the current working tree."
2575
2619
msgstr ""
2576
2620
2577
#: bzrlib/builtins.py:4151
2621
#: bzrlib/builtins.py:4244
2578
2622
msgid ""
2579
2623
"When merging from a branch, by default bzr will try to merge in all new\n"
2580
2624
"work from the other branch, automatically determining an appropriate base\n"
2581
2625
"revision. If this fails, you may need to give an explicit base."
2582
2626
msgstr ""
2583
2627
2584
#: bzrlib/builtins.py:4155
2628
#: bzrlib/builtins.py:4248
2585
2629
msgid ""
2586
2630
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2587
2631
"try to merge in all new work up to and including revision OTHER."
2588
2632
msgstr ""
2589
2633
2590
#: bzrlib/builtins.py:4158
2634
#: bzrlib/builtins.py:4251
2591
2635
msgid ""
2592
2636
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2593
2637
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2598
2642
"changes from the other branch is not stored in the commit."
2599
2643
msgstr ""
2600
2644
2601
#: bzrlib/builtins.py:4166
2645
#: bzrlib/builtins.py:4259
2602
2646
msgid "Revision numbers are always relative to the source branch."
2603
2647
msgstr ""
2604
2648
2605
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2649
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2606
2650
msgid ""
2607
2651
"Merge will do its best to combine the changes in two branches, but there\n"
2608
2652
"are some kinds of problems only a human can fix. When it encounters those,\n"
2609
2653
"it will mark a conflict. A conflict means that you need to fix something,\n"
2610
"before you should commit."
2654
"before you can commit."
2611
2655
msgstr ""
2612
2656
2613
#: bzrlib/builtins.py:4173
2657
#: bzrlib/builtins.py:4266
2614
2658
msgid ""
2615
2659
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2616
2660
msgstr ""
2617
2661
2618
#: bzrlib/builtins.py:4175
2662
#: bzrlib/builtins.py:4268
2619
2663
msgid ""
2620
2664
"If there is no default branch set, the first merge will set it (use\n"
2621
2665
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2623
2667
"only be saved if the remote location can be accessed."
2624
2668
msgstr ""
2625
2669
2626
#: bzrlib/builtins.py:4180
2670
#: bzrlib/builtins.py:4273
2627
2671
msgid ""
2628
2672
"The results of the merge are placed into the destination working\n"
2629
2673
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2630
2674
"committed to record the result of the merge."
2631
2675
msgstr ""
2632
2676
2633
#: bzrlib/builtins.py:4184
2677
#: bzrlib/builtins.py:4277
2634
2678
msgid ""
2635
2679
"merge refuses to run if there are any uncommitted changes, unless\n"
2636
2680
"--force is given. If --force is given, then the changes from the source \n"
2639
2683
"merge revision which has more than two parents."
2640
2684
msgstr ""
2641
2685
2642
#: bzrlib/builtins.py:4190
2686
#: bzrlib/builtins.py:4283
2643
2687
msgid ""
2644
2688
"If one would like to merge changes from the working tree of the other\n"
2645
2689
"branch without merging any committed revisions, the --uncommitted option\n"
2646
2690
"can be given."
2647
2691
msgstr ""
2648
2692
2649
#: bzrlib/builtins.py:4194
2693
#: bzrlib/builtins.py:4287
2650
2694
msgid ""
2651
2695
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2652
2696
"you to apply each diff hunk and file change, similar to \"shelve\"."
2653
2697
msgstr ""
2654
2698
2655
#: bzrlib/builtins.py:4197
2699
#: bzrlib/builtins.py:4290
2656
2700
msgid ""
2657
2701
":Examples:\n"
2658
2702
" To merge all new revisions from bzr.dev::"
2659
2703
msgstr ""
2660
2704
2661
#: bzrlib/builtins.py:4200
2705
#: bzrlib/builtins.py:4293
2662
2706
msgid " bzr merge ../bzr.dev"
2663
2707
msgstr ""
2664
2708
2665
#: bzrlib/builtins.py:4202
2709
#: bzrlib/builtins.py:4295
2666
2710
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2667
2711
msgstr ""
2668
2712
2669
#: bzrlib/builtins.py:4204
2713
#: bzrlib/builtins.py:4297
2670
2714
msgid " bzr merge -r 82 ../bzr.dev"
2671
2715
msgstr ""
2672
2716
2673
#: bzrlib/builtins.py:4206
2717
#: bzrlib/builtins.py:4299
2674
2718
msgid " To merge the changes introduced by 82, without previous changes::"
2675
2719
msgstr ""
2676
2720
2677
#: bzrlib/builtins.py:4208
2721
#: bzrlib/builtins.py:4301
2678
2722
msgid " bzr merge -r 81..82 ../bzr.dev"
2679
2723
msgstr ""
2680
2724
2681
#: bzrlib/builtins.py:4210
2725
#: bzrlib/builtins.py:4303
2682
2726
msgid " To apply a merge directive contained in /tmp/merge::"
2683
2727
msgstr ""
2684
2728
2685
#: bzrlib/builtins.py:4212
2729
#: bzrlib/builtins.py:4305
2686
2730
msgid " bzr merge /tmp/merge"
2687
2731
msgstr ""
2688
2732
2689
#: bzrlib/builtins.py:4214
2733
#: bzrlib/builtins.py:4307
2690
2734
msgid ""
2691
2735
" To create a merge revision with three parents from two branches\n"
2692
2736
" feature1a and feature1b:"
2693
2737
msgstr ""
2694
2738
2695
#: bzrlib/builtins.py:4217
2739
#: bzrlib/builtins.py:4310
2696
2740
msgid ""
2697
2741
" bzr merge ../feature1a\n"
2698
2742
" bzr merge ../feature1b --force\n"
2699
2743
" bzr commit -m 'revision with three parents'"
2700
2744
msgstr ""
2701
2745
2702
#: bzrlib/builtins.py:4229
2746
#: bzrlib/builtins.py:4322
2703
2747
msgid "Merge even if the destination tree has uncommitted changes."
2704
2748
msgstr ""
2705
2749
2706
#: bzrlib/builtins.py:4235
2750
#: bzrlib/builtins.py:4328
2707
2751
msgid ""
2708
2752
"Apply uncommitted changes from a working copy, instead of branch changes."
2709
2753
msgstr ""
2710
2754
2711
#: bzrlib/builtins.py:4237
2755
#: bzrlib/builtins.py:4330
2712
2756
msgid ""
2713
2757
"If the destination is already completely merged into the source, pull from "
2714
2758
"the source rather than merging. When this happens, you do not need to "
2715
2759
"commit the result."
2716
2760
msgstr ""
2717
2761
2718
#: bzrlib/builtins.py:4242
2762
#: bzrlib/builtins.py:4335
2719
2763
msgid ""
2720
2764
"Branch to merge into, rather than the one containing the working directory."
2721
2765
msgstr ""
2722
2766
2723
#: bzrlib/builtins.py:4244
2767
#: bzrlib/builtins.py:4337
2724
2768
msgid "Instead of merging, show a diff of the merge."
2725
2769
msgstr ""
2726
2770
2727
#: bzrlib/builtins.py:4246
2771
#: bzrlib/builtins.py:4339
2728
2772
msgid "Select changes interactively."
2729
2773
msgstr ""
2730
2774
2731
#: bzrlib/builtins.py:4268
2775
#: bzrlib/builtins.py:4361
2732
2776
msgid ""
2733
2777
"Merging into empty branches not currently supported, "
2734
2778
"https://bugs.launchpad.net/bzr/+bug/308562"
2735
2779
msgstr ""
2736
2780
2737
#: bzrlib/builtins.py:4295
2781
#: bzrlib/builtins.py:4388
2738
2782
msgid "Cannot use --uncommitted with bundles or merge directives."
2739
2783
msgstr ""
2740
2784
2741
#: bzrlib/builtins.py:4306
2785
#: bzrlib/builtins.py:4399
2742
2786
msgid "Cannot use --uncommitted and --revision at the same time."
2743
2787
msgstr ""
2744
2788
2745
#: bzrlib/builtins.py:4326
2789
#: bzrlib/builtins.py:4419
2746
2790
msgid "merger: "
2747
2791
msgstr ""
2748
2792
2749
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2793
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2750
2794
msgid "Nothing to do."
2751
2795
msgstr ""
2752
2796
2753
#: bzrlib/builtins.py:4332
2797
#: bzrlib/builtins.py:4425
2754
2798
msgid "Cannot pull individual files"
2755
2799
msgstr ""
2756
2800
2757
#: bzrlib/builtins.py:4340
2801
#: bzrlib/builtins.py:4433
2758
2802
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2759
2803
msgstr ""
2760
2804
2761
#: bzrlib/builtins.py:4398
2805
#: bzrlib/builtins.py:4491
2762
2806
#, python-format
2763
2807
msgid "Show-base is not supported for this merge type. %s"
2764
2808
msgstr ""
2765
2809
2766
#: bzrlib/builtins.py:4407
2810
#: bzrlib/builtins.py:4500
2767
2811
#, python-format
2768
2812
msgid "Conflict reduction is not supported for merge type %s."
2769
2813
msgstr ""
2770
2814
2771
#: bzrlib/builtins.py:4411
2815
#: bzrlib/builtins.py:4504
2772
2816
msgid "Cannot do conflict reduction and show base."
2773
2817
msgstr ""
2774
2818
2775
#: bzrlib/builtins.py:4522
2819
#: bzrlib/builtins.py:4615
2776
2820
msgid "No location specified or remembered"
2777
2821
msgstr ""
2778
2822
2779
#: bzrlib/builtins.py:4524
2823
#: bzrlib/builtins.py:4617
2780
2824
msgid "{0} remembered {1} location {2}"
2781
2825
msgstr ""
2782
2826
2783
#: bzrlib/builtins.py:4530
2827
#: bzrlib/builtins.py:4623
2784
2828
msgid "Redo a merge."
2785
2829
msgstr ""
2786
2830
2787
#: bzrlib/builtins.py:4532
2831
#: bzrlib/builtins.py:4625
2788
2832
msgid ""
2789
2833
"Use this if you want to try a different merge technique while resolving\n"
2790
2834
"conflicts. Some merge techniques are better than others, and remerge\n"
2791
2835
"lets you try different ones on different files."
2792
2836
msgstr ""
2793
2837
2794
#: bzrlib/builtins.py:4536
2838
#: bzrlib/builtins.py:4629
2795
2839
msgid ""
2796
2840
"The options for remerge have the same meaning and defaults as the ones for\n"
2797
2841
"merge. The difference is that remerge can (only) be run when there is a\n"
2798
2842
"pending merge, and it lets you specify particular files."
2799
2843
msgstr ""
2800
2844
2801
#: bzrlib/builtins.py:4540
2845
#: bzrlib/builtins.py:4633
2802
2846
msgid ""
2803
2847
":Examples:\n"
2804
2848
" Re-do the merge of all conflicted files, and show the base text in\n"
2805
2849
" conflict regions, in addition to the usual THIS and OTHER texts::"
2806
2850
msgstr ""
2807
2851
2808
#: bzrlib/builtins.py:4544
2852
#: bzrlib/builtins.py:4637
2809
2853
msgid " bzr remerge --show-base"
2810
2854
msgstr ""
2811
2855
2812
#: bzrlib/builtins.py:4546
2856
#: bzrlib/builtins.py:4639
2813
2857
msgid ""
2814
2858
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2815
2859
" additional processing to reduce the size of conflict regions::"
2816
2860
msgstr ""
2817
2861
2818
#: bzrlib/builtins.py:4549
2862
#: bzrlib/builtins.py:4642
2819
2863
msgid " bzr remerge --merge-type weave --reprocess foobar"
2820
2864
msgstr ""
2821
2865
2822
#: bzrlib/builtins.py:4556
2866
#: bzrlib/builtins.py:4649
2823
2867
msgid "Show base revision text in conflicts."
2824
2868
msgstr ""
2825
2869
2826
#: bzrlib/builtins.py:4568
2870
#: bzrlib/builtins.py:4661
2827
2871
msgid ""
2828
2872
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2829
2873
"merges."
2830
2874
msgstr ""
2831
2875
2832
#: bzrlib/builtins.py:4624
2876
#: bzrlib/builtins.py:4717
2833
2877
msgid "Revert files to a previous revision."
2834
2878
msgstr ""
2835
2879
2836
#: bzrlib/builtins.py:4626
2880
#: bzrlib/builtins.py:4719
2837
2881
msgid ""
2838
2882
"Giving a list of files will revert only those files. Otherwise, all files\n"
2839
2883
"will be reverted. If the revision is not specified with '--revision', the\n"
2840
2884
"last committed revision is used."
2841
2885
msgstr ""
2842
2886
2843
#: bzrlib/builtins.py:4630
2887
#: bzrlib/builtins.py:4723
2844
2888
msgid ""
2845
2889
"To remove only some changes, without reverting to a prior version, use\n"
2846
2890
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2849
2893
"certain changes on a hunk-by-hunk basis, see the shelve command."
2850
2894
msgstr ""
2851
2895
2852
#: bzrlib/builtins.py:4636
2896
#: bzrlib/builtins.py:4729
2853
2897
msgid ""
2854
2898
"By default, any files that have been manually changed will be backed up\n"
2855
2899
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2856
2900
"'.~#~' appended to their name, where # is a number."
2857
2901
msgstr ""
2858
2902
2859
#: bzrlib/builtins.py:4640
2903
#: bzrlib/builtins.py:4733
2860
2904
msgid ""
2861
2905
"When you provide files, you can use their current pathname or the pathname\n"
2862
2906
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2864
2908
"reverted."
2865
2909
msgstr ""
2866
2910
2867
#: bzrlib/builtins.py:4645
2911
#: bzrlib/builtins.py:4738
2868
2912
msgid ""
2869
2913
"If you have newly added files since the target revision, they will be\n"
2870
2914
"removed. If the files to be removed have been changed, backups will be\n"
2872
2916
"deleted."
2873
2917
msgstr ""
2874
2918
2875
#: bzrlib/builtins.py:4650
2919
#: bzrlib/builtins.py:4743
2876
2920
msgid ""
2877
2921
"The working tree contains a list of revisions that have been merged but\n"
2878
2922
"not yet committed. These revisions will be included as additional parents\n"
2884
2928
"reverting any files."
2885
2929
msgstr ""
2886
2930
2887
#: bzrlib/builtins.py:4659
2931
#: bzrlib/builtins.py:4752
2888
2932
msgid ""
2889
2933
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2890
2934
"changes from a branch in a single revision. To do this, perform the merge\n"
2898
2942
"target branches."
2899
2943
msgstr ""
2900
2944
2901
#: bzrlib/builtins.py:4673
2945
#: bzrlib/builtins.py:4766
2902
2946
msgid "Do not save backups of reverted files."
2903
2947
msgstr ""
2904
2948
2905
#: bzrlib/builtins.py:4675
2949
#: bzrlib/builtins.py:4768
2906
2950
msgid "Remove pending merge marker, without changing any files."
2907
2951
msgstr ""
2908
2952
2909
#: bzrlib/builtins.py:4706
2953
#: bzrlib/builtins.py:4799
2910
2954
msgid ""
2911
2955
"Show help on a command or other topic.\n"
2912
2956
" "
2913
2957
msgstr ""
2914
2958
2915
#: bzrlib/builtins.py:4711
2959
#: bzrlib/builtins.py:4804
2916
2960
msgid "Show help on all commands."
2917
2961
msgstr ""
2918
2962
2919
#: bzrlib/builtins.py:4740
2963
#: bzrlib/builtins.py:4833
2920
2964
msgid "Show unmerged/unpulled revisions between two branches."
2921
2965
msgstr ""
2922
2966
2923
#: bzrlib/builtins.py:4742
2967
#: bzrlib/builtins.py:4835
2924
2968
msgid "OTHER_BRANCH may be local or remote."
2925
2969
msgstr ""
2926
2970
2927
#: bzrlib/builtins.py:4744
2971
#: bzrlib/builtins.py:4837
2928
2972
msgid ""
2929
2973
"To filter on a range of revisions, you can use the command -r begin..end\n"
2930
2974
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2935
2979
" 0 - no missing revisions"
2936
2980
msgstr ""
2937
2981
2938
#: bzrlib/builtins.py:4754
2982
#: bzrlib/builtins.py:4847
2939
2983
msgid ""
2940
2984
" Determine the missing revisions between this and the branch at the\n"
2941
2985
" remembered pull location::"
2942
2986
msgstr ""
2943
2987
2944
#: bzrlib/builtins.py:4757
2988
#: bzrlib/builtins.py:4850
2945
2989
msgid " bzr missing"
2946
2990
msgstr ""
2947
2991
2948
#: bzrlib/builtins.py:4759
2992
#: bzrlib/builtins.py:4852
2949
2993
msgid " Determine the missing revisions between this and another branch::"
2950
2994
msgstr ""
2951
2995
2952
#: bzrlib/builtins.py:4761
2996
#: bzrlib/builtins.py:4854
2953
2997
msgid " bzr missing http://server/branch"
2954
2998
msgstr ""
2955
2999
2956
#: bzrlib/builtins.py:4763
3000
#: bzrlib/builtins.py:4856
2957
3001
msgid ""
2958
3002
" Determine the missing revisions up to a specific revision on the other\n"
2959
3003
" branch::"
2960
3004
msgstr ""
2961
3005
2962
#: bzrlib/builtins.py:4766
3006
#: bzrlib/builtins.py:4859
2963
3007
msgid " bzr missing -r ..-10"
2964
3008
msgstr ""
2965
3009
2966
#: bzrlib/builtins.py:4768
3010
#: bzrlib/builtins.py:4861
2967
3011
msgid ""
2968
3012
" Determine the missing revisions up to a specific revision on this\n"
2969
3013
" branch::"
2970
3014
msgstr ""
2971
3015
2972
#: bzrlib/builtins.py:4771
3016
#: bzrlib/builtins.py:4864
2973
3017
msgid " bzr missing --my-revision ..-10"
2974
3018
msgstr ""
2975
3019
2976
#: bzrlib/builtins.py:4778
3020
#: bzrlib/builtins.py:4871
2977
3021
msgid "Reverse the order of revisions."
2978
3022
msgstr ""
2979
3023
2980
#: bzrlib/builtins.py:4780
3024
#: bzrlib/builtins.py:4873
2981
3025
msgid "Display changes in the local branch only."
2982
3026
msgstr ""
2983
3027
2984
#: bzrlib/builtins.py:4781
3028
#: bzrlib/builtins.py:4874
2985
3029
msgid "Same as --mine-only."
2986
3030
msgstr ""
2987
3031
2988
#: bzrlib/builtins.py:4783
3032
#: bzrlib/builtins.py:4876
2989
3033
msgid "Display changes in the remote branch only."
2990
3034
msgstr ""
2991
3035
2992
#: bzrlib/builtins.py:4784
3036
#: bzrlib/builtins.py:4877
2993
3037
msgid "Same as --theirs-only."
2994
3038
msgstr ""
2995
3039
2996
#: bzrlib/builtins.py:4789
3040
#: bzrlib/builtins.py:4882
2997
3041
msgid ""
2998
3042
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2999
3043
"details."
3000
3044
msgstr ""
3001
3045
3002
#: bzrlib/builtins.py:4793
3046
#: bzrlib/builtins.py:4886
3003
3047
msgid ""
3004
3048
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3005
3049
"details."
3006
3050
msgstr ""
3007
3051
3008
#: bzrlib/builtins.py:4796
3052
#: bzrlib/builtins.py:4889
3009
3053
msgid "Show all revisions in addition to the mainline ones."
3010
3054
msgstr ""
3011
3055
3012
#: bzrlib/builtins.py:4850
3056
#: bzrlib/builtins.py:4943
3013
3057
msgid "No peer location known or specified."
3014
3058
msgstr ""
3015
3059
3016
#: bzrlib/builtins.py:4854
3060
#: bzrlib/builtins.py:4947
3017
3061
msgid "Using saved parent location: {0}\n"
3018
3062
msgstr ""
3019
3063
3020
#: bzrlib/builtins.py:4887
3064
#: bzrlib/builtins.py:4980
3021
3065
#, python-format
3022
3066
msgid "You have %d extra revision:\n"
3023
3067
msgid_plural "You have %d extra revisions:\n"
3024
3068
msgstr[0] ""
3025
3069
msgstr[1] ""
3026
3070
3027
#: bzrlib/builtins.py:4903
3071
#: bzrlib/builtins.py:4996
3028
3072
#, python-format
3029
3073
msgid "You are missing %d revision:\n"
3030
3074
msgid_plural "You are missing %d revisions:\n"
3031
3075
msgstr[0] ""
3032
3076
msgstr[1] ""
3033
3077
3034
#: bzrlib/builtins.py:4915
3078
#: bzrlib/builtins.py:5008
3035
3079
msgid "This branch has no new revisions.\n"
3036
3080
msgstr ""
3037
3081
3038
#: bzrlib/builtins.py:4918
3082
#: bzrlib/builtins.py:5011
3039
3083
msgid "Other branch has no new revisions.\n"
3040
3084
msgstr ""
3041
3085
3042
#: bzrlib/builtins.py:4923
3086
#: bzrlib/builtins.py:5016
3043
3087
msgid "Branches are up to date.\n"
3044
3088
msgstr ""
3045
3089
3046
#: bzrlib/builtins.py:4934
3090
#: bzrlib/builtins.py:5027
3047
3091
msgid "Compress the data within a repository."
3048
3092
msgstr ""
3049
3093
3050
#: bzrlib/builtins.py:4936
3094
#: bzrlib/builtins.py:5029
3051
3095
msgid ""
3052
3096
"This operation compresses the data within a bazaar repository. As\n"
3053
3097
"bazaar supports automatic packing of repository, this operation is\n"
3054
3098
"normally not required to be done manually."
3055
3099
msgstr ""
3056
3100
3057
#: bzrlib/builtins.py:4940
3101
#: bzrlib/builtins.py:5033
3058
3102
msgid ""
3059
3103
"During the pack operation, bazaar takes a backup of existing repository\n"
3060
3104
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3063
3107
"used."
3064
3108
msgstr ""
3065
3109
3066
#: bzrlib/builtins.py:4946
3110
#: bzrlib/builtins.py:5039
3067
3111
msgid ""
3068
3112
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3069
3113
"during or immediately after repacking, you may be left with a state\n"
3071
3115
"been. In this case the repository may be unusable."
3072
3116
msgstr ""
3073
3117
3074
#: bzrlib/builtins.py:4955
3118
#: bzrlib/builtins.py:5048
3075
3119
msgid "Delete obsolete packs to save disk space."
3076
3120
msgstr ""
3077
3121
3078
#: bzrlib/builtins.py:4969
3122
#: bzrlib/builtins.py:5062
3079
3123
msgid "List the installed plugins."
3080
3124
msgstr ""
3081
3125
3082
#: bzrlib/builtins.py:4971
3126
#: bzrlib/builtins.py:5064
3083
3127
msgid ""
3084
3128
"This command displays the list of installed plugins including\n"
3085
3129
"version of plugin and a short description of each."
3086
3130
msgstr ""
3087
3131
3088
#: bzrlib/builtins.py:4974
3132
#: bzrlib/builtins.py:5067
3089
3133
msgid "--verbose shows the path where each plugin is located."
3090
3134
msgstr ""
3091
3135
3092
#: bzrlib/builtins.py:4976
3136
#: bzrlib/builtins.py:5069
3093
3137
msgid ""
3094
3138
"A plugin is an external component for Bazaar that extends the\n"
3095
3139
"revision control system, by adding or replacing code in Bazaar.\n"
3098
3142
"customizing log output."
3099
3143
msgstr ""
3100
3144
3101
#: bzrlib/builtins.py:4982
3145
#: bzrlib/builtins.py:5075
3102
3146
msgid ""
3103
3147
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3104
3148
"for further information on plugins including where to find them and how to\n"
3106
3150
"plugins using the Python programming language."
3107
3151
msgstr ""
3108
3152
3109
#: bzrlib/builtins.py:4998
3153
#: bzrlib/builtins.py:5091
3110
3154
msgid "Show testament (signing-form) of a revision."
3111
3155
msgstr ""
3112
3156
3113
#: bzrlib/builtins.py:5001
3157
#: bzrlib/builtins.py:5094
3114
3158
msgid "Produce long-format testament."
3115
3159
msgstr ""
3116
3160
3117
#: bzrlib/builtins.py:5003
3161
#: bzrlib/builtins.py:5096
3118
3162
msgid "Produce a strict-format testament."
3119
3163
msgstr ""
3120
3164
3121
#: bzrlib/builtins.py:5029
3165
#: bzrlib/builtins.py:5122
3122
3166
msgid "Show the origin of each line in a file."
3123
3167
msgstr ""
3124
3168
3125
#: bzrlib/builtins.py:5031
3169
#: bzrlib/builtins.py:5124
3126
3170
msgid ""
3127
3171
"This prints out the given file with an annotation on the left side\n"
3128
3172
"indicating which revision, author and date introduced the change."
3129
3173
msgstr ""
3130
3174
3131
#: bzrlib/builtins.py:5034
3175
#: bzrlib/builtins.py:5127
3132
3176
msgid ""
3133
3177
"If the origin is the same for a run of consecutive lines, it is\n"
3134
3178
"shown only at the top, unless the --all option is given."
3135
3179
msgstr ""
3136
3180
3137
#: bzrlib/builtins.py:5042
3181
#: bzrlib/builtins.py:5135
3138
3182
msgid "Show annotations on all lines."
3139
3183
msgstr ""
3140
3184
3141
#: bzrlib/builtins.py:5043
3185
#: bzrlib/builtins.py:5136
3142
3186
msgid "Show commit date in annotations."
3143
3187
msgstr ""
3144
3188
3145
#: bzrlib/builtins.py:5130
3189
#: bzrlib/builtins.py:5223
3146
3190
msgid "Cannot sign a range of non-revision-history revisions"
3147
3191
msgstr ""
3148
3192
3149
#: bzrlib/builtins.py:5142
3193
#: bzrlib/builtins.py:5235
3150
3194
msgid "Please supply either one revision, or a range."
3151
3195
msgstr ""
3152
3196
3153
#: bzrlib/builtins.py:5146
3197
#: bzrlib/builtins.py:5239
3154
3198
msgid ""
3155
3199
"Convert the current branch into a checkout of the supplied branch.\n"
3156
3200
"If no branch is supplied, rebind to the last bound location."
3157
3201
msgstr ""
3158
3202
3159
#: bzrlib/builtins.py:5149
3203
#: bzrlib/builtins.py:5242
3160
3204
msgid ""
3161
3205
"Once converted into a checkout, commits must succeed on the master branch\n"
3162
3206
"before they will be applied to the local branch."
3163
3207
msgstr ""
3164
3208
3165
#: bzrlib/builtins.py:5152
3209
#: bzrlib/builtins.py:5245
3166
3210
msgid ""
3167
3211
"Bound branches use the nickname of its master branch unless it is set\n"
3168
3212
"locally, in which case binding will update the local nickname to be\n"
3169
3213
"that of the master."
3170
3214
msgstr ""
3171
3215
3172
#: bzrlib/builtins.py:5167
3216
#: bzrlib/builtins.py:5260
3173
3217
msgid "No location supplied. This format does not remember old locations."
3174
3218
msgstr ""
3175
3219
3176
#: bzrlib/builtins.py:5172
3220
#: bzrlib/builtins.py:5265
3177
3221
msgid "Branch is already bound"
3178
3222
msgstr ""
3179
3223
3180
#: bzrlib/builtins.py:5174
3224
#: bzrlib/builtins.py:5267
3181
3225
msgid "No location supplied and no previous location known"
3182
3226
msgstr ""
3183
3227
3184
#: bzrlib/builtins.py:5180
3228
#: bzrlib/builtins.py:5273
3185
3229
msgid "These branches have diverged. Try merging, and then bind again."
3186
3230
msgstr ""
3187
3231
3188
#: bzrlib/builtins.py:5187
3232
#: bzrlib/builtins.py:5280
3189
3233
msgid "Convert the current checkout into a regular branch."
3190
3234
msgstr ""
3191
3235
3192
#: bzrlib/builtins.py:5189
3236
#: bzrlib/builtins.py:5282
3193
3237
msgid ""
3194
3238
"After unbinding, the local branch is considered independent and subsequent\n"
3195
3239
"commits will be local only."
3196
3240
msgstr ""
3197
3241
3198
#: bzrlib/builtins.py:5200
3242
#: bzrlib/builtins.py:5293
3199
3243
msgid "Local branch is not bound"
3200
3244
msgstr ""
3201
3245
3202
#: bzrlib/builtins.py:5204
3246
#: bzrlib/builtins.py:5297
3203
3247
msgid "Remove the last committed revision."
3204
3248
msgstr ""
3205
3249
3206
#: bzrlib/builtins.py:5206
3250
#: bzrlib/builtins.py:5299
3207
3251
msgid ""
3208
3252
"--verbose will print out what is being removed.\n"
3209
3253
"--dry-run will go through all the motions, but not actually\n"
3210
3254
"remove anything."
3211
3255
msgstr ""
3212
3256
3213
#: bzrlib/builtins.py:5210
3257
#: bzrlib/builtins.py:5303
3214
3258
msgid ""
3215
3259
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3216
3260
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3217
3261
"branch at revision 15."
3218
3262
msgstr ""
3219
3263
3220
#: bzrlib/builtins.py:5214
3264
#: bzrlib/builtins.py:5307
3221
3265
msgid ""
3222
3266
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3223
3267
"it may make is to restore any pending merges that were present before\n"
3224
3268
"the commit."
3225
3269
msgstr ""
3226
3270
3227
#: bzrlib/builtins.py:5225
3271
#: bzrlib/builtins.py:5318
3228
3272
msgid "Don't actually make changes."
3229
3273
msgstr ""
3230
3274
3231
#: bzrlib/builtins.py:5226
3275
#: bzrlib/builtins.py:5319
3232
3276
msgid "Say yes to all questions."
3233
3277
msgstr ""
3234
3278
3235
#: bzrlib/builtins.py:5228
3279
#: bzrlib/builtins.py:5321
3236
3280
msgid "Keep tags that point to removed revisions."
3237
3281
msgstr ""
3238
3282
3239
#: bzrlib/builtins.py:5230
3283
#: bzrlib/builtins.py:5323
3240
3284
msgid "Only remove the commits from the local branch when in a checkout."
3241
3285
msgstr ""
3242
3286
3243
#: bzrlib/builtins.py:5279
3287
#: bzrlib/builtins.py:5372
3244
3288
msgid "No revisions to uncommit.\n"
3245
3289
msgstr ""
3246
3290
3247
#: bzrlib/builtins.py:5294
3291
#: bzrlib/builtins.py:5387
3248
3292
msgid "Dry-run, pretending to remove the above revisions.\n"
3249
3293
msgstr ""
3250
3294
3251
#: bzrlib/builtins.py:5297
3295
#: bzrlib/builtins.py:5390
3252
3296
msgid "The above revision(s) will be removed.\n"
3253
3297
msgstr ""
3254
3298
3255
#: bzrlib/builtins.py:5301
3299
#: bzrlib/builtins.py:5394
3256
3300
msgid "Uncommit these revisions"
3257
3301
msgstr ""
3258
3302
3259
#: bzrlib/builtins.py:5304
3303
#: bzrlib/builtins.py:5397
3260
3304
msgid "Canceled\n"
3261
3305
msgstr ""
3262
3306
3263
#: bzrlib/builtins.py:5311
3307
#: bzrlib/builtins.py:5404
3264
3308
#, python-format
3265
3309
msgid ""
3266
3310
"You can restore the old tip by running:\n"
3267
3311
" bzr pull . -r revid:%s\n"
3268
3312
msgstr ""
3269
3313
3270
#: bzrlib/builtins.py:5316
3314
#: bzrlib/builtins.py:5409
3271
3315
msgid "Break a dead lock."
3272
3316
msgstr ""
3273
3317
3274
#: bzrlib/builtins.py:5318
3318
#: bzrlib/builtins.py:5411
3275
3319
msgid ""
3276
3320
"This command breaks a lock on a repository, branch, working directory or\n"
3277
3321
"config file."
3278
3322
msgstr ""
3279
3323
3280
#: bzrlib/builtins.py:5321
3324
#: bzrlib/builtins.py:5414
3281
3325
msgid ""
3282
3326
"CAUTION: Locks should only be broken when you are sure that the process\n"
3283
3327
"holding the lock has been stopped."
3284
3328
msgstr ""
3285
3329
3286
#: bzrlib/builtins.py:5324
3330
#: bzrlib/builtins.py:5417
3287
3331
msgid ""
3288
3332
"You can get information on what locks are open via the 'bzr info\n"
3289
3333
"[location]' command."
3290
3334
msgstr ""
3291
3335
3292
#: bzrlib/builtins.py:5327
3336
#: bzrlib/builtins.py:5420
3293
3337
msgid ""
3294
3338
":Examples:\n"
3295
3339
" bzr break-lock\n"
3297
3341
" bzr break-lock --conf ~/.bazaar"
3298
3342
msgstr ""
3299
3343
3300
#: bzrlib/builtins.py:5336
3344
#: bzrlib/builtins.py:5429
3301
3345
msgid "LOCATION is the directory where the config lock is."
3302
3346
msgstr ""
3303
3347
3304
#: bzrlib/builtins.py:5338
3348
#: bzrlib/builtins.py:5431
3305
3349
msgid "Do not ask for confirmation before breaking the lock."
3306
3350
msgstr ""
3307
3351
3308
#: bzrlib/builtins.py:5373
3352
#: bzrlib/builtins.py:5466
3309
3353
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3310
3354
msgstr ""
3311
3355
3312
#: bzrlib/builtins.py:5374
3356
#: bzrlib/builtins.py:5467
3313
3357
msgid "Run the bzr server."
3314
3358
msgstr ""
3315
3359
3316
#: bzrlib/builtins.py:5380
3360
#: bzrlib/builtins.py:5473
3317
3361
msgid "Serve on stdin/out for use from inetd or sshd."
3318
3362
msgstr ""
3319
3363
3320
#: bzrlib/builtins.py:5381
3364
#: bzrlib/builtins.py:5474
3321
3365
msgid "protocol"
3322
3366
msgstr ""
3323
3367
3324
#: bzrlib/builtins.py:5382
3368
#: bzrlib/builtins.py:5475
3325
3369
msgid "Protocol to serve."
3326
3370
msgstr ""
3327
3371
3328
#: bzrlib/builtins.py:5386
3372
#: bzrlib/builtins.py:5479
3329
3373
msgid ""
3330
3374
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3331
3375
"Passing 0 as the port number will result in a dynamically allocated port. "
3332
3376
"The default port depends on the protocol."
3333
3377
msgstr ""
3334
3378
3335
#: bzrlib/builtins.py:5392
3379
#: bzrlib/builtins.py:5485
3336
3380
msgid "Serve contents of this directory."
3337
3381
msgstr ""
3338
3382
3339
#: bzrlib/builtins.py:5394
3383
#: bzrlib/builtins.py:5487
3340
3384
msgid ""
3341
3385
"By default the server is a readonly server. Supplying --allow-writes "
3342
3386
"enables write access to the contents of the served directory and below. "
3345
3389
"uncontrolled write access to your file system."
3346
3390
msgstr ""
3347
3391
3348
#: bzrlib/builtins.py:5403
3392
#: bzrlib/builtins.py:5496
3349
3393
msgid "Override the default idle client timeout (5min)."
3350
3394
msgstr ""
3351
3395
3352
#: bzrlib/builtins.py:5453
3396
#: bzrlib/builtins.py:5546
3353
3397
msgid "Combine a tree into its containing tree."
3354
3398
msgstr ""
3355
3399
3356
#: bzrlib/builtins.py:5455
3400
#: bzrlib/builtins.py:5548
3357
3401
msgid "This command requires the target tree to be in a rich-root format."
3358
3402
msgstr ""
3359
3403
3360
#: bzrlib/builtins.py:5457
3404
#: bzrlib/builtins.py:5550
3361
3405
msgid ""
3362
3406
"The TREE argument should be an independent tree, inside another tree, but\n"
3363
3407
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3364
3408
"running \"bzr branch\" with the target inside a tree.)"
3365
3409
msgstr ""
3366
3410
3367
#: bzrlib/builtins.py:5461
3411
#: bzrlib/builtins.py:5554
3368
3412
msgid ""
3369
3413
"The result is a combined tree, with the subtree no longer an independent\n"
3370
3414
"part. This is marked as a merge of the subtree into the containing tree,\n"
3371
3415
"and all history is preserved."
3372
3416
msgstr ""
3373
3417
3374
#: bzrlib/builtins.py:5479
3418
#: bzrlib/builtins.py:5572
3375
3419
#, python-format
3376
3420
msgid ""
3377
3421
"Can't join trees because %s doesn't support rich root data.\n"
3378
3422
"You can use bzr upgrade on the repository."
3379
3423
msgstr ""
3380
3424
3381
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3425
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3382
3426
msgid "Cannot join {0}. {1}"
3383
3427
msgstr ""
3384
3428
3385
#: bzrlib/builtins.py:5499
3429
#: bzrlib/builtins.py:5592
3386
3430
msgid "Split a subdirectory of a tree into a separate tree."
3387
3431
msgstr ""
3388
3432
3389
#: bzrlib/builtins.py:5501
3433
#: bzrlib/builtins.py:5594
3390
3434
msgid ""
3391
3435
"This command will produce a target tree in a format that supports\n"
3392
3436
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3393
3437
"converted into earlier formats like 'dirstate-tags'."
3394
3438
msgstr ""
3395
3439
3396
#: bzrlib/builtins.py:5505
3440
#: bzrlib/builtins.py:5598
3397
3441
msgid ""
3398
3442
"The TREE argument should be a subdirectory of a working tree. That\n"
3399
3443
"subdirectory will be converted into an independent tree, with its own\n"
3400
3444
"branch. Commits in the top-level tree will not apply to the new subtree."
3401
3445
msgstr ""
3402
3446
3403
#: bzrlib/builtins.py:5585
3447
#: bzrlib/builtins.py:5678
3404
3448
msgid "No submit branch specified or known"
3405
3449
msgstr ""
3406
3450
3407
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3451
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3408
3452
msgid "No public branch specified or known"
3409
3453
msgstr ""
3410
3454
3411
#: bzrlib/builtins.py:5598
3455
#: bzrlib/builtins.py:5691
3412
3456
msgid "bzr merge-directive takes at most two one revision identifiers"
3413
3457
msgstr ""
3414
3458
3415
#: bzrlib/builtins.py:5607
3459
#: bzrlib/builtins.py:5700
3416
3460
msgid "No revisions to bundle."
3417
3461
msgstr ""
3418
3462
3419
#: bzrlib/builtins.py:5626
3463
#: bzrlib/builtins.py:5719
3420
3464
msgid "Mail or create a merge-directive for submitting changes."
3421
3465
msgstr ""
3422
3466
3423
#: bzrlib/builtins.py:5628
3467
#: bzrlib/builtins.py:5721
3424
3468
msgid "A merge directive provides many things needed for requesting merges:"
3425
3469
msgstr ""
3426
3470
3427
#: bzrlib/builtins.py:5630
3471
#: bzrlib/builtins.py:5723
3428
3472
msgid "* A machine-readable description of the merge to perform"
3429
3473
msgstr ""
3430
3474
3431
#: bzrlib/builtins.py:5632
3475
#: bzrlib/builtins.py:5725
3432
3476
msgid "* An optional patch that is a preview of the changes requested"
3433
3477
msgstr ""
3434
3478
3435
#: bzrlib/builtins.py:5634
3479
#: bzrlib/builtins.py:5727
3436
3480
msgid ""
3437
3481
"* An optional bundle of revision data, so that the changes can be applied\n"
3438
3482
" directly from the merge directive, without retrieving data from a\n"
3439
3483
" branch."
3440
3484
msgstr ""
3441
3485
3442
#: bzrlib/builtins.py:5638
3486
#: bzrlib/builtins.py:5731
3443
3487
msgid ""
3444
3488
"`bzr send` creates a compact data set that, when applied using bzr\n"
3445
3489
"merge, has the same effect as merging from the source branch. "
3446
3490
msgstr ""
3447
3491
3448
#: bzrlib/builtins.py:5641
3492
#: bzrlib/builtins.py:5734
3449
3493
msgid ""
3450
3494
"By default the merge directive is self-contained and can be applied to any\n"
3451
3495
"branch containing submit_branch in its ancestory without needing access to\n"
3452
3496
"the source branch."
3453
3497
msgstr ""
3454
3498
3455
#: bzrlib/builtins.py:5645
3499
#: bzrlib/builtins.py:5738
3456
3500
msgid ""
3457
3501
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3458
3502
"revisions, but only a structured request to merge from the\n"
3461
3505
"included if known, so that people can check it later."
3462
3506
msgstr ""
3463
3507
3464
#: bzrlib/builtins.py:5651
3508
#: bzrlib/builtins.py:5744
3465
3509
msgid ""
3466
3510
"The submit branch defaults to the parent of the source branch, but can be\n"
3467
3511
"overridden. Both submit branch and public branch will be remembered in\n"
3470
3514
"be changed using --from."
3471
3515
msgstr ""
3472
3516
3473
#: bzrlib/builtins.py:5657
3517
#: bzrlib/builtins.py:5750
3474
3518
msgid ""
3475
3519
"Both the submit branch and the public branch follow the usual behavior with\n"
3476
3520
"respect to --remember: If there is no default location set, the first send\n"
3479
3523
"--remember. The value will only be saved if the location can be accessed."
3480
3524
msgstr ""
3481
3525
3482
#: bzrlib/builtins.py:5663
3526
#: bzrlib/builtins.py:5756
3483
3527
msgid ""
3484
3528
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3485
3529
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3487
3531
"in the merge directive."
3488
3532
msgstr ""
3489
3533
3490
#: bzrlib/builtins.py:5668
3534
#: bzrlib/builtins.py:5761
3491
3535
msgid ""
3492
3536
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3493
3537
"given, in which case it is sent to a file."
3494
3538
msgstr ""
3495
3539
3496
#: bzrlib/builtins.py:5671
3540
#: bzrlib/builtins.py:5764
3497
3541
msgid ""
3498
3542
"Mail is sent using your preferred mail program. This should be transparent\n"
3499
3543
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3500
3544
"If the preferred client can't be found (or used), your editor will be used."
3501
3545
msgstr ""
3502
3546
3503
#: bzrlib/builtins.py:5675
3547
#: bzrlib/builtins.py:5768
3504
3548
msgid ""
3505
3549
"To use a specific mail program, set the mail_client configuration option.\n"
3506
3550
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3512
3556
"supported clients."
3513
3557
msgstr ""
3514
3558
3515
#: bzrlib/builtins.py:5682
3559
#: bzrlib/builtins.py:5775
3516
3560
msgid ""
3517
3561
"If mail is being sent, a to address is required. This can be supplied\n"
3518
3562
"either on the commandline, by setting the submit_to configuration\n"
3520
3564
"in the submit branch."
3521
3565
msgstr ""
3522
3566
3523
#: bzrlib/builtins.py:5687
3567
#: bzrlib/builtins.py:5780
3524
3568
msgid ""
3525
3569
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3526
3570
"and\n"
3530
3574
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3531
3575
msgstr ""
3532
3576
3533
#: bzrlib/builtins.py:5693
3577
#: bzrlib/builtins.py:5786
3534
3578
msgid ""
3535
3579
"The merge directives created by bzr send may be applied using bzr merge or\n"
3536
3580
"bzr pull by specifying a file containing a merge directive as the location."
3537
3581
msgstr ""
3538
3582
3539
#: bzrlib/builtins.py:5696
3583
#: bzrlib/builtins.py:5789
3540
3584
msgid ""
3541
3585
"bzr send makes extensive use of public locations to map local locations "
3542
3586
"into\n"
3544
3588
"set them, and use `bzr info` to display them."
3545
3589
msgstr ""
3546
3590
3547
#: bzrlib/builtins.py:5720
3591
#: bzrlib/builtins.py:5813
3548
3592
msgid "Write merge directive to this file or directory; use - for stdout."
3549
3593
msgstr ""
3550
3594
3551
#: bzrlib/builtins.py:5724
3595
#: bzrlib/builtins.py:5817
3552
3596
msgid ""
3553
3597
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3554
3598
"strict disables the check."
3555
3599
msgstr ""
3556
3600
3557
#: bzrlib/builtins.py:5726
3601
#: bzrlib/builtins.py:5819
3558
3602
msgid "Mail the request to this address."
3559
3603
msgstr ""
3560
3604
3561
#: bzrlib/builtins.py:5730
3605
#: bzrlib/builtins.py:5823
3562
3606
msgid "Body for the email."
3563
3607
msgstr ""
3564
3608
3565
#: bzrlib/builtins.py:5783
3609
#: bzrlib/builtins.py:5876
3566
3610
msgid "Do not include a bundle in the merge directive."
3567
3611
msgstr ""
3568
3612
3569
#: bzrlib/builtins.py:5784
3613
#: bzrlib/builtins.py:5877
3570
3614
msgid "Do not include a preview patch in the merge directive."
3571
3615
msgstr ""
3572
3616
3573
#: bzrlib/builtins.py:5787
3617
#: bzrlib/builtins.py:5880
3574
3618
msgid "Remember submit and public branch."
3575
3619
msgstr ""
3576
3620
3577
#: bzrlib/builtins.py:5789
3621
#: bzrlib/builtins.py:5882
3578
3622
msgid ""
3579
3623
"Branch to generate the submission from, rather than the one containing the "
3580
3624
"working directory."
3581
3625
msgstr ""
3582
3626
3583
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3627
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3584
3628
msgid "format"
3585
3629
msgstr ""
3586
3630
3587
#: bzrlib/builtins.py:5800
3631
#: bzrlib/builtins.py:5893
3588
3632
msgid "Use the specified output format."
3589
3633
msgstr ""
3590
3634
3591
#: bzrlib/builtins.py:5822
3635
#: bzrlib/builtins.py:5915
3592
3636
msgid "Create, remove or modify a tag naming a revision."
3593
3637
msgstr ""
3594
3638
3595
#: bzrlib/builtins.py:5824
3639
#: bzrlib/builtins.py:5917
3596
3640
msgid ""
3597
3641
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3598
3642
"(--revision) option can be given -rtag:X, where X is any previously\n"
3599
3643
"created tag."
3600
3644
msgstr ""
3601
3645
3602
#: bzrlib/builtins.py:5828
3646
#: bzrlib/builtins.py:5921
3603
3647
msgid ""
3604
3648
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3605
3649
"along when you branch, push, pull or merge."
3606
3650
msgstr ""
3607
3651
3608
#: bzrlib/builtins.py:5831
3652
#: bzrlib/builtins.py:5924
3609
3653
msgid ""
3610
3654
"It is an error to give a tag name that already exists unless you pass\n"
3611
3655
"--force, in which case the tag is moved to point to the new revision."
3612
3656
msgstr ""
3613
3657
3614
#: bzrlib/builtins.py:5834
3658
#: bzrlib/builtins.py:5927
3615
3659
msgid ""
3616
3660
"To rename a tag (change the name but keep it on the same revsion), run "
3617
3661
"``bzr\n"
3618
3662
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3619
3663
msgstr ""
3620
3664
3621
#: bzrlib/builtins.py:5837
3665
#: bzrlib/builtins.py:5930
3622
3666
msgid ""
3623
3667
"If no tag name is specified it will be determined through the \n"
3624
3668
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3626
3670
"details."
3627
3671
msgstr ""
3628
3672
3629
#: bzrlib/builtins.py:5847
3673
#: bzrlib/builtins.py:5940
3630
3674
msgid "Delete this tag rather than placing it."
3631
3675
msgstr ""
3632
3676
3633
#: bzrlib/builtins.py:5850
3677
#: bzrlib/builtins.py:5943
3634
3678
msgid "Branch in which to place the tag."
3635
3679
msgstr ""
3636
3680
3637
#: bzrlib/builtins.py:5852
3681
#: bzrlib/builtins.py:5945
3638
3682
msgid "Replace existing tags."
3639
3683
msgstr ""
3640
3684
3641
#: bzrlib/builtins.py:5867
3685
#: bzrlib/builtins.py:5960
3642
3686
msgid "No tag specified to delete."
3643
3687
msgstr ""
3644
3688
3645
#: bzrlib/builtins.py:5869
3689
#: bzrlib/builtins.py:5962
3646
3690
#, python-format
3647
3691
msgid "Deleted tag %s."
3648
3692
msgstr ""
3649
3693
3650
#: bzrlib/builtins.py:5883
3694
#: bzrlib/builtins.py:5976
3651
3695
msgid "Please specify a tag name."
3652
3696
msgstr ""
3653
3697
3654
#: bzrlib/builtins.py:5891
3698
#: bzrlib/builtins.py:5984
3655
3699
#, python-format
3656
3700
msgid "Tag %s already exists for that revision."
3657
3701
msgstr ""
3658
3702
3659
#: bzrlib/builtins.py:5895
3703
#: bzrlib/builtins.py:5988
3660
3704
#, python-format
3661
3705
msgid "Created tag %s."
3662
3706
msgstr ""
3663
3707
3664
#: bzrlib/builtins.py:5897
3708
#: bzrlib/builtins.py:5990
3665
3709
#, python-format
3666
3710
msgid "Updated tag %s."
3667
3711
msgstr ""
3668
3712
3669
#: bzrlib/builtins.py:5901
3713
#: bzrlib/builtins.py:5994
3670
3714
msgid "List tags."
3671
3715
msgstr ""
3672
3716
3673
#: bzrlib/builtins.py:5903
3717
#: bzrlib/builtins.py:5996
3674
3718
msgid ""
3675
3719
"This command shows a table of tag names and the revisions they reference."
3676
3720
msgstr ""
3677
3721
3678
#: bzrlib/builtins.py:5909
3722
#: bzrlib/builtins.py:6002
3679
3723
msgid "Branch whose tags should be displayed."
3680
3724
msgstr ""
3681
3725
3682
#: bzrlib/builtins.py:5911
3726
#: bzrlib/builtins.py:6004
3683
3727
msgid "Sort tags by different criteria."
3684
3728
msgstr ""
3685
3729
3686
#: bzrlib/builtins.py:5911
3730
#: bzrlib/builtins.py:6004
3687
3731
msgid "Sorting"
3688
3732
msgstr ""
3689
3733
3690
#: bzrlib/builtins.py:5980
3734
#: bzrlib/builtins.py:6073
3691
3735
msgid "Reconfigure the type of a bzr directory."
3692
3736
msgstr ""
3693
3737
3694
#: bzrlib/builtins.py:5982
3738
#: bzrlib/builtins.py:6075
3695
3739
msgid "A target configuration must be specified."
3696
3740
msgstr ""
3697
3741
3698
#: bzrlib/builtins.py:5984
3742
#: bzrlib/builtins.py:6077
3699
3743
msgid ""
3700
3744
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3701
3745
"The order of preference is\n"
3706
3750
"If none of these is available, --bind-to must be specified."
3707
3751
msgstr ""
3708
3752
3709
#: bzrlib/builtins.py:5998
3753
#: bzrlib/builtins.py:6091
3710
3754
msgid "Tree type"
3711
3755
msgstr ""
3712
3756
3713
#: bzrlib/builtins.py:5999
3757
#: bzrlib/builtins.py:6092
3714
3758
msgid "The relation between branch and tree."
3715
3759
msgstr ""
3716
3760
3717
#: bzrlib/builtins.py:6001
3761
#: bzrlib/builtins.py:6094
3718
3762
msgid "Reconfigure to be an unbound branch with no working tree."
3719
3763
msgstr ""
3720
3764
3721
#: bzrlib/builtins.py:6002
3765
#: bzrlib/builtins.py:6095
3722
3766
msgid "Reconfigure to be an unbound branch with a working tree."
3723
3767
msgstr ""
3724
3768
3725
#: bzrlib/builtins.py:6003
3769
#: bzrlib/builtins.py:6096
3726
3770
msgid "Reconfigure to be a bound branch with a working tree."
3727
3771
msgstr ""
3728
3772
3729
#: bzrlib/builtins.py:6004
3773
#: bzrlib/builtins.py:6097
3730
3774
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3731
3775
msgstr ""
3732
3776
3733
#: bzrlib/builtins.py:6009
3777
#: bzrlib/builtins.py:6102
3734
3778
msgid "Repository type"
3735
3779
msgstr ""
3736
3780
3737
#: bzrlib/builtins.py:6010
3781
#: bzrlib/builtins.py:6103
3738
3782
msgid "Location fo the repository."
3739
3783
msgstr ""
3740
3784
3741
#: bzrlib/builtins.py:6012
3785
#: bzrlib/builtins.py:6105
3742
3786
msgid ""
3743
3787
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3744
3788
msgstr ""
3745
3789
3746
#: bzrlib/builtins.py:6014
3790
#: bzrlib/builtins.py:6107
3747
3791
msgid "Reconfigure to use a shared repository."
3748
3792
msgstr ""
3749
3793
3750
#: bzrlib/builtins.py:6018
3794
#: bzrlib/builtins.py:6111
3751
3795
msgid "Trees in Repository"
3752
3796
msgstr ""
3753
3797
3754
#: bzrlib/builtins.py:6019
3798
#: bzrlib/builtins.py:6112
3755
3799
msgid "Whether new branches in the repository have trees."
3756
3800
msgstr ""
3757
3801
3758
#: bzrlib/builtins.py:6021
3802
#: bzrlib/builtins.py:6114
3759
3803
msgid ""
3760
3804
"Reconfigure repository to create working trees on branches by default."
3761
3805
msgstr ""
3762
3806
3763
#: bzrlib/builtins.py:6023
3807
#: bzrlib/builtins.py:6116
3764
3808
msgid ""
3765
3809
"Reconfigure repository to not create working trees on branches by default."
3766
3810
msgstr ""
3767
3811
3768
#: bzrlib/builtins.py:6026
3812
#: bzrlib/builtins.py:6119
3769
3813
msgid "Branch to bind checkout to."
3770
3814
msgstr ""
3771
3815
3772
#: bzrlib/builtins.py:6028
3816
#: bzrlib/builtins.py:6121
3773
3817
msgid "Perform reconfiguration even if local changes will be lost."
3774
3818
msgstr ""
3775
3819
3776
#: bzrlib/builtins.py:6031
3820
#: bzrlib/builtins.py:6124
3777
3821
msgid "Reconfigure a branch to be stacked on another branch."
3778
3822
msgstr ""
3779
3823
3780
#: bzrlib/builtins.py:6035
3824
#: bzrlib/builtins.py:6128
3781
3825
msgid ""
3782
3826
"Reconfigure a branch to be unstacked. This may require copying substantial "
3783
3827
"data into it."
3784
3828
msgstr ""
3785
3829
3786
#: bzrlib/builtins.py:6045
3830
#: bzrlib/builtins.py:6138
3787
3831
msgid "Can't use both --stacked-on and --unstacked"
3788
3832
msgstr ""
3789
3833
3790
#: bzrlib/builtins.py:6059
3834
#: bzrlib/builtins.py:6152
3791
3835
msgid "No target configuration specified"
3792
3836
msgstr ""
3793
3837
3794
#: bzrlib/builtins.py:6094
3838
#: bzrlib/builtins.py:6187
3795
3839
msgid "Set the branch of a checkout and update."
3796
3840
msgstr ""
3797
3841
3798
#: bzrlib/builtins.py:6096
3842
#: bzrlib/builtins.py:6189
3799
3843
msgid ""
3800
3844
"For lightweight checkouts, this changes the branch being referenced.\n"
3801
3845
"For heavyweight checkouts, this checks that there are no local commits\n"
3803
3847
"of the new location and binds to it."
3804
3848
msgstr ""
3805
3849
3806
#: bzrlib/builtins.py:6101
3850
#: bzrlib/builtins.py:6194
3807
3851
msgid ""
3808
3852
"In both cases, the working tree is updated and uncommitted changes\n"
3809
3853
"are merged. The user can commit or revert these as they desire."
3810
3854
msgstr ""
3811
3855
3812
#: bzrlib/builtins.py:6104
3856
#: bzrlib/builtins.py:6197
3813
3857
msgid "Pending merges need to be committed or reverted before using switch."
3814
3858
msgstr ""
3815
3859
3816
#: bzrlib/builtins.py:6106
3860
#: bzrlib/builtins.py:6199
3817
3861
msgid ""
3818
3862
"The path to the branch to switch to can be specified relative to the parent\n"
3819
3863
"directory of the current branch. For example, if you are currently in a\n"
3821
3865
"/path/to/newbranch."
3822
3866
msgstr ""
3823
3867
3824
#: bzrlib/builtins.py:6111
3868
#: bzrlib/builtins.py:6204
3825
3869
msgid ""
3826
3870
"Bound branches use the nickname of its master branch unless it is set\n"
3827
3871
"locally, in which case switching will update the local nickname to be\n"
3828
3872
"that of the master."
3829
3873
msgstr ""
3830
3874
3831
#: bzrlib/builtins.py:6119
3875
#: bzrlib/builtins.py:6212
3832
3876
msgid "Switch even if local commits will be lost."
3833
3877
msgstr ""
3834
3878
3835
#: bzrlib/builtins.py:6122
3879
#: bzrlib/builtins.py:6215
3836
3880
msgid "Create the target branch from this one before switching to it."
3837
3881
msgstr ""
3838
3882
3839
#: bzrlib/builtins.py:6134
3883
#: bzrlib/builtins.py:6229
3840
3884
msgid "You must supply either a revision or a location"
3841
3885
msgstr ""
3842
3886
3843
#: bzrlib/builtins.py:6145
3887
#: bzrlib/builtins.py:6242
3844
3888
msgid "cannot create branch without source branch"
3845
3889
msgstr ""
3846
3890
3847
#: bzrlib/builtins.py:6209
3891
#: bzrlib/builtins.py:6262
3848
3892
msgid "Manage filtered views."
3849
3893
msgstr ""
3850
3894
3851
#: bzrlib/builtins.py:6211
3895
#: bzrlib/builtins.py:6264
3852
3896
msgid ""
3853
3897
"Views provide a mask over the tree so that users can focus on\n"
3854
3898
"a subset of a tree when doing their work. After creating a view,\n"
3858
3902
"must be within the current view."
3859
3903
msgstr ""
3860
3904
3861
#: bzrlib/builtins.py:6218
3905
#: bzrlib/builtins.py:6271
3862
3906
msgid ""
3863
3907
"In most cases, a view has a short life-span: it is created to make\n"
3864
3908
"a selected change and is deleted once that change is committed.\n"
3866
3910
"and switch between them."
3867
3911
msgstr ""
3868
3912
3869
#: bzrlib/builtins.py:6223
3913
#: bzrlib/builtins.py:6276
3870
3914
msgid ""
3871
3915
"To disable the current view without deleting it, you can switch to\n"
3872
3916
"the pseudo view called ``off``. This can be useful when you need\n"
3874
3918
"want to switch back to your view after that."
3875
3919
msgstr ""
3876
3920
3877
#: bzrlib/builtins.py:6228
3921
#: bzrlib/builtins.py:6281
3878
3922
msgid ""
3879
3923
":Examples:\n"
3880
3924
" To define the current view::"
3881
3925
msgstr ""
3882
3926
3883
#: bzrlib/builtins.py:6231
3927
#: bzrlib/builtins.py:6284
3884
3928
msgid " bzr view file1 dir1 ..."
3885
3929
msgstr ""
3886
3930
3887
#: bzrlib/builtins.py:6233
3931
#: bzrlib/builtins.py:6286
3888
3932
msgid " To list the current view::"
3889
3933
msgstr ""
3890
3934
3891
#: bzrlib/builtins.py:6235
3935
#: bzrlib/builtins.py:6288
3892
3936
msgid " bzr view"
3893
3937
msgstr ""
3894
3938
3895
#: bzrlib/builtins.py:6237
3939
#: bzrlib/builtins.py:6290
3896
3940
msgid " To delete the current view::"
3897
3941
msgstr ""
3898
3942
3899
#: bzrlib/builtins.py:6239
3943
#: bzrlib/builtins.py:6292
3900
3944
msgid " bzr view --delete"
3901
3945
msgstr ""
3902
3946
3903
#: bzrlib/builtins.py:6241
3947
#: bzrlib/builtins.py:6294
3904
3948
msgid " To disable the current view without deleting it::"
3905
3949
msgstr ""
3906
3950
3907
#: bzrlib/builtins.py:6243
3951
#: bzrlib/builtins.py:6296
3908
3952
msgid " bzr view --switch off"
3909
3953
msgstr ""
3910
3954
3911
#: bzrlib/builtins.py:6245
3955
#: bzrlib/builtins.py:6298
3912
3956
msgid " To define a named view and switch to it::"
3913
3957
msgstr ""
3914
3958
3915
#: bzrlib/builtins.py:6247
3959
#: bzrlib/builtins.py:6300
3916
3960
msgid " bzr view --name view-name file1 dir1 ..."
3917
3961
msgstr ""
3918
3962
3919
#: bzrlib/builtins.py:6249
3963
#: bzrlib/builtins.py:6302
3920
3964
msgid " To list a named view::"
3921
3965
msgstr ""
3922
3966
3923
#: bzrlib/builtins.py:6251
3967
#: bzrlib/builtins.py:6304
3924
3968
msgid " bzr view --name view-name"
3925
3969
msgstr ""
3926
3970
3927
#: bzrlib/builtins.py:6253
3971
#: bzrlib/builtins.py:6306
3928
3972
msgid " To delete a named view::"
3929
3973
msgstr ""
3930
3974
3931
#: bzrlib/builtins.py:6255
3975
#: bzrlib/builtins.py:6308
3932
3976
msgid " bzr view --name view-name --delete"
3933
3977
msgstr ""
3934
3978
3935
#: bzrlib/builtins.py:6257
3979
#: bzrlib/builtins.py:6310
3936
3980
msgid " To switch to a named view::"
3937
3981
msgstr ""
3938
3982
3939
#: bzrlib/builtins.py:6259
3983
#: bzrlib/builtins.py:6312
3940
3984
msgid " bzr view --switch view-name"
3941
3985
msgstr ""
3942
3986
3943
#: bzrlib/builtins.py:6261
3987
#: bzrlib/builtins.py:6314
3944
3988
msgid " To list all views defined::"
3945
3989
msgstr ""
3946
3990
3947
#: bzrlib/builtins.py:6263
3991
#: bzrlib/builtins.py:6316
3948
3992
msgid " bzr view --all"
3949
3993
msgstr ""
3950
3994
3951
#: bzrlib/builtins.py:6265
3995
#: bzrlib/builtins.py:6318
3952
3996
msgid " To delete all views::"
3953
3997
msgstr ""
3954
3998
3955
#: bzrlib/builtins.py:6267
3999
#: bzrlib/builtins.py:6320
3956
4000
msgid " bzr view --delete --all"
3957
4001
msgstr ""
3958
4002
3959
#: bzrlib/builtins.py:6274
4003
#: bzrlib/builtins.py:6327
3960
4004
msgid "Apply list or delete action to all views."
3961
4005
msgstr ""
3962
4006
3963
#: bzrlib/builtins.py:6277
4007
#: bzrlib/builtins.py:6330
3964
4008
msgid "Delete the view."
3965
4009
msgstr ""
3966
4010
3967
#: bzrlib/builtins.py:6280
4011
#: bzrlib/builtins.py:6333
3968
4012
msgid "Name of the view to define, list or delete."
3969
4013
msgstr ""
3970
4014
3971
#: bzrlib/builtins.py:6284
4015
#: bzrlib/builtins.py:6337
3972
4016
msgid "Name of the view to switch to."
3973
4017
msgstr ""
3974
4018
3975
#: bzrlib/builtins.py:6303
4019
#: bzrlib/builtins.py:6356
3976
4020
msgid "Both --delete and a file list specified"
3977
4021
msgstr ""
3978
4022
3979
#: bzrlib/builtins.py:6306
4023
#: bzrlib/builtins.py:6359
3980
4024
msgid "Both --delete and --switch specified"
3981
4025
msgstr ""
3982
4026
3983
#: bzrlib/builtins.py:6309
4027
#: bzrlib/builtins.py:6362
3984
4028
msgid "Deleted all views.\n"
3985
4029
msgstr ""
3986
4030
3987
#: bzrlib/builtins.py:6311
4031
#: bzrlib/builtins.py:6364
3988
4032
msgid "No current view to delete"
3989
4033
msgstr ""
3990
4034
3991
#: bzrlib/builtins.py:6314
4035
#: bzrlib/builtins.py:6367
3992
4036
#, python-format
3993
4037
msgid "Deleted '%s' view.\n"
3994
4038
msgstr ""
3995
4039
3996
#: bzrlib/builtins.py:6318
4040
#: bzrlib/builtins.py:6371
3997
4041
msgid "Both --switch and a file list specified"
3998
4042
msgstr ""
3999
4043
4000
#: bzrlib/builtins.py:6321
4044
#: bzrlib/builtins.py:6374
4001
4045
msgid "Both --switch and --all specified"
4002
4046
msgstr ""
4003
4047
4004
#: bzrlib/builtins.py:6324
4048
#: bzrlib/builtins.py:6377
4005
4049
msgid "No current view to disable"
4006
4050
msgstr ""
4007
4051
4008
#: bzrlib/builtins.py:6326
4052
#: bzrlib/builtins.py:6379
4009
4053
#, python-format
4010
4054
msgid "Disabled '%s' view.\n"
4011
4055
msgstr ""
4012
4056
4013
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4057
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4014
4058
msgid "Using '{0}' view: {1}\n"
4015
4059
msgstr ""
4016
4060
4017
#: bzrlib/builtins.py:6333
4061
#: bzrlib/builtins.py:6386
4018
4062
msgid "Views defined:\n"
4019
4063
msgstr ""
4020
4064
4021
#: bzrlib/builtins.py:6342
4065
#: bzrlib/builtins.py:6395
4022
4066
msgid "No views defined.\n"
4023
4067
msgstr ""
4024
4068
4025
#: bzrlib/builtins.py:6349
4069
#: bzrlib/builtins.py:6402
4026
4070
msgid "Cannot change the 'off' pseudo view"
4027
4071
msgstr ""
4028
4072
4029
#: bzrlib/builtins.py:6357
4073
#: bzrlib/builtins.py:6410
4030
4074
msgid "No current view.\n"
4031
4075
msgstr ""
4032
4076
4033
#: bzrlib/builtins.py:6360
4077
#: bzrlib/builtins.py:6413
4034
4078
msgid "'{0}' view is: {1}\n"
4035
4079
msgstr ""
4036
4080
4037
#: bzrlib/builtins.py:6380
4081
#: bzrlib/builtins.py:6433
4038
4082
msgid " <no hooks installed>\n"
4039
4083
msgstr ""
4040
4084
4041
#: bzrlib/builtins.py:6384
4085
#: bzrlib/builtins.py:6437
4042
4086
msgid "Remove a branch."
4043
4087
msgstr ""
4044
4088
4045
#: bzrlib/builtins.py:6386
4089
#: bzrlib/builtins.py:6439
4046
4090
msgid ""
4047
4091
"This will remove the branch from the specified location but \n"
4048
4092
"will keep any working tree or repository in place."
4049
4093
msgstr ""
4050
4094
4051
#: bzrlib/builtins.py:6391
4095
#: bzrlib/builtins.py:6444
4052
4096
msgid " Remove the branch at repo/trunk::"
4053
4097
msgstr ""
4054
4098
4055
#: bzrlib/builtins.py:6393
4099
#: bzrlib/builtins.py:6446
4056
4100
msgid " bzr remove-branch repo/trunk"
4057
4101
msgstr ""
4058
4102
4059
#: bzrlib/builtins.py:6408
4103
#: bzrlib/builtins.py:6461
4060
4104
msgid "Plaintext diff output."
4061
4105
msgstr ""
4062
4106
4063
#: bzrlib/builtins.py:6409
4107
#: bzrlib/builtins.py:6462
4064
4108
msgid "Temporarily set aside some changes from the current tree."
4065
4109
msgstr ""
4066
4110
4067
#: bzrlib/builtins.py:6411
4111
#: bzrlib/builtins.py:6464
4068
4112
msgid ""
4069
4113
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4070
4114
"ie. out of the way, until a later time when you can bring them back from\n"
4073
4117
"will they survive its deletion."
4074
4118
msgstr ""
4075
4119
4076
#: bzrlib/builtins.py:6417
4120
#: bzrlib/builtins.py:6470
4077
4121
msgid "If shelve --list is specified, previously-shelved changes are listed."
4078
4122
msgstr ""
4079
4123
4080
#: bzrlib/builtins.py:6419
4124
#: bzrlib/builtins.py:6472
4081
4125
msgid ""
4082
4126
"Shelve is intended to help separate several sets of changes that have\n"
4083
4127
"been inappropriately mingled. If you just want to get rid of all changes\n"
4085
4129
"shelve all text changes at once, use shelve --all."
4086
4130
msgstr ""
4087
4131
4088
#: bzrlib/builtins.py:6424
4132
#: bzrlib/builtins.py:6477
4089
4133
msgid ""
4090
4134
"If filenames are specified, only the changes to those files will be\n"
4091
4135
"shelved. Other files will be left untouched."
4092
4136
msgstr ""
4093
4137
4094
#: bzrlib/builtins.py:6427
4138
#: bzrlib/builtins.py:6480
4095
4139
msgid ""
4096
4140
"If a revision is specified, changes since that revision will be shelved."
4097
4141
msgstr ""
4098
4142
4099
#: bzrlib/builtins.py:6429
4143
#: bzrlib/builtins.py:6482
4100
4144
msgid ""
4101
4145
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4102
4146
"restore the most recently shelved changes."
4103
4147
msgstr ""
4104
4148
4105
#: bzrlib/builtins.py:6432
4149
#: bzrlib/builtins.py:6485
4106
4150
msgid ""
4107
4151
"For complicated changes, it is possible to edit the changes in a separate\n"
4108
4152
"editor program to decide what the file remaining in the working copy\n"
4109
4153
"should look like. To do this, add the configuration option"
4110
4154
msgstr ""
4111
4155
4112
#: bzrlib/builtins.py:6436
4156
#: bzrlib/builtins.py:6489
4113
4157
msgid " change_editor = PROGRAM @new_path @old_path"
4114
4158
msgstr ""
4115
4159
4116
#: bzrlib/builtins.py:6438
4160
#: bzrlib/builtins.py:6491
4117
4161
msgid ""
4118
4162
"where @new_path is replaced with the path of the new version of the \n"
4119
4163
"file and @old_path is replaced with the path of the old version of \n"
4122
4166
" "
4123
4167
msgstr ""
4124
4168
4125
#: bzrlib/builtins.py:6450
4169
#: bzrlib/builtins.py:6503
4126
4170
msgid "Shelve all changes."
4127
4171
msgstr ""
4128
4172
4129
#: bzrlib/builtins.py:6452
4173
#: bzrlib/builtins.py:6505
4130
4174
msgid "Method to use for writing diffs."
4131
4175
msgstr ""
4132
4176
4133
#: bzrlib/builtins.py:6452
4177
#: bzrlib/builtins.py:6505
4134
4178
msgid "writer"
4135
4179
msgstr ""
4136
4180
4137
#: bzrlib/builtins.py:6456
4181
#: bzrlib/builtins.py:6509
4138
4182
msgid "List shelved changes."
4139
4183
msgstr ""
4140
4184
4141
#: bzrlib/builtins.py:6458
4185
#: bzrlib/builtins.py:6511
4142
4186
msgid "Destroy removed changes instead of shelving them."
4143
4187
msgstr ""
4144
4188
4145
#: bzrlib/builtins.py:6487
4189
#: bzrlib/builtins.py:6540
4146
4190
msgid "No shelved changes."
4147
4191
msgstr ""
4148
4192
4149
#: bzrlib/builtins.py:6498
4193
#: bzrlib/builtins.py:6551
4150
4194
msgid "Restore shelved changes."
4151
4195
msgstr ""
4152
4196
4153
#: bzrlib/builtins.py:6500
4197
#: bzrlib/builtins.py:6553
4154
4198
msgid ""
4155
4199
"By default, the most recently shelved changes are restored. However if you\n"
4156
4200
"specify a shelf by id those changes will be restored instead. This works\n"
4157
4201
"best when the changes don't depend on each other."
4158
4202
msgstr ""
4159
4203
4160
#: bzrlib/builtins.py:6509
4204
#: bzrlib/builtins.py:6562
4161
4205
msgid "The action to perform."
4162
4206
msgstr ""
4163
4207
4164
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4208
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4165
4209
msgid "action"
4166
4210
msgstr ""
4167
4211
4168
#: bzrlib/builtins.py:6511
4212
#: bzrlib/builtins.py:6564
4169
4213
msgid "Apply changes and remove from the shelf."
4170
4214
msgstr ""
4171
4215
4172
#: bzrlib/builtins.py:6512
4216
#: bzrlib/builtins.py:6565
4173
4217
msgid "Show changes, but do not apply or remove them."
4174
4218
msgstr ""
4175
4219
4176
#: bzrlib/builtins.py:6513
4220
#: bzrlib/builtins.py:6566
4177
4221
msgid ""
4178
4222
"Instead of unshelving the changes, show the diff that would result from "
4179
4223
"unshelving."
4180
4224
msgstr ""
4181
4225
4182
#: bzrlib/builtins.py:6515
4226
#: bzrlib/builtins.py:6568
4183
4227
msgid "Delete changes without applying them."
4184
4228
msgstr ""
4185
4229
4186
#: bzrlib/builtins.py:6516
4230
#: bzrlib/builtins.py:6569
4187
4231
msgid "Apply changes but don't delete them."
4188
4232
msgstr ""
4189
4233
4190
#: bzrlib/builtins.py:6531
4234
#: bzrlib/builtins.py:6584
4191
4235
msgid "Remove unwanted files from working tree."
4192
4236
msgstr ""
4193
4237
4194
#: bzrlib/builtins.py:6533
4238
#: bzrlib/builtins.py:6586
4195
4239
msgid ""
4196
4240
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4197
4241
"files are never deleted."
4198
4242
msgstr ""
4199
4243
4200
#: bzrlib/builtins.py:6536
4244
#: bzrlib/builtins.py:6589
4201
4245
msgid ""
4202
4246
"Another class is 'detritus', which includes files emitted by bzr during\n"
4203
4247
"normal operations and selftests. (The value of these files decreases with\n"
4204
4248
"time.)"
4205
4249
msgstr ""
4206
4250
4207
#: bzrlib/builtins.py:6540
4251
#: bzrlib/builtins.py:6593
4208
4252
msgid ""
4209
4253
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4210
4254
"flags are respected, and may be combined."
4211
4255
msgstr ""
4212
4256
4213
#: bzrlib/builtins.py:6543
4257
#: bzrlib/builtins.py:6596
4214
4258
msgid "To check what clean-tree will do, use --dry-run."
4215
4259
msgstr ""
4216
4260
4217
#: bzrlib/builtins.py:6546
4261
#: bzrlib/builtins.py:6599
4218
4262
msgid "Delete all ignored files."
4219
4263
msgstr ""
4220
4264
4221
#: bzrlib/builtins.py:6547
4265
#: bzrlib/builtins.py:6600
4222
4266
msgid ""
4223
4267
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4224
4268
msgstr ""
4225
4269
4226
#: bzrlib/builtins.py:6550
4270
#: bzrlib/builtins.py:6603
4227
4271
msgid "Delete files unknown to bzr (default)."
4228
4272
msgstr ""
4229
4273
4230
#: bzrlib/builtins.py:6551
4274
#: bzrlib/builtins.py:6604
4231
4275
msgid "Show files to delete instead of deleting them."
4232
4276
msgstr ""
4233
4277
4234
#: bzrlib/builtins.py:6553
4278
#: bzrlib/builtins.py:6606
4235
4279
msgid "Do not prompt before deleting."
4236
4280
msgstr ""
4237
4281
4291
4335
msgstr[0] ""
4292
4336
msgstr[1] ""
4293
4337
4294
#: bzrlib/bzrdir.py:489
4338
#: bzrlib/bzrdir.py:490
4295
4339
msgid ""
4296
4340
"making backup of {0}\n"
4297
4341
" to {1}"
4298
4342
msgstr ""
4299
4343
4300
#: bzrlib/bzrdir.py:512
4344
#: bzrlib/bzrdir.py:513
4301
4345
msgid "renamed {0} to {1}"
4302
4346
msgstr ""
4303
4347
4304
#: bzrlib/bzrdir.py:1663
4348
#: bzrlib/bzrdir.py:1652
4305
4349
#, python-format
4306
4350
msgid ""
4307
4351
"Source repository format does not support stacking, using format:\n"
4308
4352
" %s"
4309
4353
msgstr ""
4310
4354
4311
#: bzrlib/bzrdir.py:1683
4355
#: bzrlib/bzrdir.py:1672
4312
4356
#, python-format
4313
4357
msgid ""
4314
4358
"Source branch format does not support stacking, using format:\n"
4315
4359
" %s"
4316
4360
msgstr ""
4317
4361
4318
#: bzrlib/bzrdir.py:1829
4362
#: bzrlib/bzrdir.py:1818
4319
4363
msgid "starting repository conversion"
4320
4364
msgstr ""
4321
4365
4322
#: bzrlib/bzrdir.py:2058
4366
#: bzrlib/bzrdir.py:2039
4323
4367
msgid "Using default stacking branch {0} at {1}"
4324
4368
msgstr ""
4325
4369
4558
4602
msgid "bzr version-info --revision takes exactly one revision specifier"
4559
4603
msgstr ""
4560
4604
4561
#: bzrlib/commands.py:228
4605
#: bzrlib/commands.py:229
4562
4606
#, python-format
4563
4607
msgid "unknown command \"%s\""
4564
4608
msgstr ""
4565
4609
4566
#: bzrlib/commands.py:475
4610
#: bzrlib/commands.py:476
4567
4611
msgid "No help for this command."
4568
4612
msgstr ""
4569
4613
4570
#: bzrlib/commands.py:488
4614
#: bzrlib/commands.py:489
4571
4615
#, python-format
4572
4616
msgid ":Purpose: %s\n"
4573
4617
msgstr ""
4574
4618
4575
#: bzrlib/commands.py:490
4619
#: bzrlib/commands.py:491
4576
4620
#, python-format
4577
4621
msgid ""
4578
4622
":Usage:\n"
4579
4623
"%s\n"
4580
4624
msgstr ""
4581
4625
4582
#: bzrlib/commands.py:492
4626
#: bzrlib/commands.py:493
4583
4627
#, python-format
4584
4628
msgid ":Usage: %s\n"
4585
4629
msgstr ""
4586
4630
4587
#: bzrlib/commands.py:511
4631
#: bzrlib/commands.py:512
4588
4632
#, python-format
4589
4633
msgid ":Options:%s"
4590
4634
msgstr ""
4591
4635
4592
#: bzrlib/commands.py:522
4636
#: bzrlib/commands.py:523
4593
4637
#, python-format
4594
4638
msgid ""
4595
4639
":Description:\n"
4597
4641
"\n"
4598
4642
msgstr ""
4599
4643
4600
#: bzrlib/commands.py:532
4644
#: bzrlib/commands.py:533
4601
4645
#, python-format
4602
4646
msgid ""
4603
4647
"See bzr help %s for more details and examples.\n"
4604
4648
"\n"
4605
4649
msgstr ""
4606
4650
4607
#: bzrlib/commands.py:537
4651
#: bzrlib/commands.py:538
4608
4652
msgid ":Aliases: "
4609
4653
msgstr ""
4610
4654
4611
#: bzrlib/commands.py:541
4655
#: bzrlib/commands.py:542
4612
4656
#, python-format
4613
4657
msgid ":From: plugin \"%s\"\n"
4614
4658
msgstr ""
4615
4659
4616
#: bzrlib/commands.py:553
4660
#: bzrlib/commands.py:554
4617
4661
msgid ":doc:`{0} <{1}-help>`"
4618
4662
msgstr ""
4619
4663
4620
#: bzrlib/commands.py:557
4664
#: bzrlib/commands.py:558
4621
4665
#, python-format
4622
4666
msgid ":See also: %s"
4623
4667
msgstr ""
4624
4668
4625
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4669
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4626
4670
msgid "Only ASCII permitted in option names"
4627
4671
msgstr ""
4628
4672
4629
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4673
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4630
4674
msgid "command {0!r} needs one or more {1}"
4631
4675
msgstr ""
4632
4676
4633
#: bzrlib/commands.py:857
4677
#: bzrlib/commands.py:858
4634
4678
msgid "command {0!r} requires argument {1}"
4635
4679
msgstr ""
4636
4680
4637
#: bzrlib/commands.py:864
4681
#: bzrlib/commands.py:865
4638
4682
msgid "extra argument to command {0}: {1}"
4639
4683
msgstr ""
4640
4684
4641
#: bzrlib/commands.py:961
4685
#: bzrlib/commands.py:962
4642
4686
#, python-format
4643
4687
msgid "Profile data written to \"%s\"."
4644
4688
msgstr ""
4740
4784
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4741
4785
msgstr ""
4742
4786
4743
#: bzrlib/config.py:2499
4787
#: bzrlib/config.py:2485
4744
4788
msgid "{0} is not an SI unit."
4745
4789
msgstr ""
4746
4790
4747
#: bzrlib/config.py:2956
4791
#: bzrlib/config.py:2949
4748
4792
msgid ""
4749
4793
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4750
4794
"will be saved."
4751
4795
msgstr ""
4752
4796
4753
#: bzrlib/config.py:3100
4797
#: bzrlib/config.py:3093
4754
4798
#, python-format
4755
4799
msgid "Invalid '%s', should be of the form 'name=value'"
4756
4800
msgstr ""
4757
4801
4758
#: bzrlib/config.py:3969
4802
#: bzrlib/config.py:3962
4759
4803
msgid "Display, set or remove a configuration option."
4760
4804
msgstr ""
4761
4805
4762
#: bzrlib/config.py:3971
4806
#: bzrlib/config.py:3964
4763
4807
msgid "Display the active value for a given option."
4764
4808
msgstr ""
4765
4809
4766
#: bzrlib/config.py:3973
4810
#: bzrlib/config.py:3966
4767
4811
msgid ""
4768
4812
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4769
4813
"matching options are displayed mentioning their scope. The active value\n"
4770
4814
"that bzr will take into account is the first one displayed for each option."
4771
4815
msgstr ""
4772
4816
4773
#: bzrlib/config.py:3977
4817
#: bzrlib/config.py:3970
4774
4818
msgid "If no NAME is given, --all .* is implied."
4775
4819
msgstr ""
4776
4820
4777
#: bzrlib/config.py:3979
4821
#: bzrlib/config.py:3972
4778
4822
msgid ""
4779
4823
"Setting a value is achieved by using name=value without spaces. The value\n"
4780
4824
"is set in the most relevant scope and can be checked by displaying the\n"
4781
4825
"option again."
4782
4826
msgstr ""
4783
4827
4784
#: bzrlib/config.py:3991
4828
#: bzrlib/config.py:3984
4785
4829
msgid "Reduce the scope to the specified configuration file."
4786
4830
msgstr ""
4787
4831
4788
#: bzrlib/config.py:3995
4832
#: bzrlib/config.py:3988
4789
4833
msgid "Display all the defined values for the matching options."
4790
4834
msgstr ""
4791
4835
4792
#: bzrlib/config.py:3997
4836
#: bzrlib/config.py:3990
4793
4837
msgid "Remove the option from the configuration file."
4794
4838
msgstr ""
4795
4839
4869
4913
msgstr[0] ""
4870
4914
msgstr[1] ""
4871
4915
4872
#: bzrlib/controldir.py:698
4916
#: bzrlib/controldir.py:710
4873
4917
msgid "{0} is{1} redirected to {2}"
4874
4918
msgstr ""
4875
4919
4975
5019
msgid "The value '%(value)s' is not a valid value."
4976
5020
msgstr ""
4977
5021
5022
#: bzrlib/errors.py:424
5023
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5024
msgstr ""
5025
4978
5026
#: bzrlib/errors.py:443
4979
5027
msgid "Generic path error: %(path)r%(extra)s)"
4980
5028
msgstr ""
5074
5122
msgstr ""
5075
5123
5076
5124
#: bzrlib/errors.py:705
5125
msgid "A control directory already exists: \"%(path)s\"."
5126
msgstr ""
5127
5128
#: bzrlib/errors.py:710
5077
5129
msgid "Already a branch: \"%(path)s\"."
5078
5130
msgstr ""
5079
5131
5080
#: bzrlib/errors.py:711
5132
#: bzrlib/errors.py:715
5133
msgid "Parent branch already exists: \"%(path)s\"."
5134
msgstr ""
5135
5136
#: bzrlib/errors.py:721
5081
5137
msgid ""
5082
5138
"Directory contains a branch, but no working tree (use bzr checkout if you "
5083
5139
"wish to build a working tree): \"%(path)s\""
5084
5140
msgstr ""
5085
5141
5086
#: bzrlib/errors.py:716
5142
#: bzrlib/errors.py:726
5087
5143
msgid ""
5088
5144
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5089
5145
msgstr ""
5090
5146
5091
#: bzrlib/errors.py:726
5147
#: bzrlib/errors.py:736
5092
5148
msgid ""
5093
5149
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5094
5150
msgstr ""
5095
5151
5096
#: bzrlib/errors.py:736
5152
#: bzrlib/errors.py:746
5097
5153
msgid "No repository present: \"%(path)s\""
5098
5154
msgstr ""
5099
5155
5100
#: bzrlib/errors.py:743
5156
#: bzrlib/errors.py:753
5101
5157
msgid ""
5102
5158
"Unsupported branch format: %(format)s\n"
5103
5159
"Please run 'bzr upgrade'"
5104
5160
msgstr ""
5105
5161
5106
#: bzrlib/errors.py:749
5162
#: bzrlib/errors.py:759
5107
5163
msgid "Unknown %(kind)s format: %(format)r"
5108
msgstr ""
5164
msgstr "Unknown %(kind)s format: %(format)r"
5109
5165
5110
#: bzrlib/errors.py:758
5166
#: bzrlib/errors.py:768
5111
5167
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5112
5168
msgstr ""
5113
5169
5114
#: bzrlib/errors.py:768
5170
#: bzrlib/errors.py:778
5115
5171
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5116
5172
msgstr ""
5117
5173
5118
#: bzrlib/errors.py:783
5174
#: bzrlib/errors.py:793
5119
5175
msgid ""
5120
5176
"%(target)s\n"
5121
5177
"is not compatible with\n"
5123
5179
"%(details)s"
5124
5180
msgstr ""
5125
5181
5126
#: bzrlib/errors.py:799
5182
#: bzrlib/errors.py:809
5127
5183
msgid "Revision is not compatible with %(repo_format)s"
5128
5184
msgstr ""
5129
5185
5130
#: bzrlib/errors.py:809
5186
#: bzrlib/errors.py:819
5131
5187
msgid "%(context_info)s%(path)s is already versioned."
5132
5188
msgstr ""
5133
5189
5134
#: bzrlib/errors.py:830
5190
#: bzrlib/errors.py:840
5135
5191
msgid "%(context_info)s%(path)s is not versioned."
5136
5192
msgstr ""
5137
5193
5138
#: bzrlib/errors.py:851
5194
#: bzrlib/errors.py:861
5139
5195
msgid "Path(s) are not versioned: %(paths_as_string)s"
5140
5196
msgstr ""
5141
5197
5142
#: bzrlib/errors.py:862
5198
#: bzrlib/errors.py:872
5143
5199
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5144
5200
msgstr ""
5145
5201
5146
#: bzrlib/errors.py:881
5202
#: bzrlib/errors.py:891
5147
5203
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5148
msgstr ""
5204
msgstr "Cannot operate on \"%(filename)s\" of unsupported type \"%(kind)s\""
5149
5205
5150
#: bzrlib/errors.py:889
5206
#: bzrlib/errors.py:899
5151
5207
msgid ""
5152
5208
"Filename %(filename)r is not valid in your current filesystem encoding "
5153
5209
"%(fs_encoding)s"
5154
5210
msgstr ""
5155
5211
5156
#: bzrlib/errors.py:900
5212
#: bzrlib/errors.py:910
5157
5213
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5158
5214
msgstr ""
5159
5215
5160
#: bzrlib/errors.py:918
5216
#: bzrlib/errors.py:928
5161
5217
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5162
5218
msgstr ""
5163
5219
5164
#: bzrlib/errors.py:957
5220
#: bzrlib/errors.py:967
5165
5221
msgid "Cannot lock %(lock)s: %(why)s"
5166
5222
msgstr ""
5167
5223
5168
#: bzrlib/errors.py:967
5224
#: bzrlib/errors.py:977
5169
5225
msgid ""
5170
5226
"A transaction related operation was attempted after the transaction finished."
5171
5227
msgstr ""
5172
5228
5173
#: bzrlib/errors.py:994
5229
#: bzrlib/errors.py:1004
5174
5230
msgid "Cannot lock: transport is read only: %(transport)s"
5175
5231
msgstr ""
5176
5232
5177
#: bzrlib/errors.py:1002
5233
#: bzrlib/errors.py:1012
5178
5234
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5179
5235
msgstr ""
5180
5236
5181
#: bzrlib/errors.py:1013
5237
#: bzrlib/errors.py:1023
5182
5238
msgid ""
5183
5239
"Lock was broken while still open: %(lock)s - check storage consistency!"
5184
5240
msgstr ""
5185
5241
5186
#: bzrlib/errors.py:1024
5242
#: bzrlib/errors.py:1034
5187
5243
msgid ""
5188
5244
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5189
5245
"%(holder)r, wanted to break %(target)r"
5190
5246
msgstr ""
5191
5247
5192
#: bzrlib/errors.py:1036
5248
#: bzrlib/errors.py:1046
5193
5249
msgid ""
5194
5250
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5195
5251
"Use 'bzr break-lock' to clear it"
5196
5252
msgstr ""
5197
5253
5198
#: bzrlib/errors.py:1049
5254
#: bzrlib/errors.py:1059
5199
5255
msgid "Lock not held: %(lock)s"
5200
5256
msgstr ""
5201
5257
5202
#: bzrlib/errors.py:1078
5258
#: bzrlib/errors.py:1088
5203
5259
msgid "No changes to commit"
5204
5260
msgstr ""
5205
5261
5206
#: bzrlib/errors.py:1083
5262
#: bzrlib/errors.py:1093
5207
5263
msgid ""
5208
5264
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5209
5265
msgstr ""
5210
5266
5211
#: bzrlib/errors.py:1093
5267
#: bzrlib/errors.py:1103
5212
5268
msgid ""
5213
5269
"Excluding paths during commit is not supported by repository at "
5214
5270
"%(repository)r."
5215
5271
msgstr ""
5216
5272
5217
#: bzrlib/errors.py:1102
5273
#: bzrlib/errors.py:1112
5218
5274
msgid ""
5219
5275
"The specified commit message contains characters unsupported by the current "
5220
5276
"encoding."
5221
5277
msgstr ""
5222
5278
5223
#: bzrlib/errors.py:1108
5279
#: bzrlib/errors.py:1118
5224
5280
msgid "Upgrade URL cannot work with readonly URLs."
5225
5281
msgstr ""
5226
5282
5227
#: bzrlib/errors.py:1113
5283
#: bzrlib/errors.py:1123
5228
5284
msgid "The branch format %(format)s is already at the most recent format."
5229
5285
msgstr ""
5230
5286
5231
#: bzrlib/errors.py:1136
5287
#: bzrlib/errors.py:1146
5232
5288
msgid "Option --change does not accept revision ranges"
5233
5289
msgstr ""
5234
5290
5235
#: bzrlib/errors.py:1141
5291
#: bzrlib/errors.py:1151
5236
5292
msgid "No namespace registered for string: %(spec)r"
5237
5293
msgstr ""
5238
5294
5239
#: bzrlib/errors.py:1160
5295
#: bzrlib/errors.py:1170
5240
5296
msgid ""
5241
5297
"Requested revision: '%(spec)s' does not exist in branch: "
5242
5298
"%(branch_url)s%(extra)s"
5243
5299
msgstr ""
5244
5300
5245
#: bzrlib/errors.py:1174
5301
#: bzrlib/errors.py:1184
5246
5302
msgid ""
5247
5303
"Operation denied because it would change the main history, which is not "
5248
5304
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5249
5305
msgstr ""
5250
5306
5251
#: bzrlib/errors.py:1185
5307
#: bzrlib/errors.py:1195
5252
5308
msgid ""
5253
5309
"These branches have diverged. Use the missing command to see how.\n"
5254
5310
"Use the merge command to reconcile them."
5255
5311
msgstr ""
5256
5312
5257
#: bzrlib/errors.py:1205
5313
#: bzrlib/errors.py:1215
5258
5314
msgid ""
5259
5315
"Branches have no common ancestor, and no merge base revision was specified."
5260
5316
msgstr ""
5261
5317
5262
#: bzrlib/errors.py:1211
5318
#: bzrlib/errors.py:1221
5263
5319
msgid ""
5264
5320
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5265
5321
msgstr ""
5266
5322
5267
#: bzrlib/errors.py:1217
5323
#: bzrlib/errors.py:1227
5268
5324
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5269
5325
msgstr ""
5270
5326
5271
#: bzrlib/errors.py:1226
5327
#: bzrlib/errors.py:1236
5272
5328
msgid ""
5273
5329
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5274
5330
msgstr ""
5275
5331
5276
#: bzrlib/errors.py:1235
5332
#: bzrlib/errors.py:1245
5277
5333
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5278
5334
msgstr ""
5279
5335
5280
#: bzrlib/errors.py:1244
5336
#: bzrlib/errors.py:1254
5281
5337
msgid "Branch %(branch)s has no commits."
5282
5338
msgstr ""
5283
5339
5284
#: bzrlib/errors.py:1262
5340
#: bzrlib/errors.py:1272
5285
5341
msgid ""
5286
5342
"Bound branch %(branch)s is out of date with master branch "
5287
5343
"%(master)s.%(extra_help)s"
5288
5344
msgstr ""
5289
5345
5290
#: bzrlib/errors.py:1274
5346
#: bzrlib/errors.py:1284
5291
5347
msgid ""
5292
5348
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5293
5349
"bound to %(remote)s."
5294
5350
msgstr ""
5295
5351
5296
#: bzrlib/errors.py:1286
5352
#: bzrlib/errors.py:1296
5297
5353
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5298
5354
msgstr ""
5299
5355
5300
#: bzrlib/errors.py:1295
5356
#: bzrlib/errors.py:1305
5301
5357
msgid ""
5302
5358
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5303
5359
"%(error)s"
5304
5360
msgstr ""
5305
5361
5306
#: bzrlib/errors.py:1307
5362
#: bzrlib/errors.py:1317
5307
5363
msgid "Error in processing weave: %(msg)s"
5308
5364
msgstr ""
5309
5365
5310
#: bzrlib/errors.py:1316
5366
#: bzrlib/errors.py:1326
5311
5367
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5312
5368
msgstr ""
5313
5369
5314
#: bzrlib/errors.py:1327
5370
#: bzrlib/errors.py:1337
5315
5371
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5316
5372
msgstr ""
5317
5373
5318
#: bzrlib/errors.py:1337
5374
#: bzrlib/errors.py:1347
5319
5375
msgid "Weave invariant violated: %(what)s"
5320
5376
msgstr ""
5321
5377
5322
#: bzrlib/errors.py:1346
5378
#: bzrlib/errors.py:1356
5323
5379
msgid "Parents are mismatched between two revisions. %(msg)s"
5324
5380
msgstr ""
5325
5381
5326
#: bzrlib/errors.py:1368
5382
#: bzrlib/errors.py:1378
5327
5383
msgid ""
5328
5384
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5329
5385
"%(weave_b)s"
5330
5386
msgstr ""
5331
5387
5332
#: bzrlib/errors.py:1380
5388
#: bzrlib/errors.py:1390
5333
5389
msgid "Versioned file error"
5334
5390
msgstr ""
5335
5391
5336
#: bzrlib/errors.py:1385
5392
#: bzrlib/errors.py:1395
5337
5393
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5338
5394
msgstr ""
5339
5395
5340
#: bzrlib/errors.py:1395
5396
#: bzrlib/errors.py:1405
5341
5397
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5342
5398
msgstr ""
5343
5399
5344
#: bzrlib/errors.py:1405
5400
#: bzrlib/errors.py:1415
5345
5401
msgid "Text did not match its checksum: %(msg)s"
5346
5402
msgstr ""
5347
5403
5348
#: bzrlib/errors.py:1531
5404
#: bzrlib/errors.py:1541
5349
5405
msgid "Export format %(format)r not supported"
5350
5406
msgstr ""
5351
5407
5352
#: bzrlib/errors.py:1540
5408
#: bzrlib/errors.py:1550
5353
5409
msgid "Transport error: %(msg)s %(orig_error)s"
5354
5410
msgstr ""
5355
5411
5356
#: bzrlib/errors.py:1566
5412
#: bzrlib/errors.py:1576
5357
5413
msgid "Generic bzr smart protocol error: %(details)s"
5358
5414
msgstr ""
5359
5415
5360
#: bzrlib/errors.py:1574
5416
#: bzrlib/errors.py:1584
5361
5417
msgid "Received bad protocol version marker: %(marker)r"
5362
5418
msgstr ""
5363
5419
5364
#: bzrlib/errors.py:1606
5420
#: bzrlib/errors.py:1616
5365
5421
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5366
5422
msgstr ""
5367
5423
5368
#: bzrlib/errors.py:1611
5424
#: bzrlib/errors.py:1621
5369
5425
msgid "Connection error: %(msg)s %(orig_error)s"
5370
5426
msgstr ""
5371
5427
5372
#: bzrlib/errors.py:1616
5428
#: bzrlib/errors.py:1626
5373
5429
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5374
5430
msgstr ""
5375
5431
5376
#: bzrlib/errors.py:1637
5432
#: bzrlib/errors.py:1647
5377
5433
msgid "Connection closed: %(msg)s %(orig_error)s"
5378
5434
msgstr ""
5379
5435
5380
#: bzrlib/errors.py:1642
5436
#: bzrlib/errors.py:1652
5381
5437
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5382
5438
msgstr ""
5383
5439
5384
#: bzrlib/errors.py:1647
5440
#: bzrlib/errors.py:1657
5385
5441
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5386
5442
msgstr ""
5387
5443
5388
#: bzrlib/errors.py:1657
5444
#: bzrlib/errors.py:1667
5389
5445
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5390
5446
msgstr ""
5391
5447
5392
#: bzrlib/errors.py:1672
5448
#: bzrlib/errors.py:1682
5449
msgid "Certificate error: %(error)s"
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1690
5393
5453
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5394
5454
msgstr ""
5395
5455
5396
#: bzrlib/errors.py:1686
5456
#: bzrlib/errors.py:1704
5397
5457
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5398
5458
msgstr ""
5399
5459
5400
#: bzrlib/errors.py:1694
5460
#: bzrlib/errors.py:1712
5401
5461
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5402
5462
msgstr ""
5403
5463
5404
#: bzrlib/errors.py:1703
5464
#: bzrlib/errors.py:1721
5405
5465
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5406
5466
msgstr ""
5407
5467
5408
#: bzrlib/errors.py:1717
5468
#: bzrlib/errors.py:1735
5409
5469
msgid "Too many redirections"
5410
5470
msgstr ""
5411
5471
5412
#: bzrlib/errors.py:1722
5472
#: bzrlib/errors.py:1740
5413
5473
msgid "Working tree has conflicts."
5414
5474
msgstr ""
5415
5475
5416
#: bzrlib/errors.py:1726
5476
#: bzrlib/errors.py:1744
5417
5477
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5418
5478
msgstr ""
5419
5479
5420
#: bzrlib/errors.py:1735
5480
#: bzrlib/errors.py:1753
5421
5481
msgid ""
5422
5482
"Error(s) parsing config file %(filename)s:\n"
5423
5483
"%(errors)s"
5424
5484
msgstr ""
5425
5485
5426
#: bzrlib/errors.py:1746
5427
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5486
#: bzrlib/errors.py:1763
5487
msgid ""
5488
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5489
"See ``bzr help %(name)s``"
5428
5490
msgstr ""
5429
5491
5430
#: bzrlib/errors.py:1754
5492
#: bzrlib/errors.py:1773
5431
5493
msgid "%(username)r does not seem to contain a reasonable email address"
5432
5494
msgstr ""
5433
5495
5434
#: bzrlib/errors.py:1763
5496
#: bzrlib/errors.py:1782
5435
5497
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5436
5498
msgstr ""
5437
5499
5438
#: bzrlib/errors.py:1771
5500
#: bzrlib/errors.py:1790
5439
5501
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5440
5502
msgstr ""
5441
5503
5442
#: bzrlib/errors.py:1779
5504
#: bzrlib/errors.py:1798
5443
5505
msgid "Unable to import library \"%(library)s\": %(error)s"
5444
5506
msgstr ""
5445
5507
5446
#: bzrlib/errors.py:1787
5508
#: bzrlib/errors.py:1806
5447
5509
msgid "python-gpgme is not installed, it is needed to verify signatures"
5448
5510
msgstr ""
5449
5511
5450
#: bzrlib/errors.py:1795
5512
#: bzrlib/errors.py:1814
5451
5513
msgid ""
5452
5514
"The working tree for %(basedir)s has changed since the last commit, but "
5453
5515
"weave merge requires that it be unchanged"
5454
5516
msgstr ""
5455
5517
5456
#: bzrlib/errors.py:1805
5518
#: bzrlib/errors.py:1824
5457
5519
msgid ""
5458
5520
"Can't reprocess and show base, because reprocessing obscures the "
5459
5521
"relationship of conflicting lines to the base"
5460
5522
msgstr ""
5461
5523
5462
#: bzrlib/errors.py:1811
5524
#: bzrlib/errors.py:1830
5463
5525
msgid "Cycle in graph %(graph)r"
5464
5526
msgstr ""
5465
5527
5466
#: bzrlib/errors.py:1839
5528
#: bzrlib/errors.py:1858
5467
5529
msgid "File %(filename)s is not conflicted."
5468
5530
msgstr ""
5469
5531
5470
#: bzrlib/errors.py:1861
5532
#: bzrlib/errors.py:1880
5471
5533
msgid "No bundle was found in \"%(filename)s\"."
5472
5534
msgstr ""
5473
5535
5474
#: bzrlib/errors.py:1870
5536
#: bzrlib/errors.py:1889
5475
5537
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5476
5538
msgstr ""
5477
5539
5478
#: bzrlib/errors.py:1880
5540
#: bzrlib/errors.py:1899
5479
5541
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5480
5542
msgstr ""
5481
5543
5482
#: bzrlib/errors.py:1893
5544
#: bzrlib/errors.py:1912
5483
5545
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5484
5546
msgstr ""
5485
5547
5486
#: bzrlib/errors.py:1903
5548
#: bzrlib/errors.py:1922
5487
5549
msgid "Key %(key)s is already present in map"
5488
5550
msgstr ""
5489
5551
5490
#: bzrlib/errors.py:1908
5552
#: bzrlib/errors.py:1927
5491
5553
msgid "The prefix %(prefix)s is in the help search path twice."
5492
5554
msgstr ""
5493
5555
5494
#: bzrlib/errors.py:1918
5556
#: bzrlib/errors.py:1937
5495
5557
msgid ""
5496
5558
"No final name for trans_id %(trans_id)r\n"
5497
5559
"file-id: %(file_id)r\n"
5498
5560
"root trans-id: %(root_trans_id)r\n"
5499
5561
msgstr ""
5500
5562
5501
#: bzrlib/errors.py:1950
5563
#: bzrlib/errors.py:1969
5502
5564
msgid "Attempt to reuse a transform that has already been applied."
5503
5565
msgstr ""
5504
5566
5505
#: bzrlib/errors.py:1955
5567
#: bzrlib/errors.py:1974
5506
5568
msgid "Moving the root directory is not supported at this time"
5507
5569
msgstr ""
5508
5570
5509
#: bzrlib/errors.py:1960
5571
#: bzrlib/errors.py:1979
5510
5572
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5511
5573
msgstr ""
5512
5574
5513
#: bzrlib/errors.py:1971
5575
#: bzrlib/errors.py:1990
5514
5576
msgid ""
5515
5577
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5516
5578
msgstr ""
5517
5579
5518
#: bzrlib/errors.py:2007
5580
#: bzrlib/errors.py:2026
5519
5581
msgid ""
5520
5582
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5521
5583
msgstr ""
5522
5584
5523
#: bzrlib/errors.py:2037
5585
#: bzrlib/errors.py:2056
5524
5586
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5525
5587
msgstr ""
5526
5588
5527
#: bzrlib/errors.py:2045
5589
#: bzrlib/errors.py:2064
5528
5590
msgid "Nothing to merge."
5529
5591
msgstr ""
5530
5592
5531
#: bzrlib/errors.py:2050
5593
#: bzrlib/errors.py:2069
5532
5594
msgid "Format %(format)s cannot be initialised by this version of bzr."
5533
5595
msgstr ""
5534
5596
5535
#: bzrlib/errors.py:2059
5597
#: bzrlib/errors.py:2078
5536
5598
msgid ""
5537
5599
"Cannot convert from format %(from_format)s to format %(format)s. "
5538
5600
"%(problem)s"
5539
5601
msgstr ""
5540
5602
5541
#: bzrlib/errors.py:2071
5603
#: bzrlib/errors.py:2090
5542
5604
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5543
5605
msgstr ""
5544
5606
5545
#: bzrlib/errors.py:2079
5607
#: bzrlib/errors.py:2098
5546
5608
msgid "%(exe_name)s could not be found on this machine"
5547
5609
msgstr ""
5548
5610
5549
#: bzrlib/errors.py:2087
5611
#: bzrlib/errors.py:2106
5550
5612
msgid "Diff is not installed on this machine: %(msg)s"
5551
5613
msgstr ""
5552
5614
5553
#: bzrlib/errors.py:2095
5615
#: bzrlib/errors.py:2114
5554
5616
msgid "Diff3 is not installed on this machine."
5555
5617
msgstr ""
5556
5618
5557
#: bzrlib/errors.py:2101
5619
#: bzrlib/errors.py:2120
5558
5620
msgid "The content being inserted is already present."
5559
5621
msgstr ""
5560
5622
5561
#: bzrlib/errors.py:2106
5623
#: bzrlib/errors.py:2125
5562
5624
msgid ""
5563
5625
"This tree contains left-over files from a failed operation.\n"
5564
5626
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5566
5628
" keep, and delete it when you are done."
5567
5629
msgstr ""
5568
5630
5569
#: bzrlib/errors.py:2117
5631
#: bzrlib/errors.py:2136
5570
5632
msgid ""
5571
5633
"This tree contains left-over files from a failed operation.\n"
5572
5634
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5573
5635
" wish to keep, and delete it when you are done."
5574
5636
msgstr ""
5575
5637
5576
#: bzrlib/errors.py:2127
5638
#: bzrlib/errors.py:2146
5577
5639
msgid ""
5578
5640
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5579
5641
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5581
5643
" keep, and delete it when you are done."
5582
5644
msgstr ""
5583
5645
5584
#: bzrlib/errors.py:2138
5646
#: bzrlib/errors.py:2157
5585
5647
msgid ""
5586
5648
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5587
5649
"examine %(pending_deletion)s to see if it contains any files you wish to "
5588
5650
"keep, and delete it when you are done."
5589
5651
msgstr ""
5590
5652
5591
#: bzrlib/errors.py:2148
5653
#: bzrlib/errors.py:2167
5592
5654
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5593
5655
msgstr ""
5594
5656
5595
#: bzrlib/errors.py:2162
5657
#: bzrlib/errors.py:2181
5596
5658
msgid ""
5597
5659
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5598
5660
msgstr ""
5599
5661
5600
#: bzrlib/errors.py:2175
5662
#: bzrlib/errors.py:2194
5601
5663
msgid "Error in merge modified format"
5602
5664
msgstr ""
5603
5665
5604
#: bzrlib/errors.py:2180
5666
#: bzrlib/errors.py:2199
5605
5667
msgid "Format error in conflict listings"
5606
5668
msgstr ""
5607
5669
5608
#: bzrlib/errors.py:2184
5670
#: bzrlib/errors.py:2203
5609
5671
msgid ""
5610
5672
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5611
5673
"Error: %(description)s"
5612
5674
msgstr ""
5613
5675
5614
#: bzrlib/errors.py:2195
5676
#: bzrlib/errors.py:2214
5615
5677
msgid ""
5616
5678
"An error has been detected in the repository %(repo_path)s.\n"
5617
5679
"Please run bzr reconcile on this repository."
5618
5680
msgstr ""
5619
5681
5620
#: bzrlib/errors.py:2206
5682
#: bzrlib/errors.py:2225
5621
5683
msgid ""
5622
5684
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5623
5685
"reason: %(reason)s"
5624
5686
msgstr ""
5625
5687
5626
#: bzrlib/errors.py:2219
5688
#: bzrlib/errors.py:2238
5627
5689
msgid ""
5628
5690
"An inconsistent delta was supplied: %(delta)r\n"
5629
5691
"reason: %(reason)s"
5630
5692
msgstr ""
5631
5693
5632
#: bzrlib/errors.py:2231
5694
#: bzrlib/errors.py:2250
5633
5695
msgid "To use this feature you must upgrade your branch at %(path)s."
5634
5696
msgstr ""
5635
5697
5636
#: bzrlib/errors.py:2240
5698
#: bzrlib/errors.py:2259
5637
5699
msgid "To use this feature you must upgrade your repository at %(path)s."
5638
5700
msgstr ""
5639
5701
5640
#: bzrlib/errors.py:2245
5702
#: bzrlib/errors.py:2264
5641
5703
msgid ""
5642
5704
"To use this feature you must upgrade your branch at %(path)s to a format "
5643
5705
"which supports rich roots."
5644
5706
msgstr ""
5645
5707
5646
#: bzrlib/errors.py:2251
5708
#: bzrlib/errors.py:2270
5647
5709
msgid "Cannot perform local-only commits on unbound branches."
5648
5710
msgstr ""
5649
5711
5650
#: bzrlib/errors.py:2256
5712
#: bzrlib/errors.py:2275
5651
5713
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5652
5714
msgstr ""
5653
5715
5654
#: bzrlib/errors.py:2277
5716
#: bzrlib/errors.py:2296
5655
5717
msgid "Ghost tags not supported by format %(format)r."
5656
5718
msgstr ""
5657
5719
5658
#: bzrlib/errors.py:2285
5720
#: bzrlib/errors.py:2304
5659
5721
msgid "File is binary but should be text."
5660
5722
msgstr ""
5661
5723
5662
#: bzrlib/errors.py:2290
5724
#: bzrlib/errors.py:2309
5663
5725
msgid "The path %(path)s is not permitted on this platform"
5664
5726
msgstr ""
5665
5727
5666
#: bzrlib/errors.py:2299
5728
#: bzrlib/errors.py:2318
5667
5729
msgid ""
5668
5730
"Testament did not match expected value.\n"
5669
5731
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5670
5732
" {%(measured)s}"
5671
5733
msgstr ""
5672
5734
5673
#: bzrlib/errors.py:2311
5735
#: bzrlib/errors.py:2330
5674
5736
msgid "Not a bzr revision-bundle: %(text)r"
5675
5737
msgstr ""
5676
5738
5677
#: bzrlib/errors.py:2320
5739
#: bzrlib/errors.py:2339
5678
5740
msgid "Bad bzr revision-bundle: %(text)r"
5679
5741
msgstr ""
5680
5742
5681
#: bzrlib/errors.py:2329
5743
#: bzrlib/errors.py:2348
5682
5744
msgid "Malformed bzr revision-bundle header: %(text)r"
5683
5745
msgstr ""
5684
5746
5685
#: bzrlib/errors.py:2334
5747
#: bzrlib/errors.py:2353
5686
5748
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5687
5749
msgstr ""
5688
5750
5689
#: bzrlib/errors.py:2339
5751
#: bzrlib/errors.py:2358
5690
5752
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5691
5753
msgstr ""
5692
5754
5693
#: bzrlib/errors.py:2344
5755
#: bzrlib/errors.py:2363
5694
5756
msgid "End of line marker was not \\n in bzr revision-bundle"
5695
5757
msgstr ""
5696
5758
5697
#: bzrlib/errors.py:2354
5759
#: bzrlib/errors.py:2373
5698
5760
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5699
5761
msgstr ""
5700
5762
5701
#: bzrlib/errors.py:2364
5763
#: bzrlib/errors.py:2383
5702
5764
msgid "Root class for inventory serialization errors"
5703
5765
msgstr ""
5704
5766
5705
#: bzrlib/errors.py:2368
5767
#: bzrlib/errors.py:2387
5706
5768
msgid ""
5707
5769
"The inventory was not in the expected format:\n"
5708
5770
" %(msg)s"
5709
5771
msgstr ""
5710
5772
5711
#: bzrlib/errors.py:2377
5773
#: bzrlib/errors.py:2396
5712
5774
msgid "This operation requires rich root data storage"
5713
5775
msgstr ""
5714
5776
5715
#: bzrlib/errors.py:2390
5777
#: bzrlib/errors.py:2409
5716
5778
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5717
5779
msgstr ""
5718
5780
5719
#: bzrlib/errors.py:2399
5781
#: bzrlib/errors.py:2418
5720
5782
msgid ""
5721
5783
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5722
5784
"variable."
5723
5785
msgstr ""
5724
5786
5725
#: bzrlib/errors.py:2406
5787
#: bzrlib/errors.py:2425
5726
5788
msgid ""
5727
5789
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5728
5790
"ghost at {%(ghost_revision_id)s}"
5729
5791
msgstr ""
5730
5792
5731
#: bzrlib/errors.py:2416
5793
#: bzrlib/errors.py:2435
5732
5794
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5733
5795
msgstr ""
5734
5796
5735
#: bzrlib/errors.py:2467
5797
#: bzrlib/errors.py:2486
5736
5798
msgid ""
5737
5799
"A merge directive must provide either a bundle or a public branch location."
5738
5800
msgstr ""
5739
5801
5740
#: bzrlib/errors.py:2474
5802
#: bzrlib/errors.py:2493
5741
5803
msgid "Bad merge directive payload %(start)r"
5742
5804
msgstr ""
5743
5805
5744
#: bzrlib/errors.py:2484
5806
#: bzrlib/errors.py:2503
5745
5807
msgid "Preview patch does not match requested changes."
5746
5808
msgstr ""
5747
5809
5748
#: bzrlib/errors.py:2490
5810
#: bzrlib/errors.py:2509
5749
5811
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5750
5812
msgstr ""
5751
5813
5752
#: bzrlib/errors.py:2500
5814
#: bzrlib/errors.py:2519
5753
5815
msgid ""
5754
5816
"Your branch does not have all of the revisions required in order to merge "
5755
5817
"this merge directive and the target location specified in the merge "
5756
5818
"directive is not a branch: %(location)s."
5757
5819
msgstr ""
5758
5820
5759
#: bzrlib/errors.py:2512
5821
#: bzrlib/errors.py:2531
5760
5822
msgid "Unsupported entry kind %(kind)s"
5761
msgstr ""
5823
msgstr "Unsupported entry type %(kind)s"
5762
5824
5763
#: bzrlib/errors.py:2520
5825
#: bzrlib/errors.py:2539
5764
5826
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5765
5827
msgstr ""
5766
5828
5767
#: bzrlib/errors.py:2530
5829
#: bzrlib/errors.py:2549
5768
5830
msgid "Subsume target %(other_tree)s needs to be upgraded."
5769
5831
msgstr ""
5770
5832
5771
#: bzrlib/errors.py:2549
5833
#: bzrlib/errors.py:2568
5772
5834
msgid "No such tag: %(tag_name)s"
5773
5835
msgstr ""
5774
5836
5775
#: bzrlib/errors.py:2557
5837
#: bzrlib/errors.py:2576
5776
5838
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5777
5839
msgstr ""
5778
5840
5779
#: bzrlib/errors.py:2566
5841
#: bzrlib/errors.py:2585
5780
5842
msgid "Tag %(tag_name)s already exists."
5781
5843
msgstr ""
5782
5844
5783
#: bzrlib/errors.py:2574
5845
#: bzrlib/errors.py:2593
5784
5846
msgid ""
5785
5847
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5786
5848
"bugs\" for more information on this feature."
5787
5849
msgstr ""
5788
5850
5789
#: bzrlib/errors.py:2584
5851
#: bzrlib/errors.py:2603
5790
5852
msgid ""
5791
5853
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5792
5854
msgstr ""
5793
5855
5794
#: bzrlib/errors.py:2594
5856
#: bzrlib/errors.py:2613
5795
5857
msgid ""
5796
5858
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5797
5859
msgstr ""
5798
5860
5799
#: bzrlib/errors.py:2604
5861
#: bzrlib/errors.py:2623
5800
5862
msgid "Invalid line in bugs property: '%(line)s'"
5801
5863
msgstr ""
5802
5864
5803
#: bzrlib/errors.py:2612
5865
#: bzrlib/errors.py:2631
5804
5866
msgid "Invalid bug status: '%(status)s'"
5805
5867
msgstr ""
5806
5868
5807
#: bzrlib/errors.py:2620
5869
#: bzrlib/errors.py:2639
5808
5870
msgid "Could not understand response from smart server: %(response_tuple)r"
5809
5871
msgstr ""
5810
5872
5811
#: bzrlib/errors.py:2659
5873
#: bzrlib/errors.py:2678
5812
5874
msgid "Server sent an unexpected error: %(error_tuple)r"
5813
5875
msgstr ""
5814
5876
5815
#: bzrlib/errors.py:2678
5877
#: bzrlib/errors.py:2697
5816
5878
msgid "Unrecognised container format: %(container_format)r"
5817
5879
msgstr ""
5818
5880
5819
#: bzrlib/errors.py:2686
5881
#: bzrlib/errors.py:2705
5820
5882
msgid "Unexpected end of container stream"
5821
5883
msgstr ""
5822
5884
5823
#: bzrlib/errors.py:2691
5885
#: bzrlib/errors.py:2710
5824
5886
msgid "Unknown record type: %(record_type)r"
5825
5887
msgstr ""
5826
5888
5827
#: bzrlib/errors.py:2699
5889
#: bzrlib/errors.py:2718
5828
5890
msgid "Invalid record: %(reason)s"
5829
5891
msgstr ""
5830
5892
5831
#: bzrlib/errors.py:2707
5893
#: bzrlib/errors.py:2726
5832
5894
msgid "Container has data after end marker: %(excess)r"
5833
5895
msgstr ""
5834
5896
5835
#: bzrlib/errors.py:2715
5897
#: bzrlib/errors.py:2734
5836
5898
msgid "Container has multiple records with the same name: %(name)s"
5837
5899
msgstr ""
5838
5900
5839
#: bzrlib/errors.py:2728
5901
#: bzrlib/errors.py:2747
5840
5902
msgid "Corrupt or incompatible data stream: %(reason)s"
5841
5903
msgstr ""
5842
5904
5843
#: bzrlib/errors.py:2736
5905
#: bzrlib/errors.py:2755
5844
5906
msgid "SMTP error: %(error)s"
5845
5907
msgstr ""
5846
5908
5847
#: bzrlib/errors.py:2744
5909
#: bzrlib/errors.py:2763
5848
5910
msgid "No message supplied."
5849
5911
msgstr ""
5850
5912
5851
#: bzrlib/errors.py:2749
5913
#: bzrlib/errors.py:2768
5852
5914
msgid "No mail-to address (--mail-to) or output (-o) specified."
5853
5915
msgstr ""
5854
5916
5855
#: bzrlib/errors.py:2754
5917
#: bzrlib/errors.py:2773
5856
5918
msgid "Unknown mail client: %(mail_client)s"
5857
5919
msgstr ""
5858
5920
5859
#: bzrlib/errors.py:2762
5921
#: bzrlib/errors.py:2781
5860
5922
msgid ""
5861
5923
"Unable to find mail client with the following names: "
5862
5924
"%(mail_command_list_string)s"
5863
5925
msgstr ""
5864
5926
5865
#: bzrlib/errors.py:2772
5927
#: bzrlib/errors.py:2791
5866
5928
msgid "SMTP connection to %(host)s refused"
5867
5929
msgstr ""
5868
5930
5869
#: bzrlib/errors.py:2781
5931
#: bzrlib/errors.py:2800
5870
5932
msgid "Please specify smtp_server. No server at default %(host)s."
5871
5933
msgstr ""
5872
5934
5873
#: bzrlib/errors.py:2795
5935
#: bzrlib/errors.py:2814
5874
5936
msgid ""
5875
5937
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5876
5938
"reconfigure."
5877
5939
msgstr ""
5878
5940
5879
#: bzrlib/errors.py:2807
5941
#: bzrlib/errors.py:2826
5880
5942
msgid "'%(display_url)s' is already a branch."
5881
5943
msgstr ""
5882
5944
5883
#: bzrlib/errors.py:2812
5945
#: bzrlib/errors.py:2831
5884
5946
msgid "'%(display_url)s' is already a tree."
5885
5947
msgstr ""
5886
5948
5887
#: bzrlib/errors.py:2817
5949
#: bzrlib/errors.py:2836
5888
5950
msgid "'%(display_url)s' is already a checkout."
5889
5951
msgstr ""
5890
5952
5891
#: bzrlib/errors.py:2822
5953
#: bzrlib/errors.py:2841
5892
5954
msgid "'%(display_url)s' is already a lightweight checkout."
5893
5955
msgstr ""
5894
5956
5895
#: bzrlib/errors.py:2827
5957
#: bzrlib/errors.py:2846
5896
5958
msgid "'%(display_url)s' is already using a shared repository."
5897
5959
msgstr ""
5898
5960
5899
#: bzrlib/errors.py:2832
5961
#: bzrlib/errors.py:2851
5900
5962
msgid "'%(display_url)s' is already standalone."
5901
5963
msgstr ""
5902
5964
5903
#: bzrlib/errors.py:2837
5965
#: bzrlib/errors.py:2856
5904
5966
msgid "Shared repository '%(display_url)s' already creates working trees."
5905
5967
msgstr ""
5906
5968
5907
#: bzrlib/errors.py:2843
5969
#: bzrlib/errors.py:2862
5908
5970
msgid ""
5909
5971
"Shared repository '%(display_url)s' already doesn't create working trees."
5910
5972
msgstr ""
5911
5973
5912
#: bzrlib/errors.py:2849
5974
#: bzrlib/errors.py:2868
5913
5975
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5914
5976
msgstr ""
5915
5977
5916
#: bzrlib/errors.py:2854
5978
#: bzrlib/errors.py:2873
5917
5979
msgid "No location could be found to bind to at %(display_url)s."
5918
5980
msgstr ""
5919
5981
5920
#: bzrlib/errors.py:2859
5982
#: bzrlib/errors.py:2878
5921
5983
msgid ""
5922
5984
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5923
5985
"status).%(more)s"
5924
5986
msgstr ""
5925
5987
5926
#: bzrlib/errors.py:2878
5988
#: bzrlib/errors.py:2897
5927
5989
msgid ""
5928
5990
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5929
5991
"list).%(more)s"
5930
5992
msgstr ""
5931
5993
5932
#: bzrlib/errors.py:2884
5994
#: bzrlib/errors.py:2903
5933
5995
msgid "Variable {%(name)s} is not available."
5934
5996
msgstr ""
5935
5997
5936
#: bzrlib/errors.py:2892
5998
#: bzrlib/errors.py:2911
5937
5999
msgid "No template specified."
5938
6000
msgstr ""
5939
6001
5940
#: bzrlib/errors.py:2897
6002
#: bzrlib/errors.py:2916
5941
6003
msgid "Unable to create symlink %(path_str)son this platform"
5942
6004
msgstr ""
5943
6005
5944
#: bzrlib/errors.py:2912
6006
#: bzrlib/errors.py:2931
5945
6007
msgid ""
5946
6008
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5947
6009
"\"original\", \"local\"."
5948
6010
msgstr ""
5949
6011
5950
#: bzrlib/errors.py:2946
6012
#: bzrlib/errors.py:2965
5951
6013
msgid ""
5952
6014
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5953
6015
msgstr ""
6016
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5954
6017
5955
#: bzrlib/errors.py:2958
6018
#: bzrlib/errors.py:2977
5956
6019
msgid "The \"%(config_id)s\" configuration does not exist."
5957
6020
msgstr ""
5958
6021
5959
#: bzrlib/errors.py:2966
6022
#: bzrlib/errors.py:2985
5960
6023
msgid "The \"%(option_name)s\" configuration option does not exist."
5961
6024
msgstr ""
5962
6025
5963
#: bzrlib/errors.py:2974
6026
#: bzrlib/errors.py:2993
5964
6027
msgid "The alias \"%(alias_name)s\" does not exist."
5965
6028
msgstr ""
5966
6029
5967
#: bzrlib/errors.py:2988
6030
#: bzrlib/errors.py:3007
5968
6031
msgid "\"%(alias_name)s\" is not a valid location alias."
5969
6032
msgstr ""
5970
6033
5971
#: bzrlib/errors.py:2996
6034
#: bzrlib/errors.py:3015
5972
6035
msgid "No %(alias_name)s location assigned."
5973
6036
msgstr ""
5974
6037
5975
#: bzrlib/errors.py:3004
6038
#: bzrlib/errors.py:3023
5976
6039
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5977
6040
msgstr ""
5978
6041
5979
#: bzrlib/errors.py:3014
6042
#: bzrlib/errors.py:3033
5980
6043
msgid "Unknown rules detected: %(unknowns_str)s."
5981
6044
msgstr ""
5982
6045
5983
#: bzrlib/errors.py:3025
6046
#: bzrlib/errors.py:3044
5984
6047
msgid "Tip change rejected: %(msg)s"
5985
6048
msgstr ""
5986
6049
5987
#: bzrlib/errors.py:3033
6050
#: bzrlib/errors.py:3052
5988
6051
msgid "Shelf corrupt."
5989
6052
msgstr ""
5990
6053
5991
#: bzrlib/errors.py:3038
6054
#: bzrlib/errors.py:3057
5992
6055
msgid "Corruption while decompressing repository file%(orig_error)s"
5993
6056
msgstr ""
5994
6057
5995
#: bzrlib/errors.py:3050
6058
#: bzrlib/errors.py:3069
5996
6059
msgid "No changes are shelved with id \"%(shelf_id)d\"."
5997
6060
msgstr ""
5998
6061
5999
#: bzrlib/errors.py:3058
6062
#: bzrlib/errors.py:3077
6000
6063
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6001
6064
msgstr ""
6002
6065
6003
#: bzrlib/errors.py:3066
6066
#: bzrlib/errors.py:3085
6004
6067
msgid ""
6005
6068
"An attempt to access a url outside the server jail was made: '%(url)s'."
6006
6069
msgstr ""
6007
6070
6008
#: bzrlib/errors.py:3074
6071
#: bzrlib/errors.py:3093
6009
6072
msgid "The user aborted the operation."
6010
6073
msgstr ""
6011
6074
6012
#: bzrlib/errors.py:3079
6075
#: bzrlib/errors.py:3098
6013
6076
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6014
6077
msgstr ""
6015
6078
6016
#: bzrlib/errors.py:3089
6079
#: bzrlib/errors.py:3108
6017
6080
msgid "No such view: %(view_name)s."
6018
6081
msgstr ""
6019
6082
6020
#: bzrlib/errors.py:3099
6083
#: bzrlib/errors.py:3118
6021
6084
msgid ""
6022
6085
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6023
6086
"to a later format."
6024
6087
msgstr ""
6025
6088
6026
#: bzrlib/errors.py:3108
6089
#: bzrlib/errors.py:3127
6027
6090
msgid ""
6028
6091
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6029
6092
msgstr ""
6030
6093
6031
#: bzrlib/errors.py:3175
6094
#: bzrlib/errors.py:3194
6032
6095
msgid "%(bzrdir)r does not support co-located branches."
6033
6096
msgstr ""
6034
6097
6035
#: bzrlib/errors.py:3181
6098
#: bzrlib/errors.py:3200
6036
6099
msgid ""
6037
6100
"Unable to determine your name.\n"
6038
6101
"Please, set your name with the 'whoami' command.\n"
6039
6102
"E.g. bzr whoami \"Your Name <name@example.com>\""
6040
6103
msgstr ""
6041
6104
6042
#: bzrlib/errors.py:3190
6105
#: bzrlib/errors.py:3209
6043
6106
msgid "Invalid pattern(s) found. %(msg)s"
6044
6107
msgstr ""
6045
6108
6046
#: bzrlib/errors.py:3198
6109
#: bzrlib/errors.py:3217
6047
6110
msgid ""
6048
6111
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6049
6112
"unbind` to fix."
6050
6113
msgstr ""
6051
6114
6052
#: bzrlib/errors.py:3209
6115
#: bzrlib/errors.py:3228
6053
6116
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6054
6117
msgstr ""
6055
6118
6056
#: bzrlib/errors.py:3218
6119
#: bzrlib/errors.py:3237
6057
6120
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6058
6121
msgstr ""
6059
6122
6060
#: bzrlib/errors.py:3227
6123
#: bzrlib/errors.py:3246
6061
6124
msgid ""
6062
6125
"No compatible object available for operations from %(source)r to %(target)r."
6063
6126
msgstr ""
6064
6127
6065
#: bzrlib/errors.py:3237
6128
#: bzrlib/errors.py:3256
6066
6129
msgid ""
6067
6130
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6068
6131
"%(arguments)s."
6069
6132
msgstr ""
6070
6133
6071
#: bzrlib/errors.py:3247
6134
#: bzrlib/errors.py:3266
6072
6135
msgid ""
6073
6136
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6074
6137
"format %(format)r"
6075
6138
msgstr ""
6139
"Type change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6140
"format %(format)r"
6076
6141
6077
#: bzrlib/errors.py:3259
6142
#: bzrlib/errors.py:3278
6078
6143
msgid ""
6079
6144
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6080
6145
"plugin."
6081
6146
msgstr ""
6082
6147
6083
#: bzrlib/errors.py:3272
6148
#: bzrlib/errors.py:3291
6084
6149
msgid "Binary files section encountered."
6085
6150
msgstr ""
6086
6151
6087
#: bzrlib/errors.py:3280
6152
#: bzrlib/errors.py:3299
6088
6153
msgid ""
6089
6154
"Malformed patch header. %(desc)s\n"
6090
6155
"%(line)r"
6091
6156
msgstr ""
6092
6157
6093
#: bzrlib/errors.py:3289
6158
#: bzrlib/errors.py:3308
6094
6159
msgid ""
6095
6160
"Malformed hunk header. %(desc)s\n"
6096
6161
"%(line)r"
6097
6162
msgstr ""
6098
6163
6099
#: bzrlib/errors.py:3298
6164
#: bzrlib/errors.py:3317
6100
6165
msgid ""
6101
6166
"Malformed line. %(desc)s\n"
6102
6167
"%(line)r"
6103
6168
msgstr ""
6104
6169
6105
#: bzrlib/errors.py:3308
6170
#: bzrlib/errors.py:3327
6106
6171
msgid ""
6107
6172
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6108
6173
"but patch says it should be \"%(patch_line)s\""
6109
6174
msgstr ""
6110
6175
6111
#: bzrlib/errors.py:3319
6176
#: bzrlib/errors.py:3338
6112
6177
msgid "The feature %(feature)s has already been registered."
6113
6178
msgstr ""
6114
6179
6438
6503
msgid "lstat/stat of ({0!r}): {1!r}"
6439
6504
msgstr ""
6440
6505
6441
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6506
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6442
6507
#, python-format
6443
6508
msgid "sorry, %r not allowed in path"
6444
6509
msgstr ""
6445
6510
6446
#: bzrlib/osutils.py:1226
6511
#: bzrlib/osutils.py:1237
6447
6512
#, python-format
6448
6513
msgid "%r is too short to calculate a relative path"
6449
6514
msgstr ""
6887
6952
msgid "Created new branch."
6888
6953
msgstr ""
6889
6954
6890
#: bzrlib/push.py:98
6955
#: bzrlib/push.py:97
6891
6956
#, python-format
6892
6957
msgid ""
6893
6958
"Target directory %s already contains a .bzr directory, but it is not valid."
7014
7079
msgid "%s is now not stacked\n"
7015
7080
msgstr ""
7016
7081
7017
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7082
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7018
7083
#, python-format
7019
7084
msgid "bzr: ERROR (ignored): %s"
7020
7085
msgstr ""
7021
7086
7022
#: bzrlib/remote.py:2493
7087
#: bzrlib/remote.py:2541
7023
7088
msgid "Copying repository content as tarball..."
7024
7089
msgstr ""
7025
7090
7234
7299
msgid "listening on port: %s"
7235
7300
msgstr ""
7236
7301
7237
#: bzrlib/switch.py:69
7302
#: bzrlib/switch.py:73
7238
7303
msgid "Pending merges must be committed or reverted before using switch."
7239
7304
msgstr ""
7240
7305
7241
#: bzrlib/switch.py:96
7306
#: bzrlib/switch.py:100
7242
7307
msgid ""
7243
7308
"Cannot switch as local commits found in the checkout. Commit these to the "
7244
7309
"bound branch or use --force to throw them away."
7245
7310
msgstr ""
7246
7311
7247
#: bzrlib/switch.py:101
7312
#: bzrlib/switch.py:105
7248
7313
#, python-format
7249
7314
msgid ""
7250
7315
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7251
7316
"anyway, use --force."
7252
7317
msgstr ""
7253
7318
7254
#: bzrlib/switch.py:110
7319
#: bzrlib/switch.py:125
7255
7320
msgid "Cannot switch a branch, only a checkout."
7256
7321
msgstr ""
7257
7322
7258
#: bzrlib/switch.py:146
7323
#: bzrlib/switch.py:163
7259
7324
#, python-format
7260
7325
msgid "Tree is up to date at revision %d."
7261
7326
msgstr ""
7262
7327
7263
#: bzrlib/switch.py:152
7328
#: bzrlib/switch.py:169
7264
7329
#, python-format
7265
7330
msgid "Updated to revision %d."
7266
7331
msgstr ""
7267
7332
7268
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7333
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7269
7334
msgid "Apply phase"
7270
7335
msgstr ""
7271
7336
7272
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7337
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7273
7338
msgid "removing file"
7274
7339
msgstr ""
7275
7340
7276
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7341
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7277
7342
msgid "adding file"
7278
7343
msgstr ""
7279
7344
7280
#: bzrlib/transform.py:2587
7345
#: bzrlib/transform.py:2591
7281
7346
msgid "Building tree"
7282
7347
msgstr ""
7283
7348
7284
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7349
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7285
7350
msgid "Adding file contents"
7286
7351
msgstr ""
7287
7352
7288
#: bzrlib/transform.py:3024
7353
#: bzrlib/transform.py:3028
7289
7354
msgid "Resolution pass"
7290
7355
msgstr ""
7291
7356
7434
7499
7435
7500
#: dummy/help_topics/basic/detail.txt:1
7436
7501
msgid ""
7437
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7502
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7438
7503
"http://bazaar.canonical.com/"
7439
7504
msgstr ""
7440
7505
8213
8278
" K File kind changed\n"
8214
8279
" M File modified"
8215
8280
msgstr ""
8281
" N File created\n"
8282
" D File deleted\n"
8283
" K File type changed\n"
8284
" M File modified"
8216
8285
8217
8286
#: dummy/help_topics/status-flags/detail.txt:27
8218
8287
msgid "Column 3 - execute::"
8445
8514
"by\n"
8446
8515
"bzr:"
8447
8516
msgstr ""
8517
"There are two kinds of authentication used by the various schemes supported "
8518
"by\n"
8519
"bzr:"
8448
8520
8449
8521
#: en/help_topics/authentication.txt:48
8450
8522
msgid "1. user and password"
10443
10515
"to\n"
10444
10516
"do."
10445
10517
msgstr ""
10518
"Bazaar tries to avoid conflicts; its aim is to ask you to resolve the\n"
10519
"conflict if and only if there's an actual conceptual conflict in the source\n"
10520
"tree. Because Bazaar doesn't understand the real meaning of the files "
10521
"being\n"
10522
"versioned, it can, when faced with ambiguities, fall short in either "
10523
"direction\n"
10524
"trying to resolve the conflict itself. Many kinds of changes can be "
10525
"combined\n"
10526
"programmatically, but sometimes only a human can determine the right thing "
10527
"to\n"
10528
"do."
10446
10529
10447
10530
#: en/help_topics/conflict-types.txt:25
10448
10531
msgid ""
10496
10579
"these actions, Bazaar can provide some help. In the end you should at least\n"
10497
10580
"inform Bazaar that you're done with the conflict with::"
10498
10581
msgstr ""
10582
"Various actions are available depending on the kind of conflict; for some "
10583
"of\n"
10584
"these actions, Bazaar can provide some help. In the end you should at least\n"
10585
"inform Bazaar that you're done with the conflict with::"
10499
10586
10500
10587
#: en/help_topics/conflict-types.txt:51
10501
10588
msgid " ``bzr resolve FILE --action=done'"
10664
10751
"version\n"
10665
10752
"or a combination of both."
10666
10753
msgstr ""
10754
"To resolve that kind of conflict, you should rebuild FILE from either "
10755
"version\n"
10756
"or a combination of both."
10667
10757
10668
10758
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10669
10759
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10693
10783
msgid ""
10694
10784
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10695
10785
msgstr ""
10786
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10696
10787
10697
10788
#: en/help_topics/conflict-types.txt:148
10698
10789
msgid ""
10813
10904
"To resolve that kind of conflict, you should either remove or rename the\n"
10814
10905
"children or the directory or a combination of both."
10815
10906
msgstr ""
10907
"To resolve that kind of conflict, you should either remove or rename the\n"
10908
"children or the directory or a combination of both."
10816
10909
10817
10910
#: en/help_topics/conflict-types.txt:228
10818
10911
msgid ""
10912
11005
"be\n"
10913
11006
"retained for the file involved."
10914
11007
msgstr ""
11008
"To resolve that kind of conflict, you just have to decide which name should "
11009
"be\n"
11010
"retained for the file involved."
10915
11011
10916
11012
#: en/help_topics/conflict-types.txt:293
10917
11013
msgid ""
10960
11056
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10961
11057
"name should be retained for the directories involved."
10962
11058
msgstr ""
11059
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11060
"``black``. To resolve that kind of conflict, you just have to decide which\n"
11061
"name should be retained for the directories involved."
10963
11062
10964
11063
#: en/help_topics/conflict-types.txt:328
10965
11064
msgid ""
11009
11108
"To resolve that kind of conflict, you have to decide what name should be\n"
11010
11109
"retained for the file, directory or symlink involved."
11011
11110
msgstr ""
11111
"To resolve that kind of conflict, you have to decidewhich name should be\n"
11112
"retained for the file, directory or symlink involved."
11012
11113
11013
11114
#: en/help_topics/conflict-types.txt:363
11014
11115
msgid ""
11700
11801
"~~~~~~~~~~~~~~~~~~~~~~"
11701
11802
msgstr ""
11702
11803
11703
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11804
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11704
11805
msgid "Introduced in: 1.4"
11705
11806
msgstr ""
11706
11807
11892
11993
msgstr ""
11893
11994
11894
11995
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11895
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
11996
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11896
11997
msgid "Introduced in: 1.17"
11897
11998
msgstr ""
11898
11999
11948
12049
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11949
12050
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11950
12051
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11951
#: en/help_topics/hooks.txt:427
12052
#: en/help_topics/hooks.txt:443
11952
12053
msgid "Introduced in: 2.4"
11953
12054
msgstr ""
11954
12055
12049
12150
msgstr ""
12050
12151
12051
12152
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12052
#: en/help_topics/hooks.txt:505
12153
#: en/help_topics/hooks.txt:521
12053
12154
msgid "Introduced in: 1.15"
12054
12155
msgstr ""
12055
12156
12131
12232
msgstr ""
12132
12233
12133
12234
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12134
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
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
12135
12237
msgid "Introduced in: 2.5"
12136
12238
msgstr ""
12137
12239
12250
12352
12251
12353
#: en/help_topics/hooks.txt:399
12252
12354
msgid ""
12355
"post_transform\n"
12356
"~~~~~~~~~~~~~~"
12357
msgstr ""
12358
12359
#: en/help_topics/hooks.txt:404
12360
msgid ""
12361
"Called after a tree transform has been performed on a tree. The hook\n"
12362
"is called with the tree that is being transformed and the transform."
12363
msgstr ""
12364
12365
#: en/help_topics/hooks.txt:407
12366
msgid ""
12367
"pre_transform\n"
12368
"~~~~~~~~~~~~~"
12369
msgstr ""
12370
12371
#: en/help_topics/hooks.txt:412
12372
msgid ""
12373
"Called before a tree transform on this tree. The hook is called with\n"
12374
"the tree that is being transformed and the transform."
12375
msgstr ""
12376
12377
#: en/help_topics/hooks.txt:415
12378
msgid ""
12253
12379
"start_commit\n"
12254
12380
"~~~~~~~~~~~~"
12255
12381
msgstr ""
12256
12382
12257
#: en/help_topics/hooks.txt:404
12383
#: en/help_topics/hooks.txt:420
12258
12384
msgid ""
12259
12385
"Called before a commit is performed on a tree. The start commit hook\n"
12260
12386
"is able to change the tree before the commit takes place. start_commit\n"
12262
12388
"being performed on."
12263
12389
msgstr ""
12264
12390
12265
#: en/help_topics/hooks.txt:409
12391
#: en/help_topics/hooks.txt:425
12266
12392
msgid ""
12267
12393
"SmartClientHooks\n"
12268
12394
"----------------"
12269
12395
msgstr ""
12270
12396
12271
#: en/help_topics/hooks.txt:412
12397
#: en/help_topics/hooks.txt:428
12272
12398
msgid ""
12273
12399
"call\n"
12274
12400
"~~~~"
12275
12401
msgstr ""
12276
12402
12277
#: en/help_topics/hooks.txt:415
12403
#: en/help_topics/hooks.txt:431
12278
12404
msgid "Introduced in: unknown"
12279
12405
msgstr ""
12280
12406
12281
#: en/help_topics/hooks.txt:417
12407
#: en/help_topics/hooks.txt:433
12282
12408
msgid ""
12283
12409
"Called when the smart client is submitting a request to the smart\n"
12284
12410
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12285
12411
"Streaming request bodies, and responses, are not accessible."
12286
12412
msgstr ""
12287
12413
12288
#: en/help_topics/hooks.txt:421
12414
#: en/help_topics/hooks.txt:437
12289
12415
msgid ""
12290
12416
"SmartServerHooks\n"
12291
12417
"----------------"
12292
12418
msgstr ""
12293
12419
12294
#: en/help_topics/hooks.txt:424
12420
#: en/help_topics/hooks.txt:440
12295
12421
msgid ""
12296
12422
"server_exception\n"
12297
12423
"~~~~~~~~~~~~~~~~"
12298
12424
msgstr ""
12299
12425
12300
#: en/help_topics/hooks.txt:429
12426
#: en/help_topics/hooks.txt:445
12301
12427
msgid ""
12302
12428
"Called by the bzr server when an exception occurs. server_exception is\n"
12303
12429
"called with the sys.exc_info() tuple return true for the hook if the\n"
12305
12431
"normally."
12306
12432
msgstr ""
12307
12433
12308
#: en/help_topics/hooks.txt:434
12434
#: en/help_topics/hooks.txt:450
12309
12435
msgid ""
12310
12436
"server_started\n"
12311
12437
"~~~~~~~~~~~~~~"
12312
12438
msgstr ""
12313
12439
12314
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12440
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12315
12441
msgid "Introduced in: 0.16"
12316
12442
msgstr ""
12317
12443
12318
#: en/help_topics/hooks.txt:439
12444
#: en/help_topics/hooks.txt:455
12319
12445
msgid ""
12320
12446
"Called by the bzr server when it starts serving a directory.\n"
12321
12447
"server_started is called with (backing urls, public url), where\n"
12324
12450
"served."
12325
12451
msgstr ""
12326
12452
12327
#: en/help_topics/hooks.txt:445
12453
#: en/help_topics/hooks.txt:461
12328
12454
msgid ""
12329
12455
"server_started_ex\n"
12330
12456
"~~~~~~~~~~~~~~~~~"
12331
12457
msgstr ""
12332
12458
12333
#: en/help_topics/hooks.txt:450
12459
#: en/help_topics/hooks.txt:466
12334
12460
msgid ""
12335
12461
"Called by the bzr server when it starts serving a directory.\n"
12336
12462
"server_started is called with (backing_urls, server_obj)."
12337
12463
msgstr ""
12338
12464
12339
#: en/help_topics/hooks.txt:453
12465
#: en/help_topics/hooks.txt:469
12340
12466
msgid ""
12341
12467
"server_stopped\n"
12342
12468
"~~~~~~~~~~~~~~"
12343
12469
msgstr ""
12344
12470
12345
#: en/help_topics/hooks.txt:458
12471
#: en/help_topics/hooks.txt:474
12346
12472
msgid ""
12347
12473
"Called by the bzr server when it stops serving a directory.\n"
12348
12474
"server_stopped is called with the same parameters as the\n"
12349
12475
"server_started hook: (backing_urls, public_url)."
12350
12476
msgstr ""
12351
12477
12352
#: en/help_topics/hooks.txt:462
12478
#: en/help_topics/hooks.txt:478
12353
12479
msgid ""
12354
12480
"StatusHooks\n"
12355
12481
"-----------"
12356
12482
msgstr ""
12357
12483
12358
#: en/help_topics/hooks.txt:465
12484
#: en/help_topics/hooks.txt:481
12359
12485
msgid ""
12360
12486
"post_status\n"
12361
12487
"~~~~~~~~~~~"
12362
12488
msgstr ""
12363
12489
12364
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12490
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12365
12491
msgid "Introduced in: 2.3"
12366
12492
msgstr ""
12367
12493
12368
#: en/help_topics/hooks.txt:470
12494
#: en/help_topics/hooks.txt:486
12369
12495
msgid ""
12370
12496
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12371
12497
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12374
12500
"status command. to_file is the output stream for writing."
12375
12501
msgstr ""
12376
12502
12377
#: en/help_topics/hooks.txt:476
12503
#: en/help_topics/hooks.txt:492
12378
12504
msgid ""
12379
12505
"pre_status\n"
12380
12506
"~~~~~~~~~~"
12381
12507
msgstr ""
12382
12508
12383
#: en/help_topics/hooks.txt:481
12509
#: en/help_topics/hooks.txt:497
12384
12510
msgid ""
12385
12511
"Called with argument StatusHookParams before Bazaar displays the\n"
12386
12512
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12389
12515
"status command. to_file is the output stream for writing."
12390
12516
msgstr ""
12391
12517
12392
#: en/help_topics/hooks.txt:487
12518
#: en/help_topics/hooks.txt:503
12393
12519
msgid ""
12394
12520
"TransportHooks\n"
12395
12521
"--------------"
12396
12522
msgstr ""
12397
12523
12398
#: en/help_topics/hooks.txt:490
12524
#: en/help_topics/hooks.txt:506
12399
12525
msgid ""
12400
12526
"post_connect\n"
12401
12527
"~~~~~~~~~~~~"
12402
12528
msgstr ""
12403
12529
12404
#: en/help_topics/hooks.txt:495
12530
#: en/help_topics/hooks.txt:511
12405
12531
msgid ""
12406
12532
"Called after a new connection is established or a reconnect occurs.\n"
12407
12533
"The sole argument passed is either the connected transport or smart\n"
12408
12534
"medium instance."
12409
12535
msgstr ""
12410
12536
12411
#: en/help_topics/hooks.txt:499
12537
#: en/help_topics/hooks.txt:515
12412
12538
msgid ""
12413
12539
"RioVersionInfoBuilderHooks\n"
12414
12540
"--------------------------"
12415
12541
msgstr ""
12416
12542
12417
#: en/help_topics/hooks.txt:502
12543
#: en/help_topics/hooks.txt:518
12418
12544
msgid ""
12419
12545
"revision\n"
12420
12546
"~~~~~~~~"
12421
12547
msgstr ""
12422
12548
12423
#: en/help_topics/hooks.txt:507
12549
#: en/help_topics/hooks.txt:523
12424
12550
msgid ""
12425
12551
"Invoked when adding information about a revision to the RIO stanza\n"
12426
12552
"that is printed. revision is called with a revision object and a RIO\n"
13192
13318
"Many commands that accept URLs also accept location aliases too.\n"
13193
13319
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13194
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