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