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