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