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