« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6386
- compare with another revision
- download diff
- download tarball
- view history from revision 6386
- Committer: Patch Queue Manager
- Date: 2011-12-19 14:40:24 UTC
- mfrom: (6379.6.8 feature-absolute-imports)
- Revision ID: pqm@pqm.ubuntu.com-20111219144024-awadgqxn2fugwr7m
(jelmer) Use the absolute_import feature everywhere in bzrlib,
and add a source test to make sure it's used everywhere. (Jelmer Vernooij)
and add a source test to make sure it's used everywhere. (Jelmer Vernooij)
- files added:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- files modified:
- .bzrignore
added
removed
po/bzr.pot
8
8
msgstr ""
9
9
"Project-Id-Version: bzr\n"
10
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2013-07-27 12:45+0200\n"
11
"POT-Creation-Date: 2011-12-08 09:21+0100\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
18
18
"Content-Transfer-Encoding: 8bit\n"
19
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
20
21
#: bzrlib/add.py:93
21
#: bzrlib/add.py:95
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr ""
24
24
25
#: bzrlib/branch.py:872
25
#: bzrlib/branch.py:871
26
26
msgid "Unstacking"
27
27
msgstr ""
28
28
29
#: bzrlib/branch.py:3012
29
#: bzrlib/branch.py:3173
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr ""
33
33
34
#: bzrlib/branch.py:3014
34
#: bzrlib/branch.py:3175
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:3017
41
#: bzrlib/branch.py:3178
42
42
msgid "No new revisions or tags to push."
43
43
msgstr ""
44
44
45
#: bzrlib/branch.py:3019
45
#: bzrlib/branch.py:3180
46
46
msgid "No new revisions to push."
47
47
msgstr ""
48
48
49
#: bzrlib/branch.py:3039
49
#: bzrlib/branch.py:3200
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3042
53
#: bzrlib/branch.py:3203
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr ""
57
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324
58
#: bzrlib/builtins.py:118 bzrlib/builtins.py:2868 bzrlib/workingtree.py:304
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:127
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr ""
67
67
68
#: bzrlib/builtins.py:315
68
#: bzrlib/builtins.py:212
69
69
msgid "Display status summary."
70
70
msgstr ""
71
71
72
#: bzrlib/builtins.py:317
72
#: bzrlib/builtins.py:214
73
73
msgid ""
74
74
"This reports on versioned and unknown files, reporting them\n"
75
75
"grouped by state. Possible states are:"
76
76
msgstr ""
77
77
78
#: bzrlib/builtins.py:320
78
#: bzrlib/builtins.py:217
79
79
msgid ""
80
80
"added\n"
81
81
" Versioned in the working copy but not in the previous revision."
82
82
msgstr ""
83
83
84
#: bzrlib/builtins.py:323
84
#: bzrlib/builtins.py:220
85
85
msgid ""
86
86
"removed\n"
87
87
" Versioned in the previous revision but removed or deleted\n"
88
88
" in the working copy."
89
89
msgstr ""
90
90
91
#: bzrlib/builtins.py:327
91
#: bzrlib/builtins.py:224
92
92
msgid ""
93
93
"renamed\n"
94
94
" Path of this file changed from the previous revision;\n"
96
96
" parent directory was renamed."
97
97
msgstr ""
98
98
99
#: bzrlib/builtins.py:332
99
#: bzrlib/builtins.py:229
100
100
msgid ""
101
101
"modified\n"
102
102
" Text has changed since the previous revision."
103
103
msgstr ""
104
104
105
#: bzrlib/builtins.py:335
105
#: bzrlib/builtins.py:232
106
106
msgid ""
107
107
"kind changed\n"
108
108
" File kind has been changed (e.g. from file to directory)."
109
109
msgstr ""
110
110
111
#: bzrlib/builtins.py:338
111
#: bzrlib/builtins.py:235
112
112
msgid ""
113
113
"unknown\n"
114
114
" Not versioned and not matching an ignore pattern."
115
115
msgstr ""
116
116
117
#: bzrlib/builtins.py:341
117
#: bzrlib/builtins.py:238
118
118
msgid ""
119
119
"Additionally for directories, symlinks and files with a changed\n"
120
120
"executable bit, Bazaar indicates their type using a trailing\n"
122
122
"disabled using the '--no-classify' option."
123
123
msgstr ""
124
124
125
#: bzrlib/builtins.py:346
125
#: bzrlib/builtins.py:243
126
126
msgid ""
127
127
"To see ignored files use 'bzr ignored'. For details on the\n"
128
128
"changes to file texts, use 'bzr diff'."
129
129
msgstr ""
130
130
131
#: bzrlib/builtins.py:349
131
#: bzrlib/builtins.py:246
132
132
msgid ""
133
133
"Note that --short or -S gives status flags for each item, similar\n"
134
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
135
"use bzr status -SV."
136
136
msgstr ""
137
137
138
#: bzrlib/builtins.py:353
138
#: bzrlib/builtins.py:250
139
139
msgid ""
140
140
"If no arguments are specified, the status of the entire working\n"
141
141
"directory is shown. Otherwise, only the status of the specified\n"
143
143
"is reported for everything inside that directory."
144
144
msgstr ""
145
145
146
#: bzrlib/builtins.py:358
146
#: bzrlib/builtins.py:255
147
147
msgid ""
148
148
"Before merges are committed, the pending merge tip revisions are\n"
149
149
"shown. To see all pending merge revisions, use the -v option.\n"
151
151
"the no-pending option or specify a file/directory."
152
152
msgstr ""
153
153
154
#: bzrlib/builtins.py:363
154
#: bzrlib/builtins.py:260
155
155
msgid ""
156
156
"To compare the working directory to a specific revision, pass a\n"
157
157
"single revision to the revision argument."
158
158
msgstr ""
159
159
160
#: bzrlib/builtins.py:366
160
#: bzrlib/builtins.py:263
161
161
msgid ""
162
162
"To see which files have changed in a specific revision, or between\n"
163
163
"two revisions, pass a revision range to the revision argument.\n"
165
165
msgstr ""
166
166
167
167
# help of 'short' option of 'status' command
168
#: bzrlib/builtins.py:375
168
#: bzrlib/builtins.py:272
169
169
msgid "Use short status indicators."
170
170
msgstr ""
171
171
172
172
# help of 'versioned' option of 'status' command
173
#: bzrlib/builtins.py:377
173
#: bzrlib/builtins.py:274
174
174
msgid "Only show versioned files."
175
175
msgstr ""
176
176
177
177
# help of 'no-pending' option of 'status' command
178
#: bzrlib/builtins.py:379
178
#: bzrlib/builtins.py:276
179
179
msgid "Don't show pending merges."
180
180
msgstr ""
181
181
182
182
# help of 'no-classify' option of 'status' command
183
#: bzrlib/builtins.py:382
183
#: bzrlib/builtins.py:279
184
184
msgid "Do not mark object type using indicator."
185
185
msgstr ""
186
186
187
#: bzrlib/builtins.py:397
187
#: bzrlib/builtins.py:294
188
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
189
msgstr ""
190
190
191
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5229
191
#: bzrlib/builtins.py:338 bzrlib/builtins.py:5024
192
192
msgid "You can only supply one of revision_id or --revision"
193
193
msgstr ""
194
194
195
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5231
195
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5026
196
196
msgid "You must supply either --revision or a revision_id"
197
197
msgstr ""
198
198
199
#: bzrlib/builtins.py:451
199
#: bzrlib/builtins.py:348
200
200
#, python-format
201
201
msgid "Repository %r does not support access to raw revision texts"
202
202
msgstr ""
203
203
204
#: bzrlib/builtins.py:462
204
#: bzrlib/builtins.py:359
205
205
msgid "The repository {0} contains no revision {1}."
206
206
msgstr ""
207
207
208
#: bzrlib/builtins.py:469
208
#: bzrlib/builtins.py:366
209
209
msgid "You cannot specify a NULL revision."
210
210
msgstr ""
211
211
212
#: bzrlib/builtins.py:561
212
#: bzrlib/builtins.py:458
213
213
msgid "Remove the working tree from a given branch/checkout."
214
214
msgstr ""
215
215
216
#: bzrlib/builtins.py:563
216
#: bzrlib/builtins.py:460
217
217
msgid ""
218
218
"Since a lightweight checkout is little more than a working tree\n"
219
219
"this will refuse to run against one."
220
220
msgstr ""
221
221
222
#: bzrlib/builtins.py:566
222
#: bzrlib/builtins.py:463
223
223
msgid "To re-create the working tree, use \"bzr checkout\"."
224
224
msgstr ""
225
225
226
226
# help of 'force' option of 'remove-tree' command
227
#: bzrlib/builtins.py:572
227
#: bzrlib/builtins.py:469
228
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
229
msgstr ""
230
230
231
#: bzrlib/builtins.py:586
231
#: bzrlib/builtins.py:483
232
232
msgid "No working tree to remove"
233
233
msgstr ""
234
234
235
#: bzrlib/builtins.py:588
235
#: bzrlib/builtins.py:485
236
236
msgid "You cannot remove the working tree of a remote path"
237
237
msgstr ""
238
238
239
#: bzrlib/builtins.py:597
239
#: bzrlib/builtins.py:494
240
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
241
msgstr ""
242
242
243
#: bzrlib/builtins.py:637
243
#: bzrlib/builtins.py:534
244
244
msgid ""
245
245
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
246
246
"instead. Use \"--force\" if you are sure you want to reset the working tree."
247
247
msgstr ""
248
248
249
#: bzrlib/builtins.py:648
249
#: bzrlib/builtins.py:545
250
250
msgid ""
251
251
", the header appears corrupt, try passing -r -1 to set the state to the last "
252
252
"commit"
253
253
msgstr ""
254
254
255
#: bzrlib/builtins.py:652
255
#: bzrlib/builtins.py:549
256
256
msgid "failed to reset the tree state{0}"
257
257
msgstr ""
258
258
259
#: bzrlib/builtins.py:656
259
#: bzrlib/builtins.py:553
260
260
msgid "Show current revision number."
261
261
msgstr ""
262
262
263
#: bzrlib/builtins.py:658
263
#: bzrlib/builtins.py:555
264
264
msgid "This is equal to the number of revisions on this branch."
265
265
msgstr ""
266
266
267
#: bzrlib/builtins.py:671
267
#: bzrlib/builtins.py:568
268
268
msgid "--tree and --revision can not be used together"
269
269
msgstr ""
270
270
271
#: bzrlib/builtins.py:688
272
msgid "Revision numbers only make sense for single revisions, not ranges"
271
#: bzrlib/builtins.py:585 bzrlib/builtins.py:5808
272
msgid "Tags can only be placed on a single revision, not on a range"
273
273
msgstr ""
274
274
275
275
# help of 'tree' option of 'revno' command
276
#: bzrlib/builtins.py:712
276
#: bzrlib/builtins.py:609
277
277
msgid "Show revno of working tree."
278
278
msgstr ""
279
279
280
#: bzrlib/builtins.py:760
280
#: bzrlib/builtins.py:657
281
281
msgid "Add specified files or directories."
282
282
msgstr ""
283
283
284
#: bzrlib/builtins.py:762
284
#: bzrlib/builtins.py:659
285
285
msgid ""
286
286
"In non-recursive mode, all the named items are added, regardless\n"
287
287
"of whether they were previously ignored. A warning is given if\n"
288
288
"any of the named files are already versioned."
289
289
msgstr ""
290
290
291
#: bzrlib/builtins.py:766
291
#: bzrlib/builtins.py:663
292
292
msgid ""
293
293
"In recursive mode (the default), files are treated the same way\n"
294
294
"but the behaviour for directories is different. Directories that\n"
299
299
"directories. If no names are given '.' is assumed."
300
300
msgstr ""
301
301
302
#: bzrlib/builtins.py:774
302
#: bzrlib/builtins.py:671
303
303
msgid ""
304
304
"A warning will be printed when nested trees are encountered,\n"
305
305
"unless they are explicitly ignored."
306
306
msgstr ""
307
307
308
#: bzrlib/builtins.py:777
308
#: bzrlib/builtins.py:674
309
309
msgid ""
310
310
"Therefore simply saying 'bzr add' will version all files that\n"
311
311
"are currently unknown."
312
312
msgstr ""
313
313
314
#: bzrlib/builtins.py:780
314
#: bzrlib/builtins.py:677
315
315
msgid ""
316
316
"Adding a file whose parent directory is not versioned will\n"
317
317
"implicitly add the parent, and so on up to the root. This means\n"
319
319
"get added when you add a file in the directory."
320
320
msgstr ""
321
321
322
#: bzrlib/builtins.py:785
322
#: bzrlib/builtins.py:682
323
323
msgid ""
324
324
"--dry-run will show which files would be added, but not actually\n"
325
325
"add them."
326
326
msgstr ""
327
327
328
#: bzrlib/builtins.py:788
328
#: bzrlib/builtins.py:685
329
329
msgid ""
330
330
"--file-ids-from will try to use the file ids from the supplied path.\n"
331
331
"It looks up ids trying to find a matching parent directory with the\n"
336
336
"into a subdirectory of this one."
337
337
msgstr ""
338
338
339
#: bzrlib/builtins.py:796
339
#: bzrlib/builtins.py:693
340
340
msgid ""
341
341
"Any files matching patterns in the ignore list will not be added\n"
342
342
"unless they are explicitly mentioned."
343
343
msgstr ""
344
344
345
#: bzrlib/builtins.py:799
345
#: bzrlib/builtins.py:696
346
346
msgid ""
347
347
"In recursive mode, files larger than the configuration option \n"
348
348
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
350
350
msgstr ""
351
351
352
352
# help of 'no-recurse' option of 'add' command
353
#: bzrlib/builtins.py:806
353
#: bzrlib/builtins.py:703
354
354
msgid "Don't recursively add the contents of directories."
355
355
msgstr ""
356
356
357
357
# help of 'file-ids-from' option of 'add' command
358
#: bzrlib/builtins.py:813
358
#: bzrlib/builtins.py:709
359
359
msgid "Lookup file ids from this tree."
360
360
msgstr ""
361
361
362
#: bzrlib/builtins.py:849
362
#: bzrlib/builtins.py:745
363
363
msgid "ignored {0} matching \"{1}\"\n"
364
364
msgstr ""
365
365
366
#: bzrlib/builtins.py:854
366
#: bzrlib/builtins.py:750
367
367
msgid "Create a new versioned directory."
368
368
msgstr ""
369
369
370
#: bzrlib/builtins.py:856
370
#: bzrlib/builtins.py:752
371
371
msgid "This is equivalent to creating the directory and then adding it."
372
372
msgstr ""
373
373
374
# help of 'parents' option of 'mkdir' command
375
#: bzrlib/builtins.py:863
376
msgid "No error if existing, make parent directories as needed."
377
msgstr ""
378
379
#: bzrlib/builtins.py:897
374
#: bzrlib/builtins.py:767
380
375
#, python-format
381
376
msgid "added %s\n"
382
377
msgstr ""
383
378
384
#: bzrlib/builtins.py:939
379
#: bzrlib/builtins.py:811
385
380
#, python-format
386
381
msgid "invalid kind %r specified"
387
382
msgstr ""
388
383
389
#: bzrlib/builtins.py:976
384
#: bzrlib/builtins.py:848
390
385
msgid "Move or rename a file."
391
386
msgstr ""
392
387
393
#: bzrlib/builtins.py:978
388
#: bzrlib/builtins.py:850
394
389
msgid " bzr mv SOURCE... DESTINATION"
395
390
msgstr ""
396
391
397
#: bzrlib/builtins.py:980
392
#: bzrlib/builtins.py:852
398
393
msgid ""
399
394
"If the last argument is a versioned directory, all the other names\n"
400
395
"are moved into it. Otherwise, there must be exactly two arguments\n"
401
396
"and the file is changed to a new name."
402
397
msgstr ""
403
398
404
#: bzrlib/builtins.py:984
399
#: bzrlib/builtins.py:856
405
400
msgid ""
406
401
"If OLDNAME does not exist on the filesystem but is versioned and\n"
407
402
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
410
405
"The same is valid when moving many SOURCE files to a DESTINATION."
411
406
msgstr ""
412
407
413
#: bzrlib/builtins.py:990
408
#: bzrlib/builtins.py:862
414
409
msgid "Files cannot be moved between branches."
415
410
msgstr ""
416
411
417
412
# help of 'after' option of 'mv' command
418
#: bzrlib/builtins.py:997
413
#: bzrlib/builtins.py:869
419
414
msgid ""
420
415
"Move only the bzr identifier of the file, because the file has already been "
421
416
"moved."
422
417
msgstr ""
423
418
424
419
# help of 'auto' option of 'mv' command
425
#: bzrlib/builtins.py:999
420
#: bzrlib/builtins.py:871
426
421
msgid "Automatically guess renames."
427
422
msgstr ""
428
423
429
424
# help of 'dry-run' option of 'mv' command
430
#: bzrlib/builtins.py:1000
425
#: bzrlib/builtins.py:872
431
426
msgid "Avoid making changes when guessing renames."
432
427
msgstr ""
433
428
434
#: bzrlib/builtins.py:1009
429
#: bzrlib/builtins.py:881
435
430
msgid "--dry-run requires --auto."
436
431
msgstr ""
437
432
438
#: bzrlib/builtins.py:1013
433
#: bzrlib/builtins.py:885
439
434
msgid "missing file argument"
440
435
msgstr ""
441
436
442
#: bzrlib/builtins.py:1017
437
#: bzrlib/builtins.py:889
443
438
msgid "can not move root of branch"
444
439
msgstr ""
445
440
446
#: bzrlib/builtins.py:1023
441
#: bzrlib/builtins.py:895
447
442
msgid "Only one path may be specified to --auto."
448
443
msgstr ""
449
444
450
#: bzrlib/builtins.py:1026
445
#: bzrlib/builtins.py:898
451
446
msgid "--after cannot be specified with --auto."
452
447
msgstr ""
453
448
454
#: bzrlib/builtins.py:1062
449
#: bzrlib/builtins.py:935
455
450
msgid "to mv multiple files the destination must be a versioned directory"
456
451
msgstr ""
457
452
458
#: bzrlib/builtins.py:1114
453
#: bzrlib/builtins.py:987
459
454
msgid "Turn this branch into a mirror of another branch."
460
455
msgstr ""
461
456
462
#: bzrlib/builtins.py:1116
457
#: bzrlib/builtins.py:989
463
458
msgid ""
464
459
"By default, this command only works on branches that have not diverged.\n"
465
460
"Branches are considered diverged if the destination branch's most recent \n"
467
462
"parent."
468
463
msgstr ""
469
464
470
#: bzrlib/builtins.py:1121
465
#: bzrlib/builtins.py:994
471
466
msgid ""
472
467
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
473
468
"from one into the other. Once one branch has merged, the other should\n"
474
469
"be able to pull it again."
475
470
msgstr ""
476
471
477
#: bzrlib/builtins.py:1125
472
#: bzrlib/builtins.py:998
478
473
msgid ""
479
474
"If you want to replace your local changes and just want your branch to\n"
480
475
"match the remote one, use pull --overwrite. This will work even if the two\n"
481
476
"branches have diverged."
482
477
msgstr ""
483
478
484
#: bzrlib/builtins.py:1129
479
#: bzrlib/builtins.py:1002
485
480
msgid ""
486
481
"If there is no default location set, the first pull will set it (use\n"
487
482
"--no-remember to avoid setting it). After that, you can omit the\n"
489
484
"value will only be saved if the remote location can be accessed."
490
485
msgstr ""
491
486
492
#: bzrlib/builtins.py:1134
487
#: bzrlib/builtins.py:1007
493
488
msgid ""
494
489
"The --verbose option will display the revisions pulled using the log_format\n"
495
490
"configuration option. You can use a different format by overriding it with\n"
496
491
"-Olog_format=<other_format>."
497
492
msgstr ""
498
493
499
#: bzrlib/builtins.py:1138
494
#: bzrlib/builtins.py:1011
500
495
msgid ""
501
496
"Note: The location can be specified either in the form of a branch,\n"
502
497
"or in the form of a path to a file containing a merge directive generated\n"
504
499
msgstr ""
505
500
506
501
# help of 'verbose' option of 'pull' command
507
#: bzrlib/builtins.py:1146
502
#: bzrlib/builtins.py:1019
508
503
msgid "Show logs of pulled revisions."
509
504
msgstr ""
510
505
511
506
# help of 'directory' option of 'pull' command
512
#: bzrlib/builtins.py:1148
507
#: bzrlib/builtins.py:1021
513
508
msgid ""
514
509
"Branch to pull into, rather than the one containing the working directory."
515
510
msgstr ""
516
511
517
512
# help of 'local' option of 'pull' command
518
#: bzrlib/builtins.py:1151
513
#: bzrlib/builtins.py:1024
519
514
msgid ""
520
515
"Perform a local pull in a bound branch. Local pulls are not applied to the "
521
516
"master branch."
522
517
msgstr ""
523
518
524
#: bzrlib/builtins.py:1188
525
msgid "No working tree, ignoring --show-base"
519
#: bzrlib/builtins.py:1053
520
msgid "Need working tree for --show-base."
526
521
msgstr ""
527
522
528
#: bzrlib/builtins.py:1204
523
#: bzrlib/builtins.py:1069
529
524
msgid "No pull location known or specified."
530
525
msgstr ""
531
526
532
#: bzrlib/builtins.py:1210
527
#: bzrlib/builtins.py:1075
533
528
#, python-format
534
529
msgid "Using saved parent location: %s\n"
535
530
msgstr ""
536
531
537
#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423
532
#: bzrlib/builtins.py:1082 bzrlib/builtins.py:4234
538
533
msgid "Cannot use -r with merge directives or bundles"
539
534
msgstr ""
540
535
541
#: bzrlib/builtins.py:1260
536
#: bzrlib/builtins.py:1123
542
537
msgid "Update a mirror of this branch."
543
538
msgstr ""
544
539
545
#: bzrlib/builtins.py:1262
540
#: bzrlib/builtins.py:1125
546
541
msgid ""
547
542
"The target branch will not have its working tree populated because this\n"
548
543
"is both expensive, and is not supported on remote file systems."
549
544
msgstr ""
550
545
551
#: bzrlib/builtins.py:1265
546
#: bzrlib/builtins.py:1128
552
547
msgid ""
553
548
"Some smart servers or protocols *may* put the working tree in place in\n"
554
549
"the future."
555
550
msgstr ""
556
551
557
#: bzrlib/builtins.py:1268
552
#: bzrlib/builtins.py:1131
558
553
msgid ""
559
554
"This command only works on branches that have not diverged. Branches are\n"
560
555
"considered diverged if the destination branch's most recent commit is one\n"
561
556
"that has not been merged (directly or indirectly) by the source branch."
562
557
msgstr ""
563
558
564
#: bzrlib/builtins.py:1272
559
#: bzrlib/builtins.py:1135
565
560
msgid ""
566
561
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
567
562
"the other branch completely, discarding its unmerged changes."
568
563
msgstr ""
569
564
570
#: bzrlib/builtins.py:1275
565
#: bzrlib/builtins.py:1138
571
566
msgid ""
572
567
"If you want to ensure you have the different changes in the other branch,\n"
573
568
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
574
569
"After that you will be able to do a push without '--overwrite'."
575
570
msgstr ""
576
571
577
#: bzrlib/builtins.py:1279
572
#: bzrlib/builtins.py:1142
578
573
msgid ""
579
574
"If there is no default push location set, the first push will set it (use\n"
580
575
"--no-remember to avoid setting it). After that, you can omit the\n"
582
577
"value will only be saved if the remote location can be accessed."
583
578
msgstr ""
584
579
585
#: bzrlib/builtins.py:1284
580
#: bzrlib/builtins.py:1147
586
581
msgid ""
587
582
"The --verbose option will display the revisions pushed using the log_format\n"
588
583
"configuration option. You can use a different format by overriding it with\n"
589
584
"-Olog_format=<other_format>."
590
585
msgstr ""
591
586
592
# help of 'directory' option of 'dpush' command
593
# help of 'directory' option of 'push' command
594
#: bzrlib/builtins.py:1295 bzrlib/foreign.py:272
595
msgid ""
596
"Branch to push from, rather than the one containing the working directory."
597
msgstr ""
598
599
587
# help of 'use-existing-dir' option of 'push' command
600
#: bzrlib/builtins.py:1298
588
#: bzrlib/builtins.py:1161
601
589
msgid ""
602
590
"By default push will fail if the target directory exists, but does not "
603
591
"already have a control directory. This flag will allow push to proceed."
604
592
msgstr ""
605
593
606
594
# help of 'stacked' option of 'push' command
607
#: bzrlib/builtins.py:1303
595
#: bzrlib/builtins.py:1166
608
596
msgid ""
609
597
"Create a stacked branch that references the public location of the parent "
610
598
"branch."
611
599
msgstr ""
612
600
613
601
# help of 'stacked-on' option of 'push' command
614
#: bzrlib/builtins.py:1306
602
#: bzrlib/builtins.py:1169
615
603
msgid ""
616
604
"Create a stacked branch that refers to another branch for the commit "
617
605
"history. Only the work not present in the referenced branch is included in "
618
606
"the branch created."
619
607
msgstr ""
620
608
621
# help of 'strict' option of 'dpush' command
622
# help of 'strict' option of 'push' command
623
#: bzrlib/builtins.py:1311 bzrlib/foreign.py:279
624
msgid ""
625
"Refuse to push if there are uncommitted changes in the working tree, --no-"
626
"strict disables the check."
627
msgstr ""
628
629
609
# help of 'no-tree' option of 'push' command
630
#: bzrlib/builtins.py:1314
610
#: bzrlib/builtins.py:1177
631
611
msgid "Don't populate the working tree, even for protocols that support it."
632
612
msgstr ""
633
613
634
# help of 'overwrite-tags' option of 'pull' command
635
# help of 'overwrite-tags' option of 'push' command
636
#: bzrlib/builtins.py:1317
637
msgid "Overwrite tags only."
638
msgstr ""
639
640
#: bzrlib/builtins.py:1368
614
#: bzrlib/builtins.py:1221
641
615
msgid "Could not determine branch to refer to."
642
616
msgstr ""
643
617
644
#: bzrlib/builtins.py:1377
645
#, python-format
646
msgid ""
647
"No push location known or specified. To push to the parent branch (at %s), "
648
"use 'bzr push :parent'."
649
msgstr ""
650
651
#: bzrlib/builtins.py:1383 bzrlib/foreign.py:306
618
#: bzrlib/builtins.py:1228 bzrlib/foreign.py:305
652
619
msgid "No push location known or specified."
653
620
msgstr ""
654
621
655
#: bzrlib/builtins.py:1387
622
#: bzrlib/builtins.py:1232
656
623
#, python-format
657
624
msgid "Using saved push location: %s"
658
625
msgstr ""
659
626
660
#: bzrlib/builtins.py:1397
627
#: bzrlib/builtins.py:1242
661
628
msgid "Create a new branch that is a copy of an existing branch."
662
629
msgstr ""
663
630
664
#: bzrlib/builtins.py:1399
631
#: bzrlib/builtins.py:1244
665
632
msgid ""
666
633
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
667
634
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
672
639
"create ./foo-bar."
673
640
msgstr ""
674
641
675
#: bzrlib/builtins.py:1406
642
#: bzrlib/builtins.py:1251
676
643
msgid ""
677
644
"To retrieve the branch as of a particular revision, supply the --revision\n"
678
645
"parameter, as in \"branch foo/bar -r 5\"."
679
646
msgstr ""
680
647
681
#: bzrlib/builtins.py:1409
648
#: bzrlib/builtins.py:1254
682
649
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
683
650
msgstr ""
684
651
685
652
# help of 'no-tree' option of 'branch' command
686
#: bzrlib/builtins.py:1419
653
#: bzrlib/builtins.py:1264
687
654
msgid "Create a branch without a working-tree."
688
655
msgstr ""
689
656
690
657
# help of 'switch' option of 'branch' command
691
#: bzrlib/builtins.py:1421
658
#: bzrlib/builtins.py:1266
692
659
msgid "Switch the checkout in the current directory to the new branch."
693
660
msgstr ""
694
661
695
662
# help of 'stacked' option of 'branch' command
696
#: bzrlib/builtins.py:1424
663
#: bzrlib/builtins.py:1269
697
664
msgid ""
698
665
"Create a stacked branch referring to the source branch. The new branch will "
699
666
"depend on the availability of the source branch for all operations."
700
667
msgstr ""
701
668
702
669
# help of 'standalone' option of 'branch' command
703
#: bzrlib/builtins.py:1428
670
#: bzrlib/builtins.py:1273
704
671
msgid "Do not use a shared repository, even if available."
705
672
msgstr ""
706
673
707
674
# help of 'use-existing-dir' option of 'branch' command
708
#: bzrlib/builtins.py:1430
675
#: bzrlib/builtins.py:1275
709
676
msgid ""
710
677
"By default branch will fail if the target directory exists, but does not "
711
678
"already have a control directory. This flag will allow branch to proceed."
712
679
msgstr ""
713
680
714
681
# help of 'bind' option of 'branch' command
715
#: bzrlib/builtins.py:1435
682
#: bzrlib/builtins.py:1280
716
683
msgid "Bind new branch to from location."
717
684
msgstr ""
718
685
719
#: bzrlib/builtins.py:1482
686
#: bzrlib/builtins.py:1327
720
687
#, python-format
721
688
msgid "Target directory \"%s\" already exists."
722
689
msgstr ""
723
690
724
#: bzrlib/builtins.py:1494
691
#: bzrlib/builtins.py:1339
725
692
#, python-format
726
693
msgid "Parent of \"%s\" does not exist."
727
694
msgstr ""
728
695
729
#: bzrlib/builtins.py:1513
696
#: bzrlib/builtins.py:1358
730
697
msgid "The branch {0} has no revision {1}."
731
698
msgstr ""
732
699
733
#: bzrlib/builtins.py:1528 bzrlib/push.py:53
700
#: bzrlib/builtins.py:1368 bzrlib/push.py:51
734
701
#, python-format
735
702
msgid "Created new stacked branch referring to %s."
736
703
msgstr ""
737
704
738
#: bzrlib/builtins.py:1532
705
#: bzrlib/builtins.py:1372
739
706
#, python-format
740
707
msgid "Branched %d revision."
741
708
msgid_plural "Branched %d revisions."
742
709
msgstr[0] ""
743
710
msgstr[1] ""
744
711
745
#: bzrlib/builtins.py:1537
712
#: bzrlib/builtins.py:1377
746
713
#, python-format
747
714
msgid "New branch bound to %s"
748
715
msgstr ""
749
716
750
#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283
717
#: bzrlib/builtins.py:1382 bzrlib/builtins.py:6121
751
718
#, python-format
752
719
msgid "Switched to branch: %s"
753
720
msgstr ""
754
721
755
#: bzrlib/builtins.py:1547
722
#: bzrlib/builtins.py:1387
756
723
msgid "List the branches available at the current location."
757
724
msgstr ""
758
725
759
#: bzrlib/builtins.py:1549
726
#: bzrlib/builtins.py:1389
760
727
msgid ""
761
728
"This command will print the names of all the branches at the current\n"
762
729
"location."
763
730
msgstr ""
764
731
765
732
# help of 'recursive' option of 'branches' command
766
#: bzrlib/builtins.py:1556
733
#: bzrlib/builtins.py:1396
767
734
msgid ""
768
735
"Recursively scan for branches rather than just looking in the specified "
769
736
"location."
770
737
msgstr ""
771
738
772
#: bzrlib/builtins.py:1585
773
msgid "(default)"
739
#: bzrlib/builtins.py:1413
740
msgid " (default)\n"
774
741
msgstr ""
775
742
776
#: bzrlib/builtins.py:1597
743
#: bzrlib/builtins.py:1420
777
744
msgid "Create a new checkout of an existing branch."
778
745
msgstr ""
779
746
780
#: bzrlib/builtins.py:1599
747
#: bzrlib/builtins.py:1422
781
748
msgid ""
782
749
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
783
750
"for\n"
787
754
"location using SFTP."
788
755
msgstr ""
789
756
790
#: bzrlib/builtins.py:1604
757
#: bzrlib/builtins.py:1427
791
758
msgid ""
792
759
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
793
760
"will\n"
799
766
"create ./foo-bar."
800
767
msgstr ""
801
768
802
#: bzrlib/builtins.py:1611
769
#: bzrlib/builtins.py:1434
803
770
msgid ""
804
771
"To retrieve the branch as of a particular revision, supply the --revision\n"
805
772
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
810
777
msgstr ""
811
778
812
779
# help of 'lightweight' option of 'checkout' command
813
#: bzrlib/builtins.py:1621
780
#: bzrlib/builtins.py:1444
814
781
msgid ""
815
782
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
816
783
"the branch for every operation. Normal checkouts can perform common "
819
786
msgstr ""
820
787
821
788
# help of 'files-from' option of 'branch' command
822
# help of 'files-from' option of 'checkout' command
823
#: bzrlib/builtins.py:1628
789
#: bzrlib/builtins.py:1451
824
790
msgid "Get file contents from this tree."
825
791
msgstr ""
826
792
827
793
# help of 'hardlink' option of 'branch' command
828
# help of 'hardlink' option of 'checkout' command
829
#: bzrlib/builtins.py:1630
794
#: bzrlib/builtins.py:1453
830
795
msgid "Hard-link working tree files where possible."
831
796
msgstr ""
832
797
833
#: bzrlib/builtins.py:1671
798
#: bzrlib/builtins.py:1494
834
799
msgid ""
835
800
"Show list of renamed files.\n"
836
801
" "
837
802
msgstr ""
838
803
839
#: bzrlib/builtins.py:1699
804
#: bzrlib/builtins.py:1524
840
805
msgid "Update a working tree to a new revision."
841
806
msgstr ""
842
807
843
#: bzrlib/builtins.py:1701
808
#: bzrlib/builtins.py:1526
844
809
msgid ""
845
810
"This will perform a merge of the destination revision (the tip of the\n"
846
811
"branch, or the specified revision) into the working tree, and then make\n"
847
812
"that revision the basis revision for the working tree. "
848
813
msgstr ""
849
814
850
#: bzrlib/builtins.py:1705
815
#: bzrlib/builtins.py:1530
851
816
msgid ""
852
817
"You can use this to visit an older revision, or to update a working tree\n"
853
818
"that is out of date from its branch."
854
819
msgstr ""
855
820
856
#: bzrlib/builtins.py:1708
821
#: bzrlib/builtins.py:1533
857
822
msgid ""
858
823
"If there are any uncommitted changes in the tree, they will be carried\n"
859
824
"across and remain as uncommitted changes after the update. To discard\n"
861
826
"with the changes brought in by the change in basis revision."
862
827
msgstr ""
863
828
864
#: bzrlib/builtins.py:1713
829
#: bzrlib/builtins.py:1538
865
830
msgid ""
866
831
"If the tree's branch is bound to a master branch, bzr will also update\n"
867
832
"the branch from the master."
868
833
msgstr ""
869
834
870
#: bzrlib/builtins.py:1716
835
#: bzrlib/builtins.py:1541
871
836
msgid ""
872
837
"You cannot update just a single file or directory, because each Bazaar\n"
873
838
"working tree has just a single basis revision. If you want to restore a\n"
877
842
"out the old content of that file to a new location."
878
843
msgstr ""
879
844
880
#: bzrlib/builtins.py:1723
845
#: bzrlib/builtins.py:1548
881
846
msgid ""
882
847
"The 'dir' argument, if given, must be the location of the root of a\n"
883
848
"working tree to update. By default, the working tree that contains the \n"
884
849
"current working directory is used."
885
850
msgstr ""
886
851
887
#: bzrlib/builtins.py:1739
852
#: bzrlib/builtins.py:1564
888
853
msgid "bzr update --revision takes exactly one revision"
889
854
msgstr ""
890
855
891
#: bzrlib/builtins.py:1747
856
#: bzrlib/builtins.py:1572
892
857
msgid "bzr update can only update a whole tree, not a file or subdirectory"
893
858
msgstr ""
894
859
895
#: bzrlib/builtins.py:1778
860
#: bzrlib/builtins.py:1603
896
861
msgid "Tree is up to date at revision {0} of branch {1}"
897
862
msgstr ""
898
863
899
#: bzrlib/builtins.py:1794
864
#: bzrlib/builtins.py:1619
900
865
#, python-format
901
866
msgid ""
902
867
"branch has no revision %s\n"
903
868
"bzr update --revision only works for a revision in the branch history"
904
869
msgstr ""
905
870
906
#: bzrlib/builtins.py:1800
871
#: bzrlib/builtins.py:1625
907
872
msgid "Updated to revision {0} of branch {1}"
908
873
msgstr ""
909
874
910
#: bzrlib/builtins.py:1804
875
#: bzrlib/builtins.py:1629
911
876
msgid ""
912
877
"Your local commits will now show as pending merges with 'bzr status', and "
913
878
"can be committed with 'bzr commit'."
914
879
msgstr ""
915
880
916
#: bzrlib/builtins.py:1813
881
#: bzrlib/builtins.py:1638
917
882
msgid "Show information about a working tree, branch or repository."
918
883
msgstr ""
919
884
920
#: bzrlib/builtins.py:1815
885
#: bzrlib/builtins.py:1640
921
886
msgid ""
922
887
"This command will show all known locations and formats associated to the\n"
923
888
"tree, branch or repository."
924
889
msgstr ""
925
890
926
#: bzrlib/builtins.py:1818
891
#: bzrlib/builtins.py:1643
927
892
msgid ""
928
893
"In verbose mode, statistical information is included with each report.\n"
929
894
"To see extended statistic information, use a verbosity level of 2 or\n"
930
895
"higher by specifying the verbose option multiple times, e.g. -vv."
931
896
msgstr ""
932
897
933
#: bzrlib/builtins.py:1822
898
#: bzrlib/builtins.py:1647
934
899
msgid "Branches and working trees will also report any missing revisions."
935
900
msgstr ""
936
901
937
#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883
938
#: bzrlib/builtins.py:6469
939
msgid ":Examples:"
940
msgstr ""
941
942
#: bzrlib/builtins.py:1826
902
#: bzrlib/builtins.py:1651
943
903
msgid " Display information on the format and related locations:"
944
904
msgstr ""
945
905
946
#: bzrlib/builtins.py:1828
906
#: bzrlib/builtins.py:1653
947
907
msgid " bzr info"
948
908
msgstr ""
949
909
950
#: bzrlib/builtins.py:1830
910
#: bzrlib/builtins.py:1655
951
911
msgid ""
952
912
" Display the above together with extended format information and\n"
953
913
" basic statistics (like the number of files in the working tree and\n"
954
914
" number of revisions in the branch and repository):"
955
915
msgstr ""
956
916
957
#: bzrlib/builtins.py:1834
917
#: bzrlib/builtins.py:1659
958
918
msgid " bzr info -v"
959
919
msgstr ""
960
920
961
#: bzrlib/builtins.py:1836
921
#: bzrlib/builtins.py:1661
962
922
msgid " Display the above together with number of committers to the branch:"
963
923
msgstr ""
964
924
965
#: bzrlib/builtins.py:1838
925
#: bzrlib/builtins.py:1663
966
926
msgid " bzr info -vv"
967
927
msgstr ""
968
928
969
#: bzrlib/builtins.py:1857
929
#: bzrlib/builtins.py:1682
970
930
msgid "Remove files or directories."
971
931
msgstr ""
972
932
973
#: bzrlib/builtins.py:1859
933
#: bzrlib/builtins.py:1684
974
934
msgid ""
975
935
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
976
936
"delete them if they can easily be recovered using revert otherwise they\n"
977
"will be backed up (adding an extension of the form .~#~). If no options or\n"
937
"will be backed up (adding an extention of the form .~#~). If no options or\n"
978
938
"parameters are given Bazaar will scan for files that are being tracked by\n"
979
939
"Bazaar but missing in your tree and stop tracking them for you."
980
940
msgstr ""
981
941
982
942
# help of 'new' option of 'remove' command
983
#: bzrlib/builtins.py:1867
943
#: bzrlib/builtins.py:1692
984
944
msgid "Only remove files that have never been committed."
985
945
msgstr ""
986
946
987
947
# help of 'file-deletion-strategy' option of 'remove' command
988
#: bzrlib/builtins.py:1869
948
#: bzrlib/builtins.py:1694
989
949
msgid "The file deletion mode to be used."
990
950
msgstr ""
991
951
992
952
# title of 'file-deletion-strategy' option of 'remove' command
993
#: bzrlib/builtins.py:1870
953
#: bzrlib/builtins.py:1695
994
954
msgid "Deletion Strategy"
995
955
msgstr ""
996
956
997
957
# help of 'file-deletion-strategy=safe' option of 'remove' command
998
#: bzrlib/builtins.py:1871
958
#: bzrlib/builtins.py:1696
999
959
msgid "Backup changed files (default)."
1000
960
msgstr ""
1001
961
1002
962
# help of 'file-deletion-strategy=keep' option of 'remove' command
1003
#: bzrlib/builtins.py:1872
963
#: bzrlib/builtins.py:1697
1004
964
msgid "Delete from bzr but leave the working copy."
1005
965
msgstr ""
1006
966
1007
967
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
1008
#: bzrlib/builtins.py:1873
968
#: bzrlib/builtins.py:1698
1009
969
msgid "Don't backup changed files."
1010
970
msgstr ""
1011
971
1012
#: bzrlib/builtins.py:1894
972
# help of 'file-deletion-strategy=force' option of 'remove' command
973
#: bzrlib/builtins.py:1699
974
msgid ""
975
"Delete all the specified files, even if they can not be recovered and even "
976
"if they are non-empty directories. (deprecated, use no-backup)"
977
msgstr ""
978
979
#: bzrlib/builtins.py:1708
980
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
981
msgstr ""
982
983
#: bzrlib/builtins.py:1725
1013
984
msgid "No matching files."
1014
985
msgstr ""
1015
986
1016
#: bzrlib/builtins.py:1955
987
#: bzrlib/builtins.py:1786
1017
988
msgid "Reconcile bzr metadata in a branch."
1018
989
msgstr ""
1019
990
1020
#: bzrlib/builtins.py:1957
991
#: bzrlib/builtins.py:1788
1021
992
msgid ""
1022
993
"This can correct data mismatches that may have been caused by\n"
1023
994
"previous ghost operations or bzr upgrades. You should only\n"
1025
996
"advises you to run it."
1026
997
msgstr ""
1027
998
1028
#: bzrlib/builtins.py:1962
999
#: bzrlib/builtins.py:1793
1029
1000
msgid ""
1030
1001
"If a second branch is provided, cross-branch reconciliation is\n"
1031
1002
"also attempted, which will check that data like the tree root\n"
1033
1004
"correctly in both branches."
1034
1005
msgstr ""
1035
1006
1036
#: bzrlib/builtins.py:1967
1007
#: bzrlib/builtins.py:1798
1037
1008
msgid ""
1038
1009
"At the same time it is run it may recompress data resulting in\n"
1039
1010
"a potential saving in disk space or performance gain."
1040
1011
msgstr ""
1041
1012
1042
#: bzrlib/builtins.py:1970
1013
#: bzrlib/builtins.py:1801
1043
1014
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1044
1015
msgstr ""
1045
1016
1046
1017
# help of 'format=2a' option of 'init' command
1047
# help of 'format=default' option of 'init' command
1048
# help of 'format=2a' option of 'init-repository' command
1049
# help of 'format=default' option of 'init-repository' command
1050
# help of 'format=2a' option of 'upgrade' command
1051
# help of 'format=default' option of 'upgrade' command
1052
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1018
#: bzrlib/builtins.py:1868
1053
1019
msgid ""
1054
1020
"Format for the bzr 2.0 series.\n"
1055
1021
"Uses group-compress storage.\n"
1057
1023
msgstr ""
1058
1024
1059
1025
# help of 'format=pack-0.92' option of 'init' command
1060
# help of 'format=pack-0.92' option of 'init-repository' command
1061
# help of 'format=pack-0.92' option of 'upgrade' command
1062
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1026
#: bzrlib/builtins.py:1868
1063
1027
msgid ""
1064
1028
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1065
1029
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1066
1030
msgstr ""
1067
1031
1068
1032
# help of 'format=development-colo' option of 'init' command
1069
# help of 'format=development-colo' option of 'init-repository' command
1070
# help of 'format=development-colo' option of 'upgrade' command
1071
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1033
#: bzrlib/builtins.py:1868
1072
1034
msgid "The 2a format with experimental support for colocated branches.\n"
1073
1035
msgstr ""
1074
1036
1075
#: bzrlib/builtins.py:2038
1037
#: bzrlib/builtins.py:1869
1076
1038
msgid "Make a directory into a versioned branch."
1077
1039
msgstr ""
1078
1040
1079
#: bzrlib/builtins.py:2040
1041
#: bzrlib/builtins.py:1871
1080
1042
msgid ""
1081
1043
"Use this to create an empty branch, or before importing an\n"
1082
1044
"existing project."
1083
1045
msgstr ""
1084
1046
1085
#: bzrlib/builtins.py:2043
1047
#: bzrlib/builtins.py:1874
1086
1048
msgid ""
1087
1049
"If there is a repository in a parent directory of the location, then\n"
1088
1050
"the history of the branch will be stored in the repository. Otherwise\n"
1090
1052
"in the .bzr directory."
1091
1053
msgstr ""
1092
1054
1093
#: bzrlib/builtins.py:2048
1055
#: bzrlib/builtins.py:1879
1094
1056
msgid ""
1095
1057
"If there is already a branch at the location but it has no working tree,\n"
1096
1058
"the tree can be populated with 'bzr checkout'."
1097
1059
msgstr ""
1098
1060
1099
#: bzrlib/builtins.py:2051
1061
#: bzrlib/builtins.py:1882
1100
1062
msgid "Recipe for importing a tree of files::"
1101
1063
msgstr ""
1102
1064
1103
#: bzrlib/builtins.py:2053
1065
#: bzrlib/builtins.py:1884
1104
1066
msgid ""
1105
1067
" cd ~/project\n"
1106
1068
" bzr init\n"
1110
1072
msgstr ""
1111
1073
1112
1074
# help of 'create-prefix' option of 'init' command
1113
# help of 'create-prefix' option of 'push' command
1114
#: bzrlib/builtins.py:2064
1075
#: bzrlib/builtins.py:1895
1115
1076
msgid "Create the path leading up to the branch if it does not already exist."
1116
1077
msgstr ""
1117
1078
1118
1079
# help of 'format' option of 'init' command
1119
#: bzrlib/builtins.py:2067
1080
#: bzrlib/builtins.py:1898
1120
1081
msgid "Specify a format for this branch. See \"help formats\"."
1121
1082
msgstr ""
1122
1083
1123
1084
# help of 'append-revisions-only' option of 'init' command
1124
#: bzrlib/builtins.py:2075
1085
#: bzrlib/builtins.py:1906
1125
1086
msgid "Never change revnos or the existing log. Append revisions to it only."
1126
1087
msgstr ""
1127
1088
1128
1089
# help of 'no-tree' option of 'init' command
1129
#: bzrlib/builtins.py:2078
1090
#: bzrlib/builtins.py:1909
1130
1091
msgid "Create a branch without a working tree."
1131
1092
msgstr ""
1132
1093
1133
#: bzrlib/builtins.py:2098 bzrlib/push.py:110
1094
#: bzrlib/builtins.py:1929 bzrlib/push.py:108
1134
1095
#, python-format
1135
1096
msgid ""
1136
1097
"Parent directory of %s does not exist.\n"
1137
1098
"You may supply --create-prefix to create all leading parent directories."
1138
1099
msgstr ""
1139
1100
1140
#: bzrlib/builtins.py:2132
1101
#: bzrlib/builtins.py:1963
1141
1102
msgid ""
1142
1103
"This branch format cannot be set to append-revisions-only. Try --default."
1143
1104
msgstr ""
1144
1105
1145
#: bzrlib/builtins.py:2143
1106
#: bzrlib/builtins.py:1974
1146
1107
msgid "Created a {0} (format: {1})\n"
1147
1108
msgstr ""
1148
1109
1149
#: bzrlib/builtins.py:2152
1110
#: bzrlib/builtins.py:1983
1150
1111
#, python-format
1151
1112
msgid "Using shared repository: %s\n"
1152
1113
msgstr ""
1153
1114
1154
#: bzrlib/builtins.py:2156
1115
#: bzrlib/builtins.py:1987
1155
1116
msgid "Create a shared repository for branches to share storage space."
1156
1117
msgstr ""
1157
1118
1158
#: bzrlib/builtins.py:2158
1119
#: bzrlib/builtins.py:1989
1159
1120
msgid ""
1160
1121
"New branches created under the repository directory will store their\n"
1161
1122
"revisions in the repository, not in the branch directory. For branches\n"
1163
1124
"speeds up the creation of new branches."
1164
1125
msgstr ""
1165
1126
1166
#: bzrlib/builtins.py:2163
1127
#: bzrlib/builtins.py:1994
1167
1128
msgid ""
1168
1129
"If the --no-trees option is given then the branches in the repository\n"
1169
1130
"will not have working trees by default. They will still exist as \n"
1173
1134
"branches, such as on a server."
1174
1135
msgstr ""
1175
1136
1176
#: bzrlib/builtins.py:2170
1137
#: bzrlib/builtins.py:2001
1177
1138
msgid ""
1178
1139
":Examples:\n"
1179
1140
" Create a shared repository holding just branches::"
1180
1141
msgstr ""
1181
1142
1182
#: bzrlib/builtins.py:2173
1143
#: bzrlib/builtins.py:2004
1183
1144
msgid ""
1184
1145
" bzr init-repo --no-trees repo\n"
1185
1146
" bzr init repo/trunk"
1186
1147
msgstr ""
1187
1148
1188
#: bzrlib/builtins.py:2176
1149
#: bzrlib/builtins.py:2007
1189
1150
msgid " Make a lightweight checkout elsewhere::"
1190
1151
msgstr ""
1191
1152
1192
#: bzrlib/builtins.py:2178
1153
#: bzrlib/builtins.py:2009
1193
1154
msgid ""
1194
1155
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1195
1156
" cd trunk-checkout\n"
1197
1158
msgstr ""
1198
1159
1199
1160
# help of 'format' option of 'init-repository' command
1200
#: bzrlib/builtins.py:2186
1161
#: bzrlib/builtins.py:2017
1201
1162
msgid ""
1202
1163
"Specify a format for this repository. See \"bzr help formats\" for details."
1203
1164
msgstr ""
1204
1165
1205
1166
# title of 'format' option of 'init-repository' command
1206
#: bzrlib/builtins.py:2190
1167
#: bzrlib/builtins.py:2021
1207
1168
msgid "Repository format"
1208
1169
msgstr ""
1209
1170
1210
1171
# help of 'no-trees' option of 'init-repository' command
1211
#: bzrlib/builtins.py:2192
1172
#: bzrlib/builtins.py:2023
1212
1173
msgid "Branches in the repository will default to not having a working tree."
1213
1174
msgstr ""
1214
1175
1215
#: bzrlib/builtins.py:2218
1176
#: bzrlib/builtins.py:2047
1216
1177
msgid "Show differences in the working tree, between revisions or branches."
1217
1178
msgstr ""
1218
1179
1219
#: bzrlib/builtins.py:2220
1180
#: bzrlib/builtins.py:2049
1220
1181
msgid ""
1221
1182
"If no arguments are given, all changes for the current tree are listed.\n"
1222
1183
"If files are given, only the changes in those files are listed.\n"
1226
1187
"given."
1227
1188
msgstr ""
1228
1189
1229
#: bzrlib/builtins.py:2227
1190
#: bzrlib/builtins.py:2056
1230
1191
msgid ""
1231
1192
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1232
1193
"produces patches suitable for \"patch -p1\"."
1233
1194
msgstr ""
1234
1195
1235
#: bzrlib/builtins.py:2230
1196
#: bzrlib/builtins.py:2059
1236
1197
msgid ""
1237
1198
"Note that when using the -r argument with a range of revisions, the\n"
1238
1199
"differences are computed between the two specified revisions. That\n"
1242
1203
"in the range."
1243
1204
msgstr ""
1244
1205
1245
#: bzrlib/builtins.py:2237
1206
#: bzrlib/builtins.py:2066
1246
1207
msgid ""
1247
1208
":Exit values:\n"
1248
1209
" 1 - changed\n"
1251
1212
" 0 - no change"
1252
1213
msgstr ""
1253
1214
1254
#: bzrlib/builtins.py:2243
1215
#: bzrlib/builtins.py:2072
1255
1216
msgid ""
1256
1217
":Examples:\n"
1257
1218
" Shows the difference in the working tree versus the last commit::"
1258
1219
msgstr ""
1259
1220
1260
#: bzrlib/builtins.py:2246
1221
#: bzrlib/builtins.py:2075
1261
1222
msgid " bzr diff"
1262
1223
msgstr ""
1263
1224
1264
#: bzrlib/builtins.py:2248
1225
#: bzrlib/builtins.py:2077
1265
1226
msgid " Difference between the working tree and revision 1::"
1266
1227
msgstr ""
1267
1228
1268
#: bzrlib/builtins.py:2250
1229
#: bzrlib/builtins.py:2079
1269
1230
msgid " bzr diff -r1"
1270
1231
msgstr ""
1271
1232
1272
#: bzrlib/builtins.py:2252
1233
#: bzrlib/builtins.py:2081
1273
1234
msgid " Difference between revision 3 and revision 1::"
1274
1235
msgstr ""
1275
1236
1276
#: bzrlib/builtins.py:2254
1237
#: bzrlib/builtins.py:2083
1277
1238
msgid " bzr diff -r1..3"
1278
1239
msgstr ""
1279
1240
1280
#: bzrlib/builtins.py:2256
1241
#: bzrlib/builtins.py:2085
1281
1242
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1282
1243
msgstr ""
1283
1244
1284
#: bzrlib/builtins.py:2258
1245
#: bzrlib/builtins.py:2087
1285
1246
msgid " bzr diff -r1..3 xxx"
1286
1247
msgstr ""
1287
1248
1288
#: bzrlib/builtins.py:2260
1249
#: bzrlib/builtins.py:2089
1289
1250
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1290
1251
msgstr ""
1291
1252
1292
#: bzrlib/builtins.py:2262
1253
#: bzrlib/builtins.py:2091
1293
1254
msgid " bzr diff -c2"
1294
1255
msgstr ""
1295
1256
1296
#: bzrlib/builtins.py:2264
1257
#: bzrlib/builtins.py:2093
1297
1258
msgid ""
1298
1259
" To see the changes introduced by revision X::\n"
1299
1260
" \n"
1300
1261
" bzr diff -cX"
1301
1262
msgstr ""
1302
1263
1303
#: bzrlib/builtins.py:2268
1264
#: bzrlib/builtins.py:2097
1304
1265
msgid ""
1305
1266
" Note that in the case of a merge, the -c option shows the changes\n"
1306
1267
" compared to the left hand parent. To see the changes against\n"
1307
1268
" another parent, use::"
1308
1269
msgstr ""
1309
1270
1310
#: bzrlib/builtins.py:2272
1271
#: bzrlib/builtins.py:2101
1311
1272
msgid " bzr diff -r<chosen_parent>..X"
1312
1273
msgstr ""
1313
1274
1314
#: bzrlib/builtins.py:2274
1275
#: bzrlib/builtins.py:2103
1315
1276
msgid ""
1316
1277
" The changes between the current revision and the previous revision\n"
1317
1278
" (equivalent to -c-1 and -r-2..-1)"
1318
1279
msgstr ""
1319
1280
1320
#: bzrlib/builtins.py:2277
1281
#: bzrlib/builtins.py:2106
1321
1282
msgid " bzr diff -r-2.."
1322
1283
msgstr ""
1323
1284
1324
#: bzrlib/builtins.py:2279
1285
#: bzrlib/builtins.py:2108
1325
1286
msgid " Show just the differences for file NEWS::"
1326
1287
msgstr ""
1327
1288
1328
#: bzrlib/builtins.py:2281
1289
#: bzrlib/builtins.py:2110
1329
1290
msgid " bzr diff NEWS"
1330
1291
msgstr ""
1331
1292
1332
#: bzrlib/builtins.py:2283
1293
#: bzrlib/builtins.py:2112
1333
1294
msgid " Show the differences in working tree xxx for file NEWS::"
1334
1295
msgstr ""
1335
1296
1336
#: bzrlib/builtins.py:2285
1297
#: bzrlib/builtins.py:2114
1337
1298
msgid " bzr diff xxx/NEWS"
1338
1299
msgstr ""
1339
1300
1340
#: bzrlib/builtins.py:2287
1301
#: bzrlib/builtins.py:2116
1341
1302
msgid " Show the differences from branch xxx to this working tree:"
1342
1303
msgstr ""
1343
1304
1344
#: bzrlib/builtins.py:2289
1305
#: bzrlib/builtins.py:2118
1345
1306
msgid " bzr diff --old xxx"
1346
1307
msgstr ""
1347
1308
1348
#: bzrlib/builtins.py:2291
1309
#: bzrlib/builtins.py:2120
1349
1310
msgid " Show the differences between two branches for file NEWS::"
1350
1311
msgstr ""
1351
1312
1352
#: bzrlib/builtins.py:2293
1313
#: bzrlib/builtins.py:2122
1353
1314
msgid " bzr diff --old xxx --new yyy NEWS"
1354
1315
msgstr ""
1355
1316
1356
#: bzrlib/builtins.py:2295
1317
#: bzrlib/builtins.py:2124
1357
1318
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1358
1319
msgstr ""
1359
1320
1360
#: bzrlib/builtins.py:2297
1321
#: bzrlib/builtins.py:2126
1361
1322
msgid ""
1362
1323
" bzr diff --prefix old/:new/\n"
1363
1324
" \n"
1367
1328
msgstr ""
1368
1329
1369
1330
# help of 'diff-options' option of 'diff' command
1370
#: bzrlib/builtins.py:2307
1331
#: bzrlib/builtins.py:2136
1371
1332
msgid "Pass these options to the external diff program."
1372
1333
msgstr ""
1373
1334
1374
1335
# help of 'prefix' option of 'diff' command
1375
#: bzrlib/builtins.py:2310
1336
#: bzrlib/builtins.py:2139
1376
1337
msgid ""
1377
1338
"Set prefixes added to old and new filenames, as two values separated by a "
1378
1339
"colon. (eg \"old/:new/\")."
1379
1340
msgstr ""
1380
1341
1381
1342
# help of 'old' option of 'diff' command
1382
#: bzrlib/builtins.py:2313
1343
#: bzrlib/builtins.py:2142
1383
1344
msgid "Branch/tree to compare from."
1384
1345
msgstr ""
1385
1346
1386
1347
# help of 'new' option of 'diff' command
1387
#: bzrlib/builtins.py:2317
1348
#: bzrlib/builtins.py:2146
1388
1349
msgid "Branch/tree to compare to."
1389
1350
msgstr ""
1390
1351
1391
1352
# help of 'using' option of 'diff' command
1392
#: bzrlib/builtins.py:2323
1353
#: bzrlib/builtins.py:2152
1393
1354
msgid "Use this command to compare files."
1394
1355
msgstr ""
1395
1356
1396
1357
# help of 'format' option of 'diff' command
1397
#: bzrlib/builtins.py:2328
1358
#: bzrlib/builtins.py:2157
1398
1359
msgid "Diff format to use."
1399
1360
msgstr ""
1400
1361
1401
1362
# title of 'format' option of 'diff' command
1402
#: bzrlib/builtins.py:2330
1363
#: bzrlib/builtins.py:2159
1403
1364
msgid "Diff format"
1404
1365
msgstr ""
1405
1366
1406
# help of 'context' option of 'diff' command
1407
#: bzrlib/builtins.py:2332
1408
msgid "How many lines of context to show."
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2357
1367
#: bzrlib/builtins.py:2181
1412
1368
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1413
1369
msgstr ""
1414
1370
1415
#: bzrlib/builtins.py:2361
1371
#: bzrlib/builtins.py:2185
1416
1372
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1417
1373
msgstr ""
1418
1374
1419
#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776
1420
#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957
1375
#: bzrlib/builtins.py:2190 bzrlib/builtins.py:2588 bzrlib/builtins.py:2601
1376
#: bzrlib/builtins.py:2609 bzrlib/builtins.py:4760
1421
1377
msgid "{0} and {1} are mutually exclusive"
1422
1378
msgstr ""
1423
1379
1424
#: bzrlib/builtins.py:2386
1380
#: bzrlib/builtins.py:2210
1425
1381
msgid ""
1426
1382
"List files deleted in the working tree.\n"
1427
1383
" "
1428
1384
msgstr ""
1429
1385
1430
#: bzrlib/builtins.py:2463
1386
#: bzrlib/builtins.py:2288
1431
1387
msgid "Show the tree root directory."
1432
1388
msgstr ""
1433
1389
1434
#: bzrlib/builtins.py:2465
1390
#: bzrlib/builtins.py:2290
1435
1391
msgid ""
1436
1392
"The root is the nearest enclosing directory with a .bzr control\n"
1437
1393
"directory."
1438
1394
msgstr ""
1439
1395
1440
#: bzrlib/builtins.py:2480
1396
#: bzrlib/builtins.py:2305
1441
1397
msgid "The limit argument must be an integer."
1442
1398
msgstr ""
1443
1399
1444
#: bzrlib/builtins.py:2488
1400
#: bzrlib/builtins.py:2313
1445
1401
msgid "The levels argument must be an integer."
1446
1402
msgstr ""
1447
1403
1448
#: bzrlib/builtins.py:2493
1404
#: bzrlib/builtins.py:2318
1449
1405
msgid "Show historical log for a branch or subset of a branch."
1450
1406
msgstr ""
1451
1407
1452
#: bzrlib/builtins.py:2495
1408
#: bzrlib/builtins.py:2320
1453
1409
msgid ""
1454
1410
"log is bzr's default tool for exploring the history of a branch.\n"
1455
1411
"The branch to use is taken from the first parameter. If no parameters\n"
1457
1413
"Here are some simple examples::"
1458
1414
msgstr ""
1459
1415
1460
#: bzrlib/builtins.py:2500
1416
#: bzrlib/builtins.py:2325
1461
1417
msgid ""
1462
1418
" bzr log log the current branch\n"
1463
1419
" bzr log foo.py log a file in its branch\n"
1464
1420
" bzr log http://server/branch log a branch on a server"
1465
1421
msgstr ""
1466
1422
1467
#: bzrlib/builtins.py:2504
1423
#: bzrlib/builtins.py:2329
1468
1424
msgid ""
1469
1425
"The filtering, ordering and information shown for each revision can\n"
1470
1426
"be controlled as explained below. By default, all revisions are\n"
1474
1430
"were merged."
1475
1431
msgstr ""
1476
1432
1477
#: bzrlib/builtins.py:2511
1433
#: bzrlib/builtins.py:2336
1478
1434
msgid ":Output control:"
1479
1435
msgstr ""
1480
1436
1481
#: bzrlib/builtins.py:2513
1437
#: bzrlib/builtins.py:2338
1482
1438
msgid ""
1483
1439
" The log format controls how information about each revision is\n"
1484
1440
" displayed. The standard log formats are called ``long``, ``short``\n"
1486
1442
" for more details on log formats."
1487
1443
msgstr ""
1488
1444
1489
#: bzrlib/builtins.py:2518
1445
#: bzrlib/builtins.py:2343
1490
1446
msgid ""
1491
1447
" The following options can be used to control what information is\n"
1492
1448
" displayed::"
1493
1449
msgstr ""
1494
1450
1495
#: bzrlib/builtins.py:2521
1451
#: bzrlib/builtins.py:2346
1496
1452
msgid ""
1497
1453
" -l N display a maximum of N revisions\n"
1498
1454
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1501
1457
" --show-ids display revision-ids (and file-ids), not just revnos"
1502
1458
msgstr ""
1503
1459
1504
#: bzrlib/builtins.py:2527
1460
#: bzrlib/builtins.py:2352
1505
1461
msgid ""
1506
1462
" Note that the default number of levels to display is a function of the\n"
1507
1463
" log format. If the -n option is not used, the standard log formats show\n"
1508
1464
" just the top level (mainline)."
1509
1465
msgstr ""
1510
1466
1511
#: bzrlib/builtins.py:2531
1467
#: bzrlib/builtins.py:2356
1512
1468
msgid ""
1513
1469
" Status summaries are shown using status flags like A, M, etc. To see\n"
1514
1470
" the changes explained using words like ``added`` and ``modified``\n"
1515
1471
" instead, use the -vv option."
1516
1472
msgstr ""
1517
1473
1518
#: bzrlib/builtins.py:2535
1474
#: bzrlib/builtins.py:2360
1519
1475
msgid ":Ordering control:"
1520
1476
msgstr ""
1521
1477
1522
#: bzrlib/builtins.py:2537
1478
#: bzrlib/builtins.py:2362
1523
1479
msgid ""
1524
1480
" To display revisions from oldest to newest, use the --forward option.\n"
1525
1481
" In most cases, using this option will have little impact on the total\n"
1527
1483
" display revisions like --reverse does when it can."
1528
1484
msgstr ""
1529
1485
1530
#: bzrlib/builtins.py:2542
1486
#: bzrlib/builtins.py:2367
1531
1487
msgid ":Revision filtering:"
1532
1488
msgstr ""
1533
1489
1534
#: bzrlib/builtins.py:2544
1490
#: bzrlib/builtins.py:2369
1535
1491
msgid ""
1536
1492
" The -r option can be used to specify what revision or range of revisions\n"
1537
1493
" to filter against. The various forms are shown below::"
1538
1494
msgstr ""
1539
1495
1540
#: bzrlib/builtins.py:2547
1496
#: bzrlib/builtins.py:2372
1541
1497
msgid ""
1542
1498
" -rX display revision X\n"
1543
1499
" -rX.. display revision X and later\n"
1545
1501
" -rX..Y display from X to Y inclusive"
1546
1502
msgstr ""
1547
1503
1548
#: bzrlib/builtins.py:2552
1504
#: bzrlib/builtins.py:2377
1549
1505
msgid ""
1550
1506
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1551
1507
" Some common examples are given below::"
1552
1508
msgstr ""
1553
1509
1554
#: bzrlib/builtins.py:2555
1510
#: bzrlib/builtins.py:2380
1555
1511
msgid ""
1556
1512
" -r-1 show just the tip\n"
1557
1513
" -r-10.. show the last 10 mainline revisions\n"
1561
1517
" -rdate:yesterday.. show changes since yesterday"
1562
1518
msgstr ""
1563
1519
1564
#: bzrlib/builtins.py:2562
1520
#: bzrlib/builtins.py:2387
1565
1521
msgid ""
1566
1522
" When logging a range of revisions using -rX..Y, log starts at\n"
1567
1523
" revision Y and searches back in history through the primary\n"
1571
1527
" a nested merge revision and the log will be truncated accordingly."
1572
1528
msgstr ""
1573
1529
1574
#: bzrlib/builtins.py:2569
1530
#: bzrlib/builtins.py:2394
1575
1531
msgid ":Path filtering:"
1576
1532
msgstr ""
1577
1533
1578
#: bzrlib/builtins.py:2571
1534
#: bzrlib/builtins.py:2396
1579
1535
msgid ""
1580
1536
" If parameters are given and the first one is not a branch, the log\n"
1581
1537
" will be filtered to show only those revisions that changed the\n"
1582
1538
" nominated files or directories."
1583
1539
msgstr ""
1584
1540
1585
#: bzrlib/builtins.py:2575
1541
#: bzrlib/builtins.py:2400
1586
1542
msgid ""
1587
1543
" Filenames are interpreted within their historical context. To log a\n"
1588
1544
" deleted file, specify a revision range so that the file existed at\n"
1589
1545
" the end or start of the range."
1590
1546
msgstr ""
1591
1547
1592
#: bzrlib/builtins.py:2579
1548
#: bzrlib/builtins.py:2404
1593
1549
msgid ""
1594
1550
" Historical context is also important when interpreting pathnames of\n"
1595
1551
" renamed files/directories. Consider the following example:"
1596
1552
msgstr ""
1597
1553
1598
#: bzrlib/builtins.py:2582
1554
#: bzrlib/builtins.py:2407
1599
1555
msgid ""
1600
1556
" * revision 1: add tutorial.txt\n"
1601
1557
" * revision 2: modify tutorial.txt\n"
1602
1558
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1603
1559
msgstr ""
1604
1560
1605
#: bzrlib/builtins.py:2586
1561
#: bzrlib/builtins.py:2411
1606
1562
msgid " In this case:"
1607
1563
msgstr ""
1608
1564
1609
#: bzrlib/builtins.py:2588
1565
#: bzrlib/builtins.py:2413
1610
1566
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1611
1567
msgstr ""
1612
1568
1613
#: bzrlib/builtins.py:2590
1569
#: bzrlib/builtins.py:2415
1614
1570
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1615
1571
msgstr ""
1616
1572
1617
#: bzrlib/builtins.py:2592
1573
#: bzrlib/builtins.py:2417
1618
1574
msgid ""
1619
1575
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1620
1576
" the original file in revision 2."
1621
1577
msgstr ""
1622
1578
1623
#: bzrlib/builtins.py:2595
1579
#: bzrlib/builtins.py:2420
1624
1580
msgid ""
1625
1581
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1626
1582
" was no file called guide.txt in revision 2."
1627
1583
msgstr ""
1628
1584
1629
#: bzrlib/builtins.py:2598
1585
#: bzrlib/builtins.py:2423
1630
1586
msgid ""
1631
1587
" Renames are always followed by log. By design, there is no need to\n"
1632
1588
" explicitly ask for this (and no way to stop logging a file back\n"
1633
1589
" until it was last renamed)."
1634
1590
msgstr ""
1635
1591
1636
#: bzrlib/builtins.py:2602
1592
#: bzrlib/builtins.py:2427
1637
1593
msgid ":Other filtering:"
1638
1594
msgstr ""
1639
1595
1640
#: bzrlib/builtins.py:2604
1596
#: bzrlib/builtins.py:2429
1641
1597
msgid ""
1642
1598
" The --match option can be used for finding revisions that match a\n"
1643
1599
" regular expression in a commit message, committer, author or bug.\n"
1646
1602
" --match-message can be used to only match a specific field."
1647
1603
msgstr ""
1648
1604
1649
#: bzrlib/builtins.py:2610
1605
#: bzrlib/builtins.py:2435
1650
1606
msgid ":Tips & tricks:"
1651
1607
msgstr ""
1652
1608
1653
#: bzrlib/builtins.py:2612
1609
#: bzrlib/builtins.py:2437
1654
1610
msgid ""
1655
1611
" GUI tools and IDEs are often better at exploring history than command\n"
1656
1612
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1659
1615
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1660
1616
msgstr ""
1661
1617
1662
#: bzrlib/builtins.py:2618
1618
#: bzrlib/builtins.py:2443
1663
1619
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1664
1620
msgstr ""
1665
1621
1666
#: bzrlib/builtins.py:2620
1622
#: bzrlib/builtins.py:2445
1667
1623
msgid ""
1668
1624
" [ALIASES]\n"
1669
1625
" tip = log -r-1\n"
1671
1627
" show = log -v -p"
1672
1628
msgstr ""
1673
1629
1674
#: bzrlib/builtins.py:2625
1630
#: bzrlib/builtins.py:2450
1675
1631
msgid ""
1676
1632
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1677
1633
" will show the last 10 mainline revisions. To see the details of a\n"
1678
1634
" particular revision X, ``bzr show -rX``."
1679
1635
msgstr ""
1680
1636
1681
#: bzrlib/builtins.py:2629
1637
#: bzrlib/builtins.py:2454
1682
1638
msgid ""
1683
1639
" If you are interested in looking deeper into a particular merge X,\n"
1684
1640
" use ``bzr log -n0 -rX``."
1685
1641
msgstr ""
1686
1642
1687
#: bzrlib/builtins.py:2632
1643
#: bzrlib/builtins.py:2457
1688
1644
msgid ""
1689
1645
" ``bzr log -v`` on a branch with lots of history is currently\n"
1690
1646
" very slow. A fix for this issue is currently under development.\n"
1692
1648
" be given when using the -v option."
1693
1649
msgstr ""
1694
1650
1695
#: bzrlib/builtins.py:2637
1651
#: bzrlib/builtins.py:2462
1696
1652
msgid ""
1697
1653
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1698
1654
" used to find revisions matching user names, commit messages, etc.\n"
1700
1656
" a list of words but not others."
1701
1657
msgstr ""
1702
1658
1703
#: bzrlib/builtins.py:2642
1659
#: bzrlib/builtins.py:2467
1704
1660
msgid ""
1705
1661
" When exploring non-mainline history on large projects with deep\n"
1706
1662
" history, the performance of log can be greatly improved by installing\n"
1709
1665
msgstr ""
1710
1666
1711
1667
# help of 'forward' option of 'log' command
1712
#: bzrlib/builtins.py:2651
1668
#: bzrlib/builtins.py:2476
1713
1669
msgid "Show from oldest to newest."
1714
1670
msgstr ""
1715
1671
1716
1672
# help of 'verbose' option of 'log' command
1717
#: bzrlib/builtins.py:2654
1673
#: bzrlib/builtins.py:2479
1718
1674
msgid "Show files changed in each revision."
1719
1675
msgstr ""
1720
1676
1721
1677
# help of 'change' option of 'log' command
1722
#: bzrlib/builtins.py:2660
1678
#: bzrlib/builtins.py:2485
1723
1679
msgid "Show just the specified revision. See also \"help revisionspec\"."
1724
1680
msgstr ""
1725
1681
1726
1682
# help of 'authors' option of 'log' command
1727
#: bzrlib/builtins.py:2664
1683
#: bzrlib/builtins.py:2489
1728
1684
msgid "What names to list as authors - first, all or committer."
1729
1685
msgstr ""
1730
1686
1731
1687
# title of 'authors' option of 'log' command
1732
#: bzrlib/builtins.py:2665
1688
#: bzrlib/builtins.py:2490
1733
1689
msgid "Authors"
1734
1690
msgstr ""
1735
1691
1736
1692
# help of 'levels' option of 'log' command
1737
#: bzrlib/builtins.py:2670
1693
#: bzrlib/builtins.py:2495
1738
1694
msgid "Number of levels to display - 0 for all, 1 for flat."
1739
1695
msgstr ""
1740
1696
1741
1697
# help of 'limit' option of 'log' command
1742
#: bzrlib/builtins.py:2680
1698
#: bzrlib/builtins.py:2505
1743
1699
msgid "Limit the output to the first N revisions."
1744
1700
msgstr ""
1745
1701
1746
1702
# help of 'show-diff' option of 'log' command
1747
#: bzrlib/builtins.py:2685
1703
#: bzrlib/builtins.py:2510
1748
1704
msgid "Show changes made in each revision as a patch."
1749
1705
msgstr ""
1750
1706
1751
1707
# help of 'include-merged' option of 'log' command
1752
#: bzrlib/builtins.py:2687
1708
#: bzrlib/builtins.py:2512
1753
1709
msgid "Show merged revisions like --levels 0 does."
1754
1710
msgstr ""
1755
1711
1756
1712
# help of 'omit-merges' option of 'log' command
1757
#: bzrlib/builtins.py:2691
1713
#: bzrlib/builtins.py:2516
1758
1714
msgid "Do not report commits with more than one parent."
1759
1715
msgstr ""
1760
1716
1761
1717
# help of 'exclude-common-ancestry' option of 'log' command
1762
#: bzrlib/builtins.py:2693
1718
#: bzrlib/builtins.py:2518
1763
1719
msgid ""
1764
1720
"Display only the revisions that are not part of both ancestries (require -"
1765
1721
"rX..Y)."
1766
1722
msgstr ""
1767
1723
1768
1724
# help of 'signatures' option of 'log' command
1769
#: bzrlib/builtins.py:2697
1725
#: bzrlib/builtins.py:2522
1770
1726
msgid "Show digital signature validity."
1771
1727
msgstr ""
1772
1728
1773
1729
# help of 'match' option of 'log' command
1774
#: bzrlib/builtins.py:2700
1730
#: bzrlib/builtins.py:2525
1775
1731
msgid "Show revisions whose properties match this expression."
1776
1732
msgstr ""
1777
1733
1778
1734
# help of 'match-message' option of 'log' command
1779
#: bzrlib/builtins.py:2704
1735
#: bzrlib/builtins.py:2529
1780
1736
msgid "Show revisions whose message matches this expression."
1781
1737
msgstr ""
1782
1738
1783
1739
# help of 'match-committer' option of 'log' command
1784
#: bzrlib/builtins.py:2708
1740
#: bzrlib/builtins.py:2533
1785
1741
msgid "Show revisions whose committer matches this expression."
1786
1742
msgstr ""
1787
1743
1788
1744
# help of 'match-author' option of 'log' command
1789
#: bzrlib/builtins.py:2712
1745
#: bzrlib/builtins.py:2537
1790
1746
msgid "Show revisions whose authors match this expression."
1791
1747
msgstr ""
1792
1748
1793
1749
# help of 'match-bugs' option of 'log' command
1794
#: bzrlib/builtins.py:2716
1750
#: bzrlib/builtins.py:2541
1795
1751
msgid "Show revisions whose bugs match this expression."
1796
1752
msgstr ""
1797
1753
1798
#: bzrlib/builtins.py:2770
1754
#: bzrlib/builtins.py:2595
1799
1755
msgid "--exclude-common-ancestry requires -r with two revisions"
1800
1756
msgstr ""
1801
1757
1802
#: bzrlib/builtins.py:2798
1758
#: bzrlib/builtins.py:2623
1803
1759
#, python-format
1804
1760
msgid "Path unknown at end or start of revision range: %s"
1805
1761
msgstr ""
1806
1762
1807
#: bzrlib/builtins.py:2915
1763
#: bzrlib/builtins.py:2740
1808
1764
#, python-format
1809
1765
msgid "bzr %s doesn't accept two revisions in different branches."
1810
1766
msgstr ""
1811
1767
1812
#: bzrlib/builtins.py:2931
1768
#: bzrlib/builtins.py:2756
1813
1769
#, python-format
1814
1770
msgid "bzr %s --revision takes one or two values."
1815
1771
msgstr ""
1816
1772
1817
#: bzrlib/builtins.py:2976
1773
#: bzrlib/builtins.py:2801
1818
1774
msgid ""
1819
1775
"List files in a tree.\n"
1820
1776
" "
1821
1777
msgstr ""
1822
1778
1823
1779
# help of 'recursive' option of 'ls' command
1824
#: bzrlib/builtins.py:2985
1780
#: bzrlib/builtins.py:2810
1825
1781
msgid "Recurse into subdirectories."
1826
1782
msgstr ""
1827
1783
1828
1784
# help of 'from-root' option of 'ls' command
1829
#: bzrlib/builtins.py:2987
1785
#: bzrlib/builtins.py:2812
1830
1786
msgid "Print paths relative to the root of the branch."
1831
1787
msgstr ""
1832
1788
1833
1789
# help of 'unknown' option of 'ls' command
1834
#: bzrlib/builtins.py:2989
1790
#: bzrlib/builtins.py:2814
1835
1791
msgid "Print unknown files."
1836
1792
msgstr ""
1837
1793
1838
1794
# help of 'versioned' option of 'ls' command
1839
#: bzrlib/builtins.py:2990
1795
#: bzrlib/builtins.py:2815
1840
1796
msgid "Print versioned files."
1841
1797
msgstr ""
1842
1798
1843
1799
# help of 'ignored' option of 'ls' command
1844
#: bzrlib/builtins.py:2993
1800
#: bzrlib/builtins.py:2818
1845
1801
msgid "Print ignored files."
1846
1802
msgstr ""
1847
1803
1848
1804
# help of 'kind' option of 'ls' command
1849
#: bzrlib/builtins.py:2995
1805
#: bzrlib/builtins.py:2820
1850
1806
msgid "List entries of a particular kind: file, directory, symlink."
1851
1807
msgstr ""
1852
1808
1853
#: bzrlib/builtins.py:3008
1809
#: bzrlib/builtins.py:2833
1854
1810
msgid "invalid kind specified"
1855
1811
msgstr ""
1856
1812
1857
#: bzrlib/builtins.py:3011
1813
#: bzrlib/builtins.py:2836
1858
1814
msgid "Cannot set both --verbose and --null"
1859
1815
msgstr ""
1860
1816
1861
#: bzrlib/builtins.py:3020
1817
#: bzrlib/builtins.py:2845
1862
1818
msgid "cannot specify both --from-root and PATH"
1863
1819
msgstr ""
1864
1820
1865
#: bzrlib/builtins.py:3107
1821
#: bzrlib/builtins.py:2932
1866
1822
msgid "Ignore specified files or patterns."
1867
1823
msgstr ""
1868
1824
1869
#: bzrlib/builtins.py:3109
1825
#: bzrlib/builtins.py:2934
1870
1826
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1871
1827
msgstr ""
1872
1828
1873
#: bzrlib/builtins.py:3111
1829
#: bzrlib/builtins.py:2936
1874
1830
msgid ""
1875
1831
"If a .bzrignore file does not exist, the ignore command\n"
1876
1832
"will create one and add the specified files or patterns to the newly\n"
1879
1835
"the use of the ignore command will require an explicit add command."
1880
1836
msgstr ""
1881
1837
1882
#: bzrlib/builtins.py:3117
1838
#: bzrlib/builtins.py:2942
1883
1839
msgid ""
1884
1840
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1885
1841
"After adding, editing or deleting that file either indirectly by\n"
1887
1843
"it."
1888
1844
msgstr ""
1889
1845
1890
#: bzrlib/builtins.py:3122
1846
#: bzrlib/builtins.py:2947
1891
1847
msgid ""
1892
1848
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1893
1849
"the global ignore file can be found in the application data directory as\n"
1896
1852
"can be edited directly using an editor."
1897
1853
msgstr ""
1898
1854
1899
#: bzrlib/builtins.py:3128
1855
#: bzrlib/builtins.py:2953
1900
1856
msgid ""
1901
1857
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1902
1858
"precedence over regular ignores. Such exceptions are used to specify\n"
1903
1859
"files that should be versioned which would otherwise be ignored."
1904
1860
msgstr ""
1905
1861
1906
#: bzrlib/builtins.py:3132
1862
#: bzrlib/builtins.py:2957
1907
1863
msgid ""
1908
1864
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1909
1865
"precedence over the '!' exception patterns."
1910
1866
msgstr ""
1911
1867
1912
#: bzrlib/builtins.py:3135
1868
#: bzrlib/builtins.py:2960
1913
1869
msgid ""
1914
1870
":Notes: \n"
1915
1871
" \n"
1917
1873
" the shell on Unix."
1918
1874
msgstr ""
1919
1875
1920
#: bzrlib/builtins.py:3140
1876
#: bzrlib/builtins.py:2965
1921
1877
msgid ""
1922
1878
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1923
1879
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1924
1880
msgstr ""
1925
1881
1926
#: bzrlib/builtins.py:3143
1882
#: bzrlib/builtins.py:2968
1927
1883
msgid ""
1928
1884
":Examples:\n"
1929
1885
" Ignore the top level Makefile::"
1930
1886
msgstr ""
1931
1887
1932
#: bzrlib/builtins.py:3146
1888
#: bzrlib/builtins.py:2971
1933
1889
msgid " bzr ignore ./Makefile"
1934
1890
msgstr ""
1935
1891
1936
#: bzrlib/builtins.py:3148
1892
#: bzrlib/builtins.py:2973
1937
1893
msgid " Ignore .class files in all directories...::"
1938
1894
msgstr ""
1939
1895
1940
#: bzrlib/builtins.py:3150
1896
#: bzrlib/builtins.py:2975
1941
1897
msgid " bzr ignore \"*.class\""
1942
1898
msgstr ""
1943
1899
1944
#: bzrlib/builtins.py:3152
1900
#: bzrlib/builtins.py:2977
1945
1901
msgid " ...but do not ignore \"special.class\"::"
1946
1902
msgstr ""
1947
1903
1948
#: bzrlib/builtins.py:3154
1904
#: bzrlib/builtins.py:2979
1949
1905
msgid " bzr ignore \"!special.class\""
1950
1906
msgstr ""
1951
1907
1952
#: bzrlib/builtins.py:3156
1908
#: bzrlib/builtins.py:2981
1953
1909
msgid " Ignore files whose name begins with the \"#\" character::"
1954
1910
msgstr ""
1955
1911
1956
#: bzrlib/builtins.py:3158
1912
#: bzrlib/builtins.py:2983
1957
1913
msgid " bzr ignore \"RE:^#\""
1958
1914
msgstr ""
1959
1915
1960
#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164
1916
#: bzrlib/builtins.py:2985
1961
1917
msgid " Ignore .o files under the lib directory::"
1962
1918
msgstr ""
1963
1919
1964
#: bzrlib/builtins.py:3162
1920
#: bzrlib/builtins.py:2987
1965
1921
msgid " bzr ignore \"lib/**/*.o\""
1966
1922
msgstr ""
1967
1923
1968
#: bzrlib/builtins.py:3166
1924
#: bzrlib/builtins.py:2991
1969
1925
msgid " bzr ignore \"RE:lib/.*\\.o\""
1970
1926
msgstr ""
1971
1927
1972
#: bzrlib/builtins.py:3168
1928
#: bzrlib/builtins.py:2993
1973
1929
msgid " Ignore everything but the \"debian\" toplevel directory::"
1974
1930
msgstr ""
1975
1931
1976
#: bzrlib/builtins.py:3170
1932
#: bzrlib/builtins.py:2995
1977
1933
msgid ""
1978
1934
" bzr ignore \"RE:(?!debian/).*\"\n"
1979
1935
" \n"
1986
1942
msgstr ""
1987
1943
1988
1944
# help of 'default-rules' option of 'ignore' command
1989
#: bzrlib/builtins.py:3184
1945
#: bzrlib/builtins.py:3009
1990
1946
msgid "Display the default ignore rules that bzr uses."
1991
1947
msgstr ""
1992
1948
1993
#: bzrlib/builtins.py:3196
1949
#: bzrlib/builtins.py:3021
1994
1950
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1995
1951
msgstr ""
1996
1952
1997
#: bzrlib/builtins.py:3207
1953
#: bzrlib/builtins.py:3032
1998
1954
#, python-format
1999
1955
msgid "Invalid ignore pattern found. %s"
2000
1956
msgid_plural "Invalid ignore patterns found. %s"
2001
1957
msgstr[0] ""
2002
1958
msgstr[1] ""
2003
1959
2004
#: bzrlib/builtins.py:3216
1960
#: bzrlib/builtins.py:3041
2005
1961
msgid "NAME_PATTERN should not be an absolute path"
2006
1962
msgstr ""
2007
1963
2008
#: bzrlib/builtins.py:3229
1964
#: bzrlib/builtins.py:3054
2009
1965
#, python-format
2010
1966
msgid ""
2011
1967
"Warning: the following files are version controlled and match your ignore "
2015
1971
"them.\n"
2016
1972
msgstr ""
2017
1973
2018
#: bzrlib/builtins.py:3236
1974
#: bzrlib/builtins.py:3061
2019
1975
msgid "List ignored files and the patterns that matched them."
2020
1976
msgstr ""
2021
1977
2022
#: bzrlib/builtins.py:3238
1978
#: bzrlib/builtins.py:3063
2023
1979
msgid ""
2024
1980
"List all the ignored files and the ignore pattern that caused the file to\n"
2025
1981
"be ignored."
2026
1982
msgstr ""
2027
1983
2028
#: bzrlib/builtins.py:3241
1984
#: bzrlib/builtins.py:3066
2029
1985
msgid "Alternatively, to list just the files::"
2030
1986
msgstr ""
2031
1987
2032
#: bzrlib/builtins.py:3243
1988
#: bzrlib/builtins.py:3068
2033
1989
msgid " bzr ls --ignored"
2034
1990
msgstr ""
2035
1991
2036
#: bzrlib/builtins.py:3277
1992
#: bzrlib/builtins.py:3102
2037
1993
#, python-format
2038
1994
msgid "not a valid revision-number: %r"
2039
1995
msgstr ""
2040
1996
2041
#: bzrlib/builtins.py:3284
1997
#: bzrlib/builtins.py:3109
2042
1998
msgid "Export current or past revision to a destination directory or archive."
2043
1999
msgstr ""
2044
2000
2045
#: bzrlib/builtins.py:3286
2001
#: bzrlib/builtins.py:3111
2046
2002
msgid "If no revision is specified this exports the last committed revision."
2047
2003
msgstr ""
2048
2004
2049
#: bzrlib/builtins.py:3288
2005
#: bzrlib/builtins.py:3113
2050
2006
msgid ""
2051
2007
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2052
2008
"given, try to find the format with the extension. If no extension\n"
2053
2009
"is found exports to a directory (equivalent to --format=dir)."
2054
2010
msgstr ""
2055
2011
2056
#: bzrlib/builtins.py:3292
2012
#: bzrlib/builtins.py:3117
2057
2013
msgid ""
2058
2014
"If root is supplied, it will be used as the root directory inside\n"
2059
2015
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2060
2016
"to the exported filename. The root option has no effect for 'dir' format."
2061
2017
msgstr ""
2062
2018
2063
#: bzrlib/builtins.py:3296
2019
#: bzrlib/builtins.py:3121
2064
2020
msgid ""
2065
2021
"If branch is omitted then the branch containing the current working\n"
2066
2022
"directory will be used."
2067
2023
msgstr ""
2068
2024
2069
#: bzrlib/builtins.py:3299
2025
#: bzrlib/builtins.py:3124
2070
2026
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2071
2027
msgstr ""
2072
2028
2073
#: bzrlib/builtins.py:3301
2029
#: bzrlib/builtins.py:3126
2074
2030
msgid ""
2075
2031
" ================= =========================\n"
2076
2032
" Supported formats Autodetected by extension\n"
2084
2040
msgstr ""
2085
2041
2086
2042
# help of 'format' option of 'export' command
2087
#: bzrlib/builtins.py:3315
2043
#: bzrlib/builtins.py:3140
2088
2044
msgid "Type of file to export to."
2089
2045
msgstr ""
2090
2046
2091
2047
# help of 'filters' option of 'export' command
2092
#: bzrlib/builtins.py:3318
2048
#: bzrlib/builtins.py:3143
2093
2049
msgid "Apply content filters to export the convenient form."
2094
2050
msgstr ""
2095
2051
2096
2052
# help of 'root' option of 'export' command
2097
#: bzrlib/builtins.py:3322
2053
#: bzrlib/builtins.py:3147
2098
2054
msgid "Name of the root directory inside the exported file."
2099
2055
msgstr ""
2100
2056
2101
2057
# help of 'per-file-timestamps' option of 'export' command
2102
#: bzrlib/builtins.py:3324
2058
#: bzrlib/builtins.py:3149
2103
2059
msgid ""
2104
2060
"Set modification time of files to that of the last revision in which it was "
2105
2061
"changed."
2106
2062
msgstr ""
2107
2063
2108
2064
# help of 'uncommitted' option of 'export' command
2109
#: bzrlib/builtins.py:3327
2065
#: bzrlib/builtins.py:3152
2110
2066
msgid "Export the working tree contents rather than that of the last revision."
2111
2067
msgstr ""
2112
2068
2113
#: bzrlib/builtins.py:3346
2069
#: bzrlib/builtins.py:3171
2114
2070
msgid "--uncommitted requires a working tree"
2115
2071
msgstr ""
2116
2072
2117
#: bzrlib/builtins.py:3355
2073
#: bzrlib/builtins.py:3180
2118
2074
#, python-format
2119
2075
msgid "Unsupported export format: %s"
2120
2076
msgstr ""
2121
2077
2122
#: bzrlib/builtins.py:3359
2078
#: bzrlib/builtins.py:3184
2123
2079
msgid "Write the contents of a file as of a given revision to standard output."
2124
2080
msgstr ""
2125
2081
2126
#: bzrlib/builtins.py:3361
2082
#: bzrlib/builtins.py:3186
2127
2083
msgid "If no revision is nominated, the last revision is used."
2128
2084
msgstr ""
2129
2085
2130
#: bzrlib/builtins.py:3363
2086
#: bzrlib/builtins.py:3188
2131
2087
msgid ""
2132
2088
"Note: Take care to redirect standard output when using this command on a\n"
2133
2089
"binary file."
2134
2090
msgstr ""
2135
2091
2136
2092
# help of 'name-from-revision' option of 'cat' command
2137
#: bzrlib/builtins.py:3369
2093
#: bzrlib/builtins.py:3194
2138
2094
msgid "The path name in the old tree."
2139
2095
msgstr ""
2140
2096
2141
2097
# help of 'filters' option of 'cat' command
2142
#: bzrlib/builtins.py:3370
2098
#: bzrlib/builtins.py:3195
2143
2099
msgid "Apply content filters to display the convenience form."
2144
2100
msgstr ""
2145
2101
2146
#: bzrlib/builtins.py:3381
2102
#: bzrlib/builtins.py:3206
2147
2103
msgid "bzr cat --revision takes exactly one revision specifier"
2148
2104
msgstr ""
2149
2105
2150
#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418
2106
#: bzrlib/builtins.py:3231 bzrlib/builtins.py:3243
2151
2107
msgid "{0!r} is not present in revision {1}"
2152
2108
msgstr ""
2153
2109
2154
#: bzrlib/builtins.py:3441
2110
#: bzrlib/builtins.py:3266
2155
2111
msgid "Commit changes into a new revision."
2156
2112
msgstr ""
2157
2113
2158
#: bzrlib/builtins.py:3443
2114
#: bzrlib/builtins.py:3268
2159
2115
msgid ""
2160
2116
"An explanatory message needs to be given for each commit. This is\n"
2161
2117
"often done by using the --message option (getting the message from the\n"
2165
2121
"boilerplate text loaded into the editor, use the --show-diff option."
2166
2122
msgstr ""
2167
2123
2168
#: bzrlib/builtins.py:3450
2124
#: bzrlib/builtins.py:3275
2169
2125
msgid ""
2170
2126
"By default, the entire tree is committed and the person doing the\n"
2171
2127
"commit is assumed to be the author. These defaults can be overridden\n"
2172
2128
"as explained below."
2173
2129
msgstr ""
2174
2130
2175
#: bzrlib/builtins.py:3454
2131
#: bzrlib/builtins.py:3279
2176
2132
msgid ":Selective commits:"
2177
2133
msgstr ""
2178
2134
2179
#: bzrlib/builtins.py:3456
2135
#: bzrlib/builtins.py:3281
2180
2136
msgid ""
2181
2137
" If selected files are specified, only changes to those files are\n"
2182
2138
" committed. If a directory is specified then the directory and\n"
2183
2139
" everything within it is committed."
2184
2140
msgstr ""
2185
2141
2186
#: bzrlib/builtins.py:3460
2142
#: bzrlib/builtins.py:3285
2187
2143
msgid ""
2188
2144
" When excludes are given, they take precedence over selected files.\n"
2189
2145
" For example, to commit only changes within foo, but not changes\n"
2190
2146
" within foo/bar::"
2191
2147
msgstr ""
2192
2148
2193
#: bzrlib/builtins.py:3464
2149
#: bzrlib/builtins.py:3289
2194
2150
msgid " bzr commit foo -x foo/bar"
2195
2151
msgstr ""
2196
2152
2197
#: bzrlib/builtins.py:3466
2153
#: bzrlib/builtins.py:3291
2198
2154
msgid " A selective commit after a merge is not yet supported."
2199
2155
msgstr ""
2200
2156
2201
#: bzrlib/builtins.py:3468
2157
#: bzrlib/builtins.py:3293
2202
2158
msgid ":Custom authors:"
2203
2159
msgstr ""
2204
2160
2205
#: bzrlib/builtins.py:3470
2161
#: bzrlib/builtins.py:3295
2206
2162
msgid ""
2207
2163
" If the author of the change is not the same person as the committer,\n"
2208
2164
" you can specify the author's name using the --author option. The\n"
2212
2168
" author."
2213
2169
msgstr ""
2214
2170
2215
#: bzrlib/builtins.py:3477
2171
#: bzrlib/builtins.py:3302
2216
2172
msgid ":Checks:"
2217
2173
msgstr ""
2218
2174
2219
#: bzrlib/builtins.py:3479
2175
#: bzrlib/builtins.py:3304
2220
2176
msgid ""
2221
2177
" A common mistake is to forget to add a new file or directory before\n"
2222
2178
" running the commit command. The --strict option checks for unknown\n"
2225
2181
" for details."
2226
2182
msgstr ""
2227
2183
2228
#: bzrlib/builtins.py:3485
2184
#: bzrlib/builtins.py:3310
2229
2185
msgid ":Things to note:"
2230
2186
msgstr ""
2231
2187
2232
#: bzrlib/builtins.py:3487
2188
#: bzrlib/builtins.py:3312
2233
2189
msgid ""
2234
2190
" If you accidentially commit the wrong changes or make a spelling\n"
2235
2191
" mistake in the commit message say, you can use the uncommit command\n"
2236
2192
" to undo it. See ``bzr help uncommit`` for details."
2237
2193
msgstr ""
2238
2194
2239
#: bzrlib/builtins.py:3491
2195
#: bzrlib/builtins.py:3316
2240
2196
msgid ""
2241
2197
" Hooks can also be configured to run after a commit. This allows you\n"
2242
2198
" to trigger updates to external systems like bug trackers. The --fixes\n"
2245
2201
msgstr ""
2246
2202
2247
2203
# help of 'exclude' option of 'commit' command
2248
#: bzrlib/builtins.py:3501
2204
#: bzrlib/builtins.py:3326
2249
2205
msgid "Do not consider changes made to a given path."
2250
2206
msgstr ""
2251
2207
2252
2208
# help of 'message' option of 'commit' command
2253
#: bzrlib/builtins.py:3504
2209
#: bzrlib/builtins.py:3329
2254
2210
msgid "Description of the new revision."
2255
2211
msgstr ""
2256
2212
2257
2213
# help of 'unchanged' option of 'commit' command
2258
#: bzrlib/builtins.py:3507
2214
#: bzrlib/builtins.py:3332
2259
2215
msgid "Commit even if nothing has changed."
2260
2216
msgstr ""
2261
2217
2262
2218
# help of 'file' option of 'commit' command
2263
#: bzrlib/builtins.py:3511
2219
#: bzrlib/builtins.py:3336
2264
2220
msgid "Take commit message from this file."
2265
2221
msgstr ""
2266
2222
2267
2223
# help of 'strict' option of 'commit' command
2268
#: bzrlib/builtins.py:3513
2224
#: bzrlib/builtins.py:3338
2269
2225
msgid "Refuse to commit if there are unknown files in the working tree."
2270
2226
msgstr ""
2271
2227
2272
2228
# help of 'commit-time' option of 'commit' command
2273
#: bzrlib/builtins.py:3516
2229
#: bzrlib/builtins.py:3341
2274
2230
msgid ""
2275
2231
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2276
2232
"08:00:00 +0100'."
2277
2233
msgstr ""
2278
2234
2279
2235
# help of 'fixes' option of 'commit' command
2280
#: bzrlib/builtins.py:3519
2236
#: bzrlib/builtins.py:3344
2281
2237
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2282
2238
msgstr ""
2283
2239
2284
2240
# help of 'author' option of 'commit' command
2285
#: bzrlib/builtins.py:3522
2241
#: bzrlib/builtins.py:3347
2286
2242
msgid "Set the author's name, if it's different from the committer."
2287
2243
msgstr ""
2288
2244
2289
2245
# help of 'local' option of 'commit' command
2290
#: bzrlib/builtins.py:3525
2246
#: bzrlib/builtins.py:3350
2291
2247
msgid ""
2292
2248
"Perform a local commit in a bound branch. Local commits are not pushed to "
2293
2249
"the master branch until a normal commit is performed."
2294
2250
msgstr ""
2295
2251
2296
2252
# help of 'show-diff' option of 'commit' command
2297
#: bzrlib/builtins.py:3531
2253
#: bzrlib/builtins.py:3356
2298
2254
msgid ""
2299
2255
"When no message is supplied, show the diff along with the status summary in "
2300
2256
"the message editor."
2301
2257
msgstr ""
2302
2258
2303
2259
# help of 'lossy' option of 'commit' command
2304
#: bzrlib/builtins.py:3534
2260
#: bzrlib/builtins.py:3359
2305
2261
msgid ""
2306
2262
"When committing to a foreign version control system do not push data that "
2307
2263
"can not be natively represented."
2308
2264
msgstr ""
2309
2265
2310
#: bzrlib/builtins.py:3552
2266
#: bzrlib/builtins.py:3377
2311
2267
#, python-format
2312
2268
msgid ""
2313
2269
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2315
2271
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2316
2272
msgstr ""
2317
2273
2318
#: bzrlib/builtins.py:3561
2274
#: bzrlib/builtins.py:3386
2319
2275
#, python-format
2320
2276
msgid ""
2321
2277
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2323
2279
"Commit refused."
2324
2280
msgstr ""
2325
2281
2326
#: bzrlib/builtins.py:3570
2282
#: bzrlib/builtins.py:3395
2327
2283
#, python-format
2328
2284
msgid "Unrecognized bug %s. Commit refused."
2329
2285
msgstr ""
2330
2286
2331
#: bzrlib/builtins.py:3573
2287
#: bzrlib/builtins.py:3398
2332
2288
#, python-format
2333
2289
msgid ""
2334
2290
"%s\n"
2335
2291
"Commit refused."
2336
2292
msgstr ""
2337
2293
2338
#: bzrlib/builtins.py:3597
2294
#: bzrlib/builtins.py:3422
2339
2295
msgid "Could not parse --commit-time: "
2340
2296
msgstr ""
2341
2297
2342
#: bzrlib/builtins.py:3637
2298
#: bzrlib/builtins.py:3462
2343
2299
msgid "please specify either --message or --file"
2344
2300
msgstr ""
2345
2301
2346
#: bzrlib/builtins.py:3666
2302
#: bzrlib/builtins.py:3491
2347
2303
msgid "please specify a commit message with either --message or --file"
2348
2304
msgstr ""
2349
2305
2350
#: bzrlib/builtins.py:3669
2306
#: bzrlib/builtins.py:3494
2351
2307
msgid ""
2352
2308
"Empty commit message specified. Please specify a commit message with either "
2353
2309
"--message or --file or leave a blank message with --message \"\"."
2354
2310
msgstr ""
2355
2311
2356
#: bzrlib/builtins.py:3689
2312
#: bzrlib/builtins.py:3514
2357
2313
msgid ""
2358
2314
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2359
2315
"--unchanged to force an empty commit."
2360
2316
msgstr ""
2361
2317
2362
#: bzrlib/builtins.py:3693
2318
#: bzrlib/builtins.py:3518
2363
2319
msgid ""
2364
2320
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2365
2321
"resolve FILE\" to resolve."
2366
2322
msgstr ""
2367
2323
2368
#: bzrlib/builtins.py:3697
2324
#: bzrlib/builtins.py:3522
2369
2325
msgid "Commit refused because there are unknown files in the working tree."
2370
2326
msgstr ""
2371
2327
2372
#: bzrlib/builtins.py:3700
2328
#: bzrlib/builtins.py:3525
2373
2329
msgid ""
2374
2330
"\n"
2375
2331
"To commit to master branch, run update and then commit.\n"
2376
2332
"You can also pass --local to commit to continue working disconnected."
2377
2333
msgstr ""
2378
2334
2379
#: bzrlib/builtins.py:3708
2335
#: bzrlib/builtins.py:3533
2380
2336
msgid ""
2381
2337
"Validate working tree structure, branch consistency and repository history."
2382
2338
msgstr ""
2383
2339
2384
#: bzrlib/builtins.py:3710
2340
#: bzrlib/builtins.py:3535
2385
2341
msgid ""
2386
2342
"This command checks various invariants about branch and repository storage\n"
2387
2343
"to detect data corruption or bzr bugs."
2388
2344
msgstr ""
2389
2345
2390
#: bzrlib/builtins.py:3713
2346
#: bzrlib/builtins.py:3538
2391
2347
msgid ""
2392
2348
"The working tree and branch checks will only give output if a problem is\n"
2393
2349
"detected. The output fields of the repository check are:"
2394
2350
msgstr ""
2395
2351
2396
#: bzrlib/builtins.py:3716
2352
#: bzrlib/builtins.py:3541
2397
2353
msgid ""
2398
2354
"revisions\n"
2399
2355
" This is just the number of revisions checked. It doesn't\n"
2400
2356
" indicate a problem."
2401
2357
msgstr ""
2402
2358
2403
#: bzrlib/builtins.py:3720
2359
#: bzrlib/builtins.py:3545
2404
2360
msgid ""
2405
2361
"versionedfiles\n"
2406
2362
" This is just the number of versionedfiles checked. It\n"
2407
2363
" doesn't indicate a problem."
2408
2364
msgstr ""
2409
2365
2410
#: bzrlib/builtins.py:3724
2366
#: bzrlib/builtins.py:3549
2411
2367
msgid ""
2412
2368
"unreferenced ancestors\n"
2413
2369
" Texts that are ancestors of other texts, but\n"
2415
2371
" subtle problem that Bazaar can work around."
2416
2372
msgstr ""
2417
2373
2418
#: bzrlib/builtins.py:3729
2374
#: bzrlib/builtins.py:3554
2419
2375
msgid ""
2420
2376
"unique file texts\n"
2421
2377
" This is the total number of unique file contents\n"
2422
2378
" seen in the checked revisions. It does not indicate a problem."
2423
2379
msgstr ""
2424
2380
2425
#: bzrlib/builtins.py:3733
2381
#: bzrlib/builtins.py:3558
2426
2382
msgid ""
2427
2383
"repeated file texts\n"
2428
2384
" This is the total number of repeated texts seen\n"
2431
2387
" indicate a problem."
2432
2388
msgstr ""
2433
2389
2434
#: bzrlib/builtins.py:3739
2390
#: bzrlib/builtins.py:3564
2435
2391
msgid ""
2436
2392
"If no restrictions are specified, all Bazaar data that is found at the "
2437
2393
"given\n"
2438
2394
"location will be checked."
2439
2395
msgstr ""
2440
2396
2441
#: bzrlib/builtins.py:3744
2397
#: bzrlib/builtins.py:3567
2398
msgid ":Examples:"
2399
msgstr ""
2400
2401
#: bzrlib/builtins.py:3569
2442
2402
msgid " Check the tree and branch at 'foo'::"
2443
2403
msgstr ""
2444
2404
2445
#: bzrlib/builtins.py:3746
2405
#: bzrlib/builtins.py:3571
2446
2406
msgid " bzr check --tree --branch foo"
2447
2407
msgstr ""
2448
2408
2449
#: bzrlib/builtins.py:3748
2409
#: bzrlib/builtins.py:3573
2450
2410
msgid " Check only the repository at 'bar'::"
2451
2411
msgstr ""
2452
2412
2453
#: bzrlib/builtins.py:3750
2413
#: bzrlib/builtins.py:3575
2454
2414
msgid " bzr check --repo bar"
2455
2415
msgstr ""
2456
2416
2457
#: bzrlib/builtins.py:3752
2417
#: bzrlib/builtins.py:3577
2458
2418
msgid " Check everything at 'baz'::"
2459
2419
msgstr ""
2460
2420
2461
#: bzrlib/builtins.py:3754
2421
#: bzrlib/builtins.py:3579
2462
2422
msgid " bzr check baz"
2463
2423
msgstr ""
2464
2424
2465
2425
# help of 'branch' option of 'check' command
2466
#: bzrlib/builtins.py:3760
2426
#: bzrlib/builtins.py:3585
2467
2427
msgid "Check the branch related to the current directory."
2468
2428
msgstr ""
2469
2429
2470
2430
# help of 'repo' option of 'check' command
2471
#: bzrlib/builtins.py:3762
2431
#: bzrlib/builtins.py:3587
2472
2432
msgid "Check the repository related to the current directory."
2473
2433
msgstr ""
2474
2434
2475
2435
# help of 'tree' option of 'check' command
2476
#: bzrlib/builtins.py:3764
2436
#: bzrlib/builtins.py:3589
2477
2437
msgid "Check the working tree related to the current directory."
2478
2438
msgstr ""
2479
2439
2480
#: bzrlib/builtins.py:3778
2440
#: bzrlib/builtins.py:3603
2481
2441
msgid "Upgrade a repository, branch or working tree to a newer format."
2482
2442
msgstr ""
2483
2443
2484
#: bzrlib/builtins.py:3780
2444
#: bzrlib/builtins.py:3605
2485
2445
msgid ""
2486
2446
"When the default format has changed after a major new release of\n"
2487
2447
"Bazaar, you may be informed during certain operations that you\n"
2490
2450
"with older repositories or with older versions of Bazaar."
2491
2451
msgstr ""
2492
2452
2493
#: bzrlib/builtins.py:3786
2453
#: bzrlib/builtins.py:3611
2494
2454
msgid ""
2495
2455
"If you wish to upgrade to a particular format rather than the\n"
2496
2456
"current default, that can be specified using the --format option.\n"
2500
2460
"2.x default) so downgrading is not always possible."
2501
2461
msgstr ""
2502
2462
2503
#: bzrlib/builtins.py:3793
2463
#: bzrlib/builtins.py:3618
2504
2464
msgid ""
2505
2465
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2506
2466
"process (where # is a number). By default, this is left there on\n"
2511
2471
"afterwards."
2512
2472
msgstr ""
2513
2473
2514
#: bzrlib/builtins.py:3801
2474
#: bzrlib/builtins.py:3626
2515
2475
msgid ""
2516
2476
"If the location given is a shared repository, dependent branches\n"
2517
2477
"are also converted provided the repository converts successfully.\n"
2519
2479
"tried."
2520
2480
msgstr ""
2521
2481
2522
#: bzrlib/builtins.py:3806
2482
#: bzrlib/builtins.py:3631
2523
2483
msgid ""
2524
2484
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2525
2485
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2526
2486
msgstr ""
2527
2487
2528
2488
# help of 'format' option of 'upgrade' command
2529
#: bzrlib/builtins.py:3814
2489
#: bzrlib/builtins.py:3639
2530
2490
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2531
2491
msgstr ""
2532
2492
2533
2493
# title of 'format' option of 'init' command
2534
# title of 'format' option of 'upgrade' command
2535
#: bzrlib/builtins.py:3818
2494
#: bzrlib/builtins.py:3643
2536
2495
msgid "Branch format"
2537
2496
msgstr ""
2538
2497
2539
2498
# help of 'clean' option of 'upgrade' command
2540
#: bzrlib/builtins.py:3820
2499
#: bzrlib/builtins.py:3645
2541
2500
msgid "Remove the backup.bzr directory if successful."
2542
2501
msgstr ""
2543
2502
2544
2503
# help of 'dry-run' option of 'add' command
2545
# help of 'dry-run' option of 'upgrade' command
2546
#: bzrlib/builtins.py:3822
2504
#: bzrlib/builtins.py:3647
2547
2505
msgid "Show what would be done, but don't actually do anything."
2548
2506
msgstr ""
2549
2507
2550
#: bzrlib/builtins.py:3837
2508
#: bzrlib/builtins.py:3662
2551
2509
msgid "Show or set bzr user id."
2552
2510
msgstr ""
2553
2511
2554
#: bzrlib/builtins.py:3839
2512
#: bzrlib/builtins.py:3664
2555
2513
msgid ""
2556
2514
":Examples:\n"
2557
2515
" Show the email of the current user::"
2558
2516
msgstr ""
2559
2517
2560
#: bzrlib/builtins.py:3842
2518
#: bzrlib/builtins.py:3667
2561
2519
msgid " bzr whoami --email"
2562
2520
msgstr ""
2563
2521
2564
#: bzrlib/builtins.py:3844
2522
#: bzrlib/builtins.py:3669
2565
2523
msgid " Set the current user::"
2566
2524
msgstr ""
2567
2525
2568
#: bzrlib/builtins.py:3846
2526
#: bzrlib/builtins.py:3671
2569
2527
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2570
2528
msgstr ""
2571
2529
2572
2530
# help of 'email' option of 'whoami' command
2573
#: bzrlib/builtins.py:3850
2531
#: bzrlib/builtins.py:3675
2574
2532
msgid "Display email address only."
2575
2533
msgstr ""
2576
2534
2577
2535
# help of 'branch' option of 'whoami' command
2578
#: bzrlib/builtins.py:3852
2536
#: bzrlib/builtins.py:3677
2579
2537
msgid "Set identity for the current branch instead of globally."
2580
2538
msgstr ""
2581
2539
2582
#: bzrlib/builtins.py:3878
2540
#: bzrlib/builtins.py:3701
2583
2541
msgid "--email can only be used to display existing identity"
2584
2542
msgstr ""
2585
2543
2586
#: bzrlib/builtins.py:3902
2544
#: bzrlib/builtins.py:3723
2587
2545
msgid "Print or set the branch nickname."
2588
2546
msgstr ""
2589
2547
2590
#: bzrlib/builtins.py:3904
2548
#: bzrlib/builtins.py:3725
2591
2549
msgid ""
2592
"If unset, the colocated branch name is used for colocated branches, and\n"
2593
"the branch directory name is used for other branches. To print the\n"
2594
"current nickname, execute with no argument."
2550
"If unset, the tree root directory name is used as the nickname.\n"
2551
"To print the current nickname, execute with no argument."
2595
2552
msgstr ""
2596
2553
2597
#: bzrlib/builtins.py:3908
2554
#: bzrlib/builtins.py:3728
2598
2555
msgid ""
2599
2556
"Bound branches use the nickname of its master branch unless it is set\n"
2600
2557
"locally."
2601
2558
msgstr ""
2602
2559
2603
#: bzrlib/builtins.py:3928
2560
#: bzrlib/builtins.py:3748
2604
2561
msgid "Set/unset and display aliases."
2605
2562
msgstr ""
2606
2563
2607
#: bzrlib/builtins.py:3930
2564
#: bzrlib/builtins.py:3750
2608
2565
msgid ""
2609
2566
":Examples:\n"
2610
2567
" Show the current aliases::"
2611
2568
msgstr ""
2612
2569
2613
#: bzrlib/builtins.py:3933
2570
#: bzrlib/builtins.py:3753
2614
2571
msgid " bzr alias"
2615
2572
msgstr ""
2616
2573
2617
#: bzrlib/builtins.py:3935
2574
#: bzrlib/builtins.py:3755
2618
2575
msgid " Show the alias specified for 'll'::"
2619
2576
msgstr ""
2620
2577
2621
#: bzrlib/builtins.py:3937
2578
#: bzrlib/builtins.py:3757
2622
2579
msgid " bzr alias ll"
2623
2580
msgstr ""
2624
2581
2625
#: bzrlib/builtins.py:3939
2582
#: bzrlib/builtins.py:3759
2626
2583
msgid " Set an alias for 'll'::"
2627
2584
msgstr ""
2628
2585
2629
#: bzrlib/builtins.py:3941
2586
#: bzrlib/builtins.py:3761
2630
2587
msgid " bzr alias ll=\"log --line -r-10..-1\""
2631
2588
msgstr ""
2632
2589
2633
#: bzrlib/builtins.py:3943
2590
#: bzrlib/builtins.py:3763
2634
2591
msgid " To remove an alias for 'll'::"
2635
2592
msgstr ""
2636
2593
2637
#: bzrlib/builtins.py:3945
2594
#: bzrlib/builtins.py:3765
2638
2595
msgid " bzr alias --remove ll"
2639
2596
msgstr ""
2640
2597
2641
2598
# help of 'remove' option of 'alias' command
2642
#: bzrlib/builtins.py:3950
2599
#: bzrlib/builtins.py:3770
2643
2600
msgid "Remove the alias."
2644
2601
msgstr ""
2645
2602
2646
#: bzrlib/builtins.py:3968
2603
#: bzrlib/builtins.py:3788
2647
2604
msgid "bzr alias --remove expects an alias to remove."
2648
2605
msgstr ""
2649
2606
2650
#: bzrlib/builtins.py:4149
2607
#: bzrlib/builtins.py:3960
2651
2608
msgid "subunit not available. subunit needs to be installed to use --subunit."
2652
2609
msgstr ""
2653
2610
2654
#: bzrlib/builtins.py:4166
2611
#: bzrlib/builtins.py:3977
2655
2612
msgid ""
2656
2613
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2657
2614
msgstr ""
2658
2615
2659
#: bzrlib/builtins.py:4213
2616
#: bzrlib/builtins.py:4024
2660
2617
msgid "Show version of bzr."
2661
2618
msgstr ""
2662
2619
2663
2620
# help of 'short' option of 'version' command
2664
#: bzrlib/builtins.py:4217
2621
#: bzrlib/builtins.py:4028
2665
2622
msgid "Print just the version number."
2666
2623
msgstr ""
2667
2624
2668
#: bzrlib/builtins.py:4236
2625
#: bzrlib/builtins.py:4047
2669
2626
msgid "It sure does!\n"
2670
2627
msgstr ""
2671
2628
2672
#: bzrlib/builtins.py:4260
2629
#: bzrlib/builtins.py:4071
2673
2630
#, python-format
2674
2631
msgid "merge base is revision %s\n"
2675
2632
msgstr ""
2676
2633
2677
#: bzrlib/builtins.py:4264
2634
#: bzrlib/builtins.py:4075
2678
2635
msgid "Perform a three-way merge."
2679
2636
msgstr ""
2680
2637
2681
#: bzrlib/builtins.py:4266
2638
#: bzrlib/builtins.py:4077
2682
2639
msgid ""
2683
2640
"The source of the merge can be specified either in the form of a branch,\n"
2684
2641
"or in the form of a path to a file containing a merge directive generated\n"
2689
2646
"the current working tree."
2690
2647
msgstr ""
2691
2648
2692
#: bzrlib/builtins.py:4274
2649
#: bzrlib/builtins.py:4085
2693
2650
msgid ""
2694
2651
"When merging from a branch, by default bzr will try to merge in all new\n"
2695
2652
"work from the other branch, automatically determining an appropriate base\n"
2696
2653
"revision. If this fails, you may need to give an explicit base."
2697
2654
msgstr ""
2698
2655
2699
#: bzrlib/builtins.py:4278
2656
#: bzrlib/builtins.py:4089
2700
2657
msgid ""
2701
2658
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2702
2659
"try to merge in all new work up to and including revision OTHER."
2703
2660
msgstr ""
2704
2661
2705
#: bzrlib/builtins.py:4281
2662
#: bzrlib/builtins.py:4092
2706
2663
msgid ""
2707
2664
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2708
2665
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2713
2670
"changes from the other branch is not stored in the commit."
2714
2671
msgstr ""
2715
2672
2716
#: bzrlib/builtins.py:4289
2673
#: bzrlib/builtins.py:4100
2717
2674
msgid "Revision numbers are always relative to the source branch."
2718
2675
msgstr ""
2719
2676
2720
#: bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2721
msgid ""
2722
"Merge will do its best to combine the changes in two branches, but there\n"
2723
"are some kinds of problems only a human can fix. When it encounters those,\n"
2724
"it will mark a conflict. A conflict means that you need to fix something,\n"
2725
"before you can commit."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4296
2677
#: bzrlib/builtins.py:4107
2729
2678
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2730
2679
msgstr ""
2731
2680
2732
#: bzrlib/builtins.py:4298
2681
#: bzrlib/builtins.py:4109
2733
2682
msgid ""
2734
2683
"If there is no default branch set, the first merge will set it (use\n"
2735
2684
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2737
2686
"only be saved if the remote location can be accessed."
2738
2687
msgstr ""
2739
2688
2740
#: bzrlib/builtins.py:4303
2689
#: bzrlib/builtins.py:4114
2741
2690
msgid ""
2742
2691
"The results of the merge are placed into the destination working\n"
2743
2692
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2744
2693
"committed to record the result of the merge."
2745
2694
msgstr ""
2746
2695
2747
#: bzrlib/builtins.py:4307
2696
#: bzrlib/builtins.py:4118
2748
2697
msgid ""
2749
2698
"merge refuses to run if there are any uncommitted changes, unless\n"
2750
2699
"--force is given. If --force is given, then the changes from the source \n"
2753
2702
"merge revision which has more than two parents."
2754
2703
msgstr ""
2755
2704
2756
#: bzrlib/builtins.py:4313
2705
#: bzrlib/builtins.py:4124
2757
2706
msgid ""
2758
2707
"If one would like to merge changes from the working tree of the other\n"
2759
2708
"branch without merging any committed revisions, the --uncommitted option\n"
2760
2709
"can be given."
2761
2710
msgstr ""
2762
2711
2763
#: bzrlib/builtins.py:4317
2712
#: bzrlib/builtins.py:4128
2764
2713
msgid ""
2765
2714
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2766
2715
"you to apply each diff hunk and file change, similar to \"shelve\"."
2767
2716
msgstr ""
2768
2717
2769
#: bzrlib/builtins.py:4320
2718
#: bzrlib/builtins.py:4131
2770
2719
msgid ""
2771
2720
":Examples:\n"
2772
2721
" To merge all new revisions from bzr.dev::"
2773
2722
msgstr ""
2774
2723
2775
#: bzrlib/builtins.py:4323
2724
#: bzrlib/builtins.py:4134
2776
2725
msgid " bzr merge ../bzr.dev"
2777
2726
msgstr ""
2778
2727
2779
#: bzrlib/builtins.py:4325
2728
#: bzrlib/builtins.py:4136
2780
2729
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2781
2730
msgstr ""
2782
2731
2783
#: bzrlib/builtins.py:4327
2732
#: bzrlib/builtins.py:4138
2784
2733
msgid " bzr merge -r 82 ../bzr.dev"
2785
2734
msgstr ""
2786
2735
2787
#: bzrlib/builtins.py:4329
2736
#: bzrlib/builtins.py:4140
2788
2737
msgid " To merge the changes introduced by 82, without previous changes::"
2789
2738
msgstr ""
2790
2739
2791
#: bzrlib/builtins.py:4331
2740
#: bzrlib/builtins.py:4142
2792
2741
msgid " bzr merge -r 81..82 ../bzr.dev"
2793
2742
msgstr ""
2794
2743
2795
#: bzrlib/builtins.py:4333
2744
#: bzrlib/builtins.py:4144
2796
2745
msgid " To apply a merge directive contained in /tmp/merge::"
2797
2746
msgstr ""
2798
2747
2799
#: bzrlib/builtins.py:4335
2748
#: bzrlib/builtins.py:4146
2800
2749
msgid " bzr merge /tmp/merge"
2801
2750
msgstr ""
2802
2751
2803
#: bzrlib/builtins.py:4337
2752
#: bzrlib/builtins.py:4148
2804
2753
msgid ""
2805
2754
" To create a merge revision with three parents from two branches\n"
2806
2755
" feature1a and feature1b:"
2807
2756
msgstr ""
2808
2757
2809
#: bzrlib/builtins.py:4340
2758
#: bzrlib/builtins.py:4151
2810
2759
msgid ""
2811
2760
" bzr merge ../feature1a\n"
2812
2761
" bzr merge ../feature1b --force\n"
2814
2763
msgstr ""
2815
2764
2816
2765
# help of 'force' option of 'merge' command
2817
#: bzrlib/builtins.py:4352
2766
#: bzrlib/builtins.py:4163
2818
2767
msgid "Merge even if the destination tree has uncommitted changes."
2819
2768
msgstr ""
2820
2769
2821
2770
# help of 'uncommitted' option of 'merge' command
2822
#: bzrlib/builtins.py:4358
2771
#: bzrlib/builtins.py:4169
2823
2772
msgid ""
2824
2773
"Apply uncommitted changes from a working copy, instead of branch changes."
2825
2774
msgstr ""
2826
2775
2827
2776
# help of 'pull' option of 'merge' command
2828
#: bzrlib/builtins.py:4360
2777
#: bzrlib/builtins.py:4171
2829
2778
msgid ""
2830
2779
"If the destination is already completely merged into the source, pull from "
2831
2780
"the source rather than merging. When this happens, you do not need to "
2833
2782
msgstr ""
2834
2783
2835
2784
# help of 'directory' option of 'merge' command
2836
#: bzrlib/builtins.py:4365
2785
#: bzrlib/builtins.py:4176
2837
2786
msgid ""
2838
2787
"Branch to merge into, rather than the one containing the working directory."
2839
2788
msgstr ""
2840
2789
2841
2790
# help of 'preview' option of 'merge' command
2842
#: bzrlib/builtins.py:4367
2791
#: bzrlib/builtins.py:4178
2843
2792
msgid "Instead of merging, show a diff of the merge."
2844
2793
msgstr ""
2845
2794
2846
2795
# help of 'interactive' option of 'merge' command
2847
#: bzrlib/builtins.py:4369
2796
#: bzrlib/builtins.py:4180
2848
2797
msgid "Select changes interactively."
2849
2798
msgstr ""
2850
2799
2851
#: bzrlib/builtins.py:4391
2800
#: bzrlib/builtins.py:4202
2852
2801
msgid ""
2853
2802
"Merging into empty branches not currently supported, https://bugs.launchpad."
2854
2803
"net/bzr/+bug/308562"
2855
2804
msgstr ""
2856
2805
2857
#: bzrlib/builtins.py:4418
2806
#: bzrlib/builtins.py:4229
2858
2807
msgid "Cannot use --uncommitted with bundles or merge directives."
2859
2808
msgstr ""
2860
2809
2861
#: bzrlib/builtins.py:4429
2810
#: bzrlib/builtins.py:4240
2862
2811
msgid "Cannot use --uncommitted and --revision at the same time."
2863
2812
msgstr ""
2864
2813
2865
#: bzrlib/builtins.py:4449
2814
#: bzrlib/builtins.py:4260
2866
2815
msgid "merger: "
2867
2816
msgstr ""
2868
2817
2869
#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
2818
#: bzrlib/builtins.py:4262 bzrlib/bundle/apply_bundle.py:68
2870
2819
msgid "Nothing to do."
2871
2820
msgstr ""
2872
2821
2873
#: bzrlib/builtins.py:4455
2822
#: bzrlib/builtins.py:4266
2874
2823
msgid "Cannot pull individual files"
2875
2824
msgstr ""
2876
2825
2877
#: bzrlib/builtins.py:4463
2826
#: bzrlib/builtins.py:4274
2878
2827
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2879
2828
msgstr ""
2880
2829
2881
#: bzrlib/builtins.py:4521
2830
#: bzrlib/builtins.py:4332
2882
2831
#, python-format
2883
2832
msgid "Show-base is not supported for this merge type. %s"
2884
2833
msgstr ""
2885
2834
2886
#: bzrlib/builtins.py:4530
2835
#: bzrlib/builtins.py:4341
2887
2836
#, python-format
2888
2837
msgid "Conflict reduction is not supported for merge type %s."
2889
2838
msgstr ""
2890
2839
2891
#: bzrlib/builtins.py:4534
2840
#: bzrlib/builtins.py:4345
2892
2841
msgid "Cannot do conflict reduction and show base."
2893
2842
msgstr ""
2894
2843
2895
#: bzrlib/builtins.py:4645
2844
#: bzrlib/builtins.py:4456
2896
2845
msgid "No location specified or remembered"
2897
2846
msgstr ""
2898
2847
2899
#: bzrlib/builtins.py:4647
2848
#: bzrlib/builtins.py:4458
2900
2849
msgid "{0} remembered {1} location {2}"
2901
2850
msgstr ""
2902
2851
2903
#: bzrlib/builtins.py:4653
2852
#: bzrlib/builtins.py:4464
2904
2853
msgid "Redo a merge."
2905
2854
msgstr ""
2906
2855
2907
#: bzrlib/builtins.py:4655
2856
#: bzrlib/builtins.py:4466
2908
2857
msgid ""
2909
2858
"Use this if you want to try a different merge technique while resolving\n"
2910
2859
"conflicts. Some merge techniques are better than others, and remerge\n"
2911
2860
"lets you try different ones on different files."
2912
2861
msgstr ""
2913
2862
2914
#: bzrlib/builtins.py:4659
2863
#: bzrlib/builtins.py:4470
2915
2864
msgid ""
2916
2865
"The options for remerge have the same meaning and defaults as the ones for\n"
2917
2866
"merge. The difference is that remerge can (only) be run when there is a\n"
2918
2867
"pending merge, and it lets you specify particular files."
2919
2868
msgstr ""
2920
2869
2921
#: bzrlib/builtins.py:4663
2870
#: bzrlib/builtins.py:4474
2922
2871
msgid ""
2923
2872
":Examples:\n"
2924
2873
" Re-do the merge of all conflicted files, and show the base text in\n"
2925
2874
" conflict regions, in addition to the usual THIS and OTHER texts::"
2926
2875
msgstr ""
2927
2876
2928
#: bzrlib/builtins.py:4667
2877
#: bzrlib/builtins.py:4478
2929
2878
msgid " bzr remerge --show-base"
2930
2879
msgstr ""
2931
2880
2932
#: bzrlib/builtins.py:4669
2881
#: bzrlib/builtins.py:4480
2933
2882
msgid ""
2934
2883
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2935
2884
" additional processing to reduce the size of conflict regions::"
2936
2885
msgstr ""
2937
2886
2938
#: bzrlib/builtins.py:4672
2887
#: bzrlib/builtins.py:4483
2939
2888
msgid " bzr remerge --merge-type weave --reprocess foobar"
2940
2889
msgstr ""
2941
2890
2942
2891
# help of 'show-base' option of 'merge' command
2943
# help of 'show-base' option of 'pull' command
2944
# help of 'show-base' option of 'remerge' command
2945
# help of 'show-base' option of 'update' command
2946
#: bzrlib/builtins.py:4679
2892
#: bzrlib/builtins.py:4490
2947
2893
msgid "Show base revision text in conflicts."
2948
2894
msgstr ""
2949
2895
2950
#: bzrlib/builtins.py:4691
2896
#: bzrlib/builtins.py:4502
2951
2897
msgid ""
2952
2898
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2953
2899
"merges."
2954
2900
msgstr ""
2955
2901
2956
#: bzrlib/builtins.py:4749
2957
msgid ""
2958
"Set files in the working tree back to the contents of a previous revision."
2902
#: bzrlib/builtins.py:4558
2903
msgid "Revert files to a previous revision."
2959
2904
msgstr ""
2960
2905
2961
#: bzrlib/builtins.py:4751
2906
#: bzrlib/builtins.py:4560
2962
2907
msgid ""
2963
2908
"Giving a list of files will revert only those files. Otherwise, all files\n"
2964
2909
"will be reverted. If the revision is not specified with '--revision', the\n"
2965
"working tree basis revision is used. A revert operation affects only the\n"
2966
"working tree, not any revision history like the branch and repository or\n"
2967
"the working tree basis revision."
2910
"last committed revision is used."
2968
2911
msgstr ""
2969
2912
2970
#: bzrlib/builtins.py:4757
2913
#: bzrlib/builtins.py:4564
2971
2914
msgid ""
2972
2915
"To remove only some changes, without reverting to a prior version, use\n"
2973
2916
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2974
2917
"will remove the changes introduced by the second last commit (-2), without\n"
2975
2918
"affecting the changes introduced by the last commit (-1). To remove\n"
2976
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2977
"To update the branch to a specific revision or the latest revision and\n"
2978
"update the working tree accordingly while preserving local changes, see the\n"
2979
"update command."
2919
"certain changes on a hunk-by-hunk basis, see the shelve command."
2980
2920
msgstr ""
2981
2921
2982
#: bzrlib/builtins.py:4766
2922
#: bzrlib/builtins.py:4570
2983
2923
msgid ""
2984
"Uncommitted changes to files that are reverted will be discarded.\n"
2985
"Howver, by default, any files that have been manually changed will be\n"
2986
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2987
"files have '.~#~' appended to their name, where # is a number."
2924
"By default, any files that have been manually changed will be backed up\n"
2925
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2926
"'.~#~' appended to their name, where # is a number."
2988
2927
msgstr ""
2989
2928
2990
#: bzrlib/builtins.py:4771
2929
#: bzrlib/builtins.py:4574
2991
2930
msgid ""
2992
2931
"When you provide files, you can use their current pathname or the pathname\n"
2993
2932
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2995
2934
"reverted."
2996
2935
msgstr ""
2997
2936
2998
#: bzrlib/builtins.py:4776
2937
#: bzrlib/builtins.py:4579
2999
2938
msgid ""
3000
2939
"If you have newly added files since the target revision, they will be\n"
3001
2940
"removed. If the files to be removed have been changed, backups will be\n"
3003
2942
"deleted."
3004
2943
msgstr ""
3005
2944
3006
#: bzrlib/builtins.py:4781
2945
#: bzrlib/builtins.py:4584
3007
2946
msgid ""
3008
2947
"The working tree contains a list of revisions that have been merged but\n"
3009
2948
"not yet committed. These revisions will be included as additional parents\n"
3015
2954
"reverting any files."
3016
2955
msgstr ""
3017
2956
3018
#: bzrlib/builtins.py:4790
2957
#: bzrlib/builtins.py:4593
3019
2958
msgid ""
3020
2959
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3021
2960
"changes from a branch in a single revision. To do this, perform the merge\n"
3030
2969
msgstr ""
3031
2970
3032
2971
# help of 'no-backup' option of 'revert' command
3033
#: bzrlib/builtins.py:4804
2972
#: bzrlib/builtins.py:4607
3034
2973
msgid "Do not save backups of reverted files."
3035
2974
msgstr ""
3036
2975
3037
2976
# help of 'forget-merges' option of 'revert' command
3038
#: bzrlib/builtins.py:4806
2977
#: bzrlib/builtins.py:4609
3039
2978
msgid "Remove pending merge marker, without changing any files."
3040
2979
msgstr ""
3041
2980
3042
#: bzrlib/builtins.py:4837
2981
#: bzrlib/builtins.py:4640
3043
2982
msgid ""
3044
2983
"Show help on a command or other topic.\n"
3045
2984
" "
3046
2985
msgstr ""
3047
2986
3048
2987
# help of 'long' option of 'help' command
3049
#: bzrlib/builtins.py:4842
2988
#: bzrlib/builtins.py:4645
3050
2989
msgid "Show help on all commands."
3051
2990
msgstr ""
3052
2991
3053
#: bzrlib/builtins.py:4871
2992
#: bzrlib/builtins.py:4674
3054
2993
msgid "Show unmerged/unpulled revisions between two branches."
3055
2994
msgstr ""
3056
2995
3057
#: bzrlib/builtins.py:4873
2996
#: bzrlib/builtins.py:4676
3058
2997
msgid "OTHER_BRANCH may be local or remote."
3059
2998
msgstr ""
3060
2999
3061
#: bzrlib/builtins.py:4875
3000
#: bzrlib/builtins.py:4678
3062
3001
msgid ""
3063
3002
"To filter on a range of revisions, you can use the command -r begin..end\n"
3064
3003
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3069
3008
" 0 - no missing revisions"
3070
3009
msgstr ""
3071
3010
3072
#: bzrlib/builtins.py:4885
3011
#: bzrlib/builtins.py:4688
3073
3012
msgid ""
3074
3013
" Determine the missing revisions between this and the branch at the\n"
3075
3014
" remembered pull location::"
3076
3015
msgstr ""
3077
3016
3078
#: bzrlib/builtins.py:4888
3017
#: bzrlib/builtins.py:4691
3079
3018
msgid " bzr missing"
3080
3019
msgstr ""
3081
3020
3082
#: bzrlib/builtins.py:4890
3021
#: bzrlib/builtins.py:4693
3083
3022
msgid " Determine the missing revisions between this and another branch::"
3084
3023
msgstr ""
3085
3024
3086
#: bzrlib/builtins.py:4892
3025
#: bzrlib/builtins.py:4695
3087
3026
msgid " bzr missing http://server/branch"
3088
3027
msgstr ""
3089
3028
3090
#: bzrlib/builtins.py:4894
3029
#: bzrlib/builtins.py:4697
3091
3030
msgid ""
3092
3031
" Determine the missing revisions up to a specific revision on the other\n"
3093
3032
" branch::"
3094
3033
msgstr ""
3095
3034
3096
#: bzrlib/builtins.py:4897
3035
#: bzrlib/builtins.py:4700
3097
3036
msgid " bzr missing -r ..-10"
3098
3037
msgstr ""
3099
3038
3100
#: bzrlib/builtins.py:4899
3039
#: bzrlib/builtins.py:4702
3101
3040
msgid ""
3102
3041
" Determine the missing revisions up to a specific revision on this\n"
3103
3042
" branch::"
3104
3043
msgstr ""
3105
3044
3106
#: bzrlib/builtins.py:4902
3045
#: bzrlib/builtins.py:4705
3107
3046
msgid " bzr missing --my-revision ..-10"
3108
3047
msgstr ""
3109
3048
3110
3049
# help of 'reverse' option of 'missing' command
3111
#: bzrlib/builtins.py:4909
3050
#: bzrlib/builtins.py:4712
3112
3051
msgid "Reverse the order of revisions."
3113
3052
msgstr ""
3114
3053
3115
3054
# help of 'mine-only' option of 'missing' command
3116
#: bzrlib/builtins.py:4911
3055
#: bzrlib/builtins.py:4714
3117
3056
msgid "Display changes in the local branch only."
3118
3057
msgstr ""
3119
3058
3120
3059
# help of 'this' option of 'missing' command
3121
#: bzrlib/builtins.py:4912
3060
#: bzrlib/builtins.py:4715
3122
3061
msgid "Same as --mine-only."
3123
3062
msgstr ""
3124
3063
3125
3064
# help of 'theirs-only' option of 'missing' command
3126
#: bzrlib/builtins.py:4914
3065
#: bzrlib/builtins.py:4717
3127
3066
msgid "Display changes in the remote branch only."
3128
3067
msgstr ""
3129
3068
3130
3069
# help of 'other' option of 'missing' command
3131
#: bzrlib/builtins.py:4915
3070
#: bzrlib/builtins.py:4718
3132
3071
msgid "Same as --theirs-only."
3133
3072
msgstr ""
3134
3073
3135
3074
# help of 'revision' option of 'missing' command
3136
#: bzrlib/builtins.py:4920
3075
#: bzrlib/builtins.py:4723
3137
3076
msgid ""
3138
3077
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3139
3078
"details."
3140
3079
msgstr ""
3141
3080
3142
3081
# help of 'my-revision' option of 'missing' command
3143
#: bzrlib/builtins.py:4924
3082
#: bzrlib/builtins.py:4727
3144
3083
msgid ""
3145
3084
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3146
3085
"details."
3147
3086
msgstr ""
3148
3087
3149
3088
# help of 'include-merged' option of 'missing' command
3150
#: bzrlib/builtins.py:4927
3089
#: bzrlib/builtins.py:4730
3151
3090
msgid "Show all revisions in addition to the mainline ones."
3152
3091
msgstr ""
3153
3092
3154
#: bzrlib/builtins.py:4981
3093
#: bzrlib/builtins.py:4784
3155
3094
msgid "No peer location known or specified."
3156
3095
msgstr ""
3157
3096
3158
#: bzrlib/builtins.py:4985
3097
#: bzrlib/builtins.py:4788
3159
3098
msgid "Using saved parent location: {0}\n"
3160
3099
msgstr ""
3161
3100
3162
#: bzrlib/builtins.py:5018
3101
#: bzrlib/builtins.py:4821
3163
3102
#, python-format
3164
3103
msgid "You have %d extra revision:\n"
3165
3104
msgid_plural "You have %d extra revisions:\n"
3166
3105
msgstr[0] ""
3167
3106
msgstr[1] ""
3168
3107
3169
#: bzrlib/builtins.py:5038
3108
#: bzrlib/builtins.py:4837
3170
3109
#, python-format
3171
3110
msgid "You are missing %d revision:\n"
3172
3111
msgid_plural "You are missing %d revisions:\n"
3173
3112
msgstr[0] ""
3174
3113
msgstr[1] ""
3175
3114
3176
#: bzrlib/builtins.py:5053
3115
#: bzrlib/builtins.py:4849
3177
3116
msgid "This branch has no new revisions.\n"
3178
3117
msgstr ""
3179
3118
3180
#: bzrlib/builtins.py:5056
3119
#: bzrlib/builtins.py:4852
3181
3120
msgid "Other branch has no new revisions.\n"
3182
3121
msgstr ""
3183
3122
3184
#: bzrlib/builtins.py:5061
3123
#: bzrlib/builtins.py:4857
3185
3124
msgid "Branches are up to date.\n"
3186
3125
msgstr ""
3187
3126
3188
#: bzrlib/builtins.py:5072
3127
#: bzrlib/builtins.py:4868
3189
3128
msgid "Compress the data within a repository."
3190
3129
msgstr ""
3191
3130
3192
#: bzrlib/builtins.py:5074
3131
#: bzrlib/builtins.py:4870
3193
3132
msgid ""
3194
3133
"This operation compresses the data within a bazaar repository. As\n"
3195
3134
"bazaar supports automatic packing of repository, this operation is\n"
3196
3135
"normally not required to be done manually."
3197
3136
msgstr ""
3198
3137
3199
#: bzrlib/builtins.py:5078
3138
#: bzrlib/builtins.py:4874
3200
3139
msgid ""
3201
3140
"During the pack operation, bazaar takes a backup of existing repository\n"
3202
3141
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3205
3144
"used."
3206
3145
msgstr ""
3207
3146
3208
#: bzrlib/builtins.py:5084
3147
#: bzrlib/builtins.py:4880
3209
3148
msgid ""
3210
3149
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3211
3150
"during or immediately after repacking, you may be left with a state\n"
3214
3153
msgstr ""
3215
3154
3216
3155
# help of 'clean-obsolete-packs' option of 'pack' command
3217
#: bzrlib/builtins.py:5093
3156
#: bzrlib/builtins.py:4889
3218
3157
msgid "Delete obsolete packs to save disk space."
3219
3158
msgstr ""
3220
3159
3221
#: bzrlib/builtins.py:5107
3160
#: bzrlib/builtins.py:4903
3222
3161
msgid "List the installed plugins."
3223
3162
msgstr ""
3224
3163
3225
#: bzrlib/builtins.py:5109
3164
#: bzrlib/builtins.py:4905
3226
3165
msgid ""
3227
3166
"This command displays the list of installed plugins including\n"
3228
3167
"version of plugin and a short description of each."
3229
3168
msgstr ""
3230
3169
3231
#: bzrlib/builtins.py:5112
3170
#: bzrlib/builtins.py:4908
3232
3171
msgid "--verbose shows the path where each plugin is located."
3233
3172
msgstr ""
3234
3173
3235
#: bzrlib/builtins.py:5114
3174
#: bzrlib/builtins.py:4910
3236
3175
msgid ""
3237
3176
"A plugin is an external component for Bazaar that extends the\n"
3238
3177
"revision control system, by adding or replacing code in Bazaar.\n"
3241
3180
"customizing log output."
3242
3181
msgstr ""
3243
3182
3244
#: bzrlib/builtins.py:5120
3183
#: bzrlib/builtins.py:4916
3245
3184
msgid ""
3246
3185
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3247
3186
"for further information on plugins including where to find them and how to\n"
3249
3188
"plugins using the Python programming language."
3250
3189
msgstr ""
3251
3190
3252
#: bzrlib/builtins.py:5136
3191
#: bzrlib/builtins.py:4932
3253
3192
msgid "Show testament (signing-form) of a revision."
3254
3193
msgstr ""
3255
3194
3256
3195
# help of 'long' option of 'testament' command
3257
#: bzrlib/builtins.py:5139
3196
#: bzrlib/builtins.py:4935
3258
3197
msgid "Produce long-format testament."
3259
3198
msgstr ""
3260
3199
3261
3200
# help of 'strict' option of 'testament' command
3262
#: bzrlib/builtins.py:5141
3201
#: bzrlib/builtins.py:4937
3263
3202
msgid "Produce a strict-format testament."
3264
3203
msgstr ""
3265
3204
3266
#: bzrlib/builtins.py:5168
3205
#: bzrlib/builtins.py:4963
3267
3206
msgid "Show the origin of each line in a file."
3268
3207
msgstr ""
3269
3208
3270
#: bzrlib/builtins.py:5170
3209
#: bzrlib/builtins.py:4965
3271
3210
msgid ""
3272
3211
"This prints out the given file with an annotation on the left side\n"
3273
3212
"indicating which revision, author and date introduced the change."
3274
3213
msgstr ""
3275
3214
3276
#: bzrlib/builtins.py:5173
3215
#: bzrlib/builtins.py:4968
3277
3216
msgid ""
3278
3217
"If the origin is the same for a run of consecutive lines, it is\n"
3279
3218
"shown only at the top, unless the --all option is given."
3280
3219
msgstr ""
3281
3220
3282
3221
# help of 'all' option of 'annotate' command
3283
#: bzrlib/builtins.py:5181
3222
#: bzrlib/builtins.py:4976
3284
3223
msgid "Show annotations on all lines."
3285
3224
msgstr ""
3286
3225
3287
3226
# help of 'long' option of 'annotate' command
3288
#: bzrlib/builtins.py:5182
3227
#: bzrlib/builtins.py:4977
3289
3228
msgid "Show commit date in annotations."
3290
3229
msgstr ""
3291
3230
3292
#: bzrlib/builtins.py:5269
3231
#: bzrlib/builtins.py:5064
3293
3232
msgid "Cannot sign a range of non-revision-history revisions"
3294
3233
msgstr ""
3295
3234
3296
#: bzrlib/builtins.py:5281
3235
#: bzrlib/builtins.py:5076
3297
3236
msgid "Please supply either one revision, or a range."
3298
3237
msgstr ""
3299
3238
3300
#: bzrlib/builtins.py:5285
3239
#: bzrlib/builtins.py:5080
3301
3240
msgid ""
3302
3241
"Convert the current branch into a checkout of the supplied branch.\n"
3303
3242
"If no branch is supplied, rebind to the last bound location."
3304
3243
msgstr ""
3305
3244
3306
#: bzrlib/builtins.py:5288
3245
#: bzrlib/builtins.py:5083
3307
3246
msgid ""
3308
3247
"Once converted into a checkout, commits must succeed on the master branch\n"
3309
3248
"before they will be applied to the local branch."
3310
3249
msgstr ""
3311
3250
3312
#: bzrlib/builtins.py:5291
3251
#: bzrlib/builtins.py:5086
3313
3252
msgid ""
3314
3253
"Bound branches use the nickname of its master branch unless it is set\n"
3315
3254
"locally, in which case binding will update the local nickname to be\n"
3316
3255
"that of the master."
3317
3256
msgstr ""
3318
3257
3319
#: bzrlib/builtins.py:5306
3258
#: bzrlib/builtins.py:5101
3320
3259
msgid "No location supplied. This format does not remember old locations."
3321
3260
msgstr ""
3322
3261
3323
#: bzrlib/builtins.py:5312
3262
#: bzrlib/builtins.py:5106
3324
3263
msgid "Branch is already bound"
3325
3264
msgstr ""
3326
3265
3327
#: bzrlib/builtins.py:5315
3266
#: bzrlib/builtins.py:5108
3328
3267
msgid "No location supplied and no previous location known"
3329
3268
msgstr ""
3330
3269
3331
#: bzrlib/builtins.py:5321
3270
#: bzrlib/builtins.py:5114
3332
3271
msgid "These branches have diverged. Try merging, and then bind again."
3333
3272
msgstr ""
3334
3273
3335
#: bzrlib/builtins.py:5328
3274
#: bzrlib/builtins.py:5121
3336
3275
msgid "Convert the current checkout into a regular branch."
3337
3276
msgstr ""
3338
3277
3339
#: bzrlib/builtins.py:5330
3278
#: bzrlib/builtins.py:5123
3340
3279
msgid ""
3341
3280
"After unbinding, the local branch is considered independent and subsequent\n"
3342
3281
"commits will be local only."
3343
3282
msgstr ""
3344
3283
3345
#: bzrlib/builtins.py:5341
3284
#: bzrlib/builtins.py:5134
3346
3285
msgid "Local branch is not bound"
3347
3286
msgstr ""
3348
3287
3349
#: bzrlib/builtins.py:5345
3288
#: bzrlib/builtins.py:5138
3350
3289
msgid "Remove the last committed revision."
3351
3290
msgstr ""
3352
3291
3353
#: bzrlib/builtins.py:5347
3292
#: bzrlib/builtins.py:5140
3354
3293
msgid ""
3355
3294
"--verbose will print out what is being removed.\n"
3356
3295
"--dry-run will go through all the motions, but not actually\n"
3357
3296
"remove anything."
3358
3297
msgstr ""
3359
3298
3360
#: bzrlib/builtins.py:5351
3299
#: bzrlib/builtins.py:5144
3361
3300
msgid ""
3362
3301
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3363
3302
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3364
3303
"branch at revision 15."
3365
3304
msgstr ""
3366
3305
3367
#: bzrlib/builtins.py:5355
3306
#: bzrlib/builtins.py:5148
3368
3307
msgid ""
3369
3308
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3370
3309
"it may make is to restore any pending merges that were present before\n"
3372
3311
msgstr ""
3373
3312
3374
3313
# help of 'dry-run' option of 'uncommit' command
3375
#: bzrlib/builtins.py:5366
3314
#: bzrlib/builtins.py:5159
3376
3315
msgid "Don't actually make changes."
3377
3316
msgstr ""
3378
3317
3379
3318
# help of 'force' option of 'uncommit' command
3380
#: bzrlib/builtins.py:5367
3319
#: bzrlib/builtins.py:5160
3381
3320
msgid "Say yes to all questions."
3382
3321
msgstr ""
3383
3322
3384
3323
# help of 'keep-tags' option of 'uncommit' command
3385
#: bzrlib/builtins.py:5369
3324
#: bzrlib/builtins.py:5162
3386
3325
msgid "Keep tags that point to removed revisions."
3387
3326
msgstr ""
3388
3327
3389
3328
# help of 'local' option of 'uncommit' command
3390
#: bzrlib/builtins.py:5371
3329
#: bzrlib/builtins.py:5164
3391
3330
msgid "Only remove the commits from the local branch when in a checkout."
3392
3331
msgstr ""
3393
3332
3394
#: bzrlib/builtins.py:5420
3333
#: bzrlib/builtins.py:5213
3395
3334
msgid "No revisions to uncommit.\n"
3396
3335
msgstr ""
3397
3336
3398
#: bzrlib/builtins.py:5435
3337
#: bzrlib/builtins.py:5228
3399
3338
msgid "Dry-run, pretending to remove the above revisions.\n"
3400
3339
msgstr ""
3401
3340
3402
#: bzrlib/builtins.py:5438
3341
#: bzrlib/builtins.py:5231
3403
3342
msgid "The above revision(s) will be removed.\n"
3404
3343
msgstr ""
3405
3344
3406
#: bzrlib/builtins.py:5442
3345
#: bzrlib/builtins.py:5235
3407
3346
msgid "Uncommit these revisions"
3408
3347
msgstr ""
3409
3348
3410
#: bzrlib/builtins.py:5445
3349
#: bzrlib/builtins.py:5238
3411
3350
msgid "Canceled\n"
3412
3351
msgstr ""
3413
3352
3414
#: bzrlib/builtins.py:5452
3353
#: bzrlib/builtins.py:5245
3415
3354
#, python-format
3416
3355
msgid ""
3417
3356
"You can restore the old tip by running:\n"
3418
3357
" bzr pull . -r revid:%s\n"
3419
3358
msgstr ""
3420
3359
3421
#: bzrlib/builtins.py:5457
3360
#: bzrlib/builtins.py:5250
3422
3361
msgid "Break a dead lock."
3423
3362
msgstr ""
3424
3363
3425
#: bzrlib/builtins.py:5459
3364
#: bzrlib/builtins.py:5252
3426
3365
msgid ""
3427
3366
"This command breaks a lock on a repository, branch, working directory or\n"
3428
3367
"config file."
3429
3368
msgstr ""
3430
3369
3431
#: bzrlib/builtins.py:5462
3370
#: bzrlib/builtins.py:5255
3432
3371
msgid ""
3433
3372
"CAUTION: Locks should only be broken when you are sure that the process\n"
3434
3373
"holding the lock has been stopped."
3435
3374
msgstr ""
3436
3375
3437
#: bzrlib/builtins.py:5465
3376
#: bzrlib/builtins.py:5258
3438
3377
msgid ""
3439
3378
"You can get information on what locks are open via the 'bzr info\n"
3440
3379
"[location]' command."
3441
3380
msgstr ""
3442
3381
3443
#: bzrlib/builtins.py:5468
3382
#: bzrlib/builtins.py:5261
3444
3383
msgid ""
3445
3384
":Examples:\n"
3446
3385
" bzr break-lock\n"
3449
3388
msgstr ""
3450
3389
3451
3390
# help of 'config' option of 'break-lock' command
3452
#: bzrlib/builtins.py:5477
3391
#: bzrlib/builtins.py:5270
3453
3392
msgid "LOCATION is the directory where the config lock is."
3454
3393
msgstr ""
3455
3394
3456
3395
# help of 'force' option of 'break-lock' command
3457
#: bzrlib/builtins.py:5479
3396
#: bzrlib/builtins.py:5272
3458
3397
msgid "Do not ask for confirmation before breaking the lock."
3459
3398
msgstr ""
3460
3399
3461
3400
# help of 'protocol=bzr' option of 'serve' command
3462
#: bzrlib/builtins.py:5514
3401
#: bzrlib/builtins.py:5307
3463
3402
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3464
3403
msgstr ""
3465
3404
3466
#: bzrlib/builtins.py:5515
3405
#: bzrlib/builtins.py:5308
3467
3406
msgid "Run the bzr server."
3468
3407
msgstr ""
3469
3408
3470
3409
# help of 'inet' option of 'serve' command
3471
#: bzrlib/builtins.py:5521
3410
#: bzrlib/builtins.py:5314
3472
3411
msgid "Serve on stdin/out for use from inetd or sshd."
3473
3412
msgstr ""
3474
3413
3475
3414
# title of 'protocol' option of 'serve' command
3476
#: bzrlib/builtins.py:5522
3415
#: bzrlib/builtins.py:5315
3477
3416
msgid "protocol"
3478
3417
msgstr ""
3479
3418
3480
3419
# help of 'protocol' option of 'serve' command
3481
#: bzrlib/builtins.py:5523
3420
#: bzrlib/builtins.py:5316
3482
3421
msgid "Protocol to serve."
3483
3422
msgstr ""
3484
3423
3485
# help of 'listen' option of 'serve' command
3486
#: bzrlib/builtins.py:5527
3487
msgid "Listen for connections on nominated address."
3488
msgstr ""
3489
3490
3424
# help of 'port' option of 'serve' command
3491
#: bzrlib/builtins.py:5529
3425
#: bzrlib/builtins.py:5320
3492
3426
msgid ""
3493
"Listen for connections on nominated port. Passing 0 as the port number will "
3494
"result in a dynamically allocated port. The default port depends on the "
3495
"protocol."
3427
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3428
"Passing 0 as the port number will result in a dynamically allocated port. "
3429
"The default port depends on the protocol."
3496
3430
msgstr ""
3497
3431
3498
3432
# help of 'directory' option of 'serve' command
3499
#: bzrlib/builtins.py:5534
3433
#: bzrlib/builtins.py:5326
3500
3434
msgid "Serve contents of this directory."
3501
3435
msgstr ""
3502
3436
3503
3437
# help of 'allow-writes' option of 'serve' command
3504
#: bzrlib/builtins.py:5536
3438
#: bzrlib/builtins.py:5328
3505
3439
msgid ""
3506
3440
"By default the server is a readonly server. Supplying --allow-writes "
3507
3441
"enables write access to the contents of the served directory and below. "
3511
3445
msgstr ""
3512
3446
3513
3447
# help of 'client-timeout' option of 'serve' command
3514
#: bzrlib/builtins.py:5545
3448
#: bzrlib/builtins.py:5337
3515
3449
msgid "Override the default idle client timeout (5min)."
3516
3450
msgstr ""
3517
3451
3518
#: bzrlib/builtins.py:5563
3452
#: bzrlib/builtins.py:5387
3519
3453
msgid "Combine a tree into its containing tree."
3520
3454
msgstr ""
3521
3455
3522
#: bzrlib/builtins.py:5565
3456
#: bzrlib/builtins.py:5389
3523
3457
msgid "This command requires the target tree to be in a rich-root format."
3524
3458
msgstr ""
3525
3459
3526
#: bzrlib/builtins.py:5567
3460
#: bzrlib/builtins.py:5391
3527
3461
msgid ""
3528
3462
"The TREE argument should be an independent tree, inside another tree, but\n"
3529
3463
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3530
3464
"running \"bzr branch\" with the target inside a tree.)"
3531
3465
msgstr ""
3532
3466
3533
#: bzrlib/builtins.py:5571
3467
#: bzrlib/builtins.py:5395
3534
3468
msgid ""
3535
3469
"The result is a combined tree, with the subtree no longer an independent\n"
3536
3470
"part. This is marked as a merge of the subtree into the containing tree,\n"
3537
3471
"and all history is preserved."
3538
3472
msgstr ""
3539
3473
3540
#: bzrlib/builtins.py:5589
3474
#: bzrlib/builtins.py:5413
3541
3475
#, python-format
3542
3476
msgid ""
3543
3477
"Can't join trees because %s doesn't support rich root data.\n"
3544
3478
"You can use bzr upgrade on the repository."
3545
3479
msgstr ""
3546
3480
3547
#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605
3481
#: bzrlib/builtins.py:5423 bzrlib/builtins.py:5429
3548
3482
msgid "Cannot join {0}. {1}"
3549
3483
msgstr ""
3550
3484
3551
#: bzrlib/builtins.py:5609
3485
#: bzrlib/builtins.py:5433
3552
3486
msgid "Split a subdirectory of a tree into a separate tree."
3553
3487
msgstr ""
3554
3488
3555
#: bzrlib/builtins.py:5611
3489
#: bzrlib/builtins.py:5435
3556
3490
msgid ""
3557
3491
"This command will produce a target tree in a format that supports\n"
3558
3492
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3559
3493
"converted into earlier formats like 'dirstate-tags'."
3560
3494
msgstr ""
3561
3495
3562
#: bzrlib/builtins.py:5615
3496
#: bzrlib/builtins.py:5439
3563
3497
msgid ""
3564
3498
"The TREE argument should be a subdirectory of a working tree. That\n"
3565
3499
"subdirectory will be converted into an independent tree, with its own\n"
3566
3500
"branch. Commits in the top-level tree will not apply to the new subtree."
3567
3501
msgstr ""
3568
3502
3569
#: bzrlib/builtins.py:5695
3503
#: bzrlib/builtins.py:5519
3570
3504
msgid "No submit branch specified or known"
3571
3505
msgstr ""
3572
3506
3573
#: bzrlib/builtins.py:5704 bzrlib/send.py:109
3507
#: bzrlib/builtins.py:5527 bzrlib/send.py:106
3574
3508
msgid "No public branch specified or known"
3575
3509
msgstr ""
3576
3510
3577
#: bzrlib/builtins.py:5709
3511
#: bzrlib/builtins.py:5532
3578
3512
msgid "bzr merge-directive takes at most two one revision identifiers"
3579
3513
msgstr ""
3580
3514
3581
#: bzrlib/builtins.py:5718
3515
#: bzrlib/builtins.py:5541
3582
3516
msgid "No revisions to bundle."
3583
3517
msgstr ""
3584
3518
3585
#: bzrlib/builtins.py:5737
3519
#: bzrlib/builtins.py:5560
3586
3520
msgid "Mail or create a merge-directive for submitting changes."
3587
3521
msgstr ""
3588
3522
3589
#: bzrlib/builtins.py:5739
3523
#: bzrlib/builtins.py:5562
3590
3524
msgid "A merge directive provides many things needed for requesting merges:"
3591
3525
msgstr ""
3592
3526
3593
#: bzrlib/builtins.py:5741
3527
#: bzrlib/builtins.py:5564
3594
3528
msgid "* A machine-readable description of the merge to perform"
3595
3529
msgstr ""
3596
3530
3597
#: bzrlib/builtins.py:5743
3531
#: bzrlib/builtins.py:5566
3598
3532
msgid "* An optional patch that is a preview of the changes requested"
3599
3533
msgstr ""
3600
3534
3601
#: bzrlib/builtins.py:5745
3535
#: bzrlib/builtins.py:5568
3602
3536
msgid ""
3603
3537
"* An optional bundle of revision data, so that the changes can be applied\n"
3604
3538
" directly from the merge directive, without retrieving data from a\n"
3605
3539
" branch."
3606
3540
msgstr ""
3607
3541
3608
#: bzrlib/builtins.py:5749
3542
#: bzrlib/builtins.py:5572
3609
3543
msgid ""
3610
3544
"`bzr send` creates a compact data set that, when applied using bzr\n"
3611
3545
"merge, has the same effect as merging from the source branch. "
3612
3546
msgstr ""
3613
3547
3614
#: bzrlib/builtins.py:5752
3548
#: bzrlib/builtins.py:5575
3615
3549
msgid ""
3616
3550
"By default the merge directive is self-contained and can be applied to any\n"
3617
3551
"branch containing submit_branch in its ancestory without needing access to\n"
3618
3552
"the source branch."
3619
3553
msgstr ""
3620
3554
3621
#: bzrlib/builtins.py:5756
3555
#: bzrlib/builtins.py:5579
3622
3556
msgid ""
3623
3557
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3624
3558
"revisions, but only a structured request to merge from the\n"
3627
3561
"included if known, so that people can check it later."
3628
3562
msgstr ""
3629
3563
3630
#: bzrlib/builtins.py:5762
3564
#: bzrlib/builtins.py:5585
3631
3565
msgid ""
3632
3566
"The submit branch defaults to the parent of the source branch, but can be\n"
3633
3567
"overridden. Both submit branch and public branch will be remembered in\n"
3636
3570
"be changed using --from."
3637
3571
msgstr ""
3638
3572
3639
#: bzrlib/builtins.py:5768
3573
#: bzrlib/builtins.py:5591
3640
3574
msgid ""
3641
3575
"Both the submit branch and the public branch follow the usual behavior with\n"
3642
3576
"respect to --remember: If there is no default location set, the first send\n"
3645
3579
"--remember. The value will only be saved if the location can be accessed."
3646
3580
msgstr ""
3647
3581
3648
#: bzrlib/builtins.py:5774
3582
#: bzrlib/builtins.py:5597
3649
3583
msgid ""
3650
3584
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3651
3585
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3653
3587
"in the merge directive."
3654
3588
msgstr ""
3655
3589
3656
#: bzrlib/builtins.py:5779
3590
#: bzrlib/builtins.py:5602
3657
3591
msgid ""
3658
3592
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3659
3593
"given, in which case it is sent to a file."
3660
3594
msgstr ""
3661
3595
3662
#: bzrlib/builtins.py:5782
3596
#: bzrlib/builtins.py:5605
3663
3597
msgid ""
3664
3598
"Mail is sent using your preferred mail program. This should be transparent\n"
3665
3599
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3666
3600
"If the preferred client can't be found (or used), your editor will be used."
3667
3601
msgstr ""
3668
3602
3669
#: bzrlib/builtins.py:5786
3603
#: bzrlib/builtins.py:5609
3670
3604
msgid ""
3671
3605
"To use a specific mail program, set the mail_client configuration option.\n"
3672
3606
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3678
3612
"supported clients."
3679
3613
msgstr ""
3680
3614
3681
#: bzrlib/builtins.py:5793
3615
#: bzrlib/builtins.py:5616
3682
3616
msgid ""
3683
3617
"If mail is being sent, a to address is required. This can be supplied\n"
3684
3618
"either on the commandline, by setting the submit_to configuration\n"
3686
3620
"in the submit branch."
3687
3621
msgstr ""
3688
3622
3689
#: bzrlib/builtins.py:5798
3623
#: bzrlib/builtins.py:5621
3690
3624
msgid ""
3691
3625
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3692
3626
"and\n"
3696
3630
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3697
3631
msgstr ""
3698
3632
3699
#: bzrlib/builtins.py:5804
3633
#: bzrlib/builtins.py:5627
3700
3634
msgid ""
3701
3635
"The merge directives created by bzr send may be applied using bzr merge or\n"
3702
3636
"bzr pull by specifying a file containing a merge directive as the location."
3703
3637
msgstr ""
3704
3638
3705
#: bzrlib/builtins.py:5807
3639
#: bzrlib/builtins.py:5630
3706
3640
msgid ""
3707
3641
"bzr send makes extensive use of public locations to map local locations "
3708
3642
"into\n"
3711
3645
msgstr ""
3712
3646
3713
3647
# help of 'output' option of 'send' command
3714
#: bzrlib/builtins.py:5831
3648
#: bzrlib/builtins.py:5654
3715
3649
msgid "Write merge directive to this file or directory; use - for stdout."
3716
3650
msgstr ""
3717
3651
3718
3652
# help of 'strict' option of 'send' command
3719
#: bzrlib/builtins.py:5835
3653
#: bzrlib/builtins.py:5658
3720
3654
msgid ""
3721
3655
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3722
3656
"strict disables the check."
3723
3657
msgstr ""
3724
3658
3725
3659
# help of 'mail-to' option of 'send' command
3726
#: bzrlib/builtins.py:5837
3660
#: bzrlib/builtins.py:5660
3727
3661
msgid "Mail the request to this address."
3728
3662
msgstr ""
3729
3663
3730
3664
# help of 'body' option of 'send' command
3731
#: bzrlib/builtins.py:5841
3665
#: bzrlib/builtins.py:5664
3732
3666
msgid "Body for the email."
3733
3667
msgstr ""
3734
3668
3735
3669
# help of 'no-bundle' option of 'send' command
3736
#: bzrlib/builtins.py:5894
3670
#: bzrlib/builtins.py:5717
3737
3671
msgid "Do not include a bundle in the merge directive."
3738
3672
msgstr ""
3739
3673
3740
3674
# help of 'no-patch' option of 'send' command
3741
#: bzrlib/builtins.py:5895
3675
#: bzrlib/builtins.py:5718
3742
3676
msgid "Do not include a preview patch in the merge directive."
3743
3677
msgstr ""
3744
3678
3745
3679
# help of 'remember' option of 'send' command
3746
#: bzrlib/builtins.py:5898
3680
#: bzrlib/builtins.py:5721
3747
3681
msgid "Remember submit and public branch."
3748
3682
msgstr ""
3749
3683
3750
3684
# help of 'from' option of 'send' command
3751
#: bzrlib/builtins.py:5900
3685
#: bzrlib/builtins.py:5723
3752
3686
msgid ""
3753
3687
"Branch to generate the submission from, rather than the one containing the "
3754
3688
"working directory."
3755
3689
msgstr ""
3756
3690
3757
3691
# title of 'format' option of 'send' command
3758
# title of 'format' option of 'version-info' command
3759
#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76
3692
#: bzrlib/builtins.py:5733
3760
3693
msgid "format"
3761
3694
msgstr ""
3762
3695
3763
3696
# help of 'format' option of 'send' command
3764
#: bzrlib/builtins.py:5911
3697
#: bzrlib/builtins.py:5734
3765
3698
msgid "Use the specified output format."
3766
3699
msgstr ""
3767
3700
3768
#: bzrlib/builtins.py:5933
3701
#: bzrlib/builtins.py:5756
3769
3702
msgid "Create, remove or modify a tag naming a revision."
3770
3703
msgstr ""
3771
3704
3772
#: bzrlib/builtins.py:5935
3705
#: bzrlib/builtins.py:5758
3773
3706
msgid ""
3774
3707
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3775
3708
"(--revision) option can be given -rtag:X, where X is any previously\n"
3776
3709
"created tag."
3777
3710
msgstr ""
3778
3711
3779
#: bzrlib/builtins.py:5939
3712
#: bzrlib/builtins.py:5762
3780
3713
msgid ""
3781
3714
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3782
3715
"along when you branch, push, pull or merge."
3783
3716
msgstr ""
3784
3717
3785
#: bzrlib/builtins.py:5942
3718
#: bzrlib/builtins.py:5765
3786
3719
msgid ""
3787
3720
"It is an error to give a tag name that already exists unless you pass\n"
3788
3721
"--force, in which case the tag is moved to point to the new revision."
3789
3722
msgstr ""
3790
3723
3791
#: bzrlib/builtins.py:5945
3724
#: bzrlib/builtins.py:5768
3792
3725
msgid ""
3793
3726
"To rename a tag (change the name but keep it on the same revsion), run "
3794
3727
"``bzr\n"
3795
3728
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3796
3729
msgstr ""
3797
3730
3798
#: bzrlib/builtins.py:5948
3731
#: bzrlib/builtins.py:5771
3799
3732
msgid ""
3800
3733
"If no tag name is specified it will be determined through the \n"
3801
3734
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3804
3737
msgstr ""
3805
3738
3806
3739
# help of 'delete' option of 'tag' command
3807
#: bzrlib/builtins.py:5958
3740
#: bzrlib/builtins.py:5781
3808
3741
msgid "Delete this tag rather than placing it."
3809
3742
msgstr ""
3810
3743
3811
3744
# help of 'directory' option of 'tag' command
3812
#: bzrlib/builtins.py:5961
3745
#: bzrlib/builtins.py:5784
3813
3746
msgid "Branch in which to place the tag."
3814
3747
msgstr ""
3815
3748
3816
3749
# help of 'force' option of 'tag' command
3817
#: bzrlib/builtins.py:5963
3750
#: bzrlib/builtins.py:5786
3818
3751
msgid "Replace existing tags."
3819
3752
msgstr ""
3820
3753
3821
#: bzrlib/builtins.py:5978
3754
#: bzrlib/builtins.py:5801
3822
3755
msgid "No tag specified to delete."
3823
3756
msgstr ""
3824
3757
3825
#: bzrlib/builtins.py:5980
3758
#: bzrlib/builtins.py:5803
3826
3759
#, python-format
3827
3760
msgid "Deleted tag %s."
3828
3761
msgstr ""
3829
3762
3830
#: bzrlib/builtins.py:5985
3831
msgid "Tags can only be placed on a single revision, not on a range"
3832
msgstr ""
3833
3834
#: bzrlib/builtins.py:5994
3763
#: bzrlib/builtins.py:5817
3835
3764
msgid "Please specify a tag name."
3836
3765
msgstr ""
3837
3766
3838
#: bzrlib/builtins.py:6002
3767
#: bzrlib/builtins.py:5825
3839
3768
#, python-format
3840
3769
msgid "Tag %s already exists for that revision."
3841
3770
msgstr ""
3842
3771
3843
#: bzrlib/builtins.py:6006
3772
#: bzrlib/builtins.py:5829
3844
3773
#, python-format
3845
3774
msgid "Created tag %s."
3846
3775
msgstr ""
3847
3776
3848
#: bzrlib/builtins.py:6008
3777
#: bzrlib/builtins.py:5831
3849
3778
#, python-format
3850
3779
msgid "Updated tag %s."
3851
3780
msgstr ""
3852
3781
3853
#: bzrlib/builtins.py:6012
3782
#: bzrlib/builtins.py:5835
3854
3783
msgid "List tags."
3855
3784
msgstr ""
3856
3785
3857
#: bzrlib/builtins.py:6014
3786
#: bzrlib/builtins.py:5837
3858
3787
msgid ""
3859
3788
"This command shows a table of tag names and the revisions they reference."
3860
3789
msgstr ""
3861
3790
3862
3791
# help of 'directory' option of 'tags' command
3863
#: bzrlib/builtins.py:6020
3792
#: bzrlib/builtins.py:5843
3864
3793
msgid "Branch whose tags should be displayed."
3865
3794
msgstr ""
3866
3795
3867
3796
# help of 'sort' option of 'tags' command
3868
#: bzrlib/builtins.py:6022
3797
#: bzrlib/builtins.py:5845
3869
3798
msgid "Sort tags by different criteria."
3870
3799
msgstr ""
3871
3800
3872
3801
# title of 'sort' option of 'tags' command
3873
#: bzrlib/builtins.py:6022
3802
#: bzrlib/builtins.py:5845
3874
3803
msgid "Sorting"
3875
3804
msgstr ""
3876
3805
3877
#: bzrlib/builtins.py:6091
3806
#: bzrlib/builtins.py:5914
3878
3807
msgid "Reconfigure the type of a bzr directory."
3879
3808
msgstr ""
3880
3809
3881
#: bzrlib/builtins.py:6093
3810
#: bzrlib/builtins.py:5916
3882
3811
msgid "A target configuration must be specified."
3883
3812
msgstr ""
3884
3813
3885
#: bzrlib/builtins.py:6095
3814
#: bzrlib/builtins.py:5918
3886
3815
msgid ""
3887
3816
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3888
3817
"The order of preference is\n"
3894
3823
msgstr ""
3895
3824
3896
3825
# title of 'tree_type' option of 'reconfigure' command
3897
#: bzrlib/builtins.py:6109
3826
#: bzrlib/builtins.py:5932
3898
3827
msgid "Tree type"
3899
3828
msgstr ""
3900
3829
3901
3830
# help of 'tree_type' option of 'reconfigure' command
3902
#: bzrlib/builtins.py:6110
3831
#: bzrlib/builtins.py:5933
3903
3832
msgid "The relation between branch and tree."
3904
3833
msgstr ""
3905
3834
3906
3835
# help of 'tree_type=branch' option of 'reconfigure' command
3907
#: bzrlib/builtins.py:6112
3836
#: bzrlib/builtins.py:5935
3908
3837
msgid "Reconfigure to be an unbound branch with no working tree."
3909
3838
msgstr ""
3910
3839
3911
3840
# help of 'tree_type=tree' option of 'reconfigure' command
3912
#: bzrlib/builtins.py:6113
3841
#: bzrlib/builtins.py:5936
3913
3842
msgid "Reconfigure to be an unbound branch with a working tree."
3914
3843
msgstr ""
3915
3844
3916
3845
# help of 'tree_type=checkout' option of 'reconfigure' command
3917
#: bzrlib/builtins.py:6114
3846
#: bzrlib/builtins.py:5937
3918
3847
msgid "Reconfigure to be a bound branch with a working tree."
3919
3848
msgstr ""
3920
3849
3921
3850
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3922
#: bzrlib/builtins.py:6115
3851
#: bzrlib/builtins.py:5938
3923
3852
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3924
3853
msgstr ""
3925
3854
3926
3855
# title of 'repository_type' option of 'reconfigure' command
3927
#: bzrlib/builtins.py:6120
3856
#: bzrlib/builtins.py:5943
3928
3857
msgid "Repository type"
3929
3858
msgstr ""
3930
3859
3931
3860
# help of 'repository_type' option of 'reconfigure' command
3932
#: bzrlib/builtins.py:6121
3861
#: bzrlib/builtins.py:5944
3933
3862
msgid "Location fo the repository."
3934
3863
msgstr ""
3935
3864
3936
3865
# help of 'repository_type=standalone' option of 'reconfigure' command
3937
#: bzrlib/builtins.py:6123
3866
#: bzrlib/builtins.py:5946
3938
3867
msgid ""
3939
3868
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3940
3869
msgstr ""
3941
3870
3942
3871
# help of 'repository_type=use-shared' option of 'reconfigure' command
3943
#: bzrlib/builtins.py:6125
3872
#: bzrlib/builtins.py:5948
3944
3873
msgid "Reconfigure to use a shared repository."
3945
3874
msgstr ""
3946
3875
3947
3876
# title of 'repository_trees' option of 'reconfigure' command
3948
#: bzrlib/builtins.py:6129
3877
#: bzrlib/builtins.py:5952
3949
3878
msgid "Trees in Repository"
3950
3879
msgstr ""
3951
3880
3952
3881
# help of 'repository_trees' option of 'reconfigure' command
3953
#: bzrlib/builtins.py:6130
3882
#: bzrlib/builtins.py:5953
3954
3883
msgid "Whether new branches in the repository have trees."
3955
3884
msgstr ""
3956
3885
3957
3886
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3958
#: bzrlib/builtins.py:6132
3887
#: bzrlib/builtins.py:5955
3959
3888
msgid "Reconfigure repository to create working trees on branches by default."
3960
3889
msgstr ""
3961
3890
3962
3891
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3963
#: bzrlib/builtins.py:6134
3892
#: bzrlib/builtins.py:5957
3964
3893
msgid ""
3965
3894
"Reconfigure repository to not create working trees on branches by default."
3966
3895
msgstr ""
3967
3896
3968
3897
# help of 'bind-to' option of 'reconfigure' command
3969
#: bzrlib/builtins.py:6137
3898
#: bzrlib/builtins.py:5960
3970
3899
msgid "Branch to bind checkout to."
3971
3900
msgstr ""
3972
3901
3973
3902
# help of 'force' option of 'reconfigure' command
3974
#: bzrlib/builtins.py:6139
3903
#: bzrlib/builtins.py:5962
3975
3904
msgid "Perform reconfiguration even if local changes will be lost."
3976
3905
msgstr ""
3977
3906
3978
3907
# help of 'stacked-on' option of 'reconfigure' command
3979
#: bzrlib/builtins.py:6142
3908
#: bzrlib/builtins.py:5965
3980
3909
msgid "Reconfigure a branch to be stacked on another branch."
3981
3910
msgstr ""
3982
3911
3983
3912
# help of 'unstacked' option of 'reconfigure' command
3984
#: bzrlib/builtins.py:6146
3913
#: bzrlib/builtins.py:5969
3985
3914
msgid ""
3986
3915
"Reconfigure a branch to be unstacked. This may require copying substantial "
3987
3916
"data into it."
3988
3917
msgstr ""
3989
3918
3990
#: bzrlib/builtins.py:6156
3919
#: bzrlib/builtins.py:5979
3991
3920
msgid "Can't use both --stacked-on and --unstacked"
3992
3921
msgstr ""
3993
3922
3994
#: bzrlib/builtins.py:6170
3923
#: bzrlib/builtins.py:5993
3995
3924
msgid "No target configuration specified"
3996
3925
msgstr ""
3997
3926
3998
#: bzrlib/builtins.py:6205
3927
#: bzrlib/builtins.py:6028
3999
3928
msgid "Set the branch of a checkout and update."
4000
3929
msgstr ""
4001
3930
4002
#: bzrlib/builtins.py:6207
3931
#: bzrlib/builtins.py:6030
4003
3932
msgid ""
4004
3933
"For lightweight checkouts, this changes the branch being referenced.\n"
4005
3934
"For heavyweight checkouts, this checks that there are no local commits\n"
4007
3936
"of the new location and binds to it."
4008
3937
msgstr ""
4009
3938
4010
#: bzrlib/builtins.py:6212
3939
#: bzrlib/builtins.py:6035
4011
3940
msgid ""
4012
3941
"In both cases, the working tree is updated and uncommitted changes\n"
4013
3942
"are merged. The user can commit or revert these as they desire."
4014
3943
msgstr ""
4015
3944
4016
#: bzrlib/builtins.py:6215
3945
#: bzrlib/builtins.py:6038
4017
3946
msgid "Pending merges need to be committed or reverted before using switch."
4018
3947
msgstr ""
4019
3948
4020
#: bzrlib/builtins.py:6217
3949
#: bzrlib/builtins.py:6040
4021
3950
msgid ""
4022
3951
"The path to the branch to switch to can be specified relative to the parent\n"
4023
3952
"directory of the current branch. For example, if you are currently in a\n"
4025
3954
"/path/to/newbranch."
4026
3955
msgstr ""
4027
3956
4028
#: bzrlib/builtins.py:6222
3957
#: bzrlib/builtins.py:6045
4029
3958
msgid ""
4030
3959
"Bound branches use the nickname of its master branch unless it is set\n"
4031
3960
"locally, in which case switching will update the local nickname to be\n"
4033
3962
msgstr ""
4034
3963
4035
3964
# help of 'force' option of 'switch' command
4036
#: bzrlib/builtins.py:6230
3965
#: bzrlib/builtins.py:6053
4037
3966
msgid "Switch even if local commits will be lost."
4038
3967
msgstr ""
4039
3968
4040
3969
# help of 'create-branch' option of 'switch' command
4041
#: bzrlib/builtins.py:6233
3970
#: bzrlib/builtins.py:6056
4042
3971
msgid "Create the target branch from this one before switching to it."
4043
3972
msgstr ""
4044
3973
4045
# help of 'store' option of 'switch' command
4046
#: bzrlib/builtins.py:6236
4047
msgid "Store and restore uncommitted changes in the branch."
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6250
3974
#: bzrlib/builtins.py:6068
4051
3975
msgid "You must supply either a revision or a location"
4052
3976
msgstr ""
4053
3977
4054
#: bzrlib/builtins.py:6263
3978
#: bzrlib/builtins.py:6079
4055
3979
msgid "cannot create branch without source branch"
4056
3980
msgstr ""
4057
3981
4058
#: bzrlib/builtins.py:6289
3982
#: bzrlib/builtins.py:6143
4059
3983
msgid "Manage filtered views."
4060
3984
msgstr ""
4061
3985
4062
#: bzrlib/builtins.py:6291
3986
#: bzrlib/builtins.py:6145
4063
3987
msgid ""
4064
3988
"Views provide a mask over the tree so that users can focus on\n"
4065
3989
"a subset of a tree when doing their work. After creating a view,\n"
4069
3993
"must be within the current view."
4070
3994
msgstr ""
4071
3995
4072
#: bzrlib/builtins.py:6298
3996
#: bzrlib/builtins.py:6152
4073
3997
msgid ""
4074
3998
"In most cases, a view has a short life-span: it is created to make\n"
4075
3999
"a selected change and is deleted once that change is committed.\n"
4077
4001
"and switch between them."
4078
4002
msgstr ""
4079
4003
4080
#: bzrlib/builtins.py:6303
4004
#: bzrlib/builtins.py:6157
4081
4005
msgid ""
4082
4006
"To disable the current view without deleting it, you can switch to\n"
4083
4007
"the pseudo view called ``off``. This can be useful when you need\n"
4085
4009
"want to switch back to your view after that."
4086
4010
msgstr ""
4087
4011
4088
#: bzrlib/builtins.py:6308
4012
#: bzrlib/builtins.py:6162
4089
4013
msgid ""
4090
4014
":Examples:\n"
4091
4015
" To define the current view::"
4092
4016
msgstr ""
4093
4017
4094
#: bzrlib/builtins.py:6311
4018
#: bzrlib/builtins.py:6165
4095
4019
msgid " bzr view file1 dir1 ..."
4096
4020
msgstr ""
4097
4021
4098
#: bzrlib/builtins.py:6313
4022
#: bzrlib/builtins.py:6167
4099
4023
msgid " To list the current view::"
4100
4024
msgstr ""
4101
4025
4102
#: bzrlib/builtins.py:6315
4026
#: bzrlib/builtins.py:6169
4103
4027
msgid " bzr view"
4104
4028
msgstr ""
4105
4029
4106
#: bzrlib/builtins.py:6317
4030
#: bzrlib/builtins.py:6171
4107
4031
msgid " To delete the current view::"
4108
4032
msgstr ""
4109
4033
4110
#: bzrlib/builtins.py:6319
4034
#: bzrlib/builtins.py:6173
4111
4035
msgid " bzr view --delete"
4112
4036
msgstr ""
4113
4037
4114
#: bzrlib/builtins.py:6321
4038
#: bzrlib/builtins.py:6175
4115
4039
msgid " To disable the current view without deleting it::"
4116
4040
msgstr ""
4117
4041
4118
#: bzrlib/builtins.py:6323
4042
#: bzrlib/builtins.py:6177
4119
4043
msgid " bzr view --switch off"
4120
4044
msgstr ""
4121
4045
4122
#: bzrlib/builtins.py:6325
4046
#: bzrlib/builtins.py:6179
4123
4047
msgid " To define a named view and switch to it::"
4124
4048
msgstr ""
4125
4049
4126
#: bzrlib/builtins.py:6327
4050
#: bzrlib/builtins.py:6181
4127
4051
msgid " bzr view --name view-name file1 dir1 ..."
4128
4052
msgstr ""
4129
4053
4130
#: bzrlib/builtins.py:6329
4054
#: bzrlib/builtins.py:6183
4131
4055
msgid " To list a named view::"
4132
4056
msgstr ""
4133
4057
4134
#: bzrlib/builtins.py:6331
4058
#: bzrlib/builtins.py:6185
4135
4059
msgid " bzr view --name view-name"
4136
4060
msgstr ""
4137
4061
4138
#: bzrlib/builtins.py:6333
4062
#: bzrlib/builtins.py:6187
4139
4063
msgid " To delete a named view::"
4140
4064
msgstr ""
4141
4065
4142
#: bzrlib/builtins.py:6335
4066
#: bzrlib/builtins.py:6189
4143
4067
msgid " bzr view --name view-name --delete"
4144
4068
msgstr ""
4145
4069
4146
#: bzrlib/builtins.py:6337
4070
#: bzrlib/builtins.py:6191
4147
4071
msgid " To switch to a named view::"
4148
4072
msgstr ""
4149
4073
4150
#: bzrlib/builtins.py:6339
4074
#: bzrlib/builtins.py:6193
4151
4075
msgid " bzr view --switch view-name"
4152
4076
msgstr ""
4153
4077
4154
#: bzrlib/builtins.py:6341
4078
#: bzrlib/builtins.py:6195
4155
4079
msgid " To list all views defined::"
4156
4080
msgstr ""
4157
4081
4158
#: bzrlib/builtins.py:6343
4082
#: bzrlib/builtins.py:6197
4159
4083
msgid " bzr view --all"
4160
4084
msgstr ""
4161
4085
4162
#: bzrlib/builtins.py:6345
4086
#: bzrlib/builtins.py:6199
4163
4087
msgid " To delete all views::"
4164
4088
msgstr ""
4165
4089
4166
#: bzrlib/builtins.py:6347
4090
#: bzrlib/builtins.py:6201
4167
4091
msgid " bzr view --delete --all"
4168
4092
msgstr ""
4169
4093
4170
4094
# help of 'all' option of 'view' command
4171
#: bzrlib/builtins.py:6354
4095
#: bzrlib/builtins.py:6208
4172
4096
msgid "Apply list or delete action to all views."
4173
4097
msgstr ""
4174
4098
4175
4099
# help of 'delete' option of 'view' command
4176
#: bzrlib/builtins.py:6357
4100
#: bzrlib/builtins.py:6211
4177
4101
msgid "Delete the view."
4178
4102
msgstr ""
4179
4103
4180
4104
# help of 'name' option of 'view' command
4181
#: bzrlib/builtins.py:6360
4105
#: bzrlib/builtins.py:6214
4182
4106
msgid "Name of the view to define, list or delete."
4183
4107
msgstr ""
4184
4108
4185
4109
# help of 'switch' option of 'view' command
4186
#: bzrlib/builtins.py:6364
4110
#: bzrlib/builtins.py:6218
4187
4111
msgid "Name of the view to switch to."
4188
4112
msgstr ""
4189
4113
4190
#: bzrlib/builtins.py:6383
4114
#: bzrlib/builtins.py:6237
4191
4115
msgid "Both --delete and a file list specified"
4192
4116
msgstr ""
4193
4117
4194
#: bzrlib/builtins.py:6386
4118
#: bzrlib/builtins.py:6240
4195
4119
msgid "Both --delete and --switch specified"
4196
4120
msgstr ""
4197
4121
4198
#: bzrlib/builtins.py:6389
4122
#: bzrlib/builtins.py:6243
4199
4123
msgid "Deleted all views.\n"
4200
4124
msgstr ""
4201
4125
4202
#: bzrlib/builtins.py:6391
4126
#: bzrlib/builtins.py:6245
4203
4127
msgid "No current view to delete"
4204
4128
msgstr ""
4205
4129
4206
#: bzrlib/builtins.py:6394
4130
#: bzrlib/builtins.py:6248
4207
4131
#, python-format
4208
4132
msgid "Deleted '%s' view.\n"
4209
4133
msgstr ""
4210
4134
4211
#: bzrlib/builtins.py:6398
4135
#: bzrlib/builtins.py:6252
4212
4136
msgid "Both --switch and a file list specified"
4213
4137
msgstr ""
4214
4138
4215
#: bzrlib/builtins.py:6401
4139
#: bzrlib/builtins.py:6255
4216
4140
msgid "Both --switch and --all specified"
4217
4141
msgstr ""
4218
4142
4219
#: bzrlib/builtins.py:6404
4143
#: bzrlib/builtins.py:6258
4220
4144
msgid "No current view to disable"
4221
4145
msgstr ""
4222
4146
4223
#: bzrlib/builtins.py:6406
4147
#: bzrlib/builtins.py:6260
4224
4148
#, python-format
4225
4149
msgid "Disabled '%s' view.\n"
4226
4150
msgstr ""
4227
4151
4228
#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432
4152
#: bzrlib/builtins.py:6264 bzrlib/builtins.py:6286
4229
4153
msgid "Using '{0}' view: {1}\n"
4230
4154
msgstr ""
4231
4155
4232
#: bzrlib/builtins.py:6413
4156
#: bzrlib/builtins.py:6267
4233
4157
msgid "Views defined:\n"
4234
4158
msgstr ""
4235
4159
4236
#: bzrlib/builtins.py:6422
4160
#: bzrlib/builtins.py:6276
4237
4161
msgid "No views defined.\n"
4238
4162
msgstr ""
4239
4163
4240
#: bzrlib/builtins.py:6429
4164
#: bzrlib/builtins.py:6283
4241
4165
msgid "Cannot change the 'off' pseudo view"
4242
4166
msgstr ""
4243
4167
4244
#: bzrlib/builtins.py:6437
4168
#: bzrlib/builtins.py:6291
4245
4169
msgid "No current view.\n"
4246
4170
msgstr ""
4247
4171
4248
#: bzrlib/builtins.py:6440
4172
#: bzrlib/builtins.py:6294
4249
4173
msgid "'{0}' view is: {1}\n"
4250
4174
msgstr ""
4251
4175
4252
#: bzrlib/builtins.py:6460
4176
#: bzrlib/builtins.py:6314
4253
4177
msgid " <no hooks installed>\n"
4254
4178
msgstr ""
4255
4179
4256
#: bzrlib/builtins.py:6464
4180
#: bzrlib/builtins.py:6318
4257
4181
msgid "Remove a branch."
4258
4182
msgstr ""
4259
4183
4260
#: bzrlib/builtins.py:6466
4184
#: bzrlib/builtins.py:6320
4261
4185
msgid ""
4262
4186
"This will remove the branch from the specified location but \n"
4263
4187
"will keep any working tree or repository in place."
4264
4188
msgstr ""
4265
4189
4266
#: bzrlib/builtins.py:6471
4190
#: bzrlib/builtins.py:6325
4267
4191
msgid " Remove the branch at repo/trunk::"
4268
4192
msgstr ""
4269
4193
4270
#: bzrlib/builtins.py:6473
4194
#: bzrlib/builtins.py:6327
4271
4195
msgid " bzr remove-branch repo/trunk"
4272
4196
msgstr ""
4273
4197
4274
# help of 'force' option of 'remove-branch' command
4275
#: bzrlib/builtins.py:6480
4276
msgid "Remove branch even if it is the active branch."
4277
msgstr ""
4278
4279
#: bzrlib/builtins.py:6494
4280
msgid "Branch is active. Use --force to remove it."
4281
msgstr ""
4282
4283
4198
# help of 'writer=plain' option of 'shelve' command
4284
#: bzrlib/builtins.py:6498
4199
#: bzrlib/builtins.py:6342
4285
4200
msgid "Plaintext diff output."
4286
4201
msgstr ""
4287
4202
4288
#: bzrlib/builtins.py:6499
4203
#: bzrlib/builtins.py:6343
4289
4204
msgid "Temporarily set aside some changes from the current tree."
4290
4205
msgstr ""
4291
4206
4292
#: bzrlib/builtins.py:6501
4207
#: bzrlib/builtins.py:6345
4293
4208
msgid ""
4294
4209
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4295
4210
"ie. out of the way, until a later time when you can bring them back from\n"
4298
4213
"will they survive its deletion."
4299
4214
msgstr ""
4300
4215
4301
#: bzrlib/builtins.py:6507
4216
#: bzrlib/builtins.py:6351
4302
4217
msgid "If shelve --list is specified, previously-shelved changes are listed."
4303
4218
msgstr ""
4304
4219
4305
#: bzrlib/builtins.py:6509
4220
#: bzrlib/builtins.py:6353
4306
4221
msgid ""
4307
4222
"Shelve is intended to help separate several sets of changes that have\n"
4308
4223
"been inappropriately mingled. If you just want to get rid of all changes\n"
4310
4225
"shelve all text changes at once, use shelve --all."
4311
4226
msgstr ""
4312
4227
4313
#: bzrlib/builtins.py:6514
4228
#: bzrlib/builtins.py:6358
4314
4229
msgid ""
4315
4230
"If filenames are specified, only the changes to those files will be\n"
4316
4231
"shelved. Other files will be left untouched."
4317
4232
msgstr ""
4318
4233
4319
#: bzrlib/builtins.py:6517
4234
#: bzrlib/builtins.py:6361
4320
4235
msgid ""
4321
4236
"If a revision is specified, changes since that revision will be shelved."
4322
4237
msgstr ""
4323
4238
4324
#: bzrlib/builtins.py:6519
4239
#: bzrlib/builtins.py:6363
4325
4240
msgid ""
4326
4241
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4327
4242
"restore the most recently shelved changes."
4328
4243
msgstr ""
4329
4244
4330
#: bzrlib/builtins.py:6522
4245
#: bzrlib/builtins.py:6366
4331
4246
msgid ""
4332
4247
"For complicated changes, it is possible to edit the changes in a separate\n"
4333
4248
"editor program to decide what the file remaining in the working copy\n"
4334
4249
"should look like. To do this, add the configuration option"
4335
4250
msgstr ""
4336
4251
4337
#: bzrlib/builtins.py:6526
4252
#: bzrlib/builtins.py:6370
4338
4253
msgid " change_editor = PROGRAM @new_path @old_path"
4339
4254
msgstr ""
4340
4255
4341
#: bzrlib/builtins.py:6528
4256
#: bzrlib/builtins.py:6372
4342
4257
msgid ""
4343
4258
"where @new_path is replaced with the path of the new version of the \n"
4344
4259
"file and @old_path is replaced with the path of the old version of \n"
4348
4263
msgstr ""
4349
4264
4350
4265
# help of 'all' option of 'shelve' command
4351
#: bzrlib/builtins.py:6540
4266
#: bzrlib/builtins.py:6384
4352
4267
msgid "Shelve all changes."
4353
4268
msgstr ""
4354
4269
4355
4270
# help of 'writer' option of 'shelve' command
4356
#: bzrlib/builtins.py:6542
4271
#: bzrlib/builtins.py:6386
4357
4272
msgid "Method to use for writing diffs."
4358
4273
msgstr ""
4359
4274
4360
4275
# title of 'writer' option of 'shelve' command
4361
#: bzrlib/builtins.py:6542
4276
#: bzrlib/builtins.py:6386
4362
4277
msgid "writer"
4363
4278
msgstr ""
4364
4279
4365
4280
# help of 'list' option of 'shelve' command
4366
#: bzrlib/builtins.py:6546
4281
#: bzrlib/builtins.py:6390
4367
4282
msgid "List shelved changes."
4368
4283
msgstr ""
4369
4284
4370
4285
# help of 'destroy' option of 'shelve' command
4371
#: bzrlib/builtins.py:6548
4286
#: bzrlib/builtins.py:6392
4372
4287
msgid "Destroy removed changes instead of shelving them."
4373
4288
msgstr ""
4374
4289
4375
#: bzrlib/builtins.py:6577
4290
#: bzrlib/builtins.py:6421
4376
4291
msgid "No shelved changes."
4377
4292
msgstr ""
4378
4293
4379
#: bzrlib/builtins.py:6588
4294
#: bzrlib/builtins.py:6432
4380
4295
msgid "Restore shelved changes."
4381
4296
msgstr ""
4382
4297
4383
#: bzrlib/builtins.py:6590
4298
#: bzrlib/builtins.py:6434
4384
4299
msgid ""
4385
4300
"By default, the most recently shelved changes are restored. However if you\n"
4386
4301
"specify a shelf by id those changes will be restored instead. This works\n"
4388
4303
msgstr ""
4389
4304
4390
4305
# help of 'action' option of 'unshelve' command
4391
#: bzrlib/builtins.py:6599
4306
#: bzrlib/builtins.py:6443
4392
4307
msgid "The action to perform."
4393
4308
msgstr ""
4394
4309
4395
# title of 'action' option of 'resolve' command
4396
# title of 'action' option of 'unshelve' command
4397
#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694
4398
msgid "action"
4399
msgstr ""
4400
4401
4310
# help of 'action=apply' option of 'unshelve' command
4402
#: bzrlib/builtins.py:6601
4311
#: bzrlib/builtins.py:6445
4403
4312
msgid "Apply changes and remove from the shelf."
4404
4313
msgstr ""
4405
4314
4406
4315
# help of 'action=dry-run' option of 'unshelve' command
4407
#: bzrlib/builtins.py:6602
4316
#: bzrlib/builtins.py:6446
4408
4317
msgid "Show changes, but do not apply or remove them."
4409
4318
msgstr ""
4410
4319
4411
4320
# help of 'action=preview' option of 'unshelve' command
4412
#: bzrlib/builtins.py:6603
4321
#: bzrlib/builtins.py:6447
4413
4322
msgid ""
4414
4323
"Instead of unshelving the changes, show the diff that would result from "
4415
4324
"unshelving."
4416
4325
msgstr ""
4417
4326
4418
4327
# help of 'action=delete-only' option of 'unshelve' command
4419
#: bzrlib/builtins.py:6605
4328
#: bzrlib/builtins.py:6449
4420
4329
msgid "Delete changes without applying them."
4421
4330
msgstr ""
4422
4331
4423
4332
# help of 'action=keep' option of 'unshelve' command
4424
#: bzrlib/builtins.py:6606
4333
#: bzrlib/builtins.py:6450
4425
4334
msgid "Apply changes but don't delete them."
4426
4335
msgstr ""
4427
4336
4428
#: bzrlib/builtins.py:6621
4337
#: bzrlib/builtins.py:6465
4429
4338
msgid "Remove unwanted files from working tree."
4430
4339
msgstr ""
4431
4340
4432
#: bzrlib/builtins.py:6623
4341
#: bzrlib/builtins.py:6467
4433
4342
msgid ""
4434
4343
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4435
4344
"files are never deleted."
4436
4345
msgstr ""
4437
4346
4438
#: bzrlib/builtins.py:6626
4347
#: bzrlib/builtins.py:6470
4439
4348
msgid ""
4440
4349
"Another class is 'detritus', which includes files emitted by bzr during\n"
4441
4350
"normal operations and selftests. (The value of these files decreases with\n"
4442
4351
"time.)"
4443
4352
msgstr ""
4444
4353
4445
#: bzrlib/builtins.py:6630
4354
#: bzrlib/builtins.py:6474
4446
4355
msgid ""
4447
4356
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4448
4357
"flags are respected, and may be combined."
4449
4358
msgstr ""
4450
4359
4451
#: bzrlib/builtins.py:6633
4360
#: bzrlib/builtins.py:6477
4452
4361
msgid "To check what clean-tree will do, use --dry-run."
4453
4362
msgstr ""
4454
4363
4455
4364
# help of 'ignored' option of 'clean-tree' command
4456
#: bzrlib/builtins.py:6636
4365
#: bzrlib/builtins.py:6480
4457
4366
msgid "Delete all ignored files."
4458
4367
msgstr ""
4459
4368
4460
4369
# help of 'detritus' option of 'clean-tree' command
4461
#: bzrlib/builtins.py:6637
4370
#: bzrlib/builtins.py:6481
4462
4371
msgid ""
4463
4372
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4464
4373
msgstr ""
4465
4374
4466
4375
# help of 'unknown' option of 'clean-tree' command
4467
#: bzrlib/builtins.py:6640
4376
#: bzrlib/builtins.py:6484
4468
4377
msgid "Delete files unknown to bzr (default)."
4469
4378
msgstr ""
4470
4379
4471
4380
# help of 'dry-run' option of 'clean-tree' command
4472
#: bzrlib/builtins.py:6641
4381
#: bzrlib/builtins.py:6485
4473
4382
msgid "Show files to delete instead of deleting them."
4474
4383
msgstr ""
4475
4384
4476
4385
# help of 'force' option of 'clean-tree' command
4477
#: bzrlib/builtins.py:6643
4386
#: bzrlib/builtins.py:6487
4478
4387
msgid "Do not prompt before deleting."
4479
4388
msgstr ""
4480
4389
4481
#: bzrlib/bundle/__init__.py:59
4390
#: bzrlib/bundle/__init__.py:57
4482
4391
msgid "A directory cannot be a bundle"
4483
4392
msgstr ""
4484
4393
4485
#: bzrlib/bundle/apply_bundle.py:40
4394
#: bzrlib/bundle/apply_bundle.py:37
4486
4395
msgid "Install revisions"
4487
4396
msgstr ""
4488
4397
4398
#: bzrlib/bundle/commands.py:61
4399
msgid "--verbose requires a merge directive"
4400
msgstr ""
4401
4489
4402
#: bzrlib/bundle/commands.py:64
4490
msgid "--verbose requires a merge directive"
4491
msgstr ""
4492
4493
#: bzrlib/bundle/commands.py:67
4494
4403
msgid "Bundle format not supported"
4495
4404
msgstr ""
4496
4405
4497
#: bzrlib/bundle/commands.py:77
4406
#: bzrlib/bundle/commands.py:74
4498
4407
msgid "Records\n"
4499
4408
msgstr ""
4500
4409
4501
#: bzrlib/bundle/commands.py:81
4410
#: bzrlib/bundle/commands.py:78
4502
4411
msgid "{0}: {1} ({2} multiparent)\n"
4503
4412
msgstr ""
4504
4413
4505
#: bzrlib/bundle/commands.py:83
4414
#: bzrlib/bundle/commands.py:80
4506
4415
#, python-format
4507
4416
msgid "unique files: %d\n"
4508
4417
msgstr ""
4509
4418
4510
#: bzrlib/bundle/commands.py:92
4419
#: bzrlib/bundle/commands.py:89
4511
4420
msgid "Revisions\n"
4512
4421
msgstr ""
4513
4422
4514
#: bzrlib/bundle/commands.py:93
4423
#: bzrlib/bundle/commands.py:90
4515
4424
#, python-format
4516
4425
msgid "nicks: %s\n"
4517
4426
msgstr ""
4518
4427
4519
#: bzrlib/bundle/commands.py:95
4428
#: bzrlib/bundle/commands.py:92
4520
4429
#, python-format
4521
4430
msgid ""
4522
4431
"committers: \n"
4523
4432
"%s\n"
4524
4433
msgstr ""
4525
4434
4526
#: bzrlib/bundle/commands.py:103
4435
#: bzrlib/bundle/commands.py:100
4527
4436
msgid "Decoded contents\n"
4528
4437
msgstr ""
4529
4438
4530
#: bzrlib/bundle/serializer/v4.py:327
4439
#: bzrlib/bundle/serializer/v4.py:325
4531
4440
#, python-format
4532
4441
msgid "Bundling %d revision."
4533
4442
msgid_plural "Bundling %d revisions."
4544
4453
msgid "renamed {0} to {1}"
4545
4454
msgstr ""
4546
4455
4547
#: bzrlib/bzrdir.py:1639
4456
#: bzrlib/bzrdir.py:1512
4548
4457
#, python-format
4549
4458
msgid ""
4550
4459
"Source repository format does not support stacking, using format:\n"
4551
4460
" %s"
4552
4461
msgstr ""
4553
4462
4554
#: bzrlib/bzrdir.py:1659
4463
#: bzrlib/bzrdir.py:1532
4555
4464
#, python-format
4556
4465
msgid ""
4557
4466
"Source branch format does not support stacking, using format:\n"
4558
4467
" %s"
4559
4468
msgstr ""
4560
4469
4561
#: bzrlib/bzrdir.py:1805
4470
#: bzrlib/bzrdir.py:1677
4562
4471
msgid "starting repository conversion"
4563
4472
msgstr ""
4564
4473
4565
#: bzrlib/bzrdir.py:2026
4474
#: bzrlib/bzrdir.py:1906
4566
4475
msgid "Using default stacking branch {0} at {1}"
4567
4476
msgstr ""
4568
4477
4478
#: bzrlib/check.py:106
4479
msgid "check"
4480
msgstr ""
4481
4569
4482
#: bzrlib/check.py:108
4570
msgid "check"
4483
msgid "checking revisions"
4571
4484
msgstr ""
4572
4485
4573
4486
#: bzrlib/check.py:110
4574
msgid "checking revisions"
4487
msgid "checking commit contents"
4575
4488
msgstr ""
4576
4489
4577
4490
#: bzrlib/check.py:112
4578
msgid "checking commit contents"
4579
msgstr ""
4580
4581
#: bzrlib/check.py:114
4582
4491
msgid "checking file graphs"
4583
4492
msgstr ""
4584
4493
4585
#: bzrlib/check.py:118
4494
#: bzrlib/check.py:116
4586
4495
msgid "checking branches and trees"
4587
4496
msgstr ""
4588
4497
4589
#: bzrlib/check.py:205
4498
#: bzrlib/check.py:203
4590
4499
msgid "checked repository {0} format {1}"
4591
4500
msgstr ""
4592
4501
4593
#: bzrlib/check.py:208
4502
#: bzrlib/check.py:206
4594
4503
#, python-format
4595
4504
msgid "%6d revisions"
4596
4505
msgstr ""
4597
4506
4507
#: bzrlib/check.py:207
4508
#, python-format
4509
msgid "%6d file-ids"
4510
msgstr ""
4511
4598
4512
#: bzrlib/check.py:209
4599
4513
#, python-format
4600
msgid "%6d file-ids"
4601
msgstr ""
4602
4603
#: bzrlib/check.py:211
4604
#, python-format
4605
4514
msgid "%6d unreferenced text versions"
4606
4515
msgstr ""
4607
4516
4608
#: bzrlib/check.py:215
4517
#: bzrlib/check.py:213
4609
4518
msgid "unreferenced version: {{{0}}} in {1}"
4610
4519
msgstr ""
4611
4520
4612
#: bzrlib/check.py:218
4521
#: bzrlib/check.py:216
4613
4522
#, python-format
4614
4523
msgid "%6d revisions are missing inventory_sha1"
4615
4524
msgstr ""
4616
4525
4617
#: bzrlib/check.py:221
4526
#: bzrlib/check.py:219
4618
4527
#, python-format
4619
4528
msgid "%6d revisions are mentioned but not present"
4620
4529
msgstr ""
4621
4530
4622
#: bzrlib/check.py:224
4531
#: bzrlib/check.py:222
4623
4532
#, python-format
4624
4533
msgid "%6d ghost revisions"
4625
4534
msgstr ""
4626
4535
4627
#: bzrlib/check.py:229
4536
#: bzrlib/check.py:227
4628
4537
#, python-format
4629
4538
msgid "%6d revisions missing parents in ancestry"
4630
4539
msgstr ""
4631
4540
4632
#: bzrlib/check.py:233
4541
#: bzrlib/check.py:231
4633
4542
#, python-format
4634
4543
msgid " %s should be in the ancestry for:"
4635
4544
msgstr ""
4636
4545
4637
#: bzrlib/check.py:237
4546
#: bzrlib/check.py:235
4638
4547
#, python-format
4639
4548
msgid "%6d inconsistent parents"
4640
4549
msgstr ""
4641
4550
4642
#: bzrlib/check.py:241
4551
#: bzrlib/check.py:239
4643
4552
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4644
4553
msgstr ""
4645
4554
4646
#: bzrlib/check.py:247
4555
#: bzrlib/check.py:245
4647
4556
#, python-format
4648
4557
msgid "%6d revisions have incorrect parents in the revision index"
4649
4558
msgstr ""
4650
4559
4651
#: bzrlib/check.py:253
4560
#: bzrlib/check.py:251
4652
4561
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4653
4562
msgstr ""
4654
4563
4655
#: bzrlib/check.py:267
4564
#: bzrlib/check.py:265
4656
4565
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4657
4566
msgstr ""
4658
4567
4659
#: bzrlib/check.py:296
4568
#: bzrlib/check.py:294
4660
4569
msgid ""
4661
4570
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4662
4571
"{{{4}}}"
4663
4572
msgstr ""
4664
4573
4665
#: bzrlib/check.py:354
4574
#: bzrlib/check.py:352
4666
4575
#, python-format
4667
4576
msgid "Checking branch at '%s'."
4668
4577
msgstr ""
4669
4578
4670
#: bzrlib/check.py:374
4579
#: bzrlib/check.py:372
4671
4580
#, python-format
4672
4581
msgid "Checking working tree at '%s'."
4673
4582
msgstr ""
4674
4583
4675
#: bzrlib/check.py:427 bzrlib/check.py:441
4584
#: bzrlib/check.py:425 bzrlib/check.py:439
4676
4585
msgid "No branch found at specified location."
4677
4586
msgstr ""
4678
4587
4679
#: bzrlib/check.py:429 bzrlib/check.py:439
4588
#: bzrlib/check.py:427 bzrlib/check.py:437
4680
4589
msgid "No working tree found at specified location."
4681
4590
msgstr ""
4682
4591
4683
#: bzrlib/check.py:432
4592
#: bzrlib/check.py:430
4684
4593
#, python-format
4685
4594
msgid "Checking repository at '%s'."
4686
4595
msgstr ""
4687
4596
4688
#: bzrlib/check.py:443
4597
#: bzrlib/check.py:441
4689
4598
msgid "No repository found at specified location."
4690
4599
msgstr ""
4691
4600
4692
#: bzrlib/clean_tree.py:63
4601
#: bzrlib/clean_tree.py:62
4693
4602
msgid "Nothing to delete."
4694
4603
msgstr ""
4695
4604
4696
#: bzrlib/clean_tree.py:68
4605
#: bzrlib/clean_tree.py:67
4697
4606
msgid "Are you sure you wish to delete these"
4698
4607
msgstr ""
4699
4608
4700
#: bzrlib/clean_tree.py:70
4609
#: bzrlib/clean_tree.py:69
4701
4610
msgid "Canceled"
4702
4611
msgstr ""
4703
4612
4704
#: bzrlib/clean_tree.py:107
4613
#: bzrlib/clean_tree.py:106
4705
4614
#, python-format
4706
4615
msgid "unable to remove %s"
4707
4616
msgstr ""
4708
4617
4709
#: bzrlib/clean_tree.py:111
4618
#: bzrlib/clean_tree.py:110
4710
4619
msgid "deleting paths:"
4711
4620
msgstr ""
4712
4621
4713
#: bzrlib/clean_tree.py:125
4622
#: bzrlib/clean_tree.py:124
4714
4623
msgid "unable to remove \"{0}\": {1}."
4715
4624
msgstr ""
4716
4625
4717
#: bzrlib/clean_tree.py:130
4626
#: bzrlib/clean_tree.py:129
4718
4627
msgid "No files deleted."
4719
4628
msgstr ""
4720
4629
4721
#: bzrlib/cmd_version_info.py:47
4630
#: bzrlib/cmd_version_info.py:45
4722
4631
msgid "No known version info format {0}. Supported types are: {1}"
4723
4632
msgstr ""
4724
4633
4725
4634
# help of 'format=custom' option of 'version-info' command
4726
#: bzrlib/cmd_version_info.py:52
4635
#: bzrlib/cmd_version_info.py:50
4727
4636
msgid "Version info in Custom template-based format."
4728
4637
msgstr ""
4729
4638
4730
4639
# help of 'format=python' option of 'version-info' command
4731
#: bzrlib/cmd_version_info.py:52
4640
#: bzrlib/cmd_version_info.py:50
4732
4641
msgid "Version info in Python format."
4733
4642
msgstr ""
4734
4643
4735
4644
# help of 'format=rio' option of 'version-info' command
4736
#: bzrlib/cmd_version_info.py:52
4645
#: bzrlib/cmd_version_info.py:50
4737
4646
msgid "Version info in RIO (simple text) format (default)."
4738
4647
msgstr ""
4739
4648
4649
#: bzrlib/cmd_version_info.py:51
4650
msgid "Show version information about this tree."
4651
msgstr ""
4652
4740
4653
#: bzrlib/cmd_version_info.py:53
4741
msgid "Show version information about this tree."
4742
msgstr ""
4743
4744
#: bzrlib/cmd_version_info.py:55
4745
4654
msgid ""
4746
4655
"You can use this command to add information about version into\n"
4747
4656
"source code of an application. The output can be in one of the\n"
4748
4657
"supported formats or in a custom format based on a template."
4749
4658
msgstr ""
4750
4659
4751
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4752
#: en/help_topics/configuration.txt:738
4660
#: bzrlib/cmd_version_info.py:57
4753
4661
msgid "For example::"
4754
4662
msgstr ""
4755
4663
4756
#: bzrlib/cmd_version_info.py:61
4664
#: bzrlib/cmd_version_info.py:59
4757
4665
msgid ""
4758
4666
" bzr version-info --custom \\\n"
4759
4667
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4760
4668
msgstr ""
4761
4669
4762
#: bzrlib/cmd_version_info.py:64
4670
#: bzrlib/cmd_version_info.py:62
4763
4671
msgid ""
4764
4672
"will produce a C header file with formatted string containing the\n"
4765
4673
"current revision number. Other supported variables in templates are:"
4766
4674
msgstr ""
4767
4675
4768
#: bzrlib/cmd_version_info.py:67
4676
#: bzrlib/cmd_version_info.py:65
4769
4677
msgid ""
4770
4678
" * {date} - date of the last revision\n"
4771
4679
" * {build_date} - current date\n"
4777
4685
msgstr ""
4778
4686
4779
4687
# help of 'format' option of 'version-info' command
4780
#: bzrlib/cmd_version_info.py:77
4688
#: bzrlib/cmd_version_info.py:75
4781
4689
msgid "Select the output format."
4782
4690
msgstr ""
4783
4691
4784
4692
# help of 'all' option of 'version-info' command
4785
#: bzrlib/cmd_version_info.py:81
4693
#: bzrlib/cmd_version_info.py:79
4786
4694
msgid "Include all possible information."
4787
4695
msgstr ""
4788
4696
4789
4697
# help of 'check-clean' option of 'version-info' command
4790
#: bzrlib/cmd_version_info.py:82
4698
#: bzrlib/cmd_version_info.py:80
4791
4699
msgid "Check if tree is clean."
4792
4700
msgstr ""
4793
4701
4794
4702
# help of 'include-history' option of 'version-info' command
4795
#: bzrlib/cmd_version_info.py:84
4703
#: bzrlib/cmd_version_info.py:82
4796
4704
msgid "Include the revision-history."
4797
4705
msgstr ""
4798
4706
4799
4707
# help of 'include-file-revisions' option of 'version-info' command
4800
#: bzrlib/cmd_version_info.py:86
4708
#: bzrlib/cmd_version_info.py:84
4801
4709
msgid "Include the last revision for each file."
4802
4710
msgstr ""
4803
4711
4804
4712
# help of 'template' option of 'version-info' command
4805
#: bzrlib/cmd_version_info.py:87
4713
#: bzrlib/cmd_version_info.py:85
4806
4714
msgid "Template for the output."
4807
4715
msgstr ""
4808
4716
4809
#: bzrlib/cmd_version_info.py:101
4717
#: bzrlib/cmd_version_info.py:99
4810
4718
msgid "bzr version-info --revision takes exactly one revision specifier"
4811
4719
msgstr ""
4812
4720
4813
#: bzrlib/commands.py:229
4721
#: bzrlib/commands.py:232
4814
4722
#, python-format
4815
4723
msgid "unknown command \"%s\""
4816
4724
msgstr ""
4817
4725
4818
#: bzrlib/commands.py:476
4726
#: bzrlib/commands.py:479
4819
4727
msgid "No help for this command."
4820
4728
msgstr ""
4821
4729
4822
#: bzrlib/commands.py:489
4730
#: bzrlib/commands.py:492
4823
4731
#, python-format
4824
4732
msgid ":Purpose: %s\n"
4825
4733
msgstr ""
4826
4734
4827
#: bzrlib/commands.py:491
4735
#: bzrlib/commands.py:494
4828
4736
#, python-format
4829
4737
msgid ""
4830
4738
":Usage:\n"
4831
4739
"%s\n"
4832
4740
msgstr ""
4833
4741
4834
#: bzrlib/commands.py:493
4742
#: bzrlib/commands.py:496
4835
4743
#, python-format
4836
4744
msgid ":Usage: %s\n"
4837
4745
msgstr ""
4838
4746
4839
#: bzrlib/commands.py:512
4747
#: bzrlib/commands.py:515
4840
4748
#, python-format
4841
4749
msgid ":Options:%s"
4842
4750
msgstr ""
4843
4751
4844
#: bzrlib/commands.py:523
4752
#: bzrlib/commands.py:526
4845
4753
#, python-format
4846
4754
msgid ""
4847
4755
":Description:\n"
4849
4757
"\n"
4850
4758
msgstr ""
4851
4759
4852
#: bzrlib/commands.py:533
4760
#: bzrlib/commands.py:536
4853
4761
#, python-format
4854
4762
msgid ""
4855
4763
"See bzr help %s for more details and examples.\n"
4856
4764
"\n"
4857
4765
msgstr ""
4858
4766
4859
#: bzrlib/commands.py:538
4767
#: bzrlib/commands.py:541
4860
4768
msgid ":Aliases: "
4861
4769
msgstr ""
4862
4770
4863
#: bzrlib/commands.py:542
4771
#: bzrlib/commands.py:545
4864
4772
#, python-format
4865
4773
msgid ":From: plugin \"%s\"\n"
4866
4774
msgstr ""
4867
4775
4868
#: bzrlib/commands.py:554
4776
#: bzrlib/commands.py:557
4869
4777
msgid ":doc:`{0} <{1}-help>`"
4870
4778
msgstr ""
4871
4779
4872
#: bzrlib/commands.py:558
4780
#: bzrlib/commands.py:561
4873
4781
#, python-format
4874
4782
msgid ":See also: %s"
4875
4783
msgstr ""
4876
4784
4877
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4785
#: bzrlib/commands.py:819 bzrlib/gpg.py:317
4878
4786
msgid "Only ASCII permitted in option names"
4879
4787
msgstr ""
4880
4788
4881
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4789
#: bzrlib/commands.py:844 bzrlib/commands.py:852
4882
4790
msgid "command {0!r} needs one or more {1}"
4883
4791
msgstr ""
4884
4792
4793
#: bzrlib/commands.py:861
4794
msgid "command {0!r} requires argument {1}"
4795
msgstr ""
4796
4885
4797
#: bzrlib/commands.py:868
4886
msgid "command {0!r} requires argument {1}"
4887
msgstr ""
4888
4889
#: bzrlib/commands.py:875
4890
4798
msgid "extra argument to command {0}: {1}"
4891
4799
msgstr ""
4892
4800
4893
#: bzrlib/commands.py:952
4801
#: bzrlib/commands.py:965
4894
4802
#, python-format
4895
4803
msgid "Profile data written to \"%s\"."
4896
4804
msgstr ""
4897
4805
4898
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4806
#: bzrlib/commit.py:116 bzrlib/commit.py:738
4899
4807
msgid "added"
4900
4808
msgstr ""
4901
4809
4902
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4810
#: bzrlib/commit.py:116 bzrlib/commit.py:746
4903
4811
msgid "modified"
4904
4812
msgstr ""
4905
4813
4906
#: bzrlib/commit.py:131
4814
#: bzrlib/commit.py:130
4907
4815
#, python-format
4908
4816
msgid "Committing%s"
4909
4817
msgstr ""
4910
4818
4911
#: bzrlib/commit.py:134
4819
#: bzrlib/commit.py:133
4912
4820
#, python-format
4913
4821
msgid "Committed revision %d."
4914
4822
msgstr ""
4915
4823
4916
#: bzrlib/commit.py:143
4824
#: bzrlib/commit.py:142
4917
4825
#, python-format
4918
4826
msgid "deleted %s"
4919
4827
msgstr ""
4920
4828
4921
#: bzrlib/commit.py:146
4829
#: bzrlib/commit.py:145
4922
4830
#, python-format
4923
4831
msgid "missing %s"
4924
4832
msgstr ""
4925
4833
4926
#: bzrlib/commit.py:511
4834
#: bzrlib/commit.py:510
4927
4835
msgid ""
4928
4836
"Conflicting tags in bound branch:\n"
4929
4837
"{0}"
4930
4838
msgstr ""
4931
4839
4932
#: bzrlib/commit.py:742
4840
#: bzrlib/commit.py:740
4933
4841
msgid "renamed"
4934
4842
msgstr ""
4935
4843
4936
#: bzrlib/commit.py:976
4844
#: bzrlib/commit.py:975
4937
4845
msgid "unchanged"
4938
4846
msgstr ""
4939
4847
4940
#: bzrlib/commit.py:998
4848
#: bzrlib/commit.py:997
4941
4849
msgid "{0} [{1}] - Stage"
4942
4850
msgstr ""
4943
4851
4944
#: bzrlib/commit.py:1001
4852
#: bzrlib/commit.py:1000
4945
4853
#, python-format
4946
4854
msgid "%s - Stage"
4947
4855
msgstr ""
4966
4874
"Don't actually sign anything, just print the revisions that would be signed."
4967
4875
msgstr ""
4968
4876
4969
#: bzrlib/commit_signature_commands.py:98
4970
#, python-format
4971
msgid "Signed %d revision.\n"
4972
msgid_plural "Signed %d revisions.\n"
4973
msgstr[0] ""
4974
msgstr[1] ""
4877
#: bzrlib/commit_signature_commands.py:101
4878
msgid "Verify all commit signatures."
4879
msgstr ""
4975
4880
4976
4881
#: bzrlib/commit_signature_commands.py:103
4977
msgid "Verify all commit signatures."
4978
msgstr ""
4979
4980
#: bzrlib/commit_signature_commands.py:105
4981
4882
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4982
4883
msgstr ""
4983
4884
4984
4885
# help of 'acceptable-keys' option of 'verify-signatures' command
4985
#: bzrlib/commit_signature_commands.py:110
4886
#: bzrlib/commit_signature_commands.py:108
4986
4887
msgid ""
4987
4888
"Comma separated list of GPG key patterns which are acceptable for "
4988
4889
"verification."
4989
4890
msgstr ""
4990
4891
4991
#: bzrlib/commit_signature_commands.py:148
4892
#: bzrlib/commit_signature_commands.py:145
4992
4893
msgid "Cannot verify a range of non-revision-history revisions"
4993
4894
msgstr ""
4994
4895
4996
4897
msgid "All commits signed with verifiable keys"
4997
4898
msgstr ""
4998
4899
4999
#: bzrlib/config.py:438
4900
#: bzrlib/config.py:451
5000
4901
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5001
4902
msgstr ""
5002
4903
5003
#: bzrlib/config.py:2468
5004
msgid "{0} is not an SI unit."
5005
msgstr ""
5006
5007
#: bzrlib/config.py:2989
5008
msgid ""
5009
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5010
"will be saved."
5011
msgstr ""
5012
5013
#: bzrlib/config.py:3134
4904
#: bzrlib/config.py:2762
5014
4905
#, python-format
5015
4906
msgid "Invalid '%s', should be of the form 'name=value'"
5016
4907
msgstr ""
5017
4908
5018
#: bzrlib/config.py:4089
4909
#: bzrlib/config.py:3469
5019
4910
msgid "Display, set or remove a configuration option."
5020
4911
msgstr ""
5021
4912
5022
#: bzrlib/config.py:4091
5023
msgid "Display the active value for option NAME."
4913
#: bzrlib/config.py:3471
4914
msgid "Display the active value for a given option."
5024
4915
msgstr ""
5025
4916
5026
#: bzrlib/config.py:4093
4917
#: bzrlib/config.py:3473
5027
4918
msgid ""
5028
4919
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5029
"matching options are displayed mentioning their scope and without resolving\n"
5030
"option references in the value). The active value that bzr will take into\n"
5031
"account is the first one displayed for each option."
5032
msgstr ""
5033
5034
#: bzrlib/config.py:4098
5035
msgid ""
5036
"If NAME is not given, --all .* is implied (all options are displayed for "
5037
"the\n"
5038
"current scope)."
5039
msgstr ""
5040
5041
#: bzrlib/config.py:4101
5042
msgid ""
5043
"Setting a value is achieved by using NAME=value without spaces. The value\n"
4920
"matching options are displayed mentioning their scope. The active value\n"
4921
"that bzr will take into account is the first one displayed for each option."
4922
msgstr ""
4923
4924
#: bzrlib/config.py:3477
4925
msgid "If no NAME is given, --all .* is implied."
4926
msgstr ""
4927
4928
#: bzrlib/config.py:3479
4929
msgid ""
4930
"Setting a value is achieved by using name=value without spaces. The value\n"
5044
4931
"is set in the most relevant scope and can be checked by displaying the\n"
5045
4932
"option again."
5046
4933
msgstr ""
5047
4934
5048
#: bzrlib/config.py:4105
5049
msgid "Removing a value is achieved by using --remove NAME."
5050
msgstr ""
5051
5052
4935
# help of 'scope' option of 'config' command
5053
#: bzrlib/config.py:4115
4936
#: bzrlib/config.py:3491
5054
4937
msgid "Reduce the scope to the specified configuration file."
5055
4938
msgstr ""
5056
4939
5057
4940
# help of 'all' option of 'config' command
5058
#: bzrlib/config.py:4119
4941
#: bzrlib/config.py:3495
5059
4942
msgid "Display all the defined values for the matching options."
5060
4943
msgstr ""
5061
4944
5062
4945
# help of 'remove' option of 'config' command
5063
#: bzrlib/config.py:4121
4946
#: bzrlib/config.py:3497
5064
4947
msgid "Remove the option from the configuration file."
5065
4948
msgstr ""
5066
4949
4950
#: bzrlib/conflicts.py:48
4951
msgid "List files with conflicts."
4952
msgstr ""
4953
5067
4954
#: bzrlib/conflicts.py:50
5068
msgid "List files with conflicts."
4955
msgid ""
4956
"Merge will do its best to combine the changes in two branches, but there\n"
4957
"are some kinds of problems only a human can fix. When it encounters those,\n"
4958
"it will mark a conflict. A conflict means that you need to fix something,\n"
4959
"before you should commit."
5069
4960
msgstr ""
5070
4961
5071
#: bzrlib/conflicts.py:57
4962
#: bzrlib/conflicts.py:55
5072
4963
msgid ""
5073
4964
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5074
4965
"is supplied, the pathnames of files with text conflicts are listed,\n"
5075
4966
"instead. (This is useful for editing all files with text conflicts.)"
5076
4967
msgstr ""
5077
4968
5078
#: bzrlib/conflicts.py:61
4969
#: bzrlib/conflicts.py:59
5079
4970
msgid "Use bzr resolve when you have fixed a problem."
5080
4971
msgstr ""
5081
4972
5082
4973
# help of 'text' option of 'conflicts' command
5083
#: bzrlib/conflicts.py:66
4974
#: bzrlib/conflicts.py:64
5084
4975
msgid "List paths of files with text conflicts."
5085
4976
msgstr ""
5086
4977
5087
4978
# help of 'action=done' option of 'resolve' command
5088
#: bzrlib/conflicts.py:85
4979
#: bzrlib/conflicts.py:83
5089
4980
msgid "Marks the conflict as resolved."
5090
4981
msgstr ""
5091
4982
5092
4983
# help of 'action=take-this' option of 'resolve' command
5093
#: bzrlib/conflicts.py:88
4984
#: bzrlib/conflicts.py:86
5094
4985
msgid "Resolve the conflict preserving the version in the working tree."
5095
4986
msgstr ""
5096
4987
5097
4988
# help of 'action=take-other' option of 'resolve' command
5098
#: bzrlib/conflicts.py:91
4989
#: bzrlib/conflicts.py:89
5099
4990
msgid "Resolve the conflict taking the merged version into account."
5100
4991
msgstr ""
5101
4992
5102
4993
# help of 'action' option of 'resolve' command
5103
#: bzrlib/conflicts.py:98
4994
#: bzrlib/conflicts.py:96
5104
4995
msgid "How to resolve the conflict."
5105
4996
msgstr ""
5106
4997
5107
#: bzrlib/conflicts.py:104
4998
#: bzrlib/conflicts.py:102
5108
4999
msgid "Mark a conflict as resolved."
5109
5000
msgstr ""
5110
5001
5111
#: bzrlib/conflicts.py:111
5002
#: bzrlib/conflicts.py:109
5112
5003
msgid ""
5113
5004
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5114
5005
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5117
5008
msgstr ""
5118
5009
5119
5010
# help of 'all' option of 'resolve' command
5120
#: bzrlib/conflicts.py:119
5011
#: bzrlib/conflicts.py:117
5121
5012
msgid "Resolve all conflicts in this tree."
5122
5013
msgstr ""
5123
5014
5124
#: bzrlib/conflicts.py:126
5015
#: bzrlib/conflicts.py:124
5125
5016
msgid "If --all is specified, no FILE may be provided"
5126
5017
msgstr ""
5127
5018
5128
#: bzrlib/conflicts.py:151
5019
#: bzrlib/conflicts.py:149
5129
5020
#, python-format
5130
5021
msgid "%d conflict auto-resolved."
5131
5022
msgid_plural "%d conflicts auto-resolved."
5132
5023
msgstr[0] ""
5133
5024
msgstr[1] ""
5134
5025
5135
#: bzrlib/conflicts.py:154
5026
#: bzrlib/conflicts.py:152
5136
5027
msgid "Remaining conflicts:"
5137
5028
msgstr ""
5138
5029
5139
#: bzrlib/conflicts.py:159
5030
#: bzrlib/conflicts.py:157
5140
5031
msgid "All conflicts resolved."
5141
5032
msgstr ""
5142
5033
5143
#: bzrlib/conflicts.py:168
5034
#: bzrlib/conflicts.py:166
5144
5035
msgid "{0} conflict resolved, {1} remaining"
5145
5036
msgid_plural "{0} conflicts resolved, {1} remaining"
5146
5037
msgstr[0] ""
5147
5038
msgstr[1] ""
5148
5039
5149
#: bzrlib/controldir.py:712
5040
# title of 'action' option of 'resolve' command
5041
#: bzrlib/conflicts.py:692
5042
msgid "action"
5043
msgstr ""
5044
5045
#: bzrlib/controldir.py:682
5150
5046
msgid "{0} is{1} redirected to {2}"
5151
5047
msgstr ""
5152
5048
5153
#: bzrlib/diff.py:400
5049
#: bzrlib/diff.py:397
5154
5050
#, python-format
5155
5051
msgid "*** Ignoring files outside view. View is %s"
5156
5052
msgstr ""
5157
5053
5158
#: bzrlib/errors.py:157
5054
#: bzrlib/errors.py:155
5159
5055
msgid "The tree builder is already building a tree."
5160
5056
msgstr ""
5161
5057
5162
#: bzrlib/errors.py:178
5058
#: bzrlib/errors.py:176
5163
5059
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5164
5060
msgstr ""
5165
5061
5166
#: bzrlib/errors.py:197
5062
#: bzrlib/errors.py:195
5167
5063
msgid ""
5168
5064
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5169
5065
"versions \"%(minimum)s\" to \"%(current)s\"."
5170
5066
msgstr ""
5171
5067
5172
#: bzrlib/errors.py:209
5068
#: bzrlib/errors.py:207
5173
5069
msgid "The transport '%(transport)s' is only accessible within this process."
5174
5070
msgstr ""
5175
5071
5176
#: bzrlib/errors.py:227
5072
#: bzrlib/errors.py:225
5177
5073
msgid "Invalid revision number %(revno)s"
5178
5074
msgstr ""
5179
5075
5180
#: bzrlib/errors.py:236
5076
#: bzrlib/errors.py:234
5181
5077
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5182
5078
msgstr ""
5183
5079
5184
#: bzrlib/errors.py:247
5080
#: bzrlib/errors.py:245
5185
5081
msgid "Reserved revision-id {%(revision_id)s}"
5186
5082
msgstr ""
5187
5083
5188
#: bzrlib/errors.py:261
5084
#: bzrlib/errors.py:259
5189
5085
msgid "There is no public branch set for \"%(branch_url)s\"."
5190
5086
msgstr ""
5191
5087
5192
#: bzrlib/errors.py:271
5088
#: bzrlib/errors.py:269
5193
5089
msgid ""
5194
5090
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5195
5091
"obtain a list of topics."
5196
5092
msgstr ""
5197
5093
5198
#: bzrlib/errors.py:280
5094
#: bzrlib/errors.py:278
5199
5095
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5200
5096
msgstr ""
5201
5097
5202
#: bzrlib/errors.py:290
5098
#: bzrlib/errors.py:288
5203
5099
msgid ""
5204
5100
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5205
5101
msgstr ""
5206
5102
5207
#: bzrlib/errors.py:299
5103
#: bzrlib/errors.py:297
5208
5104
msgid "The branch '%(branch)s' is not stacked."
5209
5105
msgstr ""
5210
5106
5211
#: bzrlib/errors.py:313
5107
#: bzrlib/errors.py:311
5212
5108
msgid "No WorkingTree exists for \"%(base)s\"."
5213
5109
msgstr ""
5214
5110
5215
#: bzrlib/errors.py:322
5111
#: bzrlib/errors.py:320
5216
5112
msgid "Not currently building a tree."
5217
5113
msgstr ""
5218
5114
5219
#: bzrlib/errors.py:327
5115
#: bzrlib/errors.py:325
5220
5116
msgid "%(url)s is not a local path."
5221
5117
msgstr ""
5222
5118
5223
#: bzrlib/errors.py:355
5119
#: bzrlib/errors.py:353
5224
5120
msgid "%(not_locked)r is not write locked but needs to be."
5225
5121
msgstr ""
5226
5122
5227
#: bzrlib/errors.py:363
5123
#: bzrlib/errors.py:361
5228
5124
msgid "Error in command line options"
5229
5125
msgstr ""
5230
5126
5231
#: bzrlib/errors.py:368
5127
#: bzrlib/errors.py:366
5232
5128
msgid "%(value)s is not an index of type %(_type)s."
5233
5129
msgstr ""
5234
5130
5235
#: bzrlib/errors.py:378
5131
#: bzrlib/errors.py:376
5236
5132
msgid "Error in data for index %(value)s."
5237
5133
msgstr ""
5238
5134
5239
#: bzrlib/errors.py:387
5135
#: bzrlib/errors.py:385
5240
5136
msgid "The key '%(key)s' is already in index '%(index)s'."
5241
5137
msgstr ""
5242
5138
5243
#: bzrlib/errors.py:397
5139
#: bzrlib/errors.py:395
5244
5140
msgid "The key '%(key)s' is not a valid key."
5245
5141
msgstr ""
5246
5142
5247
#: bzrlib/errors.py:406
5143
#: bzrlib/errors.py:404
5248
5144
msgid "Could not parse options for index %(value)s."
5249
5145
msgstr ""
5250
5146
5251
#: bzrlib/errors.py:415
5147
#: bzrlib/errors.py:413
5252
5148
msgid "The value '%(value)s' is not a valid value."
5253
5149
msgstr ""
5254
5150
5255
#: bzrlib/errors.py:424
5256
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:443
5151
#: bzrlib/errors.py:441
5260
5152
msgid "Generic path error: %(path)r%(extra)s)"
5261
5153
msgstr ""
5262
5154
5263
#: bzrlib/errors.py:456
5155
#: bzrlib/errors.py:454
5264
5156
msgid "No such file: %(path)r%(extra)s"
5265
5157
msgstr ""
5266
5158
5267
#: bzrlib/errors.py:461
5159
#: bzrlib/errors.py:459
5268
5160
msgid "File exists: %(path)r%(extra)s"
5269
5161
msgstr ""
5270
5162
5271
#: bzrlib/errors.py:467
5163
#: bzrlib/errors.py:465
5272
5164
msgid ""
5273
5165
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5274
5166
"after to tell bzr about a rename that has already happened)%(extra)s"
5275
5167
msgstr ""
5276
5168
5277
#: bzrlib/errors.py:483
5169
#: bzrlib/errors.py:481
5278
5170
msgid "\"%(path)s\" is not a directory %(extra)s"
5279
5171
msgstr ""
5280
5172
5281
#: bzrlib/errors.py:488
5173
#: bzrlib/errors.py:486
5282
5174
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5283
5175
msgstr ""
5284
5176
5285
#: bzrlib/errors.py:493
5177
#: bzrlib/errors.py:491
5286
5178
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5287
5179
msgstr ""
5288
5180
5289
#: bzrlib/errors.py:498
5181
#: bzrlib/errors.py:496
5290
5182
msgid "Hard-linking \"%(path)s\" is not supported"
5291
5183
msgstr ""
5292
5184
5293
#: bzrlib/errors.py:513
5185
#: bzrlib/errors.py:511
5294
5186
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5295
5187
msgstr ""
5296
5188
5297
#: bzrlib/errors.py:518
5189
#: bzrlib/errors.py:516
5298
5190
msgid "Permission denied: \"%(path)s\"%(extra)s"
5299
5191
msgstr ""
5300
5192
5301
#: bzrlib/errors.py:523
5193
#: bzrlib/errors.py:521
5302
5194
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5303
5195
msgstr ""
5304
5196
5305
#: bzrlib/errors.py:528
5197
#: bzrlib/errors.py:526
5306
5198
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5307
5199
msgstr ""
5308
5200
5309
#: bzrlib/errors.py:539
5201
#: bzrlib/errors.py:537
5310
5202
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5311
5203
msgstr ""
5312
5204
5313
#: bzrlib/errors.py:561
5205
#: bzrlib/errors.py:559
5314
5206
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5315
5207
msgstr ""
5316
5208
5317
#: bzrlib/errors.py:571
5209
#: bzrlib/errors.py:569
5318
5210
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5319
5211
msgstr ""
5320
5212
5321
#: bzrlib/errors.py:579
5213
#: bzrlib/errors.py:577
5322
5214
msgid ""
5323
5215
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5324
5216
"upgrade the branch to permit branch stacking."
5325
5217
msgstr ""
5326
5218
5327
#: bzrlib/errors.py:590
5219
#: bzrlib/errors.py:588
5328
5220
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5329
5221
msgstr ""
5330
5222
5331
#: bzrlib/errors.py:600
5223
#: bzrlib/errors.py:598
5332
5224
msgid ""
5333
5225
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5334
5226
"need to upgrade the repository to permit branch stacking."
5335
5227
msgstr ""
5336
5228
5337
#: bzrlib/errors.py:611
5229
#: bzrlib/errors.py:609
5338
5230
msgid "Error reading from %(path)r."
5339
5231
msgstr ""
5340
5232
5341
#: bzrlib/errors.py:630
5233
#: bzrlib/errors.py:628
5342
5234
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5343
5235
msgstr ""
5344
5236
5345
#: bzrlib/errors.py:646
5237
#: bzrlib/errors.py:644
5346
5238
msgid "Path \"%(path)s\" is not unicode normalized"
5347
5239
msgstr ""
5348
5240
5349
#: bzrlib/errors.py:654
5241
#: bzrlib/errors.py:652
5350
5242
msgid "Not a branch: \"%(path)s\"%(detail)s."
5351
5243
msgstr ""
5352
5244
5353
#: bzrlib/errors.py:696
5245
#: bzrlib/errors.py:694
5354
5246
msgid "No submit branch available for branch \"%(path)s\""
5355
5247
msgstr ""
5356
5248
5357
#: bzrlib/errors.py:705
5358
msgid "A control directory already exists: \"%(path)s\"."
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:710
5249
#: bzrlib/errors.py:703
5362
5250
msgid "Already a branch: \"%(path)s\"."
5363
5251
msgstr ""
5364
5252
5365
#: bzrlib/errors.py:715
5366
msgid "Invalid branch name: %(name)s"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:724
5370
msgid "Parent branch already exists: \"%(path)s\"."
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:730
5253
#: bzrlib/errors.py:709
5374
5254
msgid ""
5375
5255
"Directory contains a branch, but no working tree (use bzr checkout if you "
5376
5256
"wish to build a working tree): \"%(path)s\""
5377
5257
msgstr ""
5378
5258
5379
#: bzrlib/errors.py:735
5259
#: bzrlib/errors.py:714
5380
5260
msgid ""
5381
5261
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5382
5262
msgstr ""
5383
5263
5384
#: bzrlib/errors.py:745
5264
#: bzrlib/errors.py:724
5385
5265
msgid ""
5386
5266
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5387
5267
msgstr ""
5388
5268
5389
#: bzrlib/errors.py:755
5269
#: bzrlib/errors.py:734
5390
5270
msgid "No repository present: \"%(path)s\""
5391
5271
msgstr ""
5392
5272
5393
#: bzrlib/errors.py:762
5273
#: bzrlib/errors.py:741
5394
5274
msgid ""
5395
5275
"Unsupported branch format: %(format)s\n"
5396
5276
"Please run 'bzr upgrade'"
5397
5277
msgstr ""
5398
5278
5399
#: bzrlib/errors.py:768
5279
#: bzrlib/errors.py:747
5400
5280
msgid "Unknown %(kind)s format: %(format)r"
5401
5281
msgstr ""
5402
5282
5403
#: bzrlib/errors.py:777
5283
#: bzrlib/errors.py:756
5404
5284
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5405
5285
msgstr ""
5406
5286
5407
#: bzrlib/errors.py:787
5408
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5409
msgstr ""
5410
5411
#: bzrlib/errors.py:802
5287
#: bzrlib/errors.py:769
5412
5288
msgid ""
5413
5289
"%(target)s\n"
5414
5290
"is not compatible with\n"
5416
5292
"%(details)s"
5417
5293
msgstr ""
5418
5294
5419
#: bzrlib/errors.py:818
5295
#: bzrlib/errors.py:785
5420
5296
msgid "Revision is not compatible with %(repo_format)s"
5421
5297
msgstr ""
5422
5298
5423
#: bzrlib/errors.py:828
5299
#: bzrlib/errors.py:795
5424
5300
msgid "%(context_info)s%(path)s is already versioned."
5425
5301
msgstr ""
5426
5302
5427
#: bzrlib/errors.py:849
5303
#: bzrlib/errors.py:816
5428
5304
msgid "%(context_info)s%(path)s is not versioned."
5429
5305
msgstr ""
5430
5306
5431
#: bzrlib/errors.py:870
5307
#: bzrlib/errors.py:837
5432
5308
msgid "Path(s) are not versioned: %(paths_as_string)s"
5433
5309
msgstr ""
5434
5310
5435
#: bzrlib/errors.py:881
5311
#: bzrlib/errors.py:848
5436
5312
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5437
5313
msgstr ""
5438
5314
5439
#: bzrlib/errors.py:900
5315
#: bzrlib/errors.py:867
5440
5316
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5441
5317
msgstr ""
5442
5318
5443
#: bzrlib/errors.py:908
5319
#: bzrlib/errors.py:875
5444
5320
msgid ""
5445
5321
"Filename %(filename)r is not valid in your current filesystem encoding "
5446
5322
"%(fs_encoding)s"
5447
5323
msgstr ""
5448
5324
5449
#: bzrlib/errors.py:919
5325
#: bzrlib/errors.py:886
5450
5326
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5451
5327
msgstr ""
5452
5328
5453
#: bzrlib/errors.py:937
5329
#: bzrlib/errors.py:904
5454
5330
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5455
5331
msgstr ""
5456
5332
5457
#: bzrlib/errors.py:976
5333
#: bzrlib/errors.py:943
5458
5334
msgid "Cannot lock %(lock)s: %(why)s"
5459
5335
msgstr ""
5460
5336
5461
#: bzrlib/errors.py:986
5337
#: bzrlib/errors.py:953
5462
5338
msgid ""
5463
5339
"A transaction related operation was attempted after the transaction finished."
5464
5340
msgstr ""
5465
5341
5466
#: bzrlib/errors.py:1013
5342
#: bzrlib/errors.py:980
5467
5343
msgid "Cannot lock: transport is read only: %(transport)s"
5468
5344
msgstr ""
5469
5345
5470
#: bzrlib/errors.py:1021
5346
#: bzrlib/errors.py:988
5471
5347
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5472
5348
msgstr ""
5473
5349
5474
#: bzrlib/errors.py:1032
5350
#: bzrlib/errors.py:999
5475
5351
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5476
5352
msgstr ""
5477
5353
5478
#: bzrlib/errors.py:1043
5354
#: bzrlib/errors.py:1010
5479
5355
msgid ""
5480
5356
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5481
5357
"%(holder)r, wanted to break %(target)r"
5482
5358
msgstr ""
5483
5359
5484
#: bzrlib/errors.py:1055
5360
#: bzrlib/errors.py:1022
5485
5361
msgid ""
5486
5362
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5487
5363
"Use 'bzr break-lock' to clear it"
5488
5364
msgstr ""
5489
5365
5490
#: bzrlib/errors.py:1068
5366
#: bzrlib/errors.py:1035
5491
5367
msgid "Lock not held: %(lock)s"
5492
5368
msgstr ""
5493
5369
5494
#: bzrlib/errors.py:1097
5370
#: bzrlib/errors.py:1064
5495
5371
msgid "No changes to commit"
5496
5372
msgstr ""
5497
5373
5498
#: bzrlib/errors.py:1102
5374
#: bzrlib/errors.py:1069
5499
5375
msgid ""
5500
5376
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5501
5377
msgstr ""
5502
5378
5503
#: bzrlib/errors.py:1112
5379
#: bzrlib/errors.py:1079
5504
5380
msgid ""
5505
5381
"Excluding paths during commit is not supported by repository at %(repository)"
5506
5382
"r."
5507
5383
msgstr ""
5508
5384
5509
#: bzrlib/errors.py:1121
5385
#: bzrlib/errors.py:1088
5510
5386
msgid ""
5511
5387
"The specified commit message contains characters unsupported by the current "
5512
5388
"encoding."
5513
5389
msgstr ""
5514
5390
5515
#: bzrlib/errors.py:1127
5391
#: bzrlib/errors.py:1094
5516
5392
msgid "Upgrade URL cannot work with readonly URLs."
5517
5393
msgstr ""
5518
5394
5519
#: bzrlib/errors.py:1132
5395
#: bzrlib/errors.py:1099
5520
5396
msgid "The branch format %(format)s is already at the most recent format."
5521
5397
msgstr ""
5522
5398
5523
#: bzrlib/errors.py:1155
5399
#: bzrlib/errors.py:1122
5524
5400
msgid "Option --change does not accept revision ranges"
5525
5401
msgstr ""
5526
5402
5527
#: bzrlib/errors.py:1160
5403
#: bzrlib/errors.py:1127
5528
5404
msgid "No namespace registered for string: %(spec)r"
5529
5405
msgstr ""
5530
5406
5531
#: bzrlib/errors.py:1179
5407
#: bzrlib/errors.py:1146
5532
5408
msgid ""
5533
5409
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5534
5410
"%(extra)s"
5535
5411
msgstr ""
5536
5412
5537
#: bzrlib/errors.py:1193
5413
#: bzrlib/errors.py:1160
5538
5414
msgid ""
5539
5415
"Operation denied because it would change the main history, which is not "
5540
5416
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5541
5417
msgstr ""
5542
5418
5543
#: bzrlib/errors.py:1204
5419
#: bzrlib/errors.py:1171
5544
5420
msgid ""
5545
5421
"These branches have diverged. Use the missing command to see how.\n"
5546
5422
"Use the merge command to reconcile them."
5547
5423
msgstr ""
5548
5424
5549
#: bzrlib/errors.py:1224
5425
#: bzrlib/errors.py:1191
5550
5426
msgid ""
5551
5427
"Branches have no common ancestor, and no merge base revision was specified."
5552
5428
msgstr ""
5553
5429
5554
#: bzrlib/errors.py:1230
5430
#: bzrlib/errors.py:1197
5555
5431
msgid ""
5556
5432
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5557
5433
msgstr ""
5558
5434
5559
#: bzrlib/errors.py:1236
5435
#: bzrlib/errors.py:1203
5560
5436
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5561
5437
msgstr ""
5562
5438
5563
#: bzrlib/errors.py:1245
5439
#: bzrlib/errors.py:1212
5564
5440
msgid ""
5565
5441
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5566
5442
msgstr ""
5567
5443
5568
#: bzrlib/errors.py:1254
5444
#: bzrlib/errors.py:1221
5569
5445
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5570
5446
msgstr ""
5571
5447
5572
#: bzrlib/errors.py:1263
5448
#: bzrlib/errors.py:1230
5573
5449
msgid "Branch %(branch)s has no commits."
5574
5450
msgstr ""
5575
5451
5576
#: bzrlib/errors.py:1281
5452
#: bzrlib/errors.py:1248
5577
5453
msgid ""
5578
5454
"Bound branch %(branch)s is out of date with master branch %(master)s."
5579
5455
"%(extra_help)s"
5580
5456
msgstr ""
5581
5457
5582
#: bzrlib/errors.py:1293
5458
#: bzrlib/errors.py:1260
5583
5459
msgid ""
5584
5460
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5585
5461
"bound to %(remote)s."
5586
5462
msgstr ""
5587
5463
5588
#: bzrlib/errors.py:1305
5464
#: bzrlib/errors.py:1272
5589
5465
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5590
5466
msgstr ""
5591
5467
5592
#: bzrlib/errors.py:1314
5468
#: bzrlib/errors.py:1281
5593
5469
msgid ""
5594
5470
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5595
5471
"%(error)s"
5596
5472
msgstr ""
5597
5473
5598
#: bzrlib/errors.py:1326
5474
#: bzrlib/errors.py:1293
5599
5475
msgid "Error in processing weave: %(msg)s"
5600
5476
msgstr ""
5601
5477
5602
#: bzrlib/errors.py:1335
5478
#: bzrlib/errors.py:1302
5603
5479
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5604
5480
msgstr ""
5605
5481
5606
#: bzrlib/errors.py:1346
5482
#: bzrlib/errors.py:1313
5607
5483
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5608
5484
msgstr ""
5609
5485
5610
#: bzrlib/errors.py:1356
5486
#: bzrlib/errors.py:1323
5611
5487
msgid "Weave invariant violated: %(what)s"
5612
5488
msgstr ""
5613
5489
5614
#: bzrlib/errors.py:1365
5490
#: bzrlib/errors.py:1332
5615
5491
msgid "Parents are mismatched between two revisions. %(msg)s"
5616
5492
msgstr ""
5617
5493
5618
#: bzrlib/errors.py:1387
5494
#: bzrlib/errors.py:1354
5619
5495
msgid ""
5620
5496
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5621
5497
"%(weave_b)s"
5622
5498
msgstr ""
5623
5499
5624
#: bzrlib/errors.py:1399
5500
#: bzrlib/errors.py:1366
5625
5501
msgid "Versioned file error"
5626
5502
msgstr ""
5627
5503
5628
#: bzrlib/errors.py:1404
5504
#: bzrlib/errors.py:1371
5629
5505
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5630
5506
msgstr ""
5631
5507
5632
#: bzrlib/errors.py:1414
5508
#: bzrlib/errors.py:1381
5633
5509
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5634
5510
msgstr ""
5635
5511
5636
#: bzrlib/errors.py:1424
5512
#: bzrlib/errors.py:1391
5637
5513
msgid "Text did not match its checksum: %(msg)s"
5638
5514
msgstr ""
5639
5515
5640
#: bzrlib/errors.py:1550
5516
#: bzrlib/errors.py:1517
5641
5517
msgid "Export format %(format)r not supported"
5642
5518
msgstr ""
5643
5519
5644
#: bzrlib/errors.py:1559
5520
#: bzrlib/errors.py:1526
5645
5521
msgid "Transport error: %(msg)s %(orig_error)s"
5646
5522
msgstr ""
5647
5523
5648
#: bzrlib/errors.py:1585
5524
#: bzrlib/errors.py:1552
5649
5525
msgid "Generic bzr smart protocol error: %(details)s"
5650
5526
msgstr ""
5651
5527
5652
#: bzrlib/errors.py:1593
5528
#: bzrlib/errors.py:1560
5653
5529
msgid "Received bad protocol version marker: %(marker)r"
5654
5530
msgstr ""
5655
5531
5656
#: bzrlib/errors.py:1625
5532
#: bzrlib/errors.py:1592
5657
5533
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5658
5534
msgstr ""
5659
5535
5660
#: bzrlib/errors.py:1630
5536
#: bzrlib/errors.py:1597
5661
5537
msgid "Connection error: %(msg)s %(orig_error)s"
5662
5538
msgstr ""
5663
5539
5664
#: bzrlib/errors.py:1635
5540
#: bzrlib/errors.py:1602
5665
5541
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5666
5542
msgstr ""
5667
5543
5668
#: bzrlib/errors.py:1656
5544
#: bzrlib/errors.py:1623
5669
5545
msgid "Connection closed: %(msg)s %(orig_error)s"
5670
5546
msgstr ""
5671
5547
5672
#: bzrlib/errors.py:1661
5548
#: bzrlib/errors.py:1628
5673
5549
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5674
5550
msgstr ""
5675
5551
5676
#: bzrlib/errors.py:1666
5552
#: bzrlib/errors.py:1633
5677
5553
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5678
5554
msgstr ""
5679
5555
5680
#: bzrlib/errors.py:1676
5556
#: bzrlib/errors.py:1643
5681
5557
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5682
5558
msgstr ""
5683
5559
5684
#: bzrlib/errors.py:1691
5685
msgid "Certificate error: %(error)s"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:1699
5560
#: bzrlib/errors.py:1658
5689
5561
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5690
5562
msgstr ""
5691
5563
5692
#: bzrlib/errors.py:1713
5564
#: bzrlib/errors.py:1672
5693
5565
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5694
5566
msgstr ""
5695
5567
5696
#: bzrlib/errors.py:1721
5568
#: bzrlib/errors.py:1680
5697
5569
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5698
5570
msgstr ""
5699
5571
5700
#: bzrlib/errors.py:1730
5572
#: bzrlib/errors.py:1689
5701
5573
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5702
5574
msgstr ""
5703
5575
5704
#: bzrlib/errors.py:1744
5576
#: bzrlib/errors.py:1703
5705
5577
msgid "Too many redirections"
5706
5578
msgstr ""
5707
5579
5708
#: bzrlib/errors.py:1749
5580
#: bzrlib/errors.py:1708
5709
5581
msgid "Working tree has conflicts."
5710
5582
msgstr ""
5711
5583
5712
#: bzrlib/errors.py:1753
5584
#: bzrlib/errors.py:1712
5713
5585
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5714
5586
msgstr ""
5715
5587
5716
#: bzrlib/errors.py:1762
5588
#: bzrlib/errors.py:1721
5717
5589
msgid ""
5718
5590
"Error(s) parsing config file %(filename)s:\n"
5719
5591
"%(errors)s"
5720
5592
msgstr ""
5721
5593
5722
#: bzrlib/errors.py:1772
5723
msgid ""
5724
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5725
"See ``bzr help %(name)s``"
5594
#: bzrlib/errors.py:1732
5595
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5726
5596
msgstr ""
5727
5597
5728
#: bzrlib/errors.py:1782
5598
#: bzrlib/errors.py:1740
5729
5599
msgid "%(username)r does not seem to contain a reasonable email address"
5730
5600
msgstr ""
5731
5601
5732
#: bzrlib/errors.py:1791
5602
#: bzrlib/errors.py:1749
5733
5603
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5734
5604
msgstr ""
5735
5605
5736
#: bzrlib/errors.py:1799
5606
#: bzrlib/errors.py:1757
5737
5607
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5738
5608
msgstr ""
5739
5609
5740
#: bzrlib/errors.py:1807
5610
#: bzrlib/errors.py:1765
5741
5611
msgid "Unable to import library \"%(library)s\": %(error)s"
5742
5612
msgstr ""
5743
5613
5744
#: bzrlib/errors.py:1815
5614
#: bzrlib/errors.py:1773
5745
5615
msgid "python-gpgme is not installed, it is needed to verify signatures"
5746
5616
msgstr ""
5747
5617
5748
#: bzrlib/errors.py:1823
5618
#: bzrlib/errors.py:1781
5749
5619
msgid ""
5750
5620
"The working tree for %(basedir)s has changed since the last commit, but "
5751
5621
"weave merge requires that it be unchanged"
5752
5622
msgstr ""
5753
5623
5754
#: bzrlib/errors.py:1833
5624
#: bzrlib/errors.py:1791
5755
5625
msgid ""
5756
5626
"Can't reprocess and show base, because reprocessing obscures the "
5757
5627
"relationship of conflicting lines to the base"
5758
5628
msgstr ""
5759
5629
5760
#: bzrlib/errors.py:1839
5630
#: bzrlib/errors.py:1797
5761
5631
msgid "Cycle in graph %(graph)r"
5762
5632
msgstr ""
5763
5633
5764
#: bzrlib/errors.py:1867
5634
#: bzrlib/errors.py:1825
5765
5635
msgid "File %(filename)s is not conflicted."
5766
5636
msgstr ""
5767
5637
5768
#: bzrlib/errors.py:1889
5638
#: bzrlib/errors.py:1847
5769
5639
msgid "No bundle was found in \"%(filename)s\"."
5770
5640
msgstr ""
5771
5641
5772
#: bzrlib/errors.py:1898
5642
#: bzrlib/errors.py:1856
5773
5643
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5774
5644
msgstr ""
5775
5645
5776
#: bzrlib/errors.py:1908
5646
#: bzrlib/errors.py:1866
5777
5647
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5778
5648
msgstr ""
5779
5649
5780
#: bzrlib/errors.py:1921
5650
#: bzrlib/errors.py:1879
5781
5651
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5782
5652
msgstr ""
5783
5653
5784
#: bzrlib/errors.py:1931
5654
#: bzrlib/errors.py:1889
5785
5655
msgid "Key %(key)s is already present in map"
5786
5656
msgstr ""
5787
5657
5788
#: bzrlib/errors.py:1936
5658
#: bzrlib/errors.py:1894
5789
5659
msgid "The prefix %(prefix)s is in the help search path twice."
5790
5660
msgstr ""
5791
5661
5792
#: bzrlib/errors.py:1946
5662
#: bzrlib/errors.py:1904
5793
5663
msgid ""
5794
5664
"No final name for trans_id %(trans_id)r\n"
5795
5665
"file-id: %(file_id)r\n"
5796
5666
"root trans-id: %(root_trans_id)r\n"
5797
5667
msgstr ""
5798
5668
5799
#: bzrlib/errors.py:1978
5669
#: bzrlib/errors.py:1936
5800
5670
msgid "Attempt to reuse a transform that has already been applied."
5801
5671
msgstr ""
5802
5672
5803
#: bzrlib/errors.py:1983
5673
#: bzrlib/errors.py:1941
5804
5674
msgid "Moving the root directory is not supported at this time"
5805
5675
msgstr ""
5806
5676
5807
#: bzrlib/errors.py:1988
5677
#: bzrlib/errors.py:1946
5808
5678
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5809
5679
msgstr ""
5810
5680
5811
#: bzrlib/errors.py:1999
5681
#: bzrlib/errors.py:1957
5812
5682
msgid ""
5813
5683
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5814
5684
msgstr ""
5815
5685
5816
#: bzrlib/errors.py:2035
5686
#: bzrlib/errors.py:1993
5817
5687
msgid ""
5818
5688
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5819
5689
msgstr ""
5820
5690
5821
#: bzrlib/errors.py:2065
5691
#: bzrlib/errors.py:2023
5822
5692
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5823
5693
msgstr ""
5824
5694
5825
#: bzrlib/errors.py:2073
5695
#: bzrlib/errors.py:2031
5826
5696
msgid "Nothing to merge."
5827
5697
msgstr ""
5828
5698
5829
#: bzrlib/errors.py:2078
5699
#: bzrlib/errors.py:2036
5830
5700
msgid "Format %(format)s cannot be initialised by this version of bzr."
5831
5701
msgstr ""
5832
5702
5833
#: bzrlib/errors.py:2087
5703
#: bzrlib/errors.py:2045
5834
5704
msgid ""
5835
5705
"Cannot convert from format %(from_format)s to format %(format)s. "
5836
5706
"%(problem)s"
5837
5707
msgstr ""
5838
5708
5839
#: bzrlib/errors.py:2099
5709
#: bzrlib/errors.py:2057
5840
5710
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5841
5711
msgstr ""
5842
5712
5843
#: bzrlib/errors.py:2107
5713
#: bzrlib/errors.py:2065
5844
5714
msgid "%(exe_name)s could not be found on this machine"
5845
5715
msgstr ""
5846
5716
5847
#: bzrlib/errors.py:2115
5717
#: bzrlib/errors.py:2073
5848
5718
msgid "Diff is not installed on this machine: %(msg)s"
5849
5719
msgstr ""
5850
5720
5851
#: bzrlib/errors.py:2123
5721
#: bzrlib/errors.py:2081
5852
5722
msgid "Diff3 is not installed on this machine."
5853
5723
msgstr ""
5854
5724
5855
#: bzrlib/errors.py:2129
5725
#: bzrlib/errors.py:2087
5856
5726
msgid "The content being inserted is already present."
5857
5727
msgstr ""
5858
5728
5859
#: bzrlib/errors.py:2134
5729
#: bzrlib/errors.py:2092
5860
5730
msgid ""
5861
5731
"This tree contains left-over files from a failed operation.\n"
5862
5732
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5864
5734
" keep, and delete it when you are done."
5865
5735
msgstr ""
5866
5736
5867
#: bzrlib/errors.py:2145
5737
#: bzrlib/errors.py:2103
5868
5738
msgid ""
5869
5739
"This tree contains left-over files from a failed operation.\n"
5870
5740
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5871
5741
" wish to keep, and delete it when you are done."
5872
5742
msgstr ""
5873
5743
5874
#: bzrlib/errors.py:2155
5744
#: bzrlib/errors.py:2113
5875
5745
msgid ""
5876
5746
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5877
5747
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5879
5749
" keep, and delete it when you are done."
5880
5750
msgstr ""
5881
5751
5882
#: bzrlib/errors.py:2166
5752
#: bzrlib/errors.py:2124
5883
5753
msgid ""
5884
5754
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5885
5755
"examine %(pending_deletion)s to see if it contains any files you wish to "
5886
5756
"keep, and delete it when you are done."
5887
5757
msgstr ""
5888
5758
5889
#: bzrlib/errors.py:2176
5759
#: bzrlib/errors.py:2134
5890
5760
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5891
5761
msgstr ""
5892
5762
5893
#: bzrlib/errors.py:2190
5763
#: bzrlib/errors.py:2148
5894
5764
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5895
5765
msgstr ""
5896
5766
5897
#: bzrlib/errors.py:2203
5767
#: bzrlib/errors.py:2161
5898
5768
msgid "Error in merge modified format"
5899
5769
msgstr ""
5900
5770
5901
#: bzrlib/errors.py:2208
5771
#: bzrlib/errors.py:2166
5902
5772
msgid "Format error in conflict listings"
5903
5773
msgstr ""
5904
5774
5905
#: bzrlib/errors.py:2212
5775
#: bzrlib/errors.py:2170
5906
5776
msgid ""
5907
5777
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5908
5778
"Error: %(description)s"
5909
5779
msgstr ""
5910
5780
5911
#: bzrlib/errors.py:2223
5781
#: bzrlib/errors.py:2181
5912
5782
msgid ""
5913
5783
"An error has been detected in the repository %(repo_path)s.\n"
5914
5784
"Please run bzr reconcile on this repository."
5915
5785
msgstr ""
5916
5786
5917
#: bzrlib/errors.py:2234
5787
#: bzrlib/errors.py:2192
5918
5788
msgid ""
5919
5789
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5920
5790
"reason: %(reason)s"
5921
5791
msgstr ""
5922
5792
5923
#: bzrlib/errors.py:2247
5793
#: bzrlib/errors.py:2205
5924
5794
msgid ""
5925
5795
"An inconsistent delta was supplied: %(delta)r\n"
5926
5796
"reason: %(reason)s"
5927
5797
msgstr ""
5928
5798
5929
#: bzrlib/errors.py:2259
5799
#: bzrlib/errors.py:2217
5930
5800
msgid "To use this feature you must upgrade your branch at %(path)s."
5931
5801
msgstr ""
5932
5802
5933
#: bzrlib/errors.py:2268
5803
#: bzrlib/errors.py:2226
5934
5804
msgid "To use this feature you must upgrade your repository at %(path)s."
5935
5805
msgstr ""
5936
5806
5937
#: bzrlib/errors.py:2273
5807
#: bzrlib/errors.py:2231
5938
5808
msgid ""
5939
5809
"To use this feature you must upgrade your branch at %(path)s to a format "
5940
5810
"which supports rich roots."
5941
5811
msgstr ""
5942
5812
5943
#: bzrlib/errors.py:2279
5813
#: bzrlib/errors.py:2237
5944
5814
msgid "Cannot perform local-only commits on unbound branches."
5945
5815
msgstr ""
5946
5816
5947
#: bzrlib/errors.py:2284
5817
#: bzrlib/errors.py:2242
5948
5818
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5949
5819
msgstr ""
5950
5820
5951
#: bzrlib/errors.py:2305
5821
#: bzrlib/errors.py:2263
5952
5822
msgid "Ghost tags not supported by format %(format)r."
5953
5823
msgstr ""
5954
5824
5955
#: bzrlib/errors.py:2313
5825
#: bzrlib/errors.py:2271
5956
5826
msgid "File is binary but should be text."
5957
5827
msgstr ""
5958
5828
5959
#: bzrlib/errors.py:2318
5829
#: bzrlib/errors.py:2276
5960
5830
msgid "The path %(path)s is not permitted on this platform"
5961
5831
msgstr ""
5962
5832
5963
#: bzrlib/errors.py:2327
5833
#: bzrlib/errors.py:2285
5964
5834
msgid ""
5965
5835
"Testament did not match expected value.\n"
5966
5836
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5967
5837
" {%(measured)s}"
5968
5838
msgstr ""
5969
5839
5970
#: bzrlib/errors.py:2339
5840
#: bzrlib/errors.py:2297
5971
5841
msgid "Not a bzr revision-bundle: %(text)r"
5972
5842
msgstr ""
5973
5843
5974
#: bzrlib/errors.py:2348
5844
#: bzrlib/errors.py:2306
5975
5845
msgid "Bad bzr revision-bundle: %(text)r"
5976
5846
msgstr ""
5977
5847
5978
#: bzrlib/errors.py:2357
5848
#: bzrlib/errors.py:2315
5979
5849
msgid "Malformed bzr revision-bundle header: %(text)r"
5980
5850
msgstr ""
5981
5851
5982
#: bzrlib/errors.py:2362
5852
#: bzrlib/errors.py:2320
5983
5853
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5984
5854
msgstr ""
5985
5855
5986
#: bzrlib/errors.py:2367
5856
#: bzrlib/errors.py:2325
5987
5857
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5988
5858
msgstr ""
5989
5859
5990
#: bzrlib/errors.py:2372
5860
#: bzrlib/errors.py:2330
5991
5861
msgid "End of line marker was not \\n in bzr revision-bundle"
5992
5862
msgstr ""
5993
5863
5994
#: bzrlib/errors.py:2382
5864
#: bzrlib/errors.py:2340
5995
5865
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5996
5866
msgstr ""
5997
5867
5998
#: bzrlib/errors.py:2392
5868
#: bzrlib/errors.py:2350
5999
5869
msgid "Root class for inventory serialization errors"
6000
5870
msgstr ""
6001
5871
6002
#: bzrlib/errors.py:2396
5872
#: bzrlib/errors.py:2354
6003
5873
msgid ""
6004
5874
"The inventory was not in the expected format:\n"
6005
5875
" %(msg)s"
6006
5876
msgstr ""
6007
5877
6008
#: bzrlib/errors.py:2405
5878
#: bzrlib/errors.py:2363
6009
5879
msgid "This operation requires rich root data storage"
6010
5880
msgstr ""
6011
5881
6012
#: bzrlib/errors.py:2418
5882
#: bzrlib/errors.py:2376
6013
5883
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6014
5884
msgstr ""
6015
5885
6016
#: bzrlib/errors.py:2427
5886
#: bzrlib/errors.py:2385
6017
5887
msgid ""
6018
5888
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6019
5889
"variable."
6020
5890
msgstr ""
6021
5891
6022
#: bzrlib/errors.py:2434
5892
#: bzrlib/errors.py:2392
6023
5893
msgid ""
6024
5894
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6025
5895
"ghost at {%(ghost_revision_id)s}"
6026
5896
msgstr ""
6027
5897
6028
#: bzrlib/errors.py:2444
5898
#: bzrlib/errors.py:2402
6029
5899
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6030
5900
msgstr ""
6031
5901
6032
#: bzrlib/errors.py:2495
5902
#: bzrlib/errors.py:2453
6033
5903
msgid ""
6034
5904
"A merge directive must provide either a bundle or a public branch location."
6035
5905
msgstr ""
6036
5906
6037
#: bzrlib/errors.py:2502
5907
#: bzrlib/errors.py:2460
6038
5908
msgid "Bad merge directive payload %(start)r"
6039
5909
msgstr ""
6040
5910
6041
#: bzrlib/errors.py:2512
5911
#: bzrlib/errors.py:2470
6042
5912
msgid "Preview patch does not match requested changes."
6043
5913
msgstr ""
6044
5914
6045
#: bzrlib/errors.py:2518
5915
#: bzrlib/errors.py:2476
6046
5916
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6047
5917
msgstr ""
6048
5918
6049
#: bzrlib/errors.py:2528
5919
#: bzrlib/errors.py:2486
6050
5920
msgid ""
6051
5921
"Your branch does not have all of the revisions required in order to merge "
6052
5922
"this merge directive and the target location specified in the merge "
6053
5923
"directive is not a branch: %(location)s."
6054
5924
msgstr ""
6055
5925
6056
#: bzrlib/errors.py:2540
5926
#: bzrlib/errors.py:2498
6057
5927
msgid "Unsupported entry kind %(kind)s"
6058
5928
msgstr ""
6059
5929
6060
#: bzrlib/errors.py:2548
5930
#: bzrlib/errors.py:2506
6061
5931
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6062
5932
msgstr ""
6063
5933
6064
#: bzrlib/errors.py:2558
5934
#: bzrlib/errors.py:2516
6065
5935
msgid "Subsume target %(other_tree)s needs to be upgraded."
6066
5936
msgstr ""
6067
5937
6068
#: bzrlib/errors.py:2577
5938
#: bzrlib/errors.py:2535
6069
5939
msgid "No such tag: %(tag_name)s"
6070
5940
msgstr ""
6071
5941
6072
#: bzrlib/errors.py:2585
5942
#: bzrlib/errors.py:2543
6073
5943
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6074
5944
msgstr ""
6075
5945
6076
#: bzrlib/errors.py:2594
5946
#: bzrlib/errors.py:2552
6077
5947
msgid "Tag %(tag_name)s already exists."
6078
5948
msgstr ""
6079
5949
6080
#: bzrlib/errors.py:2602
5950
#: bzrlib/errors.py:2560
6081
5951
msgid ""
6082
5952
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6083
5953
"\" for more information on this feature."
6084
5954
msgstr ""
6085
5955
6086
#: bzrlib/errors.py:2612
5956
#: bzrlib/errors.py:2570
6087
5957
msgid ""
6088
5958
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6089
5959
msgstr ""
6090
5960
6091
#: bzrlib/errors.py:2622
5961
#: bzrlib/errors.py:2580
6092
5962
msgid ""
6093
5963
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6094
5964
msgstr ""
6095
5965
6096
#: bzrlib/errors.py:2632
5966
#: bzrlib/errors.py:2590
6097
5967
msgid "Invalid line in bugs property: '%(line)s'"
6098
5968
msgstr ""
6099
5969
6100
#: bzrlib/errors.py:2640
5970
#: bzrlib/errors.py:2598
6101
5971
msgid "Invalid bug status: '%(status)s'"
6102
5972
msgstr ""
6103
5973
6104
#: bzrlib/errors.py:2648
5974
#: bzrlib/errors.py:2606
6105
5975
msgid "Could not understand response from smart server: %(response_tuple)r"
6106
5976
msgstr ""
6107
5977
6108
#: bzrlib/errors.py:2687
5978
#: bzrlib/errors.py:2645
6109
5979
msgid "Server sent an unexpected error: %(error_tuple)r"
6110
5980
msgstr ""
6111
5981
6112
#: bzrlib/errors.py:2706
5982
#: bzrlib/errors.py:2664
6113
5983
msgid "Unrecognised container format: %(container_format)r"
6114
5984
msgstr ""
6115
5985
6116
#: bzrlib/errors.py:2714
5986
#: bzrlib/errors.py:2672
6117
5987
msgid "Unexpected end of container stream"
6118
5988
msgstr ""
6119
5989
6120
#: bzrlib/errors.py:2719
5990
#: bzrlib/errors.py:2677
6121
5991
msgid "Unknown record type: %(record_type)r"
6122
5992
msgstr ""
6123
5993
6124
#: bzrlib/errors.py:2727
5994
#: bzrlib/errors.py:2685
6125
5995
msgid "Invalid record: %(reason)s"
6126
5996
msgstr ""
6127
5997
6128
#: bzrlib/errors.py:2735
5998
#: bzrlib/errors.py:2693
6129
5999
msgid "Container has data after end marker: %(excess)r"
6130
6000
msgstr ""
6131
6001
6132
#: bzrlib/errors.py:2743
6002
#: bzrlib/errors.py:2701
6133
6003
msgid "Container has multiple records with the same name: %(name)s"
6134
6004
msgstr ""
6135
6005
6136
#: bzrlib/errors.py:2756
6006
#: bzrlib/errors.py:2714
6137
6007
msgid "Corrupt or incompatible data stream: %(reason)s"
6138
6008
msgstr ""
6139
6009
6140
#: bzrlib/errors.py:2764
6010
#: bzrlib/errors.py:2722
6141
6011
msgid "SMTP error: %(error)s"
6142
6012
msgstr ""
6143
6013
6144
#: bzrlib/errors.py:2772
6014
#: bzrlib/errors.py:2730
6145
6015
msgid "No message supplied."
6146
6016
msgstr ""
6147
6017
6148
#: bzrlib/errors.py:2777
6018
#: bzrlib/errors.py:2735
6149
6019
msgid "No mail-to address (--mail-to) or output (-o) specified."
6150
6020
msgstr ""
6151
6021
6152
#: bzrlib/errors.py:2782
6022
#: bzrlib/errors.py:2740
6023
msgid "Unknown mail client: %(mail_client)s"
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:2748
6153
6027
msgid ""
6154
6028
"Unable to find mail client with the following names: "
6155
6029
"%(mail_command_list_string)s"
6156
6030
msgstr ""
6157
6031
6158
#: bzrlib/errors.py:2792
6032
#: bzrlib/errors.py:2758
6159
6033
msgid "SMTP connection to %(host)s refused"
6160
6034
msgstr ""
6161
6035
6162
#: bzrlib/errors.py:2801
6036
#: bzrlib/errors.py:2767
6163
6037
msgid "Please specify smtp_server. No server at default %(host)s."
6164
6038
msgstr ""
6165
6039
6166
#: bzrlib/errors.py:2815
6040
#: bzrlib/errors.py:2781
6167
6041
msgid ""
6168
6042
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6169
6043
"reconfigure."
6170
6044
msgstr ""
6171
6045
6172
#: bzrlib/errors.py:2827
6046
#: bzrlib/errors.py:2793
6173
6047
msgid "'%(display_url)s' is already a branch."
6174
6048
msgstr ""
6175
6049
6176
#: bzrlib/errors.py:2832
6050
#: bzrlib/errors.py:2798
6177
6051
msgid "'%(display_url)s' is already a tree."
6178
6052
msgstr ""
6179
6053
6180
#: bzrlib/errors.py:2837
6054
#: bzrlib/errors.py:2803
6181
6055
msgid "'%(display_url)s' is already a checkout."
6182
6056
msgstr ""
6183
6057
6184
#: bzrlib/errors.py:2842
6058
#: bzrlib/errors.py:2808
6185
6059
msgid "'%(display_url)s' is already a lightweight checkout."
6186
6060
msgstr ""
6187
6061
6188
#: bzrlib/errors.py:2847
6062
#: bzrlib/errors.py:2813
6189
6063
msgid "'%(display_url)s' is already using a shared repository."
6190
6064
msgstr ""
6191
6065
6192
#: bzrlib/errors.py:2852
6066
#: bzrlib/errors.py:2818
6193
6067
msgid "'%(display_url)s' is already standalone."
6194
6068
msgstr ""
6195
6069
6196
#: bzrlib/errors.py:2857
6070
#: bzrlib/errors.py:2823
6197
6071
msgid "Shared repository '%(display_url)s' already creates working trees."
6198
6072
msgstr ""
6199
6073
6200
#: bzrlib/errors.py:2863
6074
#: bzrlib/errors.py:2829
6201
6075
msgid ""
6202
6076
"Shared repository '%(display_url)s' already doesn't create working trees."
6203
6077
msgstr ""
6204
6078
6205
#: bzrlib/errors.py:2869
6079
#: bzrlib/errors.py:2835
6206
6080
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6207
6081
msgstr ""
6208
6082
6209
#: bzrlib/errors.py:2874
6083
#: bzrlib/errors.py:2840
6210
6084
msgid "No location could be found to bind to at %(display_url)s."
6211
6085
msgstr ""
6212
6086
6213
#: bzrlib/errors.py:2879
6087
#: bzrlib/errors.py:2845
6214
6088
msgid ""
6215
6089
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6216
6090
"%(more)s"
6217
6091
msgstr ""
6218
6092
6219
#: bzrlib/errors.py:2898
6220
msgid ""
6221
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6222
msgstr ""
6223
6224
#: bzrlib/errors.py:2913
6093
#: bzrlib/errors.py:2864
6225
6094
msgid ""
6226
6095
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6227
6096
"%(more)s"
6228
6097
msgstr ""
6229
6098
6230
#: bzrlib/errors.py:2919
6099
#: bzrlib/errors.py:2870
6231
6100
msgid "Variable {%(name)s} is not available."
6232
6101
msgstr ""
6233
6102
6234
#: bzrlib/errors.py:2927
6103
#: bzrlib/errors.py:2878
6235
6104
msgid "No template specified."
6236
6105
msgstr ""
6237
6106
6238
#: bzrlib/errors.py:2932
6107
#: bzrlib/errors.py:2883
6239
6108
msgid "Unable to create symlink %(path_str)son this platform"
6240
6109
msgstr ""
6241
6110
6242
#: bzrlib/errors.py:2947
6111
#: bzrlib/errors.py:2898
6243
6112
msgid ""
6244
6113
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6245
6114
"\", \"local\"."
6246
6115
msgstr ""
6247
6116
6248
#: bzrlib/errors.py:2981
6117
#: bzrlib/errors.py:2932
6249
6118
msgid ""
6250
6119
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6251
6120
msgstr ""
6252
6121
6253
#: bzrlib/errors.py:2993
6122
#: bzrlib/errors.py:2944
6254
6123
msgid "The \"%(config_id)s\" configuration does not exist."
6255
6124
msgstr ""
6256
6125
6257
#: bzrlib/errors.py:3001
6126
#: bzrlib/errors.py:2952
6258
6127
msgid "The \"%(option_name)s\" configuration option does not exist."
6259
6128
msgstr ""
6260
6129
6261
#: bzrlib/errors.py:3009
6130
#: bzrlib/errors.py:2960
6262
6131
msgid "The alias \"%(alias_name)s\" does not exist."
6263
6132
msgstr ""
6264
6133
6265
#: bzrlib/errors.py:3023
6134
#: bzrlib/errors.py:2974
6266
6135
msgid "\"%(alias_name)s\" is not a valid location alias."
6267
6136
msgstr ""
6268
6137
6269
#: bzrlib/errors.py:3031
6138
#: bzrlib/errors.py:2982
6270
6139
msgid "No %(alias_name)s location assigned."
6271
6140
msgstr ""
6272
6141
6273
#: bzrlib/errors.py:3039
6142
#: bzrlib/errors.py:2990
6274
6143
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6275
6144
msgstr ""
6276
6145
6277
#: bzrlib/errors.py:3049
6146
#: bzrlib/errors.py:3000
6278
6147
msgid "Unknown rules detected: %(unknowns_str)s."
6279
6148
msgstr ""
6280
6149
6281
#: bzrlib/errors.py:3060
6150
#: bzrlib/errors.py:3011
6282
6151
msgid "Tip change rejected: %(msg)s"
6283
6152
msgstr ""
6284
6153
6285
#: bzrlib/errors.py:3068
6154
#: bzrlib/errors.py:3019
6286
6155
msgid "Shelf corrupt."
6287
6156
msgstr ""
6288
6157
6289
#: bzrlib/errors.py:3073
6158
#: bzrlib/errors.py:3024
6290
6159
msgid "Corruption while decompressing repository file%(orig_error)s"
6291
6160
msgstr ""
6292
6161
6293
#: bzrlib/errors.py:3085
6162
#: bzrlib/errors.py:3036
6294
6163
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6295
6164
msgstr ""
6296
6165
6297
#: bzrlib/errors.py:3093
6166
#: bzrlib/errors.py:3044
6298
6167
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6299
6168
msgstr ""
6300
6169
6301
#: bzrlib/errors.py:3101
6170
#: bzrlib/errors.py:3052
6302
6171
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6303
6172
msgstr ""
6304
6173
6305
#: bzrlib/errors.py:3109
6174
#: bzrlib/errors.py:3060
6306
6175
msgid "The user aborted the operation."
6307
6176
msgstr ""
6308
6177
6309
#: bzrlib/errors.py:3114
6178
#: bzrlib/errors.py:3065
6310
6179
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6311
6180
msgstr ""
6312
6181
6313
#: bzrlib/errors.py:3124
6182
#: bzrlib/errors.py:3075
6314
6183
msgid "No such view: %(view_name)s."
6315
6184
msgstr ""
6316
6185
6317
#: bzrlib/errors.py:3134
6186
#: bzrlib/errors.py:3085
6318
6187
msgid ""
6319
6188
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6320
6189
"to a later format."
6321
6190
msgstr ""
6322
6191
6323
#: bzrlib/errors.py:3143
6192
#: bzrlib/errors.py:3094
6324
6193
msgid ""
6325
6194
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6326
6195
msgstr ""
6327
6196
6328
#: bzrlib/errors.py:3210
6197
#: bzrlib/errors.py:3161
6329
6198
msgid "%(bzrdir)r does not support co-located branches."
6330
6199
msgstr ""
6331
6200
6332
#: bzrlib/errors.py:3216
6201
#: bzrlib/errors.py:3167
6333
6202
msgid ""
6334
6203
"Unable to determine your name.\n"
6335
6204
"Please, set your name with the 'whoami' command.\n"
6336
6205
"E.g. bzr whoami \"Your Name <name@example.com>\""
6337
6206
msgstr ""
6338
6207
6339
#: bzrlib/errors.py:3225
6208
#: bzrlib/errors.py:3176
6340
6209
msgid "Invalid pattern(s) found. %(msg)s"
6341
6210
msgstr ""
6342
6211
6343
#: bzrlib/errors.py:3233
6212
#: bzrlib/errors.py:3184
6344
6213
msgid ""
6345
6214
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6346
6215
"unbind` to fix."
6347
6216
msgstr ""
6348
6217
6349
#: bzrlib/errors.py:3244
6218
#: bzrlib/errors.py:3195
6350
6219
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6351
6220
msgstr ""
6352
6221
6353
#: bzrlib/errors.py:3253
6222
#: bzrlib/errors.py:3204
6354
6223
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6355
6224
msgstr ""
6356
6225
6357
#: bzrlib/errors.py:3262
6226
#: bzrlib/errors.py:3213
6358
6227
msgid ""
6359
6228
"No compatible object available for operations from %(source)r to %(target)r."
6360
6229
msgstr ""
6361
6230
6362
#: bzrlib/errors.py:3272
6231
#: bzrlib/errors.py:3223
6363
6232
msgid ""
6364
6233
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6365
6234
"%(arguments)s."
6366
6235
msgstr ""
6367
6236
6368
#: bzrlib/errors.py:3282
6237
#: bzrlib/errors.py:3233
6369
6238
msgid ""
6370
6239
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6371
6240
"format %(format)r"
6372
6241
msgstr ""
6373
6242
6374
#: bzrlib/errors.py:3294
6375
msgid ""
6376
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6377
"plugin."
6378
msgstr ""
6379
6380
#: bzrlib/errors.py:3307
6243
#: bzrlib/errors.py:3249
6381
6244
msgid "Binary files section encountered."
6382
6245
msgstr ""
6383
6246
6384
#: bzrlib/errors.py:3315
6247
#: bzrlib/errors.py:3257
6385
6248
msgid ""
6386
6249
"Malformed patch header. %(desc)s\n"
6387
6250
"%(line)r"
6388
6251
msgstr ""
6389
6252
6390
#: bzrlib/errors.py:3324
6253
#: bzrlib/errors.py:3266
6391
6254
msgid ""
6392
6255
"Malformed hunk header. %(desc)s\n"
6393
6256
"%(line)r"
6394
6257
msgstr ""
6395
6258
6396
#: bzrlib/errors.py:3333
6259
#: bzrlib/errors.py:3275
6397
6260
msgid ""
6398
6261
"Malformed line. %(desc)s\n"
6399
6262
"%(line)r"
6400
6263
msgstr ""
6401
6264
6402
#: bzrlib/errors.py:3343
6265
#: bzrlib/errors.py:3285
6403
6266
msgid ""
6404
6267
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6405
6268
"but patch says it should be \"%(patch_line)s\""
6406
6269
msgstr ""
6407
6270
6408
#: bzrlib/errors.py:3354
6409
msgid "The feature %(feature)s has already been registered."
6410
msgstr ""
6411
6412
#: bzrlib/errors.py:3362
6413
msgid ""
6414
"Cannot store uncommitted changes because this branch already stores "
6415
"uncommitted changes."
6416
msgstr ""
6417
6418
#: bzrlib/export_pot.py:252
6271
#: bzrlib/export_pot.py:246
6419
6272
#, python-format
6420
6273
msgid "Exporting messages from builtin command: %s"
6421
6274
msgstr ""
6422
6275
6423
#: bzrlib/export_pot.py:271
6276
#: bzrlib/export_pot.py:265
6424
6277
msgid "Exporting messages from plugin command: {0} in {1}"
6425
6278
msgstr ""
6426
6279
6427
#: bzrlib/export_pot.py:292
6280
#: bzrlib/export_pot.py:286
6428
6281
#, python-format
6429
6282
msgid "Exporting message from error: %s"
6430
6283
msgstr ""
6431
6284
6432
#: bzrlib/fetch.py:98
6285
#: bzrlib/fetch.py:97
6433
6286
msgid "Finding revisions"
6434
6287
msgstr ""
6435
6288
6436
#: bzrlib/fetch.py:103
6289
#: bzrlib/fetch.py:102
6437
6290
msgid "Fetching revisions"
6438
6291
msgstr ""
6439
6292
6440
#: bzrlib/foreign.py:262
6293
#: bzrlib/foreign.py:261
6441
6294
msgid "Push into a different VCS without any custom bzr metadata."
6442
6295
msgstr ""
6443
6296
6444
#: bzrlib/foreign.py:264
6297
#: bzrlib/foreign.py:263
6445
6298
msgid ""
6446
6299
"This will afterwards rebase the local branch on the remote\n"
6447
6300
"branch unless the --no-rebase option is used, in which case \n"
6448
6301
"the two branches will be out of sync after the push. "
6449
6302
msgstr ""
6450
6303
6304
# help of 'directory' option of 'dpush' command
6305
#: bzrlib/foreign.py:271
6306
msgid ""
6307
"Branch to push from, rather than the one containing the working directory."
6308
msgstr ""
6309
6451
6310
# help of 'no-rebase' option of 'dpush' command
6452
#: bzrlib/foreign.py:277
6311
#: bzrlib/foreign.py:276
6453
6312
msgid "Do not rebase after push."
6454
6313
msgstr ""
6455
6314
6456
#: bzrlib/foreign.py:311
6315
# help of 'strict' option of 'dpush' command
6316
#: bzrlib/foreign.py:278
6317
msgid ""
6318
"Refuse to push if there are uncommitted changes in the working tree, --no-"
6319
"strict disables the check."
6320
msgstr ""
6321
6322
#: bzrlib/foreign.py:310
6457
6323
#, python-format
6458
6324
msgid "Using saved location: %s\n"
6459
6325
msgstr ""
6460
6326
6461
#: bzrlib/foreign.py:321
6327
#: bzrlib/foreign.py:320
6462
6328
msgid ""
6463
6329
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6464
6330
"regular push."
6465
6331
msgstr ""
6466
6332
6467
#: bzrlib/gpg.py:366
6468
msgid "No GnuPG key results for pattern: {0}"
6469
msgstr ""
6470
6471
#: bzrlib/gpg.py:439
6333
#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
6472
6334
msgid "{0} commits with valid signatures"
6473
6335
msgstr ""
6474
6336
6475
#: bzrlib/gpg.py:445
6337
#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
6476
6338
msgid "{0} commit with unknown key"
6477
6339
msgid_plural "{0} commits with unknown keys"
6478
6340
msgstr[0] ""
6479
6341
msgstr[1] ""
6480
6342
6481
#: bzrlib/gpg.py:453
6343
#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
6482
6344
msgid "{0} commit not valid"
6483
6345
msgid_plural "{0} commits not valid"
6484
6346
msgstr[0] ""
6485
6347
msgstr[1] ""
6486
6348
6487
#: bzrlib/gpg.py:461
6349
#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
6488
6350
msgid "{0} commit not signed"
6489
6351
msgid_plural "{0} commits not signed"
6490
6352
msgstr[0] ""
6491
6353
msgstr[1] ""
6492
6354
6493
#: bzrlib/gpg.py:469
6355
#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
6494
6356
msgid "{0} commit with key now expired"
6495
6357
msgid_plural "{0} commits with key now expired"
6496
6358
msgstr[0] ""
6497
6359
msgstr[1] ""
6498
6360
6499
#: bzrlib/gpg.py:489
6500
msgid "{0} commit by author {1} with key {2} now expired"
6501
msgid_plural "{0} commits by author {1} with key {2} now expired"
6502
msgstr[0] ""
6503
msgstr[1] ""
6361
#: bzrlib/gpg.py:336
6362
msgid "No GnuPG key results for pattern: {0}"
6363
msgstr ""
6504
6364
6505
#: bzrlib/gpg.py:505
6365
#: bzrlib/gpg.py:379
6506
6366
msgid "{0} signed {1} commit"
6507
6367
msgid_plural "{0} signed {1} commits"
6508
6368
msgstr[0] ""
6509
6369
msgstr[1] ""
6510
6370
6511
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6371
#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
6512
6372
msgid "{0} commit by author {1}"
6513
6373
msgid_plural "{0} commits by author {1}"
6514
6374
msgstr[0] ""
6515
6375
msgstr[1] ""
6516
6376
6517
#: bzrlib/gpg.py:554
6377
#: bzrlib/gpg.py:426
6518
6378
msgid "Unknown key {0} signed {1} commit"
6519
6379
msgid_plural "Unknown key {0} signed {1} commits"
6520
6380
msgstr[0] ""
6521
6381
msgstr[1] ""
6522
6382
6523
#: bzrlib/groupcompress.py:1739
6383
#: bzrlib/gpg.py:444
6384
msgid "{0} commit by author {1} with key {2} now expired"
6385
msgid_plural "{0} commits by author {1} with key {2} now expired"
6386
msgstr[0] ""
6387
msgstr[1] ""
6388
6389
#: bzrlib/groupcompress.py:1737
6524
6390
#, python-format
6525
6391
msgid "Insert claimed random_id=True, but then inserted %r two times"
6526
6392
msgstr ""
6527
6393
6528
#: bzrlib/hooks.py:313
6394
#: bzrlib/hooks.py:329
6529
6395
#, python-format
6530
6396
msgid "Introduced in: %s"
6531
6397
msgstr ""
6532
6398
6533
#: bzrlib/hooks.py:316
6399
#: bzrlib/hooks.py:332
6534
6400
#, python-format
6535
6401
msgid "Deprecated in: %s"
6536
6402
msgstr ""
6537
6403
6538
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6404
#: bzrlib/knit.py:1764 bzrlib/knit.py:1800
6539
6405
msgid "Walking content"
6540
6406
msgstr ""
6541
6407
6542
#: bzrlib/knit.py:3330
6408
#: bzrlib/knit.py:3328
6543
6409
msgid "annotating"
6544
6410
msgstr ""
6545
6411
6546
#: bzrlib/lock.py:549
6412
#: bzrlib/lock.py:547
6547
6413
msgid "{0!r} was {1} locked again"
6548
6414
msgstr ""
6549
6415
6550
#: bzrlib/lockdir.py:321
6416
#: bzrlib/lockdir.py:320
6551
6417
#, python-format
6552
6418
msgid "error removing pending lock: %s"
6553
6419
msgstr ""
6554
6420
6555
#: bzrlib/lockdir.py:616
6421
#: bzrlib/lockdir.py:615
6556
6422
msgid "Unable to obtain"
6557
6423
msgstr ""
6558
6424
6559
#: bzrlib/lockdir.py:618
6425
#: bzrlib/lockdir.py:617
6560
6426
msgid "Lock owner changed for"
6561
6427
msgstr ""
6562
6428
6563
#: bzrlib/lockdir.py:620
6429
#: bzrlib/lockdir.py:619
6564
6430
msgid "{0} lock {1} {2}."
6565
6431
msgstr ""
6566
6432
6567
#: bzrlib/lockdir.py:627
6433
#: bzrlib/lockdir.py:626
6568
6434
#, python-format
6569
6435
msgid "Will continue to try until %s, unless you press Ctrl-C."
6570
6436
msgstr ""
6571
6437
6572
#: bzrlib/lockdir.py:629
6438
#: bzrlib/lockdir.py:628
6573
6439
msgid "See \"bzr help break-lock\" for more."
6574
6440
msgstr ""
6575
6441
6576
#: bzrlib/lockdir.py:739
6442
#: bzrlib/lockdir.py:738
6577
6443
#, python-format
6578
6444
msgid ""
6579
6445
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6580
6446
msgstr ""
6581
6447
6582
#: bzrlib/log.py:563
6448
#: bzrlib/log.py:572
6583
6449
msgid "--exclude-common-ancestry requires two different revisions"
6584
6450
msgstr ""
6585
6451
6586
#: bzrlib/log.py:565
6452
#: bzrlib/log.py:574
6587
6453
#, python-format
6588
6454
msgid "invalid direction %r"
6589
6455
msgstr ""
6590
6456
6591
#: bzrlib/log.py:653
6457
#: bzrlib/log.py:621
6458
msgid "Start revision not found in left-hand history of end revision."
6459
msgstr ""
6460
6461
#: bzrlib/log.py:667
6592
6462
msgid "Start revision not found in history of end revision."
6593
6463
msgstr ""
6594
6464
6595
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6465
#: bzrlib/log.py:1085 bzrlib/log.py:1143
6596
6466
msgid "Logging revision 0 is invalid."
6597
6467
msgstr ""
6598
6468
6599
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6469
#: bzrlib/log.py:1087 bzrlib/log.py:1145
6600
6470
msgid "Start revision must be older than the end revision."
6601
6471
msgstr ""
6602
6472
6603
#: bzrlib/log.py:1818
6473
#: bzrlib/log.py:1832
6604
6474
#, python-format
6605
6475
msgid "unknown log formatter: %r"
6606
6476
msgstr ""
6607
6477
6608
#: bzrlib/log.py:2114
6478
#: bzrlib/log.py:2128
6609
6479
msgid "fixes bug"
6610
6480
msgid_plural "fixes bugs"
6611
6481
msgstr[0] ""
6612
6482
msgstr[1] ""
6613
6483
6614
#: bzrlib/merge.py:689
6484
#: bzrlib/merge.py:718
6615
6485
msgid "All changes applied successfully."
6616
6486
msgstr ""
6617
6487
6618
#: bzrlib/merge.py:691
6488
#: bzrlib/merge.py:720
6619
6489
#, python-format
6620
6490
msgid "%d conflicts encountered."
6621
6491
msgstr ""
6622
6492
6623
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6493
#: bzrlib/merge.py:868 bzrlib/merge.py:1956
6624
6494
msgid "Preparing file merge"
6625
6495
msgstr ""
6626
6496
6627
#: bzrlib/multiparent.py:426
6497
#: bzrlib/multiparent.py:424
6628
6498
msgid "Importing revisions"
6629
6499
msgstr ""
6630
6500
6631
6501
# help of 'help' option
6632
#: bzrlib/option.py:526
6502
#: bzrlib/option.py:524
6633
6503
msgid "Show help message."
6634
6504
msgstr ""
6635
6505
6636
6506
# help of 'quiet' option
6637
#: bzrlib/option.py:528
6507
#: bzrlib/option.py:526
6638
6508
msgid "Only display errors and warnings."
6639
6509
msgstr ""
6640
6510
6641
6511
# help of 'usage' option
6642
#: bzrlib/option.py:531
6512
#: bzrlib/option.py:529
6643
6513
msgid "Show usage message and options."
6644
6514
msgstr ""
6645
6515
6646
6516
# help of 'verbose' option
6647
#: bzrlib/option.py:533
6517
#: bzrlib/option.py:531
6648
6518
msgid "Display more information."
6649
6519
msgstr ""
6650
6520
6651
6521
# help of 'change' option
6652
#: bzrlib/option.py:541
6522
#: bzrlib/option.py:539
6653
6523
msgid ""
6654
6524
"Select changes introduced by the specified revision. See also \"help "
6655
6525
"revisionspec\"."
6656
6526
msgstr ""
6657
6527
6658
6528
# help of 'directory' option
6659
#: bzrlib/option.py:543
6529
#: bzrlib/option.py:541
6660
6530
msgid "Branch to operate on, instead of working directory."
6661
6531
msgstr ""
6662
6532
6663
6533
# help of 'log-format=long' option
6664
#: bzrlib/option.py:545
6534
#: bzrlib/option.py:543
6665
6535
msgid "Detailed log format."
6666
6536
msgstr ""
6667
6537
6668
6538
# help of 'log-format=gnu-changelog' option
6669
#: bzrlib/option.py:545
6539
#: bzrlib/option.py:543
6670
6540
msgid "Format used by GNU ChangeLog files."
6671
6541
msgstr ""
6672
6542
6673
6543
# help of 'log-format=line' option
6674
#: bzrlib/option.py:545
6544
#: bzrlib/option.py:543
6675
6545
msgid "Log format with one line per revision."
6676
6546
msgstr ""
6677
6547
6678
6548
# help of 'log-format=short' option
6679
#: bzrlib/option.py:545
6549
#: bzrlib/option.py:543
6680
6550
msgid "Moderately short log format."
6681
6551
msgstr ""
6682
6552
6683
6553
# help of 'log-format' option
6684
#: bzrlib/option.py:545
6554
#: bzrlib/option.py:543
6685
6555
msgid "Use specified log format."
6686
6556
msgstr ""
6687
6557
6688
6558
# title of 'log-format' option
6689
#: bzrlib/option.py:547
6559
#: bzrlib/option.py:545
6690
6560
msgid "Log format"
6691
6561
msgstr ""
6692
6562
6693
6563
# help of 'merge-type=lca' option
6694
#: bzrlib/option.py:549
6564
#: bzrlib/option.py:547
6695
6565
msgid "LCA-newness merge."
6696
6566
msgstr ""
6697
6567
6698
6568
# help of 'merge-type=diff3' option
6699
#: bzrlib/option.py:549
6569
#: bzrlib/option.py:547
6700
6570
msgid "Merge using external diff3."
6701
6571
msgstr ""
6702
6572
6703
6573
# help of 'merge-type=merge3' option
6704
#: bzrlib/option.py:549
6574
#: bzrlib/option.py:547
6705
6575
msgid "Native diff3-style merge."
6706
6576
msgstr ""
6707
6577
6708
6578
# help of 'merge-type' option
6709
#: bzrlib/option.py:549
6579
#: bzrlib/option.py:547
6710
6580
msgid "Select a particular merge algorithm."
6711
6581
msgstr ""
6712
6582
6713
6583
# help of 'merge-type=weave' option
6714
#: bzrlib/option.py:549
6584
#: bzrlib/option.py:547
6715
6585
msgid "Weave-based merge."
6716
6586
msgstr ""
6717
6587
6718
6588
# title of 'merge-type' option
6719
#: bzrlib/option.py:551
6589
#: bzrlib/option.py:549
6720
6590
msgid "Merge algorithm"
6721
6591
msgstr ""
6722
6592
6723
6593
# help of 'message' option
6724
#: bzrlib/option.py:554
6594
#: bzrlib/option.py:552
6725
6595
msgid "Message string."
6726
6596
msgstr ""
6727
6597
6728
6598
# help of 'null' option
6729
#: bzrlib/option.py:556
6599
#: bzrlib/option.py:554
6730
6600
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6731
6601
msgstr ""
6732
6602
6733
6603
# help of 'overwrite' option
6734
#: bzrlib/option.py:558
6604
#: bzrlib/option.py:556
6735
6605
msgid "Ignore differences between branches and overwrite unconditionally."
6736
6606
msgstr ""
6737
6607
6738
6608
# help of 'remember' option
6739
#: bzrlib/option.py:560
6609
#: bzrlib/option.py:558
6740
6610
msgid "Remember the specified location as a default."
6741
6611
msgstr ""
6742
6612
6743
6613
# help of 'reprocess' option
6744
#: bzrlib/option.py:562
6614
#: bzrlib/option.py:560
6745
6615
msgid "Reprocess to reduce spurious conflicts."
6746
6616
msgstr ""
6747
6617
6748
6618
# help of 'revision' option
6749
#: bzrlib/option.py:566
6619
#: bzrlib/option.py:564
6750
6620
msgid "See \"help revisionspec\" for details."
6751
6621
msgstr ""
6752
6622
6753
6623
# help of 'show-ids' option
6754
#: bzrlib/option.py:568
6624
#: bzrlib/option.py:566
6755
6625
msgid "Show internal object ids."
6756
6626
msgstr ""
6757
6627
6758
6628
# help of 'timezone' option
6759
#: bzrlib/option.py:571
6629
#: bzrlib/option.py:569
6760
6630
msgid "Display timezone as local, original, or utc."
6761
6631
msgstr ""
6762
6632
6763
#: bzrlib/osutils.py:100
6633
#: bzrlib/osutils.py:94
6764
6634
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6765
6635
msgstr ""
6766
6636
6767
#: bzrlib/osutils.py:220
6637
#: bzrlib/osutils.py:214
6768
6638
msgid "lstat/stat of ({0!r}): {1!r}"
6769
6639
msgstr ""
6770
6640
6771
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6641
#: bzrlib/osutils.py:964 bzrlib/osutils.py:975
6772
6642
#, python-format
6773
6643
msgid "sorry, %r not allowed in path"
6774
6644
msgstr ""
6775
6645
6776
#: bzrlib/osutils.py:1259
6646
#: bzrlib/osutils.py:1193
6777
6647
#, python-format
6778
6648
msgid "%r is too short to calculate a relative path"
6779
6649
msgstr ""
6780
6650
6781
#: bzrlib/plugin.py:143
6651
#: bzrlib/plugin.py:142
6782
6652
#, python-format
6783
6653
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6784
6654
msgstr ""
6785
6655
6786
6656
# help of 'plugin' option of 'bash-completion' command
6787
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6657
#: bzrlib/plugins/bash_completion/bashcomp.py:408
6788
6658
msgid "Enable completions for the selected plugin (default: all plugins)"
6789
6659
msgstr ""
6790
6660
6791
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6661
#: bzrlib/plugins/bash_completion/bashcomp.py:409
6792
6662
msgid "Generate a shell function for bash command line completion."
6793
6663
msgstr ""
6794
6664
6795
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6665
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6796
6666
msgid ""
6797
6667
"This command generates a shell function which can be used by bash to\n"
6798
6668
"automatically complete the currently typed command when the user presses\n"
6799
6669
"the completion key (usually tab)."
6800
6670
msgstr ""
6801
6671
6802
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6672
#: bzrlib/plugins/bash_completion/bashcomp.py:415
6803
6673
msgid ""
6804
6674
"Commonly used like this:\n"
6805
6675
" eval \"`bzr bash-completion`\""
6806
6676
msgstr ""
6807
6677
6808
6678
# help of 'function-name' option of 'bash-completion' command
6809
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6679
#: bzrlib/plugins/bash_completion/bashcomp.py:421
6810
6680
msgid "Name of the generated function (default: _bzr)"
6811
6681
msgstr ""
6812
6682
6813
6683
# help of 'function-only' option of 'bash-completion' command
6814
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6684
#: bzrlib/plugins/bash_completion/bashcomp.py:423
6815
6685
msgid "Generate only the shell function, don't enable it"
6816
6686
msgstr ""
6817
6687
6818
#: bzrlib/plugins/grep/cmds.py:77
6819
msgid "Print lines matching PATTERN for specified files and revisions."
6820
msgstr ""
6821
6822
#: bzrlib/plugins/grep/cmds.py:79
6823
msgid ""
6824
"This command searches the specified files and revisions for a given\n"
6825
"pattern. The pattern is specified as a Python regular expressions[1]."
6826
msgstr ""
6827
6828
#: bzrlib/plugins/grep/cmds.py:82
6829
msgid ""
6830
"If the file name is not specified, the revisions starting with the\n"
6831
"current directory are searched recursively. If the revision number is\n"
6832
"not specified, the working copy is searched. To search the last committed\n"
6833
"revision, use the '-r -1' or '-r last:1' option."
6834
msgstr ""
6835
6836
#: bzrlib/plugins/grep/cmds.py:87
6837
msgid ""
6838
"Unversioned files are not searched unless explicitly specified on the\n"
6839
"command line. Unversioned directores are not searched."
6840
msgstr ""
6841
6842
#: bzrlib/plugins/grep/cmds.py:90
6843
msgid ""
6844
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6845
"format. If a revision is explicitly searched, the output is shown as\n"
6846
"'filepath~N:string', where N is the revision number."
6847
msgstr ""
6848
6849
#: bzrlib/plugins/grep/cmds.py:94
6850
msgid ""
6851
"--include and --exclude options can be used to search only (or exclude\n"
6852
"from search) files with base name matches the specified Unix style GLOB\n"
6853
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6854
"to quote wildcard or backslash character literally. Note that the glob\n"
6855
"pattern is not a regular expression."
6856
msgstr ""
6857
6858
#: bzrlib/plugins/grep/cmds.py:100
6859
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6860
msgstr ""
6861
6862
# help of 'color' option of 'grep' command
6863
#: bzrlib/plugins/grep/cmds.py:109
6864
msgid "Show match in color. WHEN is never, always or auto."
6865
msgstr ""
6866
6867
# help of 'diff' option of 'grep' command
6868
#: bzrlib/plugins/grep/cmds.py:111
6869
msgid "Grep for pattern in changeset for each revision."
6870
msgstr ""
6871
6872
# help of 'exclude' option of 'grep' command
6873
#: bzrlib/plugins/grep/cmds.py:113
6874
msgid "Skip files whose base name matches GLOB."
6875
msgstr ""
6876
6877
# help of 'include' option of 'grep' command
6878
#: bzrlib/plugins/grep/cmds.py:115
6879
msgid "Search only files whose base name matches GLOB."
6880
msgstr ""
6881
6882
# help of 'files-with-matches' option of 'grep' command
6883
#: bzrlib/plugins/grep/cmds.py:117
6884
msgid "Print only the name of each input file in which PATTERN is found."
6885
msgstr ""
6886
6887
# help of 'files-without-match' option of 'grep' command
6888
#: bzrlib/plugins/grep/cmds.py:120
6889
msgid "Print only the name of each input file in which PATTERN is not found."
6890
msgstr ""
6891
6892
# help of 'fixed-string' option of 'grep' command
6893
#: bzrlib/plugins/grep/cmds.py:123
6894
msgid "Interpret PATTERN is a single fixed string (not regex)."
6895
msgstr ""
6896
6897
# help of 'from-root' option of 'grep' command
6898
#: bzrlib/plugins/grep/cmds.py:125
6899
msgid ""
6900
"Search for pattern starting from the root of the branch. (implies --"
6901
"recursive)"
6902
msgstr ""
6903
6904
# help of 'ignore-case' option of 'grep' command
6905
#: bzrlib/plugins/grep/cmds.py:128
6906
msgid "ignore case distinctions while matching."
6907
msgstr ""
6908
6909
# help of 'levels' option of 'grep' command
6910
#: bzrlib/plugins/grep/cmds.py:130
6911
msgid ""
6912
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6913
msgstr ""
6914
6915
# help of 'line-number' option of 'grep' command
6916
#: bzrlib/plugins/grep/cmds.py:135
6917
msgid "show 1-based line number."
6918
msgstr ""
6919
6920
# help of 'no-recursive' option of 'grep' command
6921
#: bzrlib/plugins/grep/cmds.py:137
6922
msgid "Don't recurse into subdirectories. (default is --recursive)"
6923
msgstr ""
6924
6925
# help of 'null' option of 'grep' command
6926
#: bzrlib/plugins/grep/cmds.py:139
6927
msgid ""
6928
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6929
"newline."
6930
msgstr ""
6931
6932
#: bzrlib/plugins/launchpad/account.py:66
6933
msgid "Setting ssh/sftp usernames for launchpad.net."
6934
msgstr ""
6935
6936
#: bzrlib/plugins/launchpad/cmds.py:43
6688
#: bzrlib/plugins/launchpad/__init__.py:79
6937
6689
msgid "Register a branch with launchpad.net."
6938
6690
msgstr ""
6939
6691
6940
#: bzrlib/plugins/launchpad/cmds.py:45
6692
#: bzrlib/plugins/launchpad/__init__.py:81
6941
6693
msgid ""
6942
6694
"This command lists a bzr branch in the directory of branches on\n"
6943
6695
"launchpad.net. Registration allows the branch to be associated with\n"
6944
6696
"bugs or specifications."
6945
6697
msgstr ""
6946
6698
6947
#: bzrlib/plugins/launchpad/cmds.py:49
6699
#: bzrlib/plugins/launchpad/__init__.py:85
6948
6700
msgid ""
6949
6701
"Before using this command you must register the project to which the\n"
6950
6702
"branch belongs, and create an account for yourself on launchpad.net."
6951
6703
msgstr ""
6952
6704
6953
#: bzrlib/plugins/launchpad/cmds.py:52
6705
#: bzrlib/plugins/launchpad/__init__.py:88
6954
6706
msgid ""
6955
6707
"arguments:\n"
6956
6708
" public_url: The publicly visible url for the branch to register.\n"
6962
6714
" otherwise error."
6963
6715
msgstr ""
6964
6716
6965
#: bzrlib/plugins/launchpad/cmds.py:61
6717
#: bzrlib/plugins/launchpad/__init__.py:97
6966
6718
msgid ""
6967
6719
"example:\n"
6968
6720
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6970
6722
msgstr ""
6971
6723
6972
6724
# help of 'project' option of 'register-branch' command
6973
#: bzrlib/plugins/launchpad/cmds.py:68
6725
#: bzrlib/plugins/launchpad/__init__.py:104
6974
6726
msgid "Launchpad project short name to associate with the branch."
6975
6727
msgstr ""
6976
6728
6977
6729
# help of 'branch-name' option of 'register-branch' command
6978
#: bzrlib/plugins/launchpad/cmds.py:75
6730
#: bzrlib/plugins/launchpad/__init__.py:111
6979
6731
msgid ""
6980
6732
"Short name for the branch; by default taken from the last component of the "
6981
6733
"url."
6982
6734
msgstr ""
6983
6735
6984
6736
# help of 'branch-title' option of 'register-branch' command
6985
#: bzrlib/plugins/launchpad/cmds.py:79
6737
#: bzrlib/plugins/launchpad/__init__.py:115
6986
6738
msgid "One-sentence description of the branch."
6987
6739
msgstr ""
6988
6740
6989
6741
# help of 'branch-description' option of 'register-branch' command
6990
#: bzrlib/plugins/launchpad/cmds.py:82
6742
#: bzrlib/plugins/launchpad/__init__.py:118
6991
6743
msgid "Longer description of the purpose or contents of the branch."
6992
6744
msgstr ""
6993
6745
6994
6746
# help of 'author' option of 'register-branch' command
6995
#: bzrlib/plugins/launchpad/cmds.py:85
6747
#: bzrlib/plugins/launchpad/__init__.py:121
6996
6748
msgid "Branch author's email address, if not yourself."
6997
6749
msgstr ""
6998
6750
6999
6751
# help of 'link-bug' option of 'register-branch' command
7000
#: bzrlib/plugins/launchpad/cmds.py:88
6752
#: bzrlib/plugins/launchpad/__init__.py:124
7001
6753
msgid "The bug this branch fixes."
7002
6754
msgstr ""
7003
6755
7004
6756
# help of 'dry-run' option of 'register-branch' command
7005
#: bzrlib/plugins/launchpad/cmds.py:91
6757
#: bzrlib/plugins/launchpad/__init__.py:127
7006
6758
msgid "Prepare the request but don't actually send it."
7007
6759
msgstr ""
7008
6760
7009
#: bzrlib/plugins/launchpad/cmds.py:113
6761
#: bzrlib/plugins/launchpad/__init__.py:149
7010
6762
msgid ""
7011
6763
"register-branch requires a public branch url - see bzr help register-branch."
7012
6764
msgstr ""
7013
6765
7014
#: bzrlib/plugins/launchpad/cmds.py:121
6766
#: bzrlib/plugins/launchpad/__init__.py:157
7015
6767
msgid "--product is deprecated; please use --project."
7016
6768
msgstr ""
7017
6769
7018
#: bzrlib/plugins/launchpad/cmds.py:151
6770
#: bzrlib/plugins/launchpad/__init__.py:189
7019
6771
msgid "Open a Launchpad branch page in your web browser."
7020
6772
msgstr ""
7021
6773
7022
6774
# help of 'dry-run' option of 'launchpad-open' command
7023
#: bzrlib/plugins/launchpad/cmds.py:156
6775
#: bzrlib/plugins/launchpad/__init__.py:194
7024
6776
msgid "Do not actually open the browser. Just say the URL we would use."
7025
6777
msgstr ""
7026
6778
7027
#: bzrlib/plugins/launchpad/cmds.py:191
6779
#: bzrlib/plugins/launchpad/__init__.py:229
7028
6780
#, python-format
7029
6781
msgid "Opening %s in web browser"
7030
6782
msgstr ""
7031
6783
7032
#: bzrlib/plugins/launchpad/cmds.py:199
6784
#: bzrlib/plugins/launchpad/__init__.py:239
7033
6785
msgid "Show or set the Launchpad user ID."
7034
6786
msgstr ""
7035
6787
7036
#: bzrlib/plugins/launchpad/cmds.py:201
6788
#: bzrlib/plugins/launchpad/__init__.py:241
7037
6789
msgid ""
7038
6790
"When communicating with Launchpad, some commands need to know your\n"
7039
6791
"Launchpad user ID. This command can be used to set or show the\n"
7040
6792
"user ID that Bazaar will use for such communication."
7041
6793
msgstr ""
7042
6794
7043
#: bzrlib/plugins/launchpad/cmds.py:205
6795
#: bzrlib/plugins/launchpad/__init__.py:245
7044
6796
msgid ""
7045
6797
":Examples:\n"
7046
6798
" Show the Launchpad ID of the current user::"
7047
6799
msgstr ""
7048
6800
7049
#: bzrlib/plugins/launchpad/cmds.py:208
6801
#: bzrlib/plugins/launchpad/__init__.py:248
7050
6802
msgid " bzr launchpad-login"
7051
6803
msgstr ""
7052
6804
7053
#: bzrlib/plugins/launchpad/cmds.py:210
6805
#: bzrlib/plugins/launchpad/__init__.py:250
7054
6806
msgid " Set the Launchpad ID of the current user to 'bob'::"
7055
6807
msgstr ""
7056
6808
7057
#: bzrlib/plugins/launchpad/cmds.py:212
6809
#: bzrlib/plugins/launchpad/__init__.py:252
7058
6810
msgid " bzr launchpad-login bob"
7059
6811
msgstr ""
7060
6812
7061
6813
# help of 'no-check' option of 'launchpad-login' command
7062
#: bzrlib/plugins/launchpad/cmds.py:219
6814
#: bzrlib/plugins/launchpad/__init__.py:259
7063
6815
msgid "Don't check that the user name is valid."
7064
6816
msgstr ""
7065
6817
7066
#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245
6818
#: bzrlib/plugins/launchpad/__init__.py:274
6819
#: bzrlib/plugins/launchpad/__init__.py:285
7067
6820
msgid "Launchpad user ID exists and has SSH keys.\n"
7068
6821
msgstr ""
7069
6822
7070
#: bzrlib/plugins/launchpad/cmds.py:237
6823
#: bzrlib/plugins/launchpad/__init__.py:277
7071
6824
msgid "No Launchpad user ID configured.\n"
7072
6825
msgstr ""
7073
6826
7074
#: bzrlib/plugins/launchpad/cmds.py:248
6827
#: bzrlib/plugins/launchpad/__init__.py:288
7075
6828
#, python-format
7076
6829
msgid "Launchpad user ID set to '%s'.\n"
7077
6830
msgstr ""
7078
6831
7079
#: bzrlib/plugins/launchpad/cmds.py:254
6832
#: bzrlib/plugins/launchpad/__init__.py:296
7080
6833
msgid "Ask Launchpad to mirror a branch now."
7081
6834
msgstr ""
7082
6835
7083
#: bzrlib/plugins/launchpad/cmds.py:271
6836
#: bzrlib/plugins/launchpad/__init__.py:316
7084
6837
msgid "Propose merging a branch on Launchpad."
7085
6838
msgstr ""
7086
6839
7087
#: bzrlib/plugins/launchpad/cmds.py:273
6840
#: bzrlib/plugins/launchpad/__init__.py:318
7088
6841
msgid ""
7089
6842
"This will open your usual editor to provide the initial comment. When it\n"
7090
6843
"has created the proposal, it will open it in your default web browser."
7091
6844
msgstr ""
7092
6845
7093
#: bzrlib/plugins/launchpad/cmds.py:276
6846
#: bzrlib/plugins/launchpad/__init__.py:321
7094
6847
msgid ""
7095
6848
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7096
6849
"is not supplied, the remembered submit branch will be used. If no submit\n"
7097
6850
"branch is remembered, the development focus will be used."
7098
6851
msgstr ""
7099
6852
7100
#: bzrlib/plugins/launchpad/cmds.py:280
6853
#: bzrlib/plugins/launchpad/__init__.py:325
7101
6854
msgid ""
7102
6855
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7103
6856
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7105
6858
"may optionally be followed by '=' and the review type. For example:"
7106
6859
msgstr ""
7107
6860
7108
#: bzrlib/plugins/launchpad/cmds.py:285
6861
#: bzrlib/plugins/launchpad/__init__.py:330
7109
6862
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7110
6863
msgstr ""
7111
6864
7112
#: bzrlib/plugins/launchpad/cmds.py:287
6865
#: bzrlib/plugins/launchpad/__init__.py:332
7113
6866
msgid ""
7114
6867
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7115
6868
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7116
6869
msgstr ""
7117
6870
7118
6871
# help of 'staging' option of 'lp-propose-merge' command
7119
#: bzrlib/plugins/launchpad/cmds.py:292
6872
#: bzrlib/plugins/launchpad/__init__.py:337
7120
6873
msgid "Propose the merge on staging."
7121
6874
msgstr ""
7122
6875
7123
6876
# help of 'message' option of 'lp-propose-merge' command
7124
#: bzrlib/plugins/launchpad/cmds.py:294
6877
#: bzrlib/plugins/launchpad/__init__.py:339
7125
6878
msgid "Commit message."
7126
6879
msgstr ""
7127
6880
7128
6881
# help of 'approve' option of 'lp-propose-merge' command
7129
#: bzrlib/plugins/launchpad/cmds.py:296
7130
msgid ""
7131
"Mark the proposal as approved immediately, setting the approved revision to "
7132
"tip."
7133
msgstr ""
7134
7135
# help of 'fixes' option of 'lp-propose-merge' command
7136
#: bzrlib/plugins/launchpad/cmds.py:298
7137
msgid "The bug this proposal fixes."
6882
#: bzrlib/plugins/launchpad/__init__.py:341
6883
msgid "Mark the proposal as approved immediately."
7138
6884
msgstr ""
7139
6885
7140
6886
# help of 'review' option of 'lp-propose-merge' command
7141
#: bzrlib/plugins/launchpad/cmds.py:300
6887
#: bzrlib/plugins/launchpad/__init__.py:343
7142
6888
msgid "Requested reviewer and optional type."
7143
6889
msgstr ""
7144
6890
7145
#: bzrlib/plugins/launchpad/cmds.py:335
6891
#: bzrlib/plugins/launchpad/__init__.py:380
7146
6892
msgid "Find the proposal to merge this revision."
7147
6893
msgstr ""
7148
6894
7149
#: bzrlib/plugins/launchpad/cmds.py:337
6895
#: bzrlib/plugins/launchpad/__init__.py:382
7150
6896
msgid ""
7151
6897
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7152
"This works only if the if the merged_revno was recorded for the merge\n"
7153
"proposal. The proposal(s) are opened in a web browser."
6898
"This works only if the selected branch was the merge proposal target, and\n"
6899
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6900
"are opened in a web browser."
7154
6901
msgstr ""
7155
6902
7156
#: bzrlib/plugins/launchpad/cmds.py:341
6903
#: bzrlib/plugins/launchpad/__init__.py:387
7157
6904
msgid ""
7158
"Only the revision specified is searched for. To find the mainline\n"
7159
"revision that merged it into mainline, use the \"mainline\" revision spec."
6905
"Any revision involved in the merge may be specified-- the revision in\n"
6906
"which the merge was performed, or one of the revisions that was merged."
7160
6907
msgstr ""
7161
6908
7162
#: bzrlib/plugins/launchpad/cmds.py:344
6909
#: bzrlib/plugins/launchpad/__init__.py:390
7163
6910
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7164
6911
msgstr ""
7165
6912
7166
#: bzrlib/plugins/launchpad/cmds.py:346
7167
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
6913
#: bzrlib/plugins/launchpad/__init__.py:392
6914
msgid " bzr lp-find-proposal -r annotate:README:1"
7168
6915
msgstr ""
7169
6916
7170
#: bzrlib/plugins/launchpad/cmds.py:365
6917
#: bzrlib/plugins/launchpad/__init__.py:407
7171
6918
msgid "No review found."
7172
6919
msgstr ""
7173
6920
7174
#: bzrlib/plugins/launchpad/cmds.py:366
6921
#: bzrlib/plugins/launchpad/__init__.py:408
7175
6922
#, python-format
7176
6923
msgid "%d proposals(s) found."
7177
6924
msgstr ""
7178
6925
7179
#: bzrlib/plugins/launchpad/cmds.py:378
6926
#: bzrlib/plugins/launchpad/__init__.py:418
6927
msgid "Finding revision-id"
6928
msgstr ""
6929
6930
#: bzrlib/plugins/launchpad/__init__.py:425
6931
msgid "Finding merge"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/launchpad/__init__.py:430
6935
msgid "Finding revno"
6936
msgstr ""
6937
6938
#: bzrlib/plugins/launchpad/__init__.py:435
6939
msgid "Finding Launchpad branch"
6940
msgstr ""
6941
6942
#: bzrlib/plugins/launchpad/__init__.py:438
7180
6943
msgid "Finding proposals"
7181
6944
msgstr ""
7182
6945
7183
#: bzrlib/plugins/launchpad/lp_api.py:228
7184
#: bzrlib/plugins/launchpad/lp_api.py:233
6946
#: bzrlib/plugins/launchpad/account.py:64
6947
msgid "Setting ssh/sftp usernames for launchpad.net."
6948
msgstr ""
6949
6950
#: bzrlib/plugins/launchpad/lp_api.py:239
6951
#: bzrlib/plugins/launchpad/lp_api.py:244
7185
6952
#, python-format
7186
6953
msgid "%s is not registered on Launchpad"
7187
6954
msgstr ""
7188
6955
7189
#: bzrlib/plugins/launchpad/lp_api.py:243
6956
#: bzrlib/plugins/launchpad/lp_api.py:254
7190
6957
#, python-format
7191
6958
msgid "%s has no development focus."
7192
6959
msgstr ""
7193
6960
7194
#: bzrlib/plugins/launchpad/lp_api.py:248
6961
#: bzrlib/plugins/launchpad/lp_api.py:259
7195
6962
#, python-format
7196
6963
msgid "development focus %s has no branch."
7197
6964
msgstr ""
7198
6965
7199
#: bzrlib/plugins/launchpad/lp_api.py:253
6966
#: bzrlib/plugins/launchpad/lp_api.py:264
7200
6967
#, python-format
7201
6968
msgid "source package %s has no branch."
7202
6969
msgstr ""
7203
6970
7204
#: bzrlib/plugins/launchpad/lp_api.py:257
6971
#: bzrlib/plugins/launchpad/lp_api.py:268
7205
6972
#, python-format
7206
6973
msgid "%s has no associated product or source package."
7207
6974
msgstr ""
7208
6975
7209
#: bzrlib/plugins/launchpad/lp_api.py:269
6976
#: bzrlib/plugins/launchpad/lp_api.py:280
7210
6977
#, python-format
7211
6978
msgid "%s is already up-to-date."
7212
6979
msgstr ""
7213
6980
7214
#: bzrlib/plugins/launchpad/lp_api.py:276
6981
#: bzrlib/plugins/launchpad/lp_api.py:287
7215
6982
#, python-format
7216
6983
msgid "Pushing to %s"
7217
6984
msgstr ""
7218
6985
7219
#: bzrlib/plugins/launchpad/lp_directory.py:170
6986
#: bzrlib/plugins/launchpad/lp_directory.py:169
7220
6987
msgid ""
7221
6988
"resolution for {0}\n"
7222
6989
" local: {1}\n"
7223
6990
" remote: {2}"
7224
6991
msgstr ""
7225
6992
7226
#: bzrlib/plugins/launchpad/lp_propose.py:159
6993
#: bzrlib/plugins/launchpad/lp_propose.py:147
7227
6994
#, python-format
7228
6995
msgid "There is already a branch merge proposal: %s"
7229
6996
msgstr ""
7230
6997
7231
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6998
#: bzrlib/plugins/weave_fmt/bzrdir.py:226
7232
6999
msgid "pb parameter to convert() is deprecated"
7233
7000
msgstr ""
7234
7001
7235
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7002
#: bzrlib/plugins/weave_fmt/bzrdir.py:229
7236
7003
msgid "starting upgrade from format 4 to 5"
7237
7004
msgstr ""
7238
7005
7239
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7006
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7240
7007
msgid "note: upgrade may be faster if all store files are ungzipped first"
7241
7008
msgstr ""
7242
7009
7243
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7010
#: bzrlib/plugins/weave_fmt/bzrdir.py:268
7244
7011
msgid "converting revision"
7245
7012
msgstr ""
7246
7013
7247
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7014
#: bzrlib/plugins/weave_fmt/bzrdir.py:273
7248
7015
msgid "upgraded to weaves:"
7249
7016
msgstr ""
7250
7017
7251
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7018
#: bzrlib/plugins/weave_fmt/bzrdir.py:274
7252
7019
#, python-format
7253
7020
msgid "%6d revisions and inventories"
7254
7021
msgstr ""
7255
7022
7256
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7023
#: bzrlib/plugins/weave_fmt/bzrdir.py:276
7257
7024
#, python-format
7258
7025
msgid "%6d revisions not present"
7259
7026
msgstr ""
7260
7027
7261
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7028
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7262
7029
#, python-format
7263
7030
msgid "%6d texts"
7264
7031
msgstr ""
7265
7032
7266
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7033
#: bzrlib/plugins/weave_fmt/bzrdir.py:314
7267
7034
msgid "writing weave"
7268
7035
msgstr ""
7269
7036
7270
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7271
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7037
#: bzrlib/plugins/weave_fmt/bzrdir.py:318
7038
#: bzrlib/plugins/weave_fmt/bzrdir.py:320
7272
7039
msgid "inventory"
7273
7040
msgstr ""
7274
7041
7275
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7042
#: bzrlib/plugins/weave_fmt/bzrdir.py:337
7276
7043
msgid "write revision"
7277
7044
msgstr ""
7278
7045
7279
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7046
#: bzrlib/plugins/weave_fmt/bzrdir.py:351
7280
7047
msgid "loading revision"
7281
7048
msgstr ""
7282
7049
7283
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7050
#: bzrlib/plugins/weave_fmt/bzrdir.py:356
7284
7051
#, python-format
7285
7052
msgid "revision {%s} not present in branch; will be converted as a ghost"
7286
7053
msgstr ""
7287
7054
7288
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7055
#: bzrlib/plugins/weave_fmt/bzrdir.py:496
7289
7056
msgid "starting upgrade from format 5 to 6"
7290
7057
msgstr ""
7291
7058
7292
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7059
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7293
7060
#, python-format
7294
7061
msgid "adding prefixes to %s"
7295
7062
msgstr ""
7296
7063
7297
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7064
#: bzrlib/plugins/weave_fmt/bzrdir.py:546
7298
7065
msgid "starting upgrade from format 6 to metadir"
7299
7066
msgstr ""
7300
7067
7301
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7068
#: bzrlib/plugins/weave_fmt/bzrdir.py:554
7302
7069
msgid "Removing ancestry.weave"
7303
7070
msgstr ""
7304
7071
7305
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7072
#: bzrlib/plugins/weave_fmt/bzrdir.py:559
7306
7073
msgid "Finding branch files"
7307
7074
msgstr ""
7308
7075
7309
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7076
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7310
7077
msgid "Upgrading repository"
7311
7078
msgstr ""
7312
7079
7313
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7080
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7314
7081
msgid "Upgrading branch"
7315
7082
msgstr ""
7316
7083
7317
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7084
#: bzrlib/plugins/weave_fmt/bzrdir.py:602
7318
7085
msgid "No working tree."
7319
7086
msgstr ""
7320
7087
7321
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7088
#: bzrlib/plugins/weave_fmt/bzrdir.py:609
7322
7089
msgid "Upgrading working tree"
7323
7090
msgstr ""
7324
7091
7092
#: bzrlib/plugins/weave_fmt/bzrdir.py:630
7093
#, python-format
7094
msgid "Make %s lock"
7095
msgstr ""
7096
7325
7097
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7326
7098
#, python-format
7327
msgid "Make %s lock"
7328
msgstr ""
7329
7330
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7331
#, python-format
7332
7099
msgid "Moving %s"
7333
7100
msgstr ""
7334
7101
7335
#: bzrlib/push.py:56
7102
#: bzrlib/push.py:54
7336
7103
msgid "Created new branch."
7337
7104
msgstr ""
7338
7105
7339
#: bzrlib/push.py:97
7106
#: bzrlib/push.py:96
7340
7107
#, python-format
7341
7108
msgid ""
7342
7109
"Target directory %s already contains a .bzr directory, but it is not valid."
7343
7110
msgstr ""
7344
7111
7345
#: bzrlib/push.py:101
7112
#: bzrlib/push.py:99
7346
7113
#, python-format
7347
7114
msgid ""
7348
7115
"Target directory %s already exists, but does not have a .bzr directory. "
7349
7116
"Supply --use-existing-dir to push there anyway."
7350
7117
msgstr ""
7351
7118
7352
#: bzrlib/push.py:122
7119
#: bzrlib/push.py:120
7353
7120
#, python-format
7354
7121
msgid "Too many redirections trying to make %s."
7355
7122
msgstr ""
7356
7123
7357
#: bzrlib/push.py:148
7124
#: bzrlib/push.py:145
7358
7125
msgid ""
7359
7126
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7360
7127
"information."
7361
7128
msgstr ""
7362
7129
7363
#: bzrlib/push.py:152
7130
#: bzrlib/push.py:149
7364
7131
#, python-format
7365
7132
msgid ""
7366
7133
"It is not possible to losslessly push to %s. You may want to use dpush "
7367
7134
"instead."
7368
7135
msgstr ""
7369
7136
7370
#: bzrlib/push.py:158
7137
#: bzrlib/push.py:155
7371
7138
#, python-format
7372
7139
msgid ""
7373
7140
"At %s you have a valid .bzr control directory, but not a branch or "
7375
7142
"directory out of the way and try again."
7376
7143
msgstr ""
7377
7144
7378
#: bzrlib/reconcile.py:97
7145
#: bzrlib/reconcile.py:96
7379
7146
#, python-format
7380
7147
msgid "Reconciling branch %s"
7381
7148
msgstr ""
7382
7149
7383
#: bzrlib/reconcile.py:103
7150
#: bzrlib/reconcile.py:102
7384
7151
#, python-format
7385
7152
msgid "Reconciling repository %s"
7386
7153
msgstr ""
7387
7154
7388
#: bzrlib/reconcile.py:105
7155
#: bzrlib/reconcile.py:104
7389
7156
msgid "Reconciling repository"
7390
7157
msgstr ""
7391
7158
7392
#: bzrlib/reconcile.py:111
7159
#: bzrlib/reconcile.py:110
7393
7160
#, python-format
7394
7161
msgid "%s cannot canonicalize CHKs."
7395
7162
msgstr ""
7396
7163
7397
#: bzrlib/reconcile.py:119
7164
#: bzrlib/reconcile.py:118
7398
7165
msgid "Reconcile aborted: revision index has inconsistent parents."
7399
7166
msgstr ""
7400
7167
7401
#: bzrlib/reconcile.py:121
7168
#: bzrlib/reconcile.py:120
7402
7169
msgid "Run \"bzr check\" for more details."
7403
7170
msgstr ""
7404
7171
7405
#: bzrlib/reconcile.py:123
7172
#: bzrlib/reconcile.py:122
7406
7173
msgid "Reconciliation complete."
7407
7174
msgstr ""
7408
7175
7409
#: bzrlib/reconcile.py:166
7176
#: bzrlib/reconcile.py:165
7410
7177
msgid "Fixing last revision info {0} => {1}"
7411
7178
msgstr ""
7412
7179
7413
#: bzrlib/reconcile.py:173
7180
#: bzrlib/reconcile.py:172
7414
7181
msgid "revision_history ok."
7415
7182
msgstr ""
7416
7183
7417
#: bzrlib/reconcile.py:234
7184
#: bzrlib/reconcile.py:233
7418
7185
msgid "Reading inventory data"
7419
7186
msgstr ""
7420
7187
7421
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7188
#: bzrlib/reconcile.py:253 bzrlib/reconcile.py:383
7422
7189
msgid "Inventory ok."
7423
7190
msgstr ""
7424
7191
7425
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7192
#: bzrlib/reconcile.py:255 bzrlib/reconcile.py:385
7426
7193
msgid "Backing up inventory"
7427
7194
msgstr ""
7428
7195
7429
#: bzrlib/reconcile.py:258
7196
#: bzrlib/reconcile.py:257
7430
7197
msgid "Backup inventory created."
7431
7198
msgstr ""
7432
7199
7433
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7200
#: bzrlib/reconcile.py:273 bzrlib/reconcile.py:404
7434
7201
msgid "Writing weave"
7435
7202
msgstr ""
7436
7203
7437
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7204
#: bzrlib/reconcile.py:276 bzrlib/reconcile.py:407
7438
7205
msgid "Inventory regenerated."
7439
7206
msgstr ""
7440
7207
7441
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7208
#: bzrlib/reconcile.py:370 bzrlib/reconcile.py:372 bzrlib/reconcile.py:375
7442
7209
msgid "Reading indexes"
7443
7210
msgstr ""
7444
7211
7445
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7212
#: bzrlib/reconcile.py:379 bzrlib/reconcile.py:381
7446
7213
msgid "Checking unused inventories"
7447
7214
msgstr ""
7448
7215
7449
#: bzrlib/reconcile.py:388
7216
#: bzrlib/reconcile.py:387
7450
7217
msgid "Backup Inventory created"
7451
7218
msgstr ""
7452
7219
7453
#: bzrlib/reconcile.py:446
7220
#: bzrlib/reconcile.py:445
7454
7221
msgid "Fixing text parents"
7455
7222
msgstr ""
7456
7223
7457
#: bzrlib/reconfigure.py:54
7224
#: bzrlib/reconfigure.py:52
7458
7225
msgid "{0} is now stacked on {1}\n"
7459
7226
msgstr ""
7460
7227
7461
#: bzrlib/reconfigure.py:69
7228
#: bzrlib/reconfigure.py:67
7462
7229
#, python-format
7463
7230
msgid "%s is now not stacked\n"
7464
7231
msgstr ""
7465
7232
7466
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7233
#: bzrlib/remote.py:1134 bzrlib/repository.py:287
7467
7234
#, python-format
7468
7235
msgid "bzr: ERROR (ignored): %s"
7469
7236
msgstr ""
7470
7237
7471
#: bzrlib/remote.py:2534
7238
#: bzrlib/remote.py:2217
7472
7239
msgid "Copying repository content as tarball..."
7473
7240
msgstr ""
7474
7241
7475
#: bzrlib/rename_map.py:69
7242
#: bzrlib/rename_map.py:68
7476
7243
msgid "Calculating hashes"
7477
7244
msgstr ""
7478
7245
7479
#: bzrlib/rename_map.py:107
7246
#: bzrlib/rename_map.py:106
7480
7247
msgid "Determining hash hits"
7481
7248
msgstr ""
7482
7249
7483
#: bzrlib/rename_map.py:242
7250
#: bzrlib/rename_map.py:241
7484
7251
msgid "{0} => {1}"
7485
7252
msgstr ""
7486
7253
7487
#: bzrlib/repository.py:1738
7254
#: bzrlib/repository.py:1781
7488
7255
msgid "Moving repository to repository.backup"
7489
7256
msgstr ""
7490
7257
7491
#: bzrlib/repository.py:1745
7258
#: bzrlib/repository.py:1788
7492
7259
msgid "Creating new repository"
7493
7260
msgstr ""
7494
7261
7495
#: bzrlib/repository.py:1750
7262
#: bzrlib/repository.py:1793
7496
7263
msgid "Copying content"
7497
7264
msgstr ""
7498
7265
7499
#: bzrlib/repository.py:1754
7266
#: bzrlib/repository.py:1797
7500
7267
msgid "Deleting old repository content"
7501
7268
msgstr ""
7502
7269
7503
#: bzrlib/repository.py:1756
7270
#: bzrlib/repository.py:1799
7504
7271
msgid "repository converted"
7505
7272
msgstr ""
7506
7273
7507
#: bzrlib/revisionspec.py:903
7274
#: bzrlib/revisionspec.py:904
7508
7275
msgid "Using {0} {1}"
7509
7276
msgstr ""
7510
7277
7511
#: bzrlib/send.py:59
7278
#: bzrlib/send.py:57
7512
7279
#, python-format
7513
7280
msgid "Mail client \"%s\" does not support specifying body"
7514
7281
msgstr ""
7515
7282
7516
#: bzrlib/send.py:63
7283
#: bzrlib/send.py:61
7517
7284
msgid "--remember requires a branch to be specified."
7518
7285
msgstr ""
7519
7286
7287
#: bzrlib/send.py:75
7288
msgid "No submit branch known or specified"
7289
msgstr ""
7290
7520
7291
#: bzrlib/send.py:78
7521
msgid "No submit branch known or specified"
7522
msgstr ""
7523
7524
#: bzrlib/send.py:81
7525
7292
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7526
7293
msgstr ""
7527
7294
7528
#: bzrlib/send.py:99
7295
#: bzrlib/send.py:95
7529
7296
#, python-format
7530
7297
msgid "No such send format '%s'."
7531
7298
msgstr ""
7532
7299
7533
#: bzrlib/send.py:115
7300
#: bzrlib/send.py:112
7534
7301
msgid "bzr send takes at most two one revision identifiers"
7535
7302
msgstr ""
7536
7303
7537
#: bzrlib/send.py:128
7304
#: bzrlib/send.py:125
7538
7305
msgid "No revisions to submit."
7539
7306
msgstr ""
7540
7307
7541
#: bzrlib/send.py:140
7308
#: bzrlib/send.py:136
7542
7309
msgid ""
7543
7310
"- not supported for merge directives that use more than one output file."
7544
7311
msgstr ""
7545
7312
7546
#: bzrlib/send.py:186
7313
#: bzrlib/send.py:178
7547
7314
msgid "Format 0.9 does not permit bundle with no patch"
7548
7315
msgstr ""
7549
7316
7317
#: bzrlib/shelf_ui.py:45
7318
#, python-format
7319
msgid "Shelve adding file \"%(path)s\"?"
7320
msgstr ""
7321
7550
7322
#: bzrlib/shelf_ui.py:46
7551
#, python-format
7552
msgid "Shelve adding file \"%(path)s\"?"
7323
msgid "Shelve binary changes?"
7553
7324
msgstr ""
7554
7325
7555
7326
#: bzrlib/shelf_ui.py:47
7556
msgid "Shelve binary changes?"
7557
msgstr ""
7558
7559
#: bzrlib/shelf_ui.py:48
7560
7327
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7561
7328
msgstr ""
7562
7329
7330
#: bzrlib/shelf_ui.py:49
7331
#, python-format
7332
msgid "Shelve removing file \"%(path)s\"?"
7333
msgstr ""
7334
7563
7335
#: bzrlib/shelf_ui.py:50
7564
7336
#, python-format
7565
msgid "Shelve removing file \"%(path)s\"?"
7337
msgid "Shelve %d change(s)?"
7566
7338
msgstr ""
7567
7339
7568
7340
#: bzrlib/shelf_ui.py:51
7569
#, python-format
7570
msgid "Shelve %d change(s)?"
7341
msgid "Shelve?"
7571
7342
msgstr ""
7572
7343
7573
7344
#: bzrlib/shelf_ui.py:52
7574
msgid "Shelve?"
7575
msgstr ""
7576
7577
#: bzrlib/shelf_ui.py:53
7578
7345
#, python-format
7579
7346
msgid ""
7580
7347
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7581
7348
msgstr ""
7582
7349
7583
#: bzrlib/shelf_ui.py:55
7350
#: bzrlib/shelf_ui.py:54
7584
7351
#, python-format
7585
7352
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7586
7353
msgstr ""
7587
7354
7588
#: bzrlib/shelf_ui.py:70
7355
#: bzrlib/shelf_ui.py:69
7589
7356
#, python-format
7590
7357
msgid "Changes shelved with id \"%d\"."
7591
7358
msgstr ""
7592
7359
7593
#: bzrlib/shelf_ui.py:74
7360
#: bzrlib/shelf_ui.py:73
7594
7361
msgid "Selected changes destroyed."
7595
7362
msgstr ""
7596
7363
7597
#: bzrlib/shelf_ui.py:78
7364
#: bzrlib/shelf_ui.py:77
7598
7365
msgid "Selected changes:"
7599
7366
msgstr ""
7600
7367
7368
#: bzrlib/shelf_ui.py:97
7369
#, python-format
7370
msgid "Delete file \"%(path)s\"?"
7371
msgstr ""
7372
7601
7373
#: bzrlib/shelf_ui.py:98
7602
#, python-format
7603
msgid "Delete file \"%(path)s\"?"
7374
msgid "Apply binary changes?"
7604
7375
msgstr ""
7605
7376
7606
7377
#: bzrlib/shelf_ui.py:99
7607
msgid "Apply binary changes?"
7608
msgstr ""
7609
7610
#: bzrlib/shelf_ui.py:100
7611
7378
#, python-format
7612
7379
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7613
7380
msgstr ""
7614
7381
7382
#: bzrlib/shelf_ui.py:101
7383
#, python-format
7384
msgid "Add file \"%(path)s\"?"
7385
msgstr ""
7386
7615
7387
#: bzrlib/shelf_ui.py:102
7616
7388
#, python-format
7617
msgid "Add file \"%(path)s\"?"
7389
msgid "Apply %d change(s)?"
7618
7390
msgstr ""
7619
7391
7620
7392
#: bzrlib/shelf_ui.py:103
7621
#, python-format
7622
msgid "Apply %d change(s)?"
7393
msgid "Apply change?"
7623
7394
msgstr ""
7624
7395
7625
7396
#: bzrlib/shelf_ui.py:104
7626
msgid "Apply change?"
7627
msgstr ""
7628
7629
#: bzrlib/shelf_ui.py:105
7630
7397
#, python-format
7631
7398
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7632
7399
msgstr ""
7633
7400
7634
#: bzrlib/shelf_ui.py:107
7401
#: bzrlib/shelf_ui.py:106
7635
7402
#, python-format
7636
7403
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7637
7404
msgstr ""
7638
7405
7639
#: bzrlib/shelf_ui.py:402
7406
#: bzrlib/shelf_ui.py:401
7640
7407
msgid "No changes are shelved."
7641
7408
msgstr ""
7642
7409
7643
#: bzrlib/shelf_ui.py:460
7410
#: bzrlib/shelf_ui.py:459
7644
7411
#, python-format
7645
7412
msgid "Using changes with id \"%d\"."
7646
7413
msgstr ""
7647
7414
7648
#: bzrlib/shelf_ui.py:464
7415
#: bzrlib/shelf_ui.py:463
7649
7416
#, python-format
7650
7417
msgid "Message: %s"
7651
7418
msgstr ""
7652
7419
7653
#: bzrlib/shelf_ui.py:476
7420
#: bzrlib/shelf_ui.py:475
7654
7421
#, python-format
7655
7422
msgid "Deleted changes with id \"%d\"."
7656
7423
msgstr ""
7657
7424
7658
#: bzrlib/smart/medium.py:714
7425
#: bzrlib/smart/medium.py:712
7659
7426
msgid "HPSS calls: {0} ({1} vfs) {2}"
7660
7427
msgstr ""
7661
7428
7662
#: bzrlib/smart/ping.py:32
7663
msgid "Pings a Bazaar smart server."
7664
msgstr ""
7665
7666
#: bzrlib/smart/ping.py:34
7667
msgid ""
7668
"This command sends a 'hello' request to the given location using the bzr\n"
7669
"smart protocol, and reports the response."
7670
msgstr ""
7671
7672
#: bzrlib/smart/server.py:169
7429
#: bzrlib/smart/server.py:167
7673
7430
msgid "Requested to stop gracefully"
7674
7431
msgstr ""
7675
7432
7676
#: bzrlib/smart/server.py:179
7433
#: bzrlib/smart/server.py:177
7677
7434
#, python-format
7678
7435
msgid "Waiting for %d client(s) to finish"
7679
7436
msgstr ""
7680
7437
7681
#: bzrlib/smart/server.py:185
7438
#: bzrlib/smart/server.py:183
7682
7439
#, python-format
7683
7440
msgid "Still waiting for %d client(s) to finish"
7684
7441
msgstr ""
7685
7442
7686
#: bzrlib/smart/server.py:219
7443
#: bzrlib/smart/server.py:217
7687
7444
#, python-format
7688
7445
msgid "listening socket error: %s"
7689
7446
msgstr ""
7690
7447
7691
#: bzrlib/smart/server.py:452
7448
#: bzrlib/smart/server.py:450
7692
7449
#, python-format
7693
7450
msgid "listening on port: %s"
7694
7451
msgstr ""
7695
7452
7696
#: bzrlib/switch.py:84
7453
#: bzrlib/switch.py:67
7697
7454
msgid "Pending merges must be committed or reverted before using switch."
7698
7455
msgstr ""
7699
7456
7700
#: bzrlib/switch.py:111
7457
#: bzrlib/switch.py:94
7701
7458
msgid ""
7702
7459
"Cannot switch as local commits found in the checkout. Commit these to the "
7703
7460
"bound branch or use --force to throw them away."
7704
7461
msgstr ""
7705
7462
7706
#: bzrlib/switch.py:116
7463
#: bzrlib/switch.py:99
7707
7464
#, python-format
7708
7465
msgid ""
7709
7466
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7710
7467
"anyway, use --force."
7711
7468
msgstr ""
7712
7469
7713
#: bzrlib/switch.py:140
7470
#: bzrlib/switch.py:108
7714
7471
msgid "Cannot switch a branch, only a checkout."
7715
7472
msgstr ""
7716
7473
7717
#: bzrlib/switch.py:183
7474
#: bzrlib/switch.py:144
7718
7475
#, python-format
7719
7476
msgid "Tree is up to date at revision %d."
7720
7477
msgstr ""
7721
7478
7722
#: bzrlib/switch.py:190
7479
#: bzrlib/switch.py:150
7723
7480
#, python-format
7724
7481
msgid "Updated to revision %d."
7725
7482
msgstr ""
7736
7493
msgid "adding file"
7737
7494
msgstr ""
7738
7495
7739
#: bzrlib/transform.py:2598
7496
#: bzrlib/transform.py:2580
7740
7497
msgid "Building tree"
7741
7498
msgstr ""
7742
7499
7743
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7500
#: bzrlib/transform.py:2670 bzrlib/transform.py:2697
7744
7501
msgid "Adding file contents"
7745
7502
msgstr ""
7746
7503
7748
7505
msgid "Resolution pass"
7749
7506
msgstr ""
7750
7507
7751
#: bzrlib/transport/ftp/_gssapi.py:88
7508
#: bzrlib/transport/ftp/_gssapi.py:86
7752
7509
#, python-format
7753
7510
msgid "Authenticated as %s"
7754
7511
msgstr ""
7755
7512
7756
#: bzrlib/tree.py:647
7513
#: bzrlib/tree.py:632
7757
7514
msgid "*** {0} content-filter: {1} => {2!r}"
7758
7515
msgstr ""
7759
7516
7760
#: bzrlib/upgrade.py:77
7517
#: bzrlib/upgrade.py:76
7761
7518
#, python-format
7762
7519
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7763
7520
msgstr ""
7764
7521
7765
#: bzrlib/upgrade.py:100
7522
#: bzrlib/upgrade.py:99
7766
7523
#, python-format
7767
7524
msgid "cannot upgrade from bzrdir format %s"
7768
7525
msgstr ""
7769
7526
7770
#: bzrlib/upgrade.py:103
7527
#: bzrlib/upgrade.py:102
7771
7528
#, python-format
7772
7529
msgid "starting upgrade of %s"
7773
7530
msgstr ""
7774
7531
7775
#: bzrlib/upgrade.py:110
7532
#: bzrlib/upgrade.py:109
7776
7533
msgid "finished"
7777
7534
msgstr ""
7778
7535
7779
#: bzrlib/upgrade.py:120
7536
#: bzrlib/upgrade.py:119
7780
7537
msgid "Deleting backup.bzr"
7781
7538
msgstr ""
7782
7539
7783
#: bzrlib/upgrade.py:151
7540
#: bzrlib/upgrade.py:150
7784
7541
msgid ""
7785
7542
"\n"
7786
7543
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7787
7544
msgstr ""
7788
7545
7789
#: bzrlib/upgrade.py:208
7546
#: bzrlib/upgrade.py:207
7790
7547
#, python-format
7791
7548
msgid "Found %d dependent branches - upgrading ..."
7792
7549
msgstr ""
7793
7550
7794
#: bzrlib/upgrade.py:276
7551
#: bzrlib/upgrade.py:275
7795
7552
msgid "Upgrading bzrdirs"
7796
7553
msgstr ""
7797
7554
7555
#: bzrlib/upgrade.py:281
7556
#, python-format
7557
msgid "Upgrading %s"
7558
msgstr ""
7559
7798
7560
#: bzrlib/upgrade.py:282
7799
#, python-format
7800
msgid "Upgrading %s"
7801
msgstr ""
7802
7803
#: bzrlib/upgrade.py:283
7804
7561
msgid "Upgrading {0} {1} ..."
7805
7562
msgstr ""
7806
7563
7807
#: bzrlib/upgrade.py:301
7564
#: bzrlib/upgrade.py:300
7808
7565
msgid "Removing backup ..."
7809
7566
msgstr ""
7810
7567
7811
#: bzrlib/upgrade.py:305
7568
#: bzrlib/upgrade.py:304
7812
7569
msgid "failed to clean-up {0}: {1}"
7813
7570
msgstr ""
7814
7571
7815
#: bzrlib/vf_repository.py:1091
7572
#: bzrlib/vf_repository.py:1093
7816
7573
msgid "inventories"
7817
7574
msgstr ""
7818
7575
7819
#: bzrlib/vf_repository.py:1117
7576
#: bzrlib/vf_repository.py:1119
7820
7577
msgid "texts"
7821
7578
msgstr ""
7822
7579
7823
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7580
#: bzrlib/vf_repository.py:1624 bzrlib/vf_repository.py:1633
7824
7581
msgid "Calculating text parents"
7825
7582
msgstr ""
7826
7583
7827
#: bzrlib/vf_repository.py:1707
7584
#: bzrlib/vf_repository.py:1709
7828
7585
msgid "Fetch texts"
7829
7586
msgstr ""
7830
7587
7831
#: bzrlib/vf_repository.py:2536
7588
#: bzrlib/vf_repository.py:2538
7832
7589
msgid "loading text store"
7833
7590
msgstr ""
7834
7591
7835
#: bzrlib/vf_repository.py:2542
7592
#: bzrlib/vf_repository.py:2544
7836
7593
msgid "checking text graph"
7837
7594
msgstr ""
7838
7595
7841
7598
msgid "Transferring revisions"
7842
7599
msgstr ""
7843
7600
7844
#: bzrlib/win32utils.py:146
7601
#: bzrlib/win32utils.py:137
7845
7602
msgid "Failed to GetProcessMemoryInfo()"
7846
7603
msgstr ""
7847
7604
7848
#: bzrlib/win32utils.py:167
7605
#: bzrlib/win32utils.py:158
7849
7606
msgid "Cannot debug memory on win32 without ctypes or win32process"
7850
7607
msgstr ""
7851
7608
7852
#: bzrlib/win32utils.py:172
7609
#: bzrlib/win32utils.py:163
7853
7610
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7854
7611
msgstr ""
7855
7612
7856
#: bzrlib/win32utils.py:180
7613
#: bzrlib/win32utils.py:171
7857
7614
#, python-format
7858
7615
msgid "WorkingSize %8d KiB"
7859
7616
msgstr ""
7860
7617
7861
#: bzrlib/win32utils.py:181
7618
#: bzrlib/win32utils.py:172
7862
7619
#, python-format
7863
7620
msgid "PeakWorking %8d KiB"
7864
7621
msgstr ""
7865
7622
7866
#: bzrlib/win32utils.py:182
7623
#: bzrlib/win32utils.py:173
7867
7624
#, python-format
7868
7625
msgid "PagefileUsage %8d KiB"
7869
7626
msgstr ""
7870
7627
7871
#: bzrlib/win32utils.py:183
7628
#: bzrlib/win32utils.py:174
7872
7629
#, python-format
7873
7630
msgid "PeakPagefileUsage %8d KiB"
7874
7631
msgstr ""
7875
7632
7876
#: bzrlib/win32utils.py:185
7633
#: bzrlib/win32utils.py:176
7877
7634
#, python-format
7878
7635
msgid "PrivateUsage %8d KiB"
7879
7636
msgstr ""
7880
7637
7881
#: bzrlib/win32utils.py:186
7638
#: bzrlib/win32utils.py:177
7882
7639
#, python-format
7883
7640
msgid "PageFaultCount %8d"
7884
7641
msgstr ""
7885
7642
7886
#: bzrlib/workingtree.py:1516
7643
#: bzrlib/workingtree.py:1467
7887
7644
msgid "Rerun update after fixing the conflicts."
7888
7645
msgstr ""
7889
7646
7893
7650
7894
7651
#: dummy/help_topics/basic/detail.txt:1
7895
7652
msgid ""
7896
"Bazaar 2.6.0 -- a free distributed version-control tool\n"
7653
"Bazaar 2.5b4 -- a free distributed version-control tool\n"
7897
7654
"http://bazaar.canonical.com/"
7898
7655
msgstr ""
7899
7656
7964
7721
msgstr ""
7965
7722
7966
7723
#: dummy/help_topics/branches/detail.txt:15
7967
#: dummy/help_topics/checkouts/detail.txt:66
7968
#: dummy/help_topics/repositories/detail.txt:36
7969
7724
msgid "Related commands::"
7970
7725
msgstr ""
7971
7726
8211
7966
msgid "How to fix diverged branches"
8212
7967
msgstr ""
8213
7968
7969
#: dummy/help_topics/env-variables/detail.txt:1
7970
msgid "Environment Variables"
7971
msgstr ""
7972
7973
#: dummy/help_topics/env-variables/detail.txt:3
7974
msgid ""
7975
"=================== "
7976
"===========================================================\n"
7977
"BZRPATH Path where bzr is to look for shell plugin external\n"
7978
" commands.\n"
7979
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7980
"EMAIL E-Mail address of the user.\n"
7981
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7982
"EDITOR Editor for editing commit messages.\n"
7983
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7984
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7985
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7986
"BZR_PLUGIN_PATH.\n"
7987
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7988
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7989
"and\n"
7990
" HOME.\n"
7991
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7992
"URLs).\n"
7993
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7994
"sshcorp,\n"
7995
" plink or lsh.\n"
7996
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7997
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7998
"BZR_COLUMNS Override implicit terminal width.\n"
7999
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8000
"(selftest)\n"
8001
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8002
"'text'.\n"
8003
"BZR_PDB Control whether to launch a debugger on error.\n"
8004
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8005
" breakin debugger.\n"
8006
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8007
"(instead\n"
8008
" of char-based).\n"
8009
"=================== "
8010
"===========================================================\n"
8011
msgstr ""
8012
8214
8013
#: dummy/help_topics/env-variables/summary.txt:1
8215
8014
msgid "Environment variable names and values"
8216
8015
msgstr ""
9210
9009
msgid " bzr commit --fixes <tracker>:<id>"
9211
9010
msgstr ""
9212
9011
9213
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9012
#: en/help_topics/bugs.txt:13
9214
9013
msgid "or::"
9215
9014
msgstr ""
9216
9015
9409
9208
"export Export current or past revision to a destination directory "
9410
9209
"or\n"
9411
9210
" archive.\n"
9412
"grep Print lines matching PATTERN for specified files and\n"
9413
" revisions. [grep]\n"
9414
9211
"help Show help on a command or other topic.\n"
9415
9212
"ignore Ignore specified files or patterns.\n"
9416
9213
"ignored List ignored files and the patterns that matched them.\n"
9434
9231
"mv Move or rename a file.\n"
9435
9232
"nick Print or set the branch nickname.\n"
9436
9233
"pack Compress the data within a repository.\n"
9437
"ping Pings a Bazaar smart server.\n"
9438
9234
"plugins List the installed plugins.\n"
9439
9235
"pull Turn this branch into a mirror of another branch.\n"
9440
9236
"push Update a mirror of this branch.\n"
9447
9243
"remove-tree Remove the working tree from a given branch/checkout.\n"
9448
9244
"renames Show list of renamed files.\n"
9449
9245
"resolve Mark a conflict as resolved.\n"
9450
"revert Set files in the working tree back to the contents of a\n"
9451
" previous revision.\n"
9246
"revert Revert files to a previous revision.\n"
9452
9247
"revno Show current revision number.\n"
9453
9248
"root Show the tree root directory.\n"
9454
9249
"send Mail or create a merge-directive for submitting changes.\n"
10073
9868
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10074
9869
msgstr ""
10075
9870
10076
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9871
#: en/help_topics/configuration.txt:318
10077
9872
msgid ""
10078
9873
" $ bzr config mypush\n"
10079
9874
" lp:~vila/bzr/832013-expand-in-stack"
10104
9899
10105
9900
#: en/help_topics/configuration.txt:336
10106
9901
msgid ""
10107
"Another such option is ``branchname``, which refers to the name of a "
10108
"colocated\n"
10109
"branch. For non-colocated branches, it behaves like basename. It can be "
10110
"used\n"
10111
"like this::"
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:340
10115
msgid ""
10116
" [/home/vila/src/bzr/bugs]\n"
10117
" mypush = lp:~vila/bzr/{branchname}"
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:343
10121
msgid ""
10122
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10123
"get::"
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:345
10127
msgid ""
10128
" bzr config mypush\n"
10129
" lp:~vila/bzr/832013-expand-in-stack"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:348
10133
msgid ""
10134
9902
"When an option is local to a Section, it cannot be referred to from option\n"
10135
9903
"values in any other section from the same ``Store`` nor from any other\n"
10136
9904
"``Store``."
10137
9905
msgstr ""
10138
9906
10139
#: en/help_topics/configuration.txt:352
9907
#: en/help_topics/configuration.txt:340
10140
9908
msgid ""
10141
9909
"\n"
10142
9910
"The main configuration file, bazaar.conf\n"
10143
9911
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10144
9912
msgstr ""
10145
9913
10146
#: en/help_topics/configuration.txt:356
9914
#: en/help_topics/configuration.txt:344
10147
9915
msgid ""
10148
9916
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10149
9917
"The default section contains the default\n"
10151
9919
"overriden by providing a branch-specific section in ``locations.conf``."
10152
9920
msgstr ""
10153
9921
10154
#: en/help_topics/configuration.txt:361
9922
#: en/help_topics/configuration.txt:349
10155
9923
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10156
9924
msgstr ""
10157
9925
10158
#: en/help_topics/configuration.txt:363
9926
#: en/help_topics/configuration.txt:351
10159
9927
msgid ""
10160
9928
" [DEFAULT]\n"
10161
9929
" email = John Doe <jdoe@isp.com>\n"
10163
9931
" create_signatures = when-required"
10164
9932
msgstr ""
10165
9933
10166
#: en/help_topics/configuration.txt:368
9934
#: en/help_topics/configuration.txt:356
10167
9935
msgid ""
10168
9936
"\n"
10169
9937
"The branch location configuration file, locations.conf\n"
10170
9938
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10171
9939
msgstr ""
10172
9940
10173
#: en/help_topics/configuration.txt:372
9941
#: en/help_topics/configuration.txt:360
10174
9942
msgid ""
10175
9943
"``locations.conf`` allows one to specify overriding settings for\n"
10176
9944
"a specific branch. The format is almost identical to the default section in\n"
10180
9948
"for. The '?' and '*' wildcards are supported::"
10181
9949
msgstr ""
10182
9950
10183
#: en/help_topics/configuration.txt:378
9951
#: en/help_topics/configuration.txt:366
10184
9952
msgid ""
10185
9953
" [/home/jdoe/branches/nethack]\n"
10186
9954
" email = Nethack Admin <nethack@nethack.com>"
10187
9955
msgstr ""
10188
9956
10189
#: en/help_topics/configuration.txt:381
9957
#: en/help_topics/configuration.txt:369
10190
9958
msgid ""
10191
9959
" [http://hypothetical.site.com/branches/devel-branch]\n"
10192
9960
" create_signatures = always"
10193
9961
msgstr ""
10194
9962
10195
#: en/help_topics/configuration.txt:384
9963
#: en/help_topics/configuration.txt:372
10196
9964
msgid ""
10197
9965
"The authentication configuration file, authentication.conf\n"
10198
9966
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10199
9967
msgstr ""
10200
9968
10201
#: en/help_topics/configuration.txt:387
9969
#: en/help_topics/configuration.txt:375
10202
9970
msgid ""
10203
9971
"``authentication.conf`` allows one to specify credentials for\n"
10204
9972
"remote servers. This can be used for all the supported transports and any "
10206
9974
"of bzr that requires authentication (smtp for example)."
10207
9975
msgstr ""
10208
9976
10209
#: en/help_topics/configuration.txt:391
9977
#: en/help_topics/configuration.txt:379
10210
9978
msgid ""
10211
9979
"The syntax of the file obeys the same rules as the others except for the\n"
10212
9980
"option policies which don't apply."
10213
9981
msgstr ""
10214
9982
10215
#: en/help_topics/configuration.txt:394
9983
#: en/help_topics/configuration.txt:382
10216
9984
msgid ""
10217
9985
"For more information on the possible uses of the authentication "
10218
9986
"configuration\n"
10219
9987
"file see :doc:`authentication-help`."
10220
9988
msgstr ""
10221
9989
10222
#: en/help_topics/configuration.txt:397
9990
#: en/help_topics/configuration.txt:385
10223
9991
msgid ""
10224
9992
"\n"
10225
9993
"Common options\n"
10226
9994
"--------------"
10227
9995
msgstr ""
10228
9996
10229
#: en/help_topics/configuration.txt:401
9997
#: en/help_topics/configuration.txt:389
10230
9998
msgid ""
10231
9999
"debug_flags\n"
10232
10000
"~~~~~~~~~~~"
10233
10001
msgstr ""
10234
10002
10235
#: en/help_topics/configuration.txt:404
10003
#: en/help_topics/configuration.txt:392
10236
10004
msgid ""
10237
10005
"A comma-separated list of debugging options to turn on. The same values\n"
10238
10006
"can be used as with the -D command-line option (see `help global-options`).\n"
10239
10007
"For example::"
10240
10008
msgstr ""
10241
10009
10242
#: en/help_topics/configuration.txt:408
10010
#: en/help_topics/configuration.txt:396
10243
10011
msgid " debug_flags = hpss"
10244
10012
msgstr ""
10245
10013
10246
#: en/help_topics/configuration.txt:412
10014
#: en/help_topics/configuration.txt:400
10247
10015
msgid " debug_flags = hpss,evil"
10248
10016
msgstr ""
10249
10017
10250
#: en/help_topics/configuration.txt:414
10018
#: en/help_topics/configuration.txt:402
10251
10019
msgid ""
10252
10020
"email\n"
10253
10021
"~~~~~"
10254
10022
msgstr ""
10255
10023
10256
#: en/help_topics/configuration.txt:417
10024
#: en/help_topics/configuration.txt:405
10257
10025
msgid ""
10258
10026
"The email address to use when committing a branch. Typically takes the form\n"
10259
10027
"of::"
10260
10028
msgstr ""
10261
10029
10262
#: en/help_topics/configuration.txt:420
10030
#: en/help_topics/configuration.txt:408
10263
10031
msgid " email = Full Name <account@hostname.tld>"
10264
10032
msgstr ""
10265
10033
10266
#: en/help_topics/configuration.txt:422
10034
#: en/help_topics/configuration.txt:410
10267
10035
msgid ""
10268
10036
"editor\n"
10269
10037
"~~~~~~"
10270
10038
msgstr ""
10271
10039
10272
#: en/help_topics/configuration.txt:425
10040
#: en/help_topics/configuration.txt:413
10273
10041
msgid ""
10274
10042
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10275
10043
"a commit message. This setting is trumped by the environment variable\n"
10277
10045
"variables."
10278
10046
msgstr ""
10279
10047
10280
#: en/help_topics/configuration.txt:430
10048
#: en/help_topics/configuration.txt:418
10281
10049
msgid ""
10282
10050
"log_format\n"
10283
10051
"~~~~~~~~~~"
10284
10052
msgstr ""
10285
10053
10286
#: en/help_topics/configuration.txt:433
10054
#: en/help_topics/configuration.txt:421
10287
10055
msgid ""
10288
10056
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10289
10057
"and ``line``. Additional formats may be provided by plugins. The default\n"
10290
10058
"value is ``long``."
10291
10059
msgstr ""
10292
10060
10293
#: en/help_topics/configuration.txt:437
10061
#: en/help_topics/configuration.txt:425
10294
10062
msgid ""
10295
10063
"check_signatures\n"
10296
10064
"~~~~~~~~~~~~~~~~"
10297
10065
msgstr ""
10298
10066
10299
#: en/help_topics/configuration.txt:440
10067
#: en/help_topics/configuration.txt:428
10300
10068
msgid ""
10301
10069
"Reserved for future use. These options will allow a policy for branches to\n"
10302
10070
"require signatures."
10303
10071
msgstr ""
10304
10072
10305
#: en/help_topics/configuration.txt:443
10073
#: en/help_topics/configuration.txt:431
10306
10074
msgid ""
10307
10075
"require\n"
10308
10076
" The gnupg signature for revisions must be present and must be valid."
10309
10077
msgstr ""
10310
10078
10311
#: en/help_topics/configuration.txt:446
10079
#: en/help_topics/configuration.txt:434
10312
10080
msgid ""
10313
10081
"ignore\n"
10314
10082
" Do not check gnupg signatures of revisions."
10315
10083
msgstr ""
10316
10084
10317
#: en/help_topics/configuration.txt:449
10085
#: en/help_topics/configuration.txt:437
10318
10086
msgid ""
10319
10087
"check-available\n"
10320
10088
" (default) If gnupg signatures for revisions are present, check them.\n"
10322
10090
" no signature is present."
10323
10091
msgstr ""
10324
10092
10325
#: en/help_topics/configuration.txt:454
10093
#: en/help_topics/configuration.txt:442
10326
10094
msgid ""
10327
10095
"create_signatures\n"
10328
10096
"~~~~~~~~~~~~~~~~~"
10329
10097
msgstr ""
10330
10098
10331
#: en/help_topics/configuration.txt:457
10099
#: en/help_topics/configuration.txt:445
10332
10100
msgid ""
10333
10101
"Defines the behaviour of signing revisions on commits. By default bzr will "
10334
10102
"not\n"
10335
10103
"sign new commits."
10336
10104
msgstr ""
10337
10105
10338
#: en/help_topics/configuration.txt:460
10106
#: en/help_topics/configuration.txt:448
10339
10107
msgid ""
10340
10108
"always\n"
10341
10109
" Sign every new revision that is committed. If the signing fails then "
10343
10111
" commit will not be made."
10344
10112
msgstr ""
10345
10113
10346
#: en/help_topics/configuration.txt:464
10114
#: en/help_topics/configuration.txt:452
10347
10115
msgid ""
10348
10116
"when-required\n"
10349
10117
" Reserved for future use."
10350
10118
msgstr ""
10351
10119
10352
#: en/help_topics/configuration.txt:467
10120
#: en/help_topics/configuration.txt:455
10353
10121
msgid ""
10354
10122
"never\n"
10355
10123
" Reserved for future use."
10356
10124
msgstr ""
10357
10125
10358
#: en/help_topics/configuration.txt:470
10126
#: en/help_topics/configuration.txt:458
10359
10127
msgid ""
10360
10128
"In future it is planned that ``when-required`` will sign newly\n"
10361
10129
"committed revisions only when the branch requires them. ``never`` will "
10363
10131
"to sign newly committed revisions, even if the branch requires signatures."
10364
10132
msgstr ""
10365
10133
10366
#: en/help_topics/configuration.txt:474
10134
#: en/help_topics/configuration.txt:462
10367
10135
msgid ""
10368
10136
"dirstate.fdatasync\n"
10369
10137
"~~~~~~~~~~~~~~~~~~"
10370
10138
msgstr ""
10371
10139
10372
#: en/help_topics/configuration.txt:477
10140
#: en/help_topics/configuration.txt:465
10373
10141
msgid ""
10374
10142
"If true (default), working tree metadata changes are flushed through the\n"
10375
10143
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10376
10144
"should not be lost if the machine crashes. See also repository.fdatasync."
10377
10145
msgstr ""
10378
10146
10379
#: en/help_topics/configuration.txt:481
10147
#: en/help_topics/configuration.txt:469
10380
10148
msgid ""
10381
10149
"gpg_signing_key\n"
10382
10150
"~~~~~~~~~~~~~~~"
10383
10151
msgstr ""
10384
10152
10385
#: en/help_topics/configuration.txt:484
10153
#: en/help_topics/configuration.txt:472
10386
10154
msgid ""
10387
10155
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10388
10156
"address, key fingerprint or full key ID. When unset or when set to\n"
10389
10157
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10390
10158
msgstr ""
10391
10159
10392
#: en/help_topics/configuration.txt:488
10160
#: en/help_topics/configuration.txt:476
10393
10161
msgid ""
10394
10162
"recurse\n"
10395
10163
"~~~~~~~"
10396
10164
msgstr ""
10397
10165
10398
#: en/help_topics/configuration.txt:491
10166
#: en/help_topics/configuration.txt:479
10399
10167
msgid ""
10400
10168
"Only useful in ``locations.conf``. Defines whether or not the\n"
10401
10169
"configuration for this section applies to subdirectories:"
10402
10170
msgstr ""
10403
10171
10404
#: en/help_topics/configuration.txt:494
10172
#: en/help_topics/configuration.txt:482
10405
10173
msgid ""
10406
10174
"true\n"
10407
10175
" (default) This section applies to subdirectories as well."
10408
10176
msgstr ""
10409
10177
10410
#: en/help_topics/configuration.txt:497
10178
#: en/help_topics/configuration.txt:485
10411
10179
msgid ""
10412
10180
"false\n"
10413
10181
" This section only applies to the branch at this directory and not\n"
10414
10182
" branches below it."
10415
10183
msgstr ""
10416
10184
10417
#: en/help_topics/configuration.txt:501
10185
#: en/help_topics/configuration.txt:489
10418
10186
msgid ""
10419
10187
"gpg_signing_command\n"
10420
10188
"~~~~~~~~~~~~~~~~~~~"
10421
10189
msgstr ""
10422
10190
10423
#: en/help_topics/configuration.txt:504
10191
#: en/help_topics/configuration.txt:492
10424
10192
msgid ""
10425
10193
"(Default: \"gpg\"). Which program should be used to sign and check "
10426
10194
"revisions.\n"
10427
10195
"For example::"
10428
10196
msgstr ""
10429
10197
10430
#: en/help_topics/configuration.txt:507
10198
#: en/help_topics/configuration.txt:495
10431
10199
msgid " gpg_signing_command = /usr/bin/gnpg"
10432
10200
msgstr ""
10433
10201
10434
#: en/help_topics/configuration.txt:509
10202
#: en/help_topics/configuration.txt:497
10435
10203
msgid ""
10436
10204
"The specified command must accept the options \"--clearsign\" and \"-u "
10437
10205
"<email>\"."
10438
10206
msgstr ""
10439
10207
10440
#: en/help_topics/configuration.txt:511
10208
#: en/help_topics/configuration.txt:499
10441
10209
msgid ""
10442
10210
"bzr_remote_path\n"
10443
10211
"~~~~~~~~~~~~~~~"
10444
10212
msgstr ""
10445
10213
10446
#: en/help_topics/configuration.txt:514
10214
#: en/help_topics/configuration.txt:502
10447
10215
msgid ""
10448
10216
"(Default: \"bzr\"). The path to the command that should be used to run the "
10449
10217
"smart\n"
10450
10218
"server for bzr. This value may only be specified in locations.conf, because:"
10451
10219
msgstr ""
10452
10220
10453
#: en/help_topics/configuration.txt:517
10221
#: en/help_topics/configuration.txt:505
10454
10222
msgid ""
10455
10223
"- it's needed before branch.conf is accessible\n"
10456
10224
"- allowing remote branch.conf files to specify commands would be a security\n"
10457
10225
" risk"
10458
10226
msgstr ""
10459
10227
10460
#: en/help_topics/configuration.txt:521
10228
#: en/help_topics/configuration.txt:509
10461
10229
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10462
10230
msgstr ""
10463
10231
10464
#: en/help_topics/configuration.txt:523
10232
#: en/help_topics/configuration.txt:511
10465
10233
msgid ""
10466
10234
"smtp_server\n"
10467
10235
"~~~~~~~~~~~"
10468
10236
msgstr ""
10469
10237
10470
#: en/help_topics/configuration.txt:526
10238
#: en/help_topics/configuration.txt:514
10471
10239
msgid ""
10472
10240
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10473
10241
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10474
10242
msgstr ""
10475
10243
10476
#: en/help_topics/configuration.txt:529
10244
#: en/help_topics/configuration.txt:517
10477
10245
msgid ""
10478
10246
"smtp_username, smtp_password\n"
10479
10247
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10480
10248
msgstr ""
10481
10249
10482
#: en/help_topics/configuration.txt:532
10250
#: en/help_topics/configuration.txt:520
10483
10251
msgid ""
10484
10252
"User and password to authenticate to the SMTP server. If smtp_username\n"
10485
10253
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10487
10255
"to send mail."
10488
10256
msgstr ""
10489
10257
10490
#: en/help_topics/configuration.txt:537
10258
#: en/help_topics/configuration.txt:525
10491
10259
msgid ""
10492
10260
"locks.steal_dead\n"
10493
10261
"~~~~~~~~~~~~~~~~"
10494
10262
msgstr ""
10495
10263
10496
#: en/help_topics/configuration.txt:540
10264
#: en/help_topics/configuration.txt:528
10497
10265
msgid ""
10498
10266
"If set to true, bzr will automatically break locks held by processes from\n"
10499
10267
"the same machine and user that are no longer alive. Otherwise, it will\n"
10501
10269
"the object is no longer in use."
10502
10270
msgstr ""
10503
10271
10504
#: en/help_topics/configuration.txt:545
10272
#: en/help_topics/configuration.txt:533
10505
10273
msgid ""
10506
10274
"mail_client\n"
10507
10275
"~~~~~~~~~~~"
10508
10276
msgstr ""
10509
10277
10510
#: en/help_topics/configuration.txt:548
10278
#: en/help_topics/configuration.txt:536
10511
10279
msgid ""
10512
10280
"A mail client to use for sending merge requests.\n"
10513
10281
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10516
10284
"``editor``."
10517
10285
msgstr ""
10518
10286
10519
#: en/help_topics/configuration.txt:553
10287
#: en/help_topics/configuration.txt:541
10520
10288
msgid "Supported values for specific clients:"
10521
10289
msgstr ""
10522
10290
10523
#: en/help_topics/configuration.txt:555
10291
#: en/help_topics/configuration.txt:543
10524
10292
msgid ""
10525
10293
":claws: Use Claws. This skips a dialog for attaching files.\n"
10526
10294
":evolution: Use Evolution.\n"
10531
10299
" this works around some bugs that xdg-email doesn't handle."
10532
10300
msgstr ""
10533
10301
10534
#: en/help_topics/configuration.txt:562
10302
#: en/help_topics/configuration.txt:550
10535
10303
msgid "Supported generic values are:"
10536
10304
msgstr ""
10537
10305
10538
#: en/help_topics/configuration.txt:564
10306
#: en/help_topics/configuration.txt:552
10539
10307
msgid ""
10540
10308
":default: See above.\n"
10541
10309
":editor: Use your editor to compose the merge request. This also uses\n"
10545
10313
":xdg-email: Use xdg-email to run your preferred mail program"
10546
10314
msgstr ""
10547
10315
10548
#: en/help_topics/configuration.txt:571
10316
#: en/help_topics/configuration.txt:559
10549
10317
msgid ""
10550
10318
"repository.fdatasync\n"
10551
10319
"~~~~~~~~~~~~~~~~~~~~"
10552
10320
msgstr ""
10553
10321
10554
#: en/help_topics/configuration.txt:574
10322
#: en/help_topics/configuration.txt:562
10555
10323
msgid ""
10556
10324
"If true (default), repository changes are flushed through the OS buffers\n"
10557
10325
"to physical disk. This is somewhat slower, but means data should not be\n"
10558
10326
"lost if the machine crashes. See also dirstate.fdatasync."
10559
10327
msgstr ""
10560
10328
10561
#: en/help_topics/configuration.txt:578
10329
#: en/help_topics/configuration.txt:566
10562
10330
msgid ""
10563
10331
"submit_branch\n"
10564
10332
"~~~~~~~~~~~~~"
10565
10333
msgstr ""
10566
10334
10567
#: en/help_topics/configuration.txt:581
10335
#: en/help_topics/configuration.txt:569
10568
10336
msgid ""
10569
10337
"The branch you intend to submit your current work to. This is "
10570
10338
"automatically\n"
10573
10341
"should usually be set on a per-branch or per-location basis."
10574
10342
msgstr ""
10575
10343
10576
#: en/help_topics/configuration.txt:585
10344
#: en/help_topics/configuration.txt:573
10577
10345
msgid ""
10578
10346
"public_branch\n"
10579
10347
"~~~~~~~~~~~~~"
10580
10348
msgstr ""
10581
10349
10582
#: en/help_topics/configuration.txt:588
10350
#: en/help_topics/configuration.txt:576
10583
10351
msgid ""
10584
10352
"A publically-accessible version of this branch (implying that this version "
10585
10353
"is\n"
10586
10354
"not publically-accessible). Used (and set) by ``bzr send``."
10587
10355
msgstr ""
10588
10356
10589
#: en/help_topics/configuration.txt:591
10357
#: en/help_topics/configuration.txt:579
10590
10358
msgid ""
10591
10359
"suppress_warnings\n"
10592
10360
"~~~~~~~~~~~~~~~~~"
10593
10361
msgstr ""
10594
10362
10595
#: en/help_topics/configuration.txt:594
10363
#: en/help_topics/configuration.txt:582
10596
10364
msgid ""
10597
10365
"A list of strings, each string represent a warning that can be emitted by\n"
10598
10366
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10599
10367
msgstr ""
10600
10368
10601
#: en/help_topics/configuration.txt:597
10369
#: en/help_topics/configuration.txt:585
10602
10370
msgid "Valid values:"
10603
10371
msgstr ""
10604
10372
10605
#: en/help_topics/configuration.txt:599
10373
#: en/help_topics/configuration.txt:587
10606
10374
msgid ""
10607
10375
"* ``format_deprecation``:\n"
10608
10376
" whether the format deprecation warning is shown on repositories that "
10610
10378
" using deprecated formats."
10611
10379
msgstr ""
10612
10380
10613
#: en/help_topics/configuration.txt:603
10381
#: en/help_topics/configuration.txt:591
10614
10382
msgid ""
10615
10383
"default_format\n"
10616
10384
"~~~~~~~~~~~~~~"
10617
10385
msgstr ""
10618
10386
10619
#: en/help_topics/configuration.txt:606
10387
#: en/help_topics/configuration.txt:594
10620
10388
msgid ""
10621
10389
"A format name for the default format used when creating branches. See "
10622
10390
"``bzr\n"
10623
10391
"help formats`` for possible values."
10624
10392
msgstr ""
10625
10393
10626
#: en/help_topics/configuration.txt:609
10394
#: en/help_topics/configuration.txt:597
10627
10395
msgid ""
10628
10396
"\n"
10629
10397
"Unicode options\n"
10630
10398
"---------------"
10631
10399
msgstr ""
10632
10400
10633
#: en/help_topics/configuration.txt:613
10401
#: en/help_topics/configuration.txt:601
10634
10402
msgid ""
10635
10403
"output_encoding\n"
10636
10404
"~~~~~~~~~~~~~~~"
10637
10405
msgstr ""
10638
10406
10639
#: en/help_topics/configuration.txt:616
10407
#: en/help_topics/configuration.txt:604
10640
10408
msgid ""
10641
10409
"A Python unicode encoding name for text output from bzr, such as log\n"
10642
10410
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10643
10411
"is the terminal encoding prefered by the operating system."
10644
10412
msgstr ""
10645
10413
10646
#: en/help_topics/configuration.txt:620
10414
#: en/help_topics/configuration.txt:608
10647
10415
msgid ""
10648
10416
"\n"
10649
10417
"Branch type specific options\n"
10650
10418
"----------------------------"
10651
10419
msgstr ""
10652
10420
10653
#: en/help_topics/configuration.txt:624
10421
#: en/help_topics/configuration.txt:612
10654
10422
msgid ""
10655
10423
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10656
10424
"later format. They\n"
10658
10426
"manually set in ``locations.conf`` or ``bazaar.conf``."
10659
10427
msgstr ""
10660
10428
10661
#: en/help_topics/configuration.txt:629
10429
#: en/help_topics/configuration.txt:617
10662
10430
msgid ""
10663
10431
"append_revisions_only\n"
10664
10432
"~~~~~~~~~~~~~~~~~~~~~"
10665
10433
msgstr ""
10666
10434
10667
#: en/help_topics/configuration.txt:632
10435
#: en/help_topics/configuration.txt:620
10668
10436
msgid ""
10669
10437
"If set to \"True\" then revisions can only be appended to the log, not\n"
10670
10438
"removed. A branch with this setting enabled can only pull from another\n"
10674
10442
"compatibility with previous bzr versions (older than 2.2)."
10675
10443
msgstr ""
10676
10444
10677
#: en/help_topics/configuration.txt:639
10445
#: en/help_topics/configuration.txt:627
10678
10446
msgid ""
10679
10447
"parent_location\n"
10680
10448
"~~~~~~~~~~~~~~~"
10681
10449
msgstr ""
10682
10450
10683
#: en/help_topics/configuration.txt:642
10451
#: en/help_topics/configuration.txt:630
10684
10452
msgid ""
10685
10453
"If present, the location of the default branch for pull or merge. This "
10686
10454
"option\n"
10688
10456
"--remember``."
10689
10457
msgstr ""
10690
10458
10691
#: en/help_topics/configuration.txt:646
10459
#: en/help_topics/configuration.txt:634
10692
10460
msgid ""
10693
10461
"push_location\n"
10694
10462
"~~~~~~~~~~~~~"
10695
10463
msgstr ""
10696
10464
10697
#: en/help_topics/configuration.txt:649
10465
#: en/help_topics/configuration.txt:637
10698
10466
msgid ""
10699
10467
"If present, the location of the default branch for push. This option\n"
10700
10468
"is normally set by the first ``push`` or ``push --remember``."
10701
10469
msgstr ""
10702
10470
10703
#: en/help_topics/configuration.txt:652
10471
#: en/help_topics/configuration.txt:640
10704
10472
msgid ""
10705
10473
"push_strict\n"
10706
10474
"~~~~~~~~~~~"
10707
10475
msgstr ""
10708
10476
10709
#: en/help_topics/configuration.txt:655
10477
#: en/help_topics/configuration.txt:643
10710
10478
msgid ""
10711
10479
"If present, defines the ``--strict`` option default value for checking\n"
10712
10480
"uncommitted changes before pushing."
10713
10481
msgstr ""
10714
10482
10715
#: en/help_topics/configuration.txt:658
10483
#: en/help_topics/configuration.txt:646
10716
10484
msgid ""
10717
10485
"dpush_strict\n"
10718
10486
"~~~~~~~~~~~~"
10719
10487
msgstr ""
10720
10488
10721
#: en/help_topics/configuration.txt:661
10489
#: en/help_topics/configuration.txt:649
10722
10490
msgid ""
10723
10491
"If present, defines the ``--strict`` option default value for checking\n"
10724
10492
"uncommitted changes before pushing into a different VCS without any\n"
10725
10493
"custom bzr metadata."
10726
10494
msgstr ""
10727
10495
10728
#: en/help_topics/configuration.txt:665
10496
#: en/help_topics/configuration.txt:653
10729
10497
msgid ""
10730
10498
"bound_location\n"
10731
10499
"~~~~~~~~~~~~~~"
10732
10500
msgstr ""
10733
10501
10734
#: en/help_topics/configuration.txt:668
10502
#: en/help_topics/configuration.txt:656
10735
10503
msgid ""
10736
10504
"The location that commits should go to when acting as a checkout.\n"
10737
10505
"This option is normally set by ``bind``."
10738
10506
msgstr ""
10739
10507
10740
#: en/help_topics/configuration.txt:671
10508
#: en/help_topics/configuration.txt:659
10741
10509
msgid ""
10742
10510
"bound\n"
10743
10511
"~~~~~"
10744
10512
msgstr ""
10745
10513
10746
#: en/help_topics/configuration.txt:674
10514
#: en/help_topics/configuration.txt:662
10747
10515
msgid ""
10748
10516
"If set to \"True\", the branch should act as a checkout, and push each "
10749
10517
"commit to\n"
10750
10518
"the bound_location. This option is normally set by ``bind``/``unbind``."
10751
10519
msgstr ""
10752
10520
10753
#: en/help_topics/configuration.txt:677
10521
#: en/help_topics/configuration.txt:665
10754
10522
msgid ""
10755
10523
"send_strict\n"
10756
10524
"~~~~~~~~~~~"
10757
10525
msgstr ""
10758
10526
10759
#: en/help_topics/configuration.txt:680
10527
#: en/help_topics/configuration.txt:668
10760
10528
msgid ""
10761
10529
"If present, defines the ``--strict`` option default value for checking\n"
10762
10530
"uncommitted changes before sending a merge directive."
10763
10531
msgstr ""
10764
10532
10765
#: en/help_topics/configuration.txt:683
10533
#: en/help_topics/configuration.txt:671
10766
10534
msgid ""
10767
10535
"add.maximum_file_size\n"
10768
10536
"~~~~~~~~~~~~~~~~~~~~~"
10769
10537
msgstr ""
10770
10538
10771
#: en/help_topics/configuration.txt:686
10539
#: en/help_topics/configuration.txt:674
10772
10540
msgid ""
10773
10541
"Defines the maximum file size the command line \"add\" operation will allow\n"
10774
10542
"in recursive mode, with files larger than this value being skipped. You "
10780
10548
"will disable skipping."
10781
10549
msgstr ""
10782
10550
10783
#: en/help_topics/configuration.txt:692
10551
#: en/help_topics/configuration.txt:680
10784
10552
msgid ""
10785
10553
"External Merge Tools\n"
10786
10554
"--------------------"
10787
10555
msgstr ""
10788
10556
10789
#: en/help_topics/configuration.txt:695
10557
#: en/help_topics/configuration.txt:683
10790
10558
msgid ""
10791
10559
"bzr.mergetool.<name>\n"
10792
10560
"~~~~~~~~~~~~~~~~~~~~"
10793
10561
msgstr ""
10794
10562
10795
#: en/help_topics/configuration.txt:698
10563
#: en/help_topics/configuration.txt:686
10796
10564
msgid ""
10797
10565
"Defines an external merge tool called <name> with the given command-line.\n"
10798
10566
"Arguments containing spaces should be quoted using single or double quotes. "
10800
10568
"executable may omit its path if it can be found on the PATH."
10801
10569
msgstr ""
10802
10570
10803
#: en/help_topics/configuration.txt:702
10571
#: en/help_topics/configuration.txt:690
10804
10572
msgid ""
10805
10573
"The following markers can be used in the command-line to substitute "
10806
10574
"filenames\n"
10807
10575
"involved in the merge conflict::"
10808
10576
msgstr ""
10809
10577
10810
#: en/help_topics/configuration.txt:705
10578
#: en/help_topics/configuration.txt:693
10811
10579
msgid ""
10812
10580
" {base} file.BASE\n"
10813
10581
" {this} file.THIS\n"
10818
10586
" succeeds."
10819
10587
msgstr ""
10820
10588
10821
#: en/help_topics/configuration.txt:714
10589
#: en/help_topics/configuration.txt:702
10822
10590
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10823
10591
msgstr ""
10824
10592
10825
#: en/help_topics/configuration.txt:716
10826
msgid ""
10827
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10828
"interpolation markers, trying to display the mergetool line results in the\n"
10829
"following problem::"
10830
msgstr ""
10831
10832
#: en/help_topics/configuration.txt:720
10833
msgid ""
10834
"\n"
10835
" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10836
"{result}'\n"
10837
" $ bzr config bzr.mergetool.kdiff3\n"
10838
" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10839
"{this} {other} -o {result}\"."
10840
msgstr ""
10841
10842
#: en/help_topics/configuration.txt:725
10843
msgid ""
10844
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10845
msgstr ""
10846
10847
#: en/help_topics/configuration.txt:727
10848
msgid ""
10849
" $ bzr config --all bzr.mergetool.kdiff3\n"
10850
" branch:\n"
10851
" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10852
msgstr ""
10853
10854
#: en/help_topics/configuration.txt:731
10855
msgid ""
10856
"\n"
10593
#: en/help_topics/configuration.txt:704
10594
msgid ""
10857
10595
"bzr.default_mergetool\n"
10858
10596
"~~~~~~~~~~~~~~~~~~~~~"
10859
10597
msgstr ""
10860
10598
10861
#: en/help_topics/configuration.txt:735
10599
#: en/help_topics/configuration.txt:707
10862
10600
msgid ""
10863
10601
"Specifies which external merge tool (as defined above) should be selected "
10864
10602
"by\n"
10865
10603
"default in tools such as ``bzr qconflicts``."
10866
10604
msgstr ""
10867
10605
10868
#: en/help_topics/configuration.txt:740
10606
#: en/help_topics/configuration.txt:712
10869
10607
msgid " bzr.default_mergetool = kdiff3\n"
10870
10608
msgstr ""
10871
10609
10994
10732
"--------------"
10995
10733
msgstr ""
10996
10734
10997
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10998
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10999
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11000
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11001
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10735
#: en/help_topics/conflict-types.txt:63
11002
10736
msgid "Typical message::"
11003
10737
msgstr ""
11004
10738
11130
10864
"copy\" has been renamed to THIS or OTHER."
11131
10865
msgstr ""
11132
10866
11133
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10867
#: en/help_topics/conflict-types.txt:134
11134
10868
msgid ""
11135
10869
"To resolve that kind of conflict, you should rebuild FILE from either "
11136
10870
"version\n"
11137
10871
"or a combination of both."
11138
10872
msgstr ""
11139
10873
11140
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11141
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11142
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11143
#: en/help_topics/conflict-types.txt:361
10874
#: en/help_topics/conflict-types.txt:137
11144
10875
msgid "``bzr resolve`` recognizes the following actions:"
11145
10876
msgstr ""
11146
10877
11158
10889
"``.OTHER`` files if they are still present in the working tree."
11159
10890
msgstr ""
11160
10891
11161
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11162
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11163
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11164
#: en/help_topics/conflict-types.txt:369
10892
#: en/help_topics/conflict-types.txt:146
11165
10893
msgid ""
11166
10894
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11167
10895
msgstr ""
11279
11007
"Resolving this issue depends very much on the particular scenario."
11280
11008
msgstr ""
11281
11009
11282
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11010
#: en/help_topics/conflict-types.txt:223
11283
11011
msgid ""
11284
11012
"To resolve that kind of conflict, you should either remove or rename the\n"
11285
11013
"children or the directory or a combination of both."
11673
11401
" transition."
11674
11402
msgstr ""
11675
11403
11676
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11404
#: en/help_topics/current-formats.txt:8
11677
11405
msgid ""
11678
11406
"\n"
11679
11407
"See :doc:`formats-help` for more about storage formats."
11815
11543
"branch can now be pushed to the mainline.\n"
11816
11544
msgstr ""
11817
11545
11818
#: en/help_topics/env-variables.txt:1
11819
msgid "Environment Variables"
11820
msgstr ""
11821
11822
#: en/help_topics/env-variables.txt:3
11823
msgid "See bzr help configuration for more details."
11824
msgstr ""
11825
11826
#: en/help_topics/env-variables.txt:5
11827
msgid ""
11828
"=================== "
11829
"===========================================================\n"
11830
"BZRPATH Path where bzr is to look for shell plugin external\n"
11831
" commands.\n"
11832
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11833
"EMAIL E-Mail address of the user.\n"
11834
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11835
"EDITOR Editor for editing commit messages.\n"
11836
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11837
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11838
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11839
"BZR_PLUGIN_PATH.\n"
11840
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11841
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11842
"and\n"
11843
" HOME.\n"
11844
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11845
"URLs).\n"
11846
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11847
"sshcorp,\n"
11848
" plink or lsh.\n"
11849
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11850
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11851
"BZR_COLUMNS Override implicit terminal width.\n"
11852
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11853
"(selftest)\n"
11854
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11855
"'text'.\n"
11856
"BZR_PDB Control whether to launch a debugger on error.\n"
11857
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11858
" breakin debugger.\n"
11859
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11860
"(instead\n"
11861
" of char-based).\n"
11862
"=================== "
11863
"===========================================================\n"
11864
msgstr ""
11865
11866
11546
#: en/help_topics/eol.txt:1
11867
11547
msgid ""
11868
11548
"End of Line Conversion\n"
11928
11608
"to use as a starting point::"
11929
11609
msgstr ""
11930
11610
11931
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11932
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11611
#: en/help_topics/eol.txt:42
11933
11612
msgid ""
11934
11613
" [name *]\n"
11935
11614
" eol = native"
12102
11781
"====="
12103
11782
msgstr ""
12104
11783
12105
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11784
#: en/help_topics/hooks.txt:5
12106
11785
msgid ""
12107
11786
"Introduction\n"
12108
11787
"------------"
12169
11848
"~~~~~~~~~~~~~~~~~~"
12170
11849
msgstr ""
12171
11850
12172
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12173
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11851
#: en/help_topics/hooks.txt:38
12174
11852
msgid "Introduced in: 2.2"
12175
11853
msgstr ""
12176
11854
12188
11866
"~~~~"
12189
11867
msgstr ""
12190
11868
12191
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12192
#: en/help_topics/hooks.txt:307
11869
#: en/help_topics/hooks.txt:48
12193
11870
msgid "Introduced in: 1.8"
12194
11871
msgstr ""
12195
11872
12219
11896
"~~~~~~~~~~~~~~~~~~~~~~"
12220
11897
msgstr ""
12221
11898
12222
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11899
#: en/help_topics/hooks.txt:66
12223
11900
msgid "Introduced in: 1.4"
12224
11901
msgstr ""
12225
11902
12231
11908
"uncommit will all trigger this hook."
12232
11909
msgstr ""
12233
11910
12234
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11911
#: en/help_topics/hooks.txt:73
12235
11912
msgid ""
12236
11913
"post_commit\n"
12237
11914
"~~~~~~~~~~~"
12238
11915
msgstr ""
12239
11916
12240
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12241
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11917
#: en/help_topics/hooks.txt:76
12242
11918
msgid "Introduced in: 0.15"
12243
11919
msgstr ""
12244
11920
12343
12019
12344
12020
#: en/help_topics/hooks.txt:142
12345
12021
msgid ""
12022
"set_rh\n"
12023
"~~~~~~"
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:147
12027
msgid ""
12028
"Invoked whenever the revision history has been set via\n"
12029
"set_revision_history. The api signature is (branch, revision_history),\n"
12030
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12031
"for bzr to trigger, a better hook to use is\n"
12032
"Branch.post_change_branch_tip."
12033
msgstr ""
12034
12035
#: en/help_topics/hooks.txt:153
12036
msgid ""
12346
12037
"transform_fallback_location\n"
12347
12038
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12348
12039
msgstr ""
12349
12040
12350
#: en/help_topics/hooks.txt:145
12041
#: en/help_topics/hooks.txt:156
12351
12042
msgid "Introduced in: 1.9"
12352
12043
msgstr ""
12353
12044
12354
#: en/help_topics/hooks.txt:147
12045
#: en/help_topics/hooks.txt:158
12355
12046
msgid ""
12356
12047
"Called when a stacked branch is activating its fallback locations.\n"
12357
12048
"transform_fallback_location is called with (branch, url), and should\n"
12365
12056
"however undefined."
12366
12057
msgstr ""
12367
12058
12368
#: en/help_topics/hooks.txt:158
12059
#: en/help_topics/hooks.txt:169
12369
12060
msgid ""
12370
12061
"CommandHooks\n"
12371
12062
"------------"
12372
12063
msgstr ""
12373
12064
12374
#: en/help_topics/hooks.txt:161
12065
#: en/help_topics/hooks.txt:172
12375
12066
msgid ""
12376
12067
"extend_command\n"
12377
12068
"~~~~~~~~~~~~~~"
12378
12069
msgstr ""
12379
12070
12380
#: en/help_topics/hooks.txt:164
12071
#: en/help_topics/hooks.txt:175
12381
12072
msgid "Introduced in: 1.13"
12382
12073
msgstr ""
12383
12074
12384
#: en/help_topics/hooks.txt:166
12075
#: en/help_topics/hooks.txt:177
12385
12076
msgid ""
12386
12077
"Called after creating a command object to allow modifications such as\n"
12387
12078
"adding or removing options, docs etc. Called with the new\n"
12388
12079
"bzrlib.commands.Command object."
12389
12080
msgstr ""
12390
12081
12391
#: en/help_topics/hooks.txt:170
12082
#: en/help_topics/hooks.txt:181
12392
12083
msgid ""
12393
12084
"get_command\n"
12394
12085
"~~~~~~~~~~~"
12395
12086
msgstr ""
12396
12087
12397
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12398
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12088
#: en/help_topics/hooks.txt:184
12399
12089
msgid "Introduced in: 1.17"
12400
12090
msgstr ""
12401
12091
12402
#: en/help_topics/hooks.txt:175
12092
#: en/help_topics/hooks.txt:186
12403
12093
msgid ""
12404
12094
"Called when creating a single command. Called with (cmd_or_None,\n"
12405
12095
"command_name). get_command should either return the cmd_or_None\n"
12409
12099
"plugin_cmds.register_lazy."
12410
12100
msgstr ""
12411
12101
12412
#: en/help_topics/hooks.txt:182
12102
#: en/help_topics/hooks.txt:193
12413
12103
msgid ""
12414
12104
"get_missing_command\n"
12415
12105
"~~~~~~~~~~~~~~~~~~~"
12416
12106
msgstr ""
12417
12107
12418
#: en/help_topics/hooks.txt:187
12108
#: en/help_topics/hooks.txt:198
12419
12109
msgid ""
12420
12110
"Called when creating a single command if no command could be found.\n"
12421
12111
"Called with (command_name). get_missing_command should either return\n"
12422
12112
"None, or a Command object to be used for the command."
12423
12113
msgstr ""
12424
12114
12425
#: en/help_topics/hooks.txt:191
12115
#: en/help_topics/hooks.txt:202
12426
12116
msgid ""
12427
12117
"list_commands\n"
12428
12118
"~~~~~~~~~~~~~"
12429
12119
msgstr ""
12430
12120
12431
#: en/help_topics/hooks.txt:196
12121
#: en/help_topics/hooks.txt:207
12432
12122
msgid ""
12433
12123
"Called when enumerating commands. Called with a set of cmd_name\n"
12434
12124
"strings for all the commands found so far. This set is safe to mutate\n"
12436
12126
"set of command names."
12437
12127
msgstr ""
12438
12128
12439
#: en/help_topics/hooks.txt:201
12440
msgid ""
12441
"post_command\n"
12442
"~~~~~~~~~~~~"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12446
msgid "Introduced in: 2.6"
12447
msgstr ""
12448
12449
#: en/help_topics/hooks.txt:206
12450
msgid "Called after executing a command. Called with the command object."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:208
12454
msgid ""
12455
"pre_command\n"
12456
"~~~~~~~~~~~"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:213
12460
msgid "Called prior to executing a command. Called with the command object."
12129
#: en/help_topics/hooks.txt:212
12130
msgid ""
12131
"_ConfigHooks\n"
12132
"------------"
12461
12133
msgstr ""
12462
12134
12463
12135
#: en/help_topics/hooks.txt:215
12464
12136
msgid ""
12465
"_ConfigHooks\n"
12466
"------------"
12137
"get\n"
12138
"~~~"
12467
12139
msgstr ""
12468
12140
12469
12141
#: en/help_topics/hooks.txt:218
12470
msgid ""
12471
"get\n"
12472
"~~~"
12473
msgstr ""
12474
12475
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12476
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12477
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12478
#: en/help_topics/hooks.txt:446
12479
12142
msgid "Introduced in: 2.4"
12480
12143
msgstr ""
12481
12144
12145
#: en/help_topics/hooks.txt:220
12146
msgid ""
12147
"Invoked when a config option is read. The signature is (stack, name,\n"
12148
"value)."
12149
msgstr ""
12150
12482
12151
#: en/help_topics/hooks.txt:223
12483
12152
msgid ""
12484
"Invoked when a config option is read. The signature is (stack, name,\n"
12485
"value)."
12486
msgstr ""
12487
12488
#: en/help_topics/hooks.txt:226
12489
msgid ""
12490
12153
"load\n"
12491
12154
"~~~~"
12492
12155
msgstr ""
12493
12156
12494
#: en/help_topics/hooks.txt:231
12157
#: en/help_topics/hooks.txt:228
12495
12158
msgid "Invoked when a config store is loaded. The signature is (store)."
12496
12159
msgstr ""
12497
12160
12498
#: en/help_topics/hooks.txt:233
12161
#: en/help_topics/hooks.txt:230
12499
12162
msgid ""
12500
12163
"remove\n"
12501
12164
"~~~~~~"
12502
12165
msgstr ""
12503
12166
12504
#: en/help_topics/hooks.txt:238
12167
#: en/help_topics/hooks.txt:235
12505
12168
msgid ""
12506
12169
"Invoked when a config option is removed. The signature is (stack,\n"
12507
12170
"name)."
12508
12171
msgstr ""
12509
12172
12510
#: en/help_topics/hooks.txt:241
12173
#: en/help_topics/hooks.txt:238
12511
12174
msgid ""
12512
12175
"save\n"
12513
12176
"~~~~"
12514
12177
msgstr ""
12515
12178
12516
#: en/help_topics/hooks.txt:246
12179
#: en/help_topics/hooks.txt:243
12517
12180
msgid "Invoked when a config store is saved. The signature is (store)."
12518
12181
msgstr ""
12519
12182
12520
#: en/help_topics/hooks.txt:248
12183
#: en/help_topics/hooks.txt:245
12521
12184
msgid ""
12522
12185
"set\n"
12523
12186
"~~~"
12524
12187
msgstr ""
12525
12188
12189
#: en/help_topics/hooks.txt:250
12190
msgid ""
12191
"Invoked when a config option is set. The signature is (stack, name,\n"
12192
"value)."
12193
msgstr ""
12194
12526
12195
#: en/help_topics/hooks.txt:253
12527
12196
msgid ""
12528
"Invoked when a config option is set. The signature is (stack, name,\n"
12529
"value)."
12197
"ControlDirHooks\n"
12198
"---------------"
12530
12199
msgstr ""
12531
12200
12532
12201
#: en/help_topics/hooks.txt:256
12533
12202
msgid ""
12534
"ControlDirHooks\n"
12535
"---------------"
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:259
12539
msgid ""
12540
12203
"post_repo_init\n"
12541
12204
"~~~~~~~~~~~~~~"
12542
12205
msgstr ""
12543
12206
12544
#: en/help_topics/hooks.txt:264
12207
#: en/help_topics/hooks.txt:261
12545
12208
msgid ""
12546
12209
"Invoked after a repository has been initialized. post_repo_init is\n"
12547
12210
"called with a bzrlib.controldir.RepoInitHookParams."
12548
12211
msgstr ""
12549
12212
12213
#: en/help_topics/hooks.txt:264
12214
msgid ""
12215
"pre_open\n"
12216
"~~~~~~~~"
12217
msgstr ""
12218
12550
12219
#: en/help_topics/hooks.txt:267
12551
msgid ""
12552
"pre_open\n"
12553
"~~~~~~~~"
12554
msgstr ""
12555
12556
#: en/help_topics/hooks.txt:270
12557
12220
msgid "Introduced in: 1.14"
12558
12221
msgstr ""
12559
12222
12560
#: en/help_topics/hooks.txt:272
12223
#: en/help_topics/hooks.txt:269
12561
12224
msgid ""
12562
12225
"Invoked before attempting to open a ControlDir with the transport that\n"
12563
12226
"the open will use."
12564
12227
msgstr ""
12565
12228
12229
#: en/help_topics/hooks.txt:272
12230
msgid ""
12231
"InfoHooks\n"
12232
"---------"
12233
msgstr ""
12234
12566
12235
#: en/help_topics/hooks.txt:275
12567
12236
msgid ""
12568
"InfoHooks\n"
12569
"---------"
12237
"repository\n"
12238
"~~~~~~~~~~"
12570
12239
msgstr ""
12571
12240
12572
12241
#: en/help_topics/hooks.txt:278
12573
msgid ""
12574
"repository\n"
12575
"~~~~~~~~~~"
12576
msgstr ""
12577
12578
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12579
#: en/help_topics/hooks.txt:524
12580
12242
msgid "Introduced in: 1.15"
12581
12243
msgstr ""
12582
12244
12583
#: en/help_topics/hooks.txt:283
12245
#: en/help_topics/hooks.txt:280
12584
12246
msgid ""
12585
12247
"Invoked when displaying the statistics for a repository. repository is\n"
12586
12248
"called with a statistics dictionary as returned by the repository and\n"
12587
12249
"a file-like object to write to."
12588
12250
msgstr ""
12589
12251
12252
#: en/help_topics/hooks.txt:284
12253
msgid ""
12254
"LockHooks\n"
12255
"---------"
12256
msgstr ""
12257
12590
12258
#: en/help_topics/hooks.txt:287
12591
12259
msgid ""
12592
"LockHooks\n"
12593
"---------"
12594
msgstr ""
12595
12596
#: en/help_topics/hooks.txt:290
12597
msgid ""
12598
12260
"lock_acquired\n"
12599
12261
"~~~~~~~~~~~~~"
12600
12262
msgstr ""
12601
12263
12602
#: en/help_topics/hooks.txt:295
12264
#: en/help_topics/hooks.txt:292
12603
12265
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12604
12266
msgstr ""
12605
12267
12606
#: en/help_topics/hooks.txt:297
12268
#: en/help_topics/hooks.txt:294
12607
12269
msgid ""
12608
12270
"lock_broken\n"
12609
12271
"~~~~~~~~~~~"
12610
12272
msgstr ""
12611
12273
12612
#: en/help_topics/hooks.txt:302
12274
#: en/help_topics/hooks.txt:299
12613
12275
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12614
12276
msgstr ""
12615
12277
12616
#: en/help_topics/hooks.txt:304
12278
#: en/help_topics/hooks.txt:301
12617
12279
msgid ""
12618
12280
"lock_released\n"
12619
12281
"~~~~~~~~~~~~~"
12620
12282
msgstr ""
12621
12283
12622
#: en/help_topics/hooks.txt:309
12284
#: en/help_topics/hooks.txt:306
12623
12285
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
12624
12286
msgstr ""
12625
12287
12288
#: en/help_topics/hooks.txt:308
12289
msgid ""
12290
"MergeHooks\n"
12291
"----------"
12292
msgstr ""
12293
12626
12294
#: en/help_topics/hooks.txt:311
12627
12295
msgid ""
12628
"MergeHooks\n"
12629
"----------"
12296
"merge_file_content\n"
12297
"~~~~~~~~~~~~~~~~~~"
12630
12298
msgstr ""
12631
12299
12632
12300
#: en/help_topics/hooks.txt:314
12633
msgid ""
12634
"merge_file_content\n"
12635
"~~~~~~~~~~~~~~~~~~"
12636
msgstr ""
12637
12638
#: en/help_topics/hooks.txt:317
12639
12301
msgid "Introduced in: 2.1"
12640
12302
msgstr ""
12641
12303
12642
#: en/help_topics/hooks.txt:319
12304
#: en/help_topics/hooks.txt:316
12643
12305
msgid ""
12644
12306
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12645
12307
"object when starting a merge. Should return either None or a subclass\n"
12649
12311
"AbstractPerFileMerger API docs for details on how it is used by merge."
12650
12312
msgstr ""
12651
12313
12314
#: en/help_topics/hooks.txt:323
12315
msgid ""
12316
"MergeDirectiveHooks\n"
12317
"-------------------"
12318
msgstr ""
12319
12652
12320
#: en/help_topics/hooks.txt:326
12653
12321
msgid ""
12654
"post_merge\n"
12655
"~~~~~~~~~~"
12656
msgstr ""
12657
12658
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12659
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12660
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12661
msgid "Introduced in: 2.5"
12662
msgstr ""
12663
12664
#: en/help_topics/hooks.txt:331
12665
msgid ""
12666
"Called after a merge. Receives a Merger object as the single argument.\n"
12667
"The return value is ignored."
12668
msgstr ""
12669
12670
#: en/help_topics/hooks.txt:334
12671
msgid ""
12672
"pre_merge\n"
12673
"~~~~~~~~~"
12674
msgstr ""
12675
12676
#: en/help_topics/hooks.txt:339
12677
msgid ""
12678
"Called before a merge. Receives a Merger object as the single\n"
12679
"argument."
12680
msgstr ""
12681
12682
#: en/help_topics/hooks.txt:342
12683
msgid ""
12684
"MergeDirectiveHooks\n"
12685
"-------------------"
12686
msgstr ""
12687
12688
#: en/help_topics/hooks.txt:345
12689
msgid ""
12690
12322
"merge_request_body\n"
12691
12323
"~~~~~~~~~~~~~~~~~~"
12692
12324
msgstr ""
12693
12325
12694
#: en/help_topics/hooks.txt:348
12326
#: en/help_topics/hooks.txt:329
12695
12327
msgid "Introduced in: 1.15.0"
12696
12328
msgstr ""
12697
12329
12698
#: en/help_topics/hooks.txt:350
12330
#: en/help_topics/hooks.txt:331
12699
12331
msgid ""
12700
12332
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12701
12333
"request. Callbacks must return a body. If more than one callback is\n"
12702
12334
"registered, the output of one callback is provided to the next."
12703
12335
msgstr ""
12704
12336
12705
#: en/help_topics/hooks.txt:354
12337
#: en/help_topics/hooks.txt:335
12706
12338
msgid ""
12707
12339
"MessageEditorHooks\n"
12708
12340
"------------------"
12709
12341
msgstr ""
12710
12342
12711
#: en/help_topics/hooks.txt:357
12343
#: en/help_topics/hooks.txt:338
12712
12344
msgid ""
12713
12345
"commit_message_template\n"
12714
12346
"~~~~~~~~~~~~~~~~~~~~~~~"
12715
12347
msgstr ""
12716
12348
12717
#: en/help_topics/hooks.txt:360
12349
#: en/help_topics/hooks.txt:341
12718
12350
msgid "Introduced in: 1.10"
12719
12351
msgstr ""
12720
12352
12721
#: en/help_topics/hooks.txt:362
12353
#: en/help_topics/hooks.txt:343
12722
12354
msgid ""
12723
12355
"Called when a commit message is being generated.\n"
12724
12356
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12729
12361
"second, and so on."
12730
12362
msgstr ""
12731
12363
12732
#: en/help_topics/hooks.txt:370
12364
#: en/help_topics/hooks.txt:351
12733
12365
msgid ""
12734
12366
"set_commit_message\n"
12735
12367
"~~~~~~~~~~~~~~~~~~"
12736
12368
msgstr ""
12737
12369
12738
#: en/help_topics/hooks.txt:375
12370
#: en/help_topics/hooks.txt:356
12739
12371
msgid ""
12740
12372
"Set a fixed commit message. set_commit_message is called with the\n"
12741
12373
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12744
12376
"should use the message editor as normal."
12745
12377
msgstr ""
12746
12378
12747
#: en/help_topics/hooks.txt:381
12379
#: en/help_topics/hooks.txt:362
12748
12380
msgid ""
12749
12381
"MutableTreeHooks\n"
12750
12382
"----------------"
12751
12383
msgstr ""
12752
12384
12753
#: en/help_topics/hooks.txt:384
12754
msgid ""
12755
"post_build_tree\n"
12756
"~~~~~~~~~~~~~~~"
12757
msgstr ""
12758
12759
#: en/help_topics/hooks.txt:389
12760
msgid ""
12761
"Called after a completely new tree is built. The hook is called with\n"
12762
"the tree as its only argument."
12763
msgstr ""
12764
12765
#: en/help_topics/hooks.txt:395
12385
#: en/help_topics/hooks.txt:368
12766
12386
msgid "Introduced in: 2.0"
12767
12387
msgstr ""
12768
12388
12769
#: en/help_topics/hooks.txt:397
12389
#: en/help_topics/hooks.txt:370
12770
12390
msgid ""
12771
12391
"Called after a commit is performed on a tree. The hook is called with\n"
12772
12392
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12774
12394
"that object."
12775
12395
msgstr ""
12776
12396
12777
#: en/help_topics/hooks.txt:402
12778
msgid ""
12779
"post_transform\n"
12780
"~~~~~~~~~~~~~~"
12781
msgstr ""
12782
12783
#: en/help_topics/hooks.txt:407
12784
msgid ""
12785
"Called after a tree transform has been performed on a tree. The hook\n"
12786
"is called with the tree that is being transformed and the transform."
12787
msgstr ""
12788
12789
#: en/help_topics/hooks.txt:410
12790
msgid ""
12791
"pre_transform\n"
12792
"~~~~~~~~~~~~~"
12793
msgstr ""
12794
12795
#: en/help_topics/hooks.txt:415
12796
msgid ""
12797
"Called before a tree transform on this tree. The hook is called with\n"
12798
"the tree that is being transformed and the transform."
12799
msgstr ""
12800
12801
#: en/help_topics/hooks.txt:418
12397
#: en/help_topics/hooks.txt:375
12802
12398
msgid ""
12803
12399
"start_commit\n"
12804
12400
"~~~~~~~~~~~~"
12805
12401
msgstr ""
12806
12402
12807
#: en/help_topics/hooks.txt:423
12403
#: en/help_topics/hooks.txt:380
12808
12404
msgid ""
12809
12405
"Called before a commit is performed on a tree. The start commit hook\n"
12810
12406
"is able to change the tree before the commit takes place. start_commit\n"
12812
12408
"being performed on."
12813
12409
msgstr ""
12814
12410
12815
#: en/help_topics/hooks.txt:428
12411
#: en/help_topics/hooks.txt:385
12816
12412
msgid ""
12817
12413
"SmartClientHooks\n"
12818
12414
"----------------"
12819
12415
msgstr ""
12820
12416
12821
#: en/help_topics/hooks.txt:431
12417
#: en/help_topics/hooks.txt:388
12822
12418
msgid ""
12823
12419
"call\n"
12824
12420
"~~~~"
12825
12421
msgstr ""
12826
12422
12827
#: en/help_topics/hooks.txt:434
12423
#: en/help_topics/hooks.txt:391
12828
12424
msgid "Introduced in: unknown"
12829
12425
msgstr ""
12830
12426
12831
#: en/help_topics/hooks.txt:436
12427
#: en/help_topics/hooks.txt:393
12832
12428
msgid ""
12833
12429
"Called when the smart client is submitting a request to the smart\n"
12834
12430
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12835
12431
"Streaming request bodies, and responses, are not accessible."
12836
12432
msgstr ""
12837
12433
12838
#: en/help_topics/hooks.txt:440
12434
#: en/help_topics/hooks.txt:397
12839
12435
msgid ""
12840
12436
"SmartServerHooks\n"
12841
12437
"----------------"
12842
12438
msgstr ""
12843
12439
12844
#: en/help_topics/hooks.txt:443
12440
#: en/help_topics/hooks.txt:400
12845
12441
msgid ""
12846
12442
"server_exception\n"
12847
12443
"~~~~~~~~~~~~~~~~"
12848
12444
msgstr ""
12849
12445
12850
#: en/help_topics/hooks.txt:448
12446
#: en/help_topics/hooks.txt:405
12851
12447
msgid ""
12852
12448
"Called by the bzr server when an exception occurs. server_exception is\n"
12853
12449
"called with the sys.exc_info() tuple return true for the hook if the\n"
12855
12451
"normally."
12856
12452
msgstr ""
12857
12453
12858
#: en/help_topics/hooks.txt:453
12454
#: en/help_topics/hooks.txt:410
12859
12455
msgid ""
12860
12456
"server_started\n"
12861
12457
"~~~~~~~~~~~~~~"
12862
12458
msgstr ""
12863
12459
12864
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12460
#: en/help_topics/hooks.txt:413
12865
12461
msgid "Introduced in: 0.16"
12866
12462
msgstr ""
12867
12463
12868
#: en/help_topics/hooks.txt:458
12464
#: en/help_topics/hooks.txt:415
12869
12465
msgid ""
12870
12466
"Called by the bzr server when it starts serving a directory.\n"
12871
12467
"server_started is called with (backing urls, public url), where\n"
12874
12470
"served."
12875
12471
msgstr ""
12876
12472
12877
#: en/help_topics/hooks.txt:464
12473
#: en/help_topics/hooks.txt:421
12878
12474
msgid ""
12879
12475
"server_started_ex\n"
12880
12476
"~~~~~~~~~~~~~~~~~"
12881
12477
msgstr ""
12882
12478
12883
#: en/help_topics/hooks.txt:469
12479
#: en/help_topics/hooks.txt:426
12884
12480
msgid ""
12885
12481
"Called by the bzr server when it starts serving a directory.\n"
12886
12482
"server_started is called with (backing_urls, server_obj)."
12887
12483
msgstr ""
12888
12484
12889
#: en/help_topics/hooks.txt:472
12485
#: en/help_topics/hooks.txt:429
12890
12486
msgid ""
12891
12487
"server_stopped\n"
12892
12488
"~~~~~~~~~~~~~~"
12893
12489
msgstr ""
12894
12490
12895
#: en/help_topics/hooks.txt:477
12491
#: en/help_topics/hooks.txt:434
12896
12492
msgid ""
12897
12493
"Called by the bzr server when it stops serving a directory.\n"
12898
12494
"server_stopped is called with the same parameters as the\n"
12899
12495
"server_started hook: (backing_urls, public_url)."
12900
12496
msgstr ""
12901
12497
12902
#: en/help_topics/hooks.txt:481
12498
#: en/help_topics/hooks.txt:438
12903
12499
msgid ""
12904
12500
"StatusHooks\n"
12905
12501
"-----------"
12906
12502
msgstr ""
12907
12503
12908
#: en/help_topics/hooks.txt:484
12504
#: en/help_topics/hooks.txt:441
12909
12505
msgid ""
12910
12506
"post_status\n"
12911
12507
"~~~~~~~~~~~"
12912
12508
msgstr ""
12913
12509
12914
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12510
#: en/help_topics/hooks.txt:444
12915
12511
msgid "Introduced in: 2.3"
12916
12512
msgstr ""
12917
12513
12918
#: en/help_topics/hooks.txt:489
12514
#: en/help_topics/hooks.txt:446
12919
12515
msgid ""
12920
12516
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12921
12517
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12924
12520
"status command. to_file is the output stream for writing."
12925
12521
msgstr ""
12926
12522
12927
#: en/help_topics/hooks.txt:495
12523
#: en/help_topics/hooks.txt:452
12928
12524
msgid ""
12929
12525
"pre_status\n"
12930
12526
"~~~~~~~~~~"
12931
12527
msgstr ""
12932
12528
12933
#: en/help_topics/hooks.txt:500
12529
#: en/help_topics/hooks.txt:457
12934
12530
msgid ""
12935
12531
"Called with argument StatusHookParams before Bazaar displays the\n"
12936
12532
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12939
12535
"status command. to_file is the output stream for writing."
12940
12536
msgstr ""
12941
12537
12942
#: en/help_topics/hooks.txt:506
12943
msgid ""
12944
"TransportHooks\n"
12945
"--------------"
12946
msgstr ""
12947
12948
#: en/help_topics/hooks.txt:509
12949
msgid ""
12950
"post_connect\n"
12951
"~~~~~~~~~~~~"
12952
msgstr ""
12953
12954
#: en/help_topics/hooks.txt:514
12955
msgid ""
12956
"Called after a new connection is established or a reconnect occurs.\n"
12957
"The sole argument passed is either the connected transport or smart\n"
12958
"medium instance."
12959
msgstr ""
12960
12961
#: en/help_topics/hooks.txt:518
12538
#: en/help_topics/hooks.txt:463
12962
12539
msgid ""
12963
12540
"RioVersionInfoBuilderHooks\n"
12964
12541
"--------------------------"
12965
12542
msgstr ""
12966
12543
12967
#: en/help_topics/hooks.txt:521
12544
#: en/help_topics/hooks.txt:466
12968
12545
msgid ""
12969
12546
"revision\n"
12970
12547
"~~~~~~~~"
12971
12548
msgstr ""
12972
12549
12973
#: en/help_topics/hooks.txt:526
12550
#: en/help_topics/hooks.txt:471
12974
12551
msgid ""
12975
12552
"Invoked when adding information about a revision to the RIO stanza\n"
12976
12553
"that is printed. revision is called with a revision object and a RIO\n"
13282
12859
" is specified, the parent branch is used instead."
13283
12860
msgstr ""
13284
12861
13285
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12862
#: en/help_topics/revisionspec.txt:73
13286
12863
msgid ""
13287
12864
" The common ancestor is the last revision that existed in both\n"
13288
12865
" branches. Usually this is the branch point, but it could also be\n"
13289
12866
" a revision that was merged."
13290
12867
msgstr ""
13291
12868
13292
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13293
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13294
#: en/help_topics/revisionspec.txt:153
12869
#: en/help_topics/revisionspec.txt:77
13295
12870
msgid " Examples::"
13296
12871
msgstr ""
13297
12872
Loggerhead is a web-based interface for Breezy
Version: 2.0.1