« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6593
- compare with another revision
- download diff
- download tarball
- view history from revision 6593
- Committer: Patch Queue Manager
- Date: 2014-04-09 13:36:25 UTC
- mfrom: (6592.1.2 1303879-py27-issues)
- Revision ID: pqm@pqm.ubuntu.com-20140409133625-s24spv3kha2w2860
(vila) Fix python-2.7.6 test failures. (Vincent Ladeuil)
- files added:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- 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 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: 2011-09-20 10:41+0100\n"
11
"POT-Creation-Date: 2013-07-27 12:45+0200\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:95
21
#: bzrlib/add.py:93
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr ""
24
24
25
#: bzrlib/branch.py:852
25
#: bzrlib/branch.py:872
26
26
msgid "Unstacking"
27
27
msgstr ""
28
28
29
#: bzrlib/branch.py:3138
29
#: bzrlib/branch.py:3012
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr ""
33
33
34
#: bzrlib/branch.py:3140
34
#: bzrlib/branch.py:3014
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:3143
41
#: bzrlib/branch.py:3017
42
42
msgid "No new revisions or tags to push."
43
43
msgstr ""
44
44
45
#: bzrlib/branch.py:3145
45
#: bzrlib/branch.py:3019
46
46
msgid "No new revisions to push."
47
47
msgstr ""
48
48
49
#: bzrlib/branch.py:3165
49
#: bzrlib/branch.py:3039
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3168
53
#: bzrlib/branch.py:3042
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr ""
57
57
58
#: bzrlib/builtins.py:116 bzrlib/builtins.py:2782 bzrlib/workingtree.py:306
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr ""
62
62
63
#: bzrlib/builtins.py:125
63
#: bzrlib/builtins.py:260
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr ""
67
67
68
#: bzrlib/builtins.py:210
68
#: bzrlib/builtins.py:315
69
69
msgid "Display status summary."
70
70
msgstr ""
71
71
72
#: bzrlib/builtins.py:212
72
#: bzrlib/builtins.py:317
73
73
msgid ""
74
74
"This reports on versioned and unknown files, reporting them\n"
75
75
"grouped by state. Possible states are:"
76
76
msgstr ""
77
77
78
#: bzrlib/builtins.py:215
78
#: bzrlib/builtins.py:320
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:218
84
#: bzrlib/builtins.py:323
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:222
91
#: bzrlib/builtins.py:327
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:227
99
#: bzrlib/builtins.py:332
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:230
105
#: bzrlib/builtins.py:335
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:233
111
#: bzrlib/builtins.py:338
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:236
117
#: bzrlib/builtins.py:341
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:241
125
#: bzrlib/builtins.py:346
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:244
131
#: bzrlib/builtins.py:349
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:248
138
#: bzrlib/builtins.py:353
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:253
146
#: bzrlib/builtins.py:358
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:258
154
#: bzrlib/builtins.py:363
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:261
160
#: bzrlib/builtins.py:366
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:270
168
#: bzrlib/builtins.py:375
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:272
173
#: bzrlib/builtins.py:377
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:274
178
#: bzrlib/builtins.py:379
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:277
183
#: bzrlib/builtins.py:382
184
184
msgid "Do not mark object type using indicator."
185
185
msgstr ""
186
186
187
#: bzrlib/builtins.py:292
187
#: bzrlib/builtins.py:397
188
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
189
msgstr ""
190
190
191
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4927
191
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5229
192
192
msgid "You can only supply one of revision_id or --revision"
193
193
msgstr ""
194
194
195
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4929
195
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5231
196
196
msgid "You must supply either --revision or a revision_id"
197
197
msgstr ""
198
198
199
#: bzrlib/builtins.py:346
199
#: bzrlib/builtins.py:451
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:357
204
#: bzrlib/builtins.py:462
205
205
msgid "The repository {0} contains no revision {1}."
206
206
msgstr ""
207
207
208
#: bzrlib/builtins.py:364
208
#: bzrlib/builtins.py:469
209
209
msgid "You cannot specify a NULL revision."
210
210
msgstr ""
211
211
212
#: bzrlib/builtins.py:456
212
#: bzrlib/builtins.py:561
213
213
msgid "Remove the working tree from a given branch/checkout."
214
214
msgstr ""
215
215
216
#: bzrlib/builtins.py:458
216
#: bzrlib/builtins.py:563
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:461
222
#: bzrlib/builtins.py:566
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:467
227
#: bzrlib/builtins.py:572
228
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
229
msgstr ""
230
230
231
#: bzrlib/builtins.py:481
231
#: bzrlib/builtins.py:586
232
232
msgid "No working tree to remove"
233
233
msgstr ""
234
234
235
#: bzrlib/builtins.py:483
235
#: bzrlib/builtins.py:588
236
236
msgid "You cannot remove the working tree of a remote path"
237
237
msgstr ""
238
238
239
#: bzrlib/builtins.py:492
239
#: bzrlib/builtins.py:597
240
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
241
msgstr ""
242
242
243
#: bzrlib/builtins.py:532
243
#: bzrlib/builtins.py:637
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:543
249
#: bzrlib/builtins.py:648
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:547
255
#: bzrlib/builtins.py:652
256
256
msgid "failed to reset the tree state{0}"
257
257
msgstr ""
258
258
259
#: bzrlib/builtins.py:551
259
#: bzrlib/builtins.py:656
260
260
msgid "Show current revision number."
261
261
msgstr ""
262
262
263
#: bzrlib/builtins.py:553
263
#: bzrlib/builtins.py:658
264
264
msgid "This is equal to the number of revisions on this branch."
265
265
msgstr ""
266
266
267
#: bzrlib/builtins.py:671
268
msgid "--tree and --revision can not be used together"
269
msgstr ""
270
271
#: bzrlib/builtins.py:688
272
msgid "Revision numbers only make sense for single revisions, not ranges"
273
msgstr ""
274
267
275
# help of 'tree' option of 'revno' command
268
#: bzrlib/builtins.py:594
269
msgid "Show revno of working tree"
276
#: bzrlib/builtins.py:712
277
msgid "Show revno of working tree."
270
278
msgstr ""
271
279
272
#: bzrlib/builtins.py:642
280
#: bzrlib/builtins.py:760
273
281
msgid "Add specified files or directories."
274
282
msgstr ""
275
283
276
#: bzrlib/builtins.py:644
284
#: bzrlib/builtins.py:762
277
285
msgid ""
278
286
"In non-recursive mode, all the named items are added, regardless\n"
279
287
"of whether they were previously ignored. A warning is given if\n"
280
288
"any of the named files are already versioned."
281
289
msgstr ""
282
290
283
#: bzrlib/builtins.py:648
291
#: bzrlib/builtins.py:766
284
292
msgid ""
285
293
"In recursive mode (the default), files are treated the same way\n"
286
294
"but the behaviour for directories is different. Directories that\n"
291
299
"directories. If no names are given '.' is assumed."
292
300
msgstr ""
293
301
294
#: bzrlib/builtins.py:656
302
#: bzrlib/builtins.py:774
303
msgid ""
304
"A warning will be printed when nested trees are encountered,\n"
305
"unless they are explicitly ignored."
306
msgstr ""
307
308
#: bzrlib/builtins.py:777
295
309
msgid ""
296
310
"Therefore simply saying 'bzr add' will version all files that\n"
297
311
"are currently unknown."
298
312
msgstr ""
299
313
300
#: bzrlib/builtins.py:659
314
#: bzrlib/builtins.py:780
301
315
msgid ""
302
316
"Adding a file whose parent directory is not versioned will\n"
303
317
"implicitly add the parent, and so on up to the root. This means\n"
305
319
"get added when you add a file in the directory."
306
320
msgstr ""
307
321
308
#: bzrlib/builtins.py:664
322
#: bzrlib/builtins.py:785
309
323
msgid ""
310
324
"--dry-run will show which files would be added, but not actually\n"
311
325
"add them."
312
326
msgstr ""
313
327
314
#: bzrlib/builtins.py:667
328
#: bzrlib/builtins.py:788
315
329
msgid ""
316
330
"--file-ids-from will try to use the file ids from the supplied path.\n"
317
331
"It looks up ids trying to find a matching parent directory with the\n"
322
336
"into a subdirectory of this one."
323
337
msgstr ""
324
338
325
#: bzrlib/builtins.py:675
339
#: bzrlib/builtins.py:796
326
340
msgid ""
327
341
"Any files matching patterns in the ignore list will not be added\n"
328
342
"unless they are explicitly mentioned."
329
343
msgstr ""
330
344
331
#: bzrlib/builtins.py:678
345
#: bzrlib/builtins.py:799
332
346
msgid ""
333
347
"In recursive mode, files larger than the configuration option \n"
334
348
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
336
350
msgstr ""
337
351
338
352
# help of 'no-recurse' option of 'add' command
339
#: bzrlib/builtins.py:685
353
#: bzrlib/builtins.py:806
340
354
msgid "Don't recursively add the contents of directories."
341
355
msgstr ""
342
356
343
357
# help of 'file-ids-from' option of 'add' command
344
#: bzrlib/builtins.py:691
358
#: bzrlib/builtins.py:813
345
359
msgid "Lookup file ids from this tree."
346
360
msgstr ""
347
361
348
#: bzrlib/builtins.py:727
362
#: bzrlib/builtins.py:849
349
363
msgid "ignored {0} matching \"{1}\"\n"
350
364
msgstr ""
351
365
352
#: bzrlib/builtins.py:732
366
#: bzrlib/builtins.py:854
353
367
msgid "Create a new versioned directory."
354
368
msgstr ""
355
369
356
#: bzrlib/builtins.py:734
370
#: bzrlib/builtins.py:856
357
371
msgid "This is equivalent to creating the directory and then adding it."
358
372
msgstr ""
359
373
360
#: bzrlib/builtins.py:748
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
361
380
#, python-format
362
381
msgid "added %s\n"
363
382
msgstr ""
364
383
365
#: bzrlib/builtins.py:792
384
#: bzrlib/builtins.py:939
366
385
#, python-format
367
386
msgid "invalid kind %r specified"
368
387
msgstr ""
369
388
370
#: bzrlib/builtins.py:829
389
#: bzrlib/builtins.py:976
371
390
msgid "Move or rename a file."
372
391
msgstr ""
373
392
374
#: bzrlib/builtins.py:831
393
#: bzrlib/builtins.py:978
375
394
msgid " bzr mv SOURCE... DESTINATION"
376
395
msgstr ""
377
396
378
#: bzrlib/builtins.py:833
397
#: bzrlib/builtins.py:980
379
398
msgid ""
380
399
"If the last argument is a versioned directory, all the other names\n"
381
400
"are moved into it. Otherwise, there must be exactly two arguments\n"
382
401
"and the file is changed to a new name."
383
402
msgstr ""
384
403
385
#: bzrlib/builtins.py:837
404
#: bzrlib/builtins.py:984
386
405
msgid ""
387
406
"If OLDNAME does not exist on the filesystem but is versioned and\n"
388
407
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
391
410
"The same is valid when moving many SOURCE files to a DESTINATION."
392
411
msgstr ""
393
412
394
#: bzrlib/builtins.py:843
413
#: bzrlib/builtins.py:990
395
414
msgid "Files cannot be moved between branches."
396
415
msgstr ""
397
416
398
417
# help of 'after' option of 'mv' command
399
#: bzrlib/builtins.py:850
418
#: bzrlib/builtins.py:997
400
419
msgid ""
401
420
"Move only the bzr identifier of the file, because the file has already been "
402
421
"moved."
403
422
msgstr ""
404
423
405
424
# help of 'auto' option of 'mv' command
406
#: bzrlib/builtins.py:852
425
#: bzrlib/builtins.py:999
407
426
msgid "Automatically guess renames."
408
427
msgstr ""
409
428
410
429
# help of 'dry-run' option of 'mv' command
411
#: bzrlib/builtins.py:853
430
#: bzrlib/builtins.py:1000
412
431
msgid "Avoid making changes when guessing renames."
413
432
msgstr ""
414
433
415
#: bzrlib/builtins.py:862
434
#: bzrlib/builtins.py:1009
416
435
msgid "--dry-run requires --auto."
417
436
msgstr ""
418
437
419
#: bzrlib/builtins.py:866
438
#: bzrlib/builtins.py:1013
420
439
msgid "missing file argument"
421
440
msgstr ""
422
441
423
#: bzrlib/builtins.py:873
442
#: bzrlib/builtins.py:1017
443
msgid "can not move root of branch"
444
msgstr ""
445
446
#: bzrlib/builtins.py:1023
424
447
msgid "Only one path may be specified to --auto."
425
448
msgstr ""
426
449
427
#: bzrlib/builtins.py:876
450
#: bzrlib/builtins.py:1026
428
451
msgid "--after cannot be specified with --auto."
429
452
msgstr ""
430
453
431
#: bzrlib/builtins.py:913
454
#: bzrlib/builtins.py:1062
432
455
msgid "to mv multiple files the destination must be a versioned directory"
433
456
msgstr ""
434
457
435
#: bzrlib/builtins.py:965
458
#: bzrlib/builtins.py:1114
436
459
msgid "Turn this branch into a mirror of another branch."
437
460
msgstr ""
438
461
439
#: bzrlib/builtins.py:967
462
#: bzrlib/builtins.py:1116
440
463
msgid ""
441
464
"By default, this command only works on branches that have not diverged.\n"
442
465
"Branches are considered diverged if the destination branch's most recent \n"
444
467
"parent."
445
468
msgstr ""
446
469
447
#: bzrlib/builtins.py:972
470
#: bzrlib/builtins.py:1121
448
471
msgid ""
449
472
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
450
473
"from one into the other. Once one branch has merged, the other should\n"
451
474
"be able to pull it again."
452
475
msgstr ""
453
476
454
#: bzrlib/builtins.py:976
477
#: bzrlib/builtins.py:1125
455
478
msgid ""
456
479
"If you want to replace your local changes and just want your branch to\n"
457
480
"match the remote one, use pull --overwrite. This will work even if the two\n"
458
481
"branches have diverged."
459
482
msgstr ""
460
483
461
#: bzrlib/builtins.py:980
484
#: bzrlib/builtins.py:1129
462
485
msgid ""
463
486
"If there is no default location set, the first pull will set it (use\n"
464
487
"--no-remember to avoid setting it). After that, you can omit the\n"
466
489
"value will only be saved if the remote location can be accessed."
467
490
msgstr ""
468
491
469
#: bzrlib/builtins.py:985
492
#: bzrlib/builtins.py:1134
493
msgid ""
494
"The --verbose option will display the revisions pulled using the log_format\n"
495
"configuration option. You can use a different format by overriding it with\n"
496
"-Olog_format=<other_format>."
497
msgstr ""
498
499
#: bzrlib/builtins.py:1138
470
500
msgid ""
471
501
"Note: The location can be specified either in the form of a branch,\n"
472
502
"or in the form of a path to a file containing a merge directive generated\n"
474
504
msgstr ""
475
505
476
506
# help of 'verbose' option of 'pull' command
477
#: bzrlib/builtins.py:993
507
#: bzrlib/builtins.py:1146
478
508
msgid "Show logs of pulled revisions."
479
509
msgstr ""
480
510
481
511
# help of 'directory' option of 'pull' command
482
#: bzrlib/builtins.py:995
512
#: bzrlib/builtins.py:1148
483
513
msgid ""
484
514
"Branch to pull into, rather than the one containing the working directory."
485
515
msgstr ""
486
516
487
517
# help of 'local' option of 'pull' command
488
#: bzrlib/builtins.py:998
518
#: bzrlib/builtins.py:1151
489
519
msgid ""
490
520
"Perform a local pull in a bound branch. Local pulls are not applied to the "
491
521
"master branch."
492
522
msgstr ""
493
523
494
#: bzrlib/builtins.py:1027
495
msgid "Need working tree for --show-base."
524
#: bzrlib/builtins.py:1188
525
msgid "No working tree, ignoring --show-base"
496
526
msgstr ""
497
527
498
#: bzrlib/builtins.py:1043
528
#: bzrlib/builtins.py:1204
499
529
msgid "No pull location known or specified."
500
530
msgstr ""
501
531
502
#: bzrlib/builtins.py:1049
532
#: bzrlib/builtins.py:1210
503
533
#, python-format
504
534
msgid "Using saved parent location: %s\n"
505
535
msgstr ""
506
536
507
#: bzrlib/builtins.py:1056 bzrlib/builtins.py:4137
537
#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423
508
538
msgid "Cannot use -r with merge directives or bundles"
509
539
msgstr ""
510
540
511
#: bzrlib/builtins.py:1097
541
#: bzrlib/builtins.py:1260
512
542
msgid "Update a mirror of this branch."
513
543
msgstr ""
514
544
515
#: bzrlib/builtins.py:1099
545
#: bzrlib/builtins.py:1262
516
546
msgid ""
517
547
"The target branch will not have its working tree populated because this\n"
518
548
"is both expensive, and is not supported on remote file systems."
519
549
msgstr ""
520
550
521
#: bzrlib/builtins.py:1102
551
#: bzrlib/builtins.py:1265
522
552
msgid ""
523
553
"Some smart servers or protocols *may* put the working tree in place in\n"
524
554
"the future."
525
555
msgstr ""
526
556
527
#: bzrlib/builtins.py:1105
557
#: bzrlib/builtins.py:1268
528
558
msgid ""
529
559
"This command only works on branches that have not diverged. Branches are\n"
530
560
"considered diverged if the destination branch's most recent commit is one\n"
531
561
"that has not been merged (directly or indirectly) by the source branch."
532
562
msgstr ""
533
563
534
#: bzrlib/builtins.py:1109
564
#: bzrlib/builtins.py:1272
535
565
msgid ""
536
566
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
537
567
"the other branch completely, discarding its unmerged changes."
538
568
msgstr ""
539
569
540
#: bzrlib/builtins.py:1112
570
#: bzrlib/builtins.py:1275
541
571
msgid ""
542
572
"If you want to ensure you have the different changes in the other branch,\n"
543
573
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
544
574
"After that you will be able to do a push without '--overwrite'."
545
575
msgstr ""
546
576
547
#: bzrlib/builtins.py:1116
577
#: bzrlib/builtins.py:1279
548
578
msgid ""
549
579
"If there is no default push location set, the first push will set it (use\n"
550
580
"--no-remember to avoid setting it). After that, you can omit the\n"
552
582
"value will only be saved if the remote location can be accessed."
553
583
msgstr ""
554
584
585
#: bzrlib/builtins.py:1284
586
msgid ""
587
"The --verbose option will display the revisions pushed using the log_format\n"
588
"configuration option. You can use a different format by overriding it with\n"
589
"-Olog_format=<other_format>."
590
msgstr ""
591
592
# help of 'directory' option of 'dpush' command
555
593
# help of 'directory' option of 'push' command
556
#: bzrlib/builtins.py:1128
594
#: bzrlib/builtins.py:1295 bzrlib/foreign.py:272
557
595
msgid ""
558
596
"Branch to push from, rather than the one containing the working directory."
559
597
msgstr ""
560
598
561
599
# help of 'use-existing-dir' option of 'push' command
562
#: bzrlib/builtins.py:1131
600
#: bzrlib/builtins.py:1298
563
601
msgid ""
564
602
"By default push will fail if the target directory exists, but does not "
565
603
"already have a control directory. This flag will allow push to proceed."
566
604
msgstr ""
567
605
568
606
# help of 'stacked' option of 'push' command
569
#: bzrlib/builtins.py:1136
607
#: bzrlib/builtins.py:1303
570
608
msgid ""
571
609
"Create a stacked branch that references the public location of the parent "
572
610
"branch."
573
611
msgstr ""
574
612
575
613
# help of 'stacked-on' option of 'push' command
576
#: bzrlib/builtins.py:1139
614
#: bzrlib/builtins.py:1306
577
615
msgid ""
578
616
"Create a stacked branch that refers to another branch for the commit "
579
617
"history. Only the work not present in the referenced branch is included in "
580
618
"the branch created."
581
619
msgstr ""
582
620
621
# help of 'strict' option of 'dpush' command
583
622
# help of 'strict' option of 'push' command
584
#: bzrlib/builtins.py:1144
623
#: bzrlib/builtins.py:1311 bzrlib/foreign.py:279
585
624
msgid ""
586
625
"Refuse to push if there are uncommitted changes in the working tree, --no-"
587
626
"strict disables the check."
588
627
msgstr ""
589
628
590
629
# help of 'no-tree' option of 'push' command
591
#: bzrlib/builtins.py:1147
630
#: bzrlib/builtins.py:1314
592
631
msgid "Don't populate the working tree, even for protocols that support it."
593
632
msgstr ""
594
633
595
#: bzrlib/builtins.py:1191
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
596
641
msgid "Could not determine branch to refer to."
597
642
msgstr ""
598
643
599
#: bzrlib/builtins.py:1198 bzrlib/foreign.py:306
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
600
652
msgid "No push location known or specified."
601
653
msgstr ""
602
654
603
#: bzrlib/builtins.py:1202
655
#: bzrlib/builtins.py:1387
604
656
#, python-format
605
657
msgid "Using saved push location: %s"
606
658
msgstr ""
607
659
608
#: bzrlib/builtins.py:1212
660
#: bzrlib/builtins.py:1397
609
661
msgid "Create a new branch that is a copy of an existing branch."
610
662
msgstr ""
611
663
612
#: bzrlib/builtins.py:1214
664
#: bzrlib/builtins.py:1399
613
665
msgid ""
614
666
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
615
667
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
620
672
"create ./foo-bar."
621
673
msgstr ""
622
674
623
#: bzrlib/builtins.py:1221
675
#: bzrlib/builtins.py:1406
624
676
msgid ""
625
677
"To retrieve the branch as of a particular revision, supply the --revision\n"
626
678
"parameter, as in \"branch foo/bar -r 5\"."
627
679
msgstr ""
628
680
629
#: bzrlib/builtins.py:1224
681
#: bzrlib/builtins.py:1409
630
682
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
631
683
msgstr ""
632
684
633
685
# help of 'no-tree' option of 'branch' command
634
#: bzrlib/builtins.py:1234
686
#: bzrlib/builtins.py:1419
635
687
msgid "Create a branch without a working-tree."
636
688
msgstr ""
637
689
638
690
# help of 'switch' option of 'branch' command
639
#: bzrlib/builtins.py:1236
691
#: bzrlib/builtins.py:1421
640
692
msgid "Switch the checkout in the current directory to the new branch."
641
693
msgstr ""
642
694
643
695
# help of 'stacked' option of 'branch' command
644
#: bzrlib/builtins.py:1239
696
#: bzrlib/builtins.py:1424
645
697
msgid ""
646
698
"Create a stacked branch referring to the source branch. The new branch will "
647
699
"depend on the availability of the source branch for all operations."
648
700
msgstr ""
649
701
650
702
# help of 'standalone' option of 'branch' command
651
#: bzrlib/builtins.py:1243
703
#: bzrlib/builtins.py:1428
652
704
msgid "Do not use a shared repository, even if available."
653
705
msgstr ""
654
706
655
707
# help of 'use-existing-dir' option of 'branch' command
656
#: bzrlib/builtins.py:1245
708
#: bzrlib/builtins.py:1430
657
709
msgid ""
658
710
"By default branch will fail if the target directory exists, but does not "
659
711
"already have a control directory. This flag will allow branch to proceed."
660
712
msgstr ""
661
713
662
714
# help of 'bind' option of 'branch' command
663
#: bzrlib/builtins.py:1250
715
#: bzrlib/builtins.py:1435
664
716
msgid "Bind new branch to from location."
665
717
msgstr ""
666
718
667
#: bzrlib/builtins.py:1291
719
#: bzrlib/builtins.py:1482
668
720
#, python-format
669
721
msgid "Target directory \"%s\" already exists."
670
722
msgstr ""
671
723
672
#: bzrlib/builtins.py:1301
724
#: bzrlib/builtins.py:1494
673
725
#, python-format
674
726
msgid "Parent of \"%s\" does not exist."
675
727
msgstr ""
676
728
677
#: bzrlib/builtins.py:1315
729
#: bzrlib/builtins.py:1513
678
730
msgid "The branch {0} has no revision {1}."
679
731
msgstr ""
680
732
681
#: bzrlib/builtins.py:1323 bzrlib/push.py:51
733
#: bzrlib/builtins.py:1528 bzrlib/push.py:53
682
734
#, python-format
683
735
msgid "Created new stacked branch referring to %s."
684
736
msgstr ""
685
737
686
#: bzrlib/builtins.py:1327
738
#: bzrlib/builtins.py:1532
687
739
#, python-format
688
740
msgid "Branched %d revision."
689
741
msgid_plural "Branched %d revisions."
690
742
msgstr[0] ""
691
743
msgstr[1] ""
692
744
693
#: bzrlib/builtins.py:1332
745
#: bzrlib/builtins.py:1537
694
746
#, python-format
695
747
msgid "New branch bound to %s"
696
748
msgstr ""
697
749
698
#: bzrlib/builtins.py:1337 bzrlib/builtins.py:5968
750
#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283
699
751
#, python-format
700
752
msgid "Switched to branch: %s"
701
753
msgstr ""
702
754
703
#: bzrlib/builtins.py:1342
755
#: bzrlib/builtins.py:1547
704
756
msgid "List the branches available at the current location."
705
757
msgstr ""
706
758
707
#: bzrlib/builtins.py:1344
708
msgid ""
709
"This command will print the names of all the branches at the current "
710
"location."
711
msgstr ""
712
713
#: bzrlib/builtins.py:1353
714
msgid " (default)\n"
715
msgstr ""
716
717
#: bzrlib/builtins.py:1359
759
#: bzrlib/builtins.py:1549
760
msgid ""
761
"This command will print the names of all the branches at the current\n"
762
"location."
763
msgstr ""
764
765
# help of 'recursive' option of 'branches' command
766
#: bzrlib/builtins.py:1556
767
msgid ""
768
"Recursively scan for branches rather than just looking in the specified "
769
"location."
770
msgstr ""
771
772
#: bzrlib/builtins.py:1585
773
msgid "(default)"
774
msgstr ""
775
776
#: bzrlib/builtins.py:1597
718
777
msgid "Create a new checkout of an existing branch."
719
778
msgstr ""
720
779
721
#: bzrlib/builtins.py:1361
780
#: bzrlib/builtins.py:1599
722
781
msgid ""
723
782
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
724
783
"for\n"
728
787
"location using SFTP."
729
788
msgstr ""
730
789
731
#: bzrlib/builtins.py:1366
790
#: bzrlib/builtins.py:1604
732
791
msgid ""
733
792
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
734
793
"will\n"
740
799
"create ./foo-bar."
741
800
msgstr ""
742
801
743
#: bzrlib/builtins.py:1373
802
#: bzrlib/builtins.py:1611
744
803
msgid ""
745
804
"To retrieve the branch as of a particular revision, supply the --revision\n"
746
805
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
751
810
msgstr ""
752
811
753
812
# help of 'lightweight' option of 'checkout' command
754
#: bzrlib/builtins.py:1383
813
#: bzrlib/builtins.py:1621
755
814
msgid ""
756
815
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
757
816
"the branch for every operation. Normal checkouts can perform common "
760
819
msgstr ""
761
820
762
821
# help of 'files-from' option of 'branch' command
763
#: bzrlib/builtins.py:1390
822
# help of 'files-from' option of 'checkout' command
823
#: bzrlib/builtins.py:1628
764
824
msgid "Get file contents from this tree."
765
825
msgstr ""
766
826
767
827
# help of 'hardlink' option of 'branch' command
768
#: bzrlib/builtins.py:1392
828
# help of 'hardlink' option of 'checkout' command
829
#: bzrlib/builtins.py:1630
769
830
msgid "Hard-link working tree files where possible."
770
831
msgstr ""
771
832
772
#: bzrlib/builtins.py:1433
833
#: bzrlib/builtins.py:1671
773
834
msgid ""
774
835
"Show list of renamed files.\n"
775
836
" "
776
837
msgstr ""
777
838
778
#: bzrlib/builtins.py:1463
779
msgid "Update a tree to have the latest code committed to its branch."
780
msgstr ""
781
782
#: bzrlib/builtins.py:1465
783
msgid ""
784
"This will perform a merge into the working tree, and may generate\n"
785
"conflicts. If you have any local changes, you will still\n"
786
"need to commit them after the update for the update to be complete."
787
msgstr ""
788
789
#: bzrlib/builtins.py:1469
790
msgid ""
791
"If you want to discard your local changes, you can just do a\n"
792
"'bzr revert' instead of 'bzr commit' after the update."
793
msgstr ""
794
795
#: bzrlib/builtins.py:1472
796
msgid ""
797
"If you want to restore a file that has been removed locally, use\n"
798
"'bzr revert' instead of 'bzr update'."
799
msgstr ""
800
801
#: bzrlib/builtins.py:1475
802
msgid ""
803
"If the tree's branch is bound to a master branch, it will also update\n"
839
#: bzrlib/builtins.py:1699
840
msgid "Update a working tree to a new revision."
841
msgstr ""
842
843
#: bzrlib/builtins.py:1701
844
msgid ""
845
"This will perform a merge of the destination revision (the tip of the\n"
846
"branch, or the specified revision) into the working tree, and then make\n"
847
"that revision the basis revision for the working tree. "
848
msgstr ""
849
850
#: bzrlib/builtins.py:1705
851
msgid ""
852
"You can use this to visit an older revision, or to update a working tree\n"
853
"that is out of date from its branch."
854
msgstr ""
855
856
#: bzrlib/builtins.py:1708
857
msgid ""
858
"If there are any uncommitted changes in the tree, they will be carried\n"
859
"across and remain as uncommitted changes after the update. To discard\n"
860
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
861
"with the changes brought in by the change in basis revision."
862
msgstr ""
863
864
#: bzrlib/builtins.py:1713
865
msgid ""
866
"If the tree's branch is bound to a master branch, bzr will also update\n"
804
867
"the branch from the master."
805
868
msgstr ""
806
869
807
#: bzrlib/builtins.py:1490
870
#: bzrlib/builtins.py:1716
871
msgid ""
872
"You cannot update just a single file or directory, because each Bazaar\n"
873
"working tree has just a single basis revision. If you want to restore a\n"
874
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
875
"update'. If you want to restore a file to its state in a previous\n"
876
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
877
"out the old content of that file to a new location."
878
msgstr ""
879
880
#: bzrlib/builtins.py:1723
881
msgid ""
882
"The 'dir' argument, if given, must be the location of the root of a\n"
883
"working tree to update. By default, the working tree that contains the \n"
884
"current working directory is used."
885
msgstr ""
886
887
#: bzrlib/builtins.py:1739
808
888
msgid "bzr update --revision takes exactly one revision"
809
889
msgstr ""
810
890
811
#: bzrlib/builtins.py:1521
891
#: bzrlib/builtins.py:1747
892
msgid "bzr update can only update a whole tree, not a file or subdirectory"
893
msgstr ""
894
895
#: bzrlib/builtins.py:1778
812
896
msgid "Tree is up to date at revision {0} of branch {1}"
813
897
msgstr ""
814
898
815
#: bzrlib/builtins.py:1537
899
#: bzrlib/builtins.py:1794
816
900
#, python-format
817
901
msgid ""
818
902
"branch has no revision %s\n"
819
903
"bzr update --revision only works for a revision in the branch history"
820
904
msgstr ""
821
905
822
#: bzrlib/builtins.py:1543
906
#: bzrlib/builtins.py:1800
823
907
msgid "Updated to revision {0} of branch {1}"
824
908
msgstr ""
825
909
826
#: bzrlib/builtins.py:1547
910
#: bzrlib/builtins.py:1804
827
911
msgid ""
828
912
"Your local commits will now show as pending merges with 'bzr status', and "
829
913
"can be committed with 'bzr commit'."
830
914
msgstr ""
831
915
832
#: bzrlib/builtins.py:1556
916
#: bzrlib/builtins.py:1813
833
917
msgid "Show information about a working tree, branch or repository."
834
918
msgstr ""
835
919
836
#: bzrlib/builtins.py:1558
920
#: bzrlib/builtins.py:1815
837
921
msgid ""
838
922
"This command will show all known locations and formats associated to the\n"
839
923
"tree, branch or repository."
840
924
msgstr ""
841
925
842
#: bzrlib/builtins.py:1561
926
#: bzrlib/builtins.py:1818
843
927
msgid ""
844
928
"In verbose mode, statistical information is included with each report.\n"
845
929
"To see extended statistic information, use a verbosity level of 2 or\n"
846
930
"higher by specifying the verbose option multiple times, e.g. -vv."
847
931
msgstr ""
848
932
849
#: bzrlib/builtins.py:1565
933
#: bzrlib/builtins.py:1822
850
934
msgid "Branches and working trees will also report any missing revisions."
851
935
msgstr ""
852
936
853
#: bzrlib/builtins.py:1569
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
854
943
msgid " Display information on the format and related locations:"
855
944
msgstr ""
856
945
857
#: bzrlib/builtins.py:1571
946
#: bzrlib/builtins.py:1828
858
947
msgid " bzr info"
859
948
msgstr ""
860
949
861
#: bzrlib/builtins.py:1573
950
#: bzrlib/builtins.py:1830
862
951
msgid ""
863
952
" Display the above together with extended format information and\n"
864
953
" basic statistics (like the number of files in the working tree and\n"
865
954
" number of revisions in the branch and repository):"
866
955
msgstr ""
867
956
868
#: bzrlib/builtins.py:1577
957
#: bzrlib/builtins.py:1834
869
958
msgid " bzr info -v"
870
959
msgstr ""
871
960
872
#: bzrlib/builtins.py:1579
961
#: bzrlib/builtins.py:1836
873
962
msgid " Display the above together with number of committers to the branch:"
874
963
msgstr ""
875
964
876
#: bzrlib/builtins.py:1581
965
#: bzrlib/builtins.py:1838
877
966
msgid " bzr info -vv"
878
967
msgstr ""
879
968
880
#: bzrlib/builtins.py:1600
969
#: bzrlib/builtins.py:1857
881
970
msgid "Remove files or directories."
882
971
msgstr ""
883
972
884
#: bzrlib/builtins.py:1602
973
#: bzrlib/builtins.py:1859
885
974
msgid ""
886
975
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
887
976
"delete them if they can easily be recovered using revert otherwise they\n"
888
"will be backed up (adding an extention of the form .~#~). If no options or\n"
977
"will be backed up (adding an extension of the form .~#~). If no options or\n"
889
978
"parameters are given Bazaar will scan for files that are being tracked by\n"
890
979
"Bazaar but missing in your tree and stop tracking them for you."
891
980
msgstr ""
892
981
893
982
# help of 'new' option of 'remove' command
894
#: bzrlib/builtins.py:1610
983
#: bzrlib/builtins.py:1867
895
984
msgid "Only remove files that have never been committed."
896
985
msgstr ""
897
986
898
987
# help of 'file-deletion-strategy' option of 'remove' command
899
#: bzrlib/builtins.py:1612
988
#: bzrlib/builtins.py:1869
900
989
msgid "The file deletion mode to be used."
901
990
msgstr ""
902
991
903
992
# title of 'file-deletion-strategy' option of 'remove' command
904
#: bzrlib/builtins.py:1613
993
#: bzrlib/builtins.py:1870
905
994
msgid "Deletion Strategy"
906
995
msgstr ""
907
996
908
#: bzrlib/builtins.py:1626
909
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
910
msgstr ""
911
912
#: bzrlib/builtins.py:1643
997
# help of 'file-deletion-strategy=safe' option of 'remove' command
998
#: bzrlib/builtins.py:1871
999
msgid "Backup changed files (default)."
1000
msgstr ""
1001
1002
# help of 'file-deletion-strategy=keep' option of 'remove' command
1003
#: bzrlib/builtins.py:1872
1004
msgid "Delete from bzr but leave the working copy."
1005
msgstr ""
1006
1007
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
1008
#: bzrlib/builtins.py:1873
1009
msgid "Don't backup changed files."
1010
msgstr ""
1011
1012
#: bzrlib/builtins.py:1894
913
1013
msgid "No matching files."
914
1014
msgstr ""
915
1015
916
#: bzrlib/builtins.py:1704
1016
#: bzrlib/builtins.py:1955
917
1017
msgid "Reconcile bzr metadata in a branch."
918
1018
msgstr ""
919
1019
920
#: bzrlib/builtins.py:1706
1020
#: bzrlib/builtins.py:1957
921
1021
msgid ""
922
1022
"This can correct data mismatches that may have been caused by\n"
923
1023
"previous ghost operations or bzr upgrades. You should only\n"
925
1025
"advises you to run it."
926
1026
msgstr ""
927
1027
928
#: bzrlib/builtins.py:1711
1028
#: bzrlib/builtins.py:1962
929
1029
msgid ""
930
1030
"If a second branch is provided, cross-branch reconciliation is\n"
931
1031
"also attempted, which will check that data like the tree root\n"
933
1033
"correctly in both branches."
934
1034
msgstr ""
935
1035
936
#: bzrlib/builtins.py:1716
1036
#: bzrlib/builtins.py:1967
937
1037
msgid ""
938
1038
"At the same time it is run it may recompress data resulting in\n"
939
1039
"a potential saving in disk space or performance gain."
940
1040
msgstr ""
941
1041
942
#: bzrlib/builtins.py:1719
1042
#: bzrlib/builtins.py:1970
943
1043
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
944
1044
msgstr ""
945
1045
946
#: bzrlib/builtins.py:1783
1046
# 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
1053
msgid ""
1054
"Format for the bzr 2.0 series.\n"
1055
"Uses group-compress storage.\n"
1056
"Provides rich roots which are a one-way transition.\n"
1057
msgstr ""
1058
1059
# 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
1063
msgid ""
1064
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1065
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1066
msgstr ""
1067
1068
# 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
1072
msgid "The 2a format with experimental support for colocated branches.\n"
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:2038
947
1076
msgid "Make a directory into a versioned branch."
948
1077
msgstr ""
949
1078
950
#: bzrlib/builtins.py:1785
1079
#: bzrlib/builtins.py:2040
951
1080
msgid ""
952
1081
"Use this to create an empty branch, or before importing an\n"
953
1082
"existing project."
954
1083
msgstr ""
955
1084
956
#: bzrlib/builtins.py:1788
1085
#: bzrlib/builtins.py:2043
957
1086
msgid ""
958
1087
"If there is a repository in a parent directory of the location, then\n"
959
1088
"the history of the branch will be stored in the repository. Otherwise\n"
961
1090
"in the .bzr directory."
962
1091
msgstr ""
963
1092
964
#: bzrlib/builtins.py:1793
1093
#: bzrlib/builtins.py:2048
965
1094
msgid ""
966
1095
"If there is already a branch at the location but it has no working tree,\n"
967
1096
"the tree can be populated with 'bzr checkout'."
968
1097
msgstr ""
969
1098
970
#: bzrlib/builtins.py:1796
1099
#: bzrlib/builtins.py:2051
971
1100
msgid "Recipe for importing a tree of files::"
972
1101
msgstr ""
973
1102
974
#: bzrlib/builtins.py:1798
1103
#: bzrlib/builtins.py:2053
975
1104
msgid ""
976
1105
" cd ~/project\n"
977
1106
" bzr init\n"
981
1110
msgstr ""
982
1111
983
1112
# help of 'create-prefix' option of 'init' command
984
#: bzrlib/builtins.py:1809
1113
# help of 'create-prefix' option of 'push' command
1114
#: bzrlib/builtins.py:2064
985
1115
msgid "Create the path leading up to the branch if it does not already exist."
986
1116
msgstr ""
987
1117
988
1118
# help of 'format' option of 'init' command
989
#: bzrlib/builtins.py:1812
1119
#: bzrlib/builtins.py:2067
990
1120
msgid "Specify a format for this branch. See \"help formats\"."
991
1121
msgstr ""
992
1122
993
1123
# help of 'append-revisions-only' option of 'init' command
994
#: bzrlib/builtins.py:1820
1124
#: bzrlib/builtins.py:2075
995
1125
msgid "Never change revnos or the existing log. Append revisions to it only."
996
1126
msgstr ""
997
1127
998
1128
# help of 'no-tree' option of 'init' command
999
#: bzrlib/builtins.py:1823
1129
#: bzrlib/builtins.py:2078
1000
1130
msgid "Create a branch without a working tree."
1001
1131
msgstr ""
1002
1132
1003
#: bzrlib/builtins.py:1843 bzrlib/push.py:108
1133
#: bzrlib/builtins.py:2098 bzrlib/push.py:110
1004
1134
#, python-format
1005
1135
msgid ""
1006
1136
"Parent directory of %s does not exist.\n"
1007
1137
"You may supply --create-prefix to create all leading parent directories."
1008
1138
msgstr ""
1009
1139
1010
#: bzrlib/builtins.py:1877
1140
#: bzrlib/builtins.py:2132
1011
1141
msgid ""
1012
1142
"This branch format cannot be set to append-revisions-only. Try --default."
1013
1143
msgstr ""
1014
1144
1015
#: bzrlib/builtins.py:1888
1145
#: bzrlib/builtins.py:2143
1016
1146
msgid "Created a {0} (format: {1})\n"
1017
1147
msgstr ""
1018
1148
1019
#: bzrlib/builtins.py:1897
1149
#: bzrlib/builtins.py:2152
1020
1150
#, python-format
1021
1151
msgid "Using shared repository: %s\n"
1022
1152
msgstr ""
1023
1153
1024
#: bzrlib/builtins.py:1901
1154
#: bzrlib/builtins.py:2156
1025
1155
msgid "Create a shared repository for branches to share storage space."
1026
1156
msgstr ""
1027
1157
1028
#: bzrlib/builtins.py:1903
1158
#: bzrlib/builtins.py:2158
1029
1159
msgid ""
1030
1160
"New branches created under the repository directory will store their\n"
1031
1161
"revisions in the repository, not in the branch directory. For branches\n"
1033
1163
"speeds up the creation of new branches."
1034
1164
msgstr ""
1035
1165
1036
#: bzrlib/builtins.py:1908
1166
#: bzrlib/builtins.py:2163
1037
1167
msgid ""
1038
1168
"If the --no-trees option is given then the branches in the repository\n"
1039
1169
"will not have working trees by default. They will still exist as \n"
1043
1173
"branches, such as on a server."
1044
1174
msgstr ""
1045
1175
1046
#: bzrlib/builtins.py:1915
1176
#: bzrlib/builtins.py:2170
1047
1177
msgid ""
1048
1178
":Examples:\n"
1049
1179
" Create a shared repository holding just branches::"
1050
1180
msgstr ""
1051
1181
1052
#: bzrlib/builtins.py:1918
1182
#: bzrlib/builtins.py:2173
1053
1183
msgid ""
1054
1184
" bzr init-repo --no-trees repo\n"
1055
1185
" bzr init repo/trunk"
1056
1186
msgstr ""
1057
1187
1058
#: bzrlib/builtins.py:1921
1188
#: bzrlib/builtins.py:2176
1059
1189
msgid " Make a lightweight checkout elsewhere::"
1060
1190
msgstr ""
1061
1191
1062
#: bzrlib/builtins.py:1923
1192
#: bzrlib/builtins.py:2178
1063
1193
msgid ""
1064
1194
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1065
1195
" cd trunk-checkout\n"
1067
1197
msgstr ""
1068
1198
1069
1199
# help of 'format' option of 'init-repository' command
1070
#: bzrlib/builtins.py:1931
1200
#: bzrlib/builtins.py:2186
1071
1201
msgid ""
1072
1202
"Specify a format for this repository. See \"bzr help formats\" for details."
1073
1203
msgstr ""
1074
1204
1075
1205
# title of 'format' option of 'init-repository' command
1076
#: bzrlib/builtins.py:1935
1206
#: bzrlib/builtins.py:2190
1077
1207
msgid "Repository format"
1078
1208
msgstr ""
1079
1209
1080
1210
# help of 'no-trees' option of 'init-repository' command
1081
#: bzrlib/builtins.py:1937
1211
#: bzrlib/builtins.py:2192
1082
1212
msgid "Branches in the repository will default to not having a working tree."
1083
1213
msgstr ""
1084
1214
1085
#: bzrlib/builtins.py:1961
1215
#: bzrlib/builtins.py:2218
1086
1216
msgid "Show differences in the working tree, between revisions or branches."
1087
1217
msgstr ""
1088
1218
1089
#: bzrlib/builtins.py:1963
1219
#: bzrlib/builtins.py:2220
1090
1220
msgid ""
1091
1221
"If no arguments are given, all changes for the current tree are listed.\n"
1092
1222
"If files are given, only the changes in those files are listed.\n"
1096
1226
"given."
1097
1227
msgstr ""
1098
1228
1099
#: bzrlib/builtins.py:1970
1229
#: bzrlib/builtins.py:2227
1100
1230
msgid ""
1101
1231
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1102
1232
"produces patches suitable for \"patch -p1\"."
1103
1233
msgstr ""
1104
1234
1105
#: bzrlib/builtins.py:1973
1235
#: bzrlib/builtins.py:2230
1106
1236
msgid ""
1107
1237
"Note that when using the -r argument with a range of revisions, the\n"
1108
1238
"differences are computed between the two specified revisions. That\n"
1112
1242
"in the range."
1113
1243
msgstr ""
1114
1244
1115
#: bzrlib/builtins.py:1980
1245
#: bzrlib/builtins.py:2237
1116
1246
msgid ""
1117
1247
":Exit values:\n"
1118
1248
" 1 - changed\n"
1121
1251
" 0 - no change"
1122
1252
msgstr ""
1123
1253
1124
#: bzrlib/builtins.py:1986
1254
#: bzrlib/builtins.py:2243
1125
1255
msgid ""
1126
1256
":Examples:\n"
1127
1257
" Shows the difference in the working tree versus the last commit::"
1128
1258
msgstr ""
1129
1259
1130
#: bzrlib/builtins.py:1989
1260
#: bzrlib/builtins.py:2246
1131
1261
msgid " bzr diff"
1132
1262
msgstr ""
1133
1263
1134
#: bzrlib/builtins.py:1991
1264
#: bzrlib/builtins.py:2248
1135
1265
msgid " Difference between the working tree and revision 1::"
1136
1266
msgstr ""
1137
1267
1138
#: bzrlib/builtins.py:1993
1268
#: bzrlib/builtins.py:2250
1139
1269
msgid " bzr diff -r1"
1140
1270
msgstr ""
1141
1271
1142
#: bzrlib/builtins.py:1995
1272
#: bzrlib/builtins.py:2252
1143
1273
msgid " Difference between revision 3 and revision 1::"
1144
1274
msgstr ""
1145
1275
1146
#: bzrlib/builtins.py:1997
1276
#: bzrlib/builtins.py:2254
1147
1277
msgid " bzr diff -r1..3"
1148
1278
msgstr ""
1149
1279
1150
#: bzrlib/builtins.py:1999
1280
#: bzrlib/builtins.py:2256
1151
1281
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1152
1282
msgstr ""
1153
1283
1154
#: bzrlib/builtins.py:2001
1284
#: bzrlib/builtins.py:2258
1155
1285
msgid " bzr diff -r1..3 xxx"
1156
1286
msgstr ""
1157
1287
1158
#: bzrlib/builtins.py:2003
1288
#: bzrlib/builtins.py:2260
1159
1289
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1160
1290
msgstr ""
1161
1291
1162
#: bzrlib/builtins.py:2005
1292
#: bzrlib/builtins.py:2262
1163
1293
msgid " bzr diff -c2"
1164
1294
msgstr ""
1165
1295
1166
#: bzrlib/builtins.py:2007
1296
#: bzrlib/builtins.py:2264
1167
1297
msgid ""
1168
1298
" To see the changes introduced by revision X::\n"
1169
1299
" \n"
1170
1300
" bzr diff -cX"
1171
1301
msgstr ""
1172
1302
1173
#: bzrlib/builtins.py:2011
1303
#: bzrlib/builtins.py:2268
1174
1304
msgid ""
1175
1305
" Note that in the case of a merge, the -c option shows the changes\n"
1176
1306
" compared to the left hand parent. To see the changes against\n"
1177
1307
" another parent, use::"
1178
1308
msgstr ""
1179
1309
1180
#: bzrlib/builtins.py:2015
1310
#: bzrlib/builtins.py:2272
1181
1311
msgid " bzr diff -r<chosen_parent>..X"
1182
1312
msgstr ""
1183
1313
1184
#: bzrlib/builtins.py:2017
1314
#: bzrlib/builtins.py:2274
1185
1315
msgid ""
1186
1316
" The changes between the current revision and the previous revision\n"
1187
1317
" (equivalent to -c-1 and -r-2..-1)"
1188
1318
msgstr ""
1189
1319
1190
#: bzrlib/builtins.py:2020
1320
#: bzrlib/builtins.py:2277
1191
1321
msgid " bzr diff -r-2.."
1192
1322
msgstr ""
1193
1323
1194
#: bzrlib/builtins.py:2022
1324
#: bzrlib/builtins.py:2279
1195
1325
msgid " Show just the differences for file NEWS::"
1196
1326
msgstr ""
1197
1327
1198
#: bzrlib/builtins.py:2024
1328
#: bzrlib/builtins.py:2281
1199
1329
msgid " bzr diff NEWS"
1200
1330
msgstr ""
1201
1331
1202
#: bzrlib/builtins.py:2026
1332
#: bzrlib/builtins.py:2283
1203
1333
msgid " Show the differences in working tree xxx for file NEWS::"
1204
1334
msgstr ""
1205
1335
1206
#: bzrlib/builtins.py:2028
1336
#: bzrlib/builtins.py:2285
1207
1337
msgid " bzr diff xxx/NEWS"
1208
1338
msgstr ""
1209
1339
1210
#: bzrlib/builtins.py:2030
1340
#: bzrlib/builtins.py:2287
1211
1341
msgid " Show the differences from branch xxx to this working tree:"
1212
1342
msgstr ""
1213
1343
1214
#: bzrlib/builtins.py:2032
1344
#: bzrlib/builtins.py:2289
1215
1345
msgid " bzr diff --old xxx"
1216
1346
msgstr ""
1217
1347
1218
#: bzrlib/builtins.py:2034
1348
#: bzrlib/builtins.py:2291
1219
1349
msgid " Show the differences between two branches for file NEWS::"
1220
1350
msgstr ""
1221
1351
1222
#: bzrlib/builtins.py:2036
1352
#: bzrlib/builtins.py:2293
1223
1353
msgid " bzr diff --old xxx --new yyy NEWS"
1224
1354
msgstr ""
1225
1355
1226
#: bzrlib/builtins.py:2038
1356
#: bzrlib/builtins.py:2295
1227
1357
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1228
1358
msgstr ""
1229
1359
1230
#: bzrlib/builtins.py:2040
1360
#: bzrlib/builtins.py:2297
1231
1361
msgid ""
1232
1362
" bzr diff --prefix old/:new/\n"
1233
1363
" \n"
1237
1367
msgstr ""
1238
1368
1239
1369
# help of 'diff-options' option of 'diff' command
1240
#: bzrlib/builtins.py:2050
1370
#: bzrlib/builtins.py:2307
1241
1371
msgid "Pass these options to the external diff program."
1242
1372
msgstr ""
1243
1373
1244
1374
# help of 'prefix' option of 'diff' command
1245
#: bzrlib/builtins.py:2053
1375
#: bzrlib/builtins.py:2310
1246
1376
msgid ""
1247
1377
"Set prefixes added to old and new filenames, as two values separated by a "
1248
1378
"colon. (eg \"old/:new/\")."
1249
1379
msgstr ""
1250
1380
1251
1381
# help of 'old' option of 'diff' command
1252
#: bzrlib/builtins.py:2056
1382
#: bzrlib/builtins.py:2313
1253
1383
msgid "Branch/tree to compare from."
1254
1384
msgstr ""
1255
1385
1256
1386
# help of 'new' option of 'diff' command
1257
#: bzrlib/builtins.py:2060
1387
#: bzrlib/builtins.py:2317
1258
1388
msgid "Branch/tree to compare to."
1259
1389
msgstr ""
1260
1390
1261
1391
# help of 'using' option of 'diff' command
1262
#: bzrlib/builtins.py:2066
1392
#: bzrlib/builtins.py:2323
1263
1393
msgid "Use this command to compare files."
1264
1394
msgstr ""
1265
1395
1266
1396
# help of 'format' option of 'diff' command
1267
#: bzrlib/builtins.py:2071
1397
#: bzrlib/builtins.py:2328
1268
1398
msgid "Diff format to use."
1269
1399
msgstr ""
1270
1400
1271
1401
# title of 'format' option of 'diff' command
1272
#: bzrlib/builtins.py:2073
1402
#: bzrlib/builtins.py:2330
1273
1403
msgid "Diff format"
1274
1404
msgstr ""
1275
1405
1276
#: bzrlib/builtins.py:2095
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
1277
1412
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1278
1413
msgstr ""
1279
1414
1280
#: bzrlib/builtins.py:2099
1415
#: bzrlib/builtins.py:2361
1281
1416
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1282
1417
msgstr ""
1283
1418
1284
#: bzrlib/builtins.py:2104 bzrlib/builtins.py:2502 bzrlib/builtins.py:2515
1285
#: bzrlib/builtins.py:2523 bzrlib/builtins.py:4663
1419
#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776
1420
#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957
1286
1421
msgid "{0} and {1} are mutually exclusive"
1287
1422
msgstr ""
1288
1423
1289
#: bzrlib/builtins.py:2124
1424
#: bzrlib/builtins.py:2386
1290
1425
msgid ""
1291
1426
"List files deleted in the working tree.\n"
1292
1427
" "
1293
1428
msgstr ""
1294
1429
1295
#: bzrlib/builtins.py:2202
1430
#: bzrlib/builtins.py:2463
1296
1431
msgid "Show the tree root directory."
1297
1432
msgstr ""
1298
1433
1299
#: bzrlib/builtins.py:2204
1434
#: bzrlib/builtins.py:2465
1300
1435
msgid ""
1301
1436
"The root is the nearest enclosing directory with a .bzr control\n"
1302
1437
"directory."
1303
1438
msgstr ""
1304
1439
1305
#: bzrlib/builtins.py:2219
1440
#: bzrlib/builtins.py:2480
1306
1441
msgid "The limit argument must be an integer."
1307
1442
msgstr ""
1308
1443
1309
#: bzrlib/builtins.py:2227
1444
#: bzrlib/builtins.py:2488
1310
1445
msgid "The levels argument must be an integer."
1311
1446
msgstr ""
1312
1447
1313
#: bzrlib/builtins.py:2232
1448
#: bzrlib/builtins.py:2493
1314
1449
msgid "Show historical log for a branch or subset of a branch."
1315
1450
msgstr ""
1316
1451
1317
#: bzrlib/builtins.py:2234
1452
#: bzrlib/builtins.py:2495
1318
1453
msgid ""
1319
1454
"log is bzr's default tool for exploring the history of a branch.\n"
1320
1455
"The branch to use is taken from the first parameter. If no parameters\n"
1322
1457
"Here are some simple examples::"
1323
1458
msgstr ""
1324
1459
1325
#: bzrlib/builtins.py:2239
1460
#: bzrlib/builtins.py:2500
1326
1461
msgid ""
1327
1462
" bzr log log the current branch\n"
1328
1463
" bzr log foo.py log a file in its branch\n"
1329
1464
" bzr log http://server/branch log a branch on a server"
1330
1465
msgstr ""
1331
1466
1332
#: bzrlib/builtins.py:2243
1467
#: bzrlib/builtins.py:2504
1333
1468
msgid ""
1334
1469
"The filtering, ordering and information shown for each revision can\n"
1335
1470
"be controlled as explained below. By default, all revisions are\n"
1339
1474
"were merged."
1340
1475
msgstr ""
1341
1476
1342
#: bzrlib/builtins.py:2250
1477
#: bzrlib/builtins.py:2511
1343
1478
msgid ":Output control:"
1344
1479
msgstr ""
1345
1480
1346
#: bzrlib/builtins.py:2252
1481
#: bzrlib/builtins.py:2513
1347
1482
msgid ""
1348
1483
" The log format controls how information about each revision is\n"
1349
1484
" displayed. The standard log formats are called ``long``, ``short``\n"
1351
1486
" for more details on log formats."
1352
1487
msgstr ""
1353
1488
1354
#: bzrlib/builtins.py:2257
1489
#: bzrlib/builtins.py:2518
1355
1490
msgid ""
1356
1491
" The following options can be used to control what information is\n"
1357
1492
" displayed::"
1358
1493
msgstr ""
1359
1494
1360
#: bzrlib/builtins.py:2260
1495
#: bzrlib/builtins.py:2521
1361
1496
msgid ""
1362
1497
" -l N display a maximum of N revisions\n"
1363
1498
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1366
1501
" --show-ids display revision-ids (and file-ids), not just revnos"
1367
1502
msgstr ""
1368
1503
1369
#: bzrlib/builtins.py:2266
1504
#: bzrlib/builtins.py:2527
1370
1505
msgid ""
1371
1506
" Note that the default number of levels to display is a function of the\n"
1372
1507
" log format. If the -n option is not used, the standard log formats show\n"
1373
1508
" just the top level (mainline)."
1374
1509
msgstr ""
1375
1510
1376
#: bzrlib/builtins.py:2270
1511
#: bzrlib/builtins.py:2531
1377
1512
msgid ""
1378
1513
" Status summaries are shown using status flags like A, M, etc. To see\n"
1379
1514
" the changes explained using words like ``added`` and ``modified``\n"
1380
1515
" instead, use the -vv option."
1381
1516
msgstr ""
1382
1517
1383
#: bzrlib/builtins.py:2274
1518
#: bzrlib/builtins.py:2535
1384
1519
msgid ":Ordering control:"
1385
1520
msgstr ""
1386
1521
1387
#: bzrlib/builtins.py:2276
1522
#: bzrlib/builtins.py:2537
1388
1523
msgid ""
1389
1524
" To display revisions from oldest to newest, use the --forward option.\n"
1390
1525
" In most cases, using this option will have little impact on the total\n"
1392
1527
" display revisions like --reverse does when it can."
1393
1528
msgstr ""
1394
1529
1395
#: bzrlib/builtins.py:2281
1530
#: bzrlib/builtins.py:2542
1396
1531
msgid ":Revision filtering:"
1397
1532
msgstr ""
1398
1533
1399
#: bzrlib/builtins.py:2283
1534
#: bzrlib/builtins.py:2544
1400
1535
msgid ""
1401
1536
" The -r option can be used to specify what revision or range of revisions\n"
1402
1537
" to filter against. The various forms are shown below::"
1403
1538
msgstr ""
1404
1539
1405
#: bzrlib/builtins.py:2286
1540
#: bzrlib/builtins.py:2547
1406
1541
msgid ""
1407
1542
" -rX display revision X\n"
1408
1543
" -rX.. display revision X and later\n"
1410
1545
" -rX..Y display from X to Y inclusive"
1411
1546
msgstr ""
1412
1547
1413
#: bzrlib/builtins.py:2291
1548
#: bzrlib/builtins.py:2552
1414
1549
msgid ""
1415
1550
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1416
1551
" Some common examples are given below::"
1417
1552
msgstr ""
1418
1553
1419
#: bzrlib/builtins.py:2294
1554
#: bzrlib/builtins.py:2555
1420
1555
msgid ""
1421
1556
" -r-1 show just the tip\n"
1422
1557
" -r-10.. show the last 10 mainline revisions\n"
1426
1561
" -rdate:yesterday.. show changes since yesterday"
1427
1562
msgstr ""
1428
1563
1429
#: bzrlib/builtins.py:2301
1564
#: bzrlib/builtins.py:2562
1430
1565
msgid ""
1431
1566
" When logging a range of revisions using -rX..Y, log starts at\n"
1432
1567
" revision Y and searches back in history through the primary\n"
1436
1571
" a nested merge revision and the log will be truncated accordingly."
1437
1572
msgstr ""
1438
1573
1439
#: bzrlib/builtins.py:2308
1574
#: bzrlib/builtins.py:2569
1440
1575
msgid ":Path filtering:"
1441
1576
msgstr ""
1442
1577
1443
#: bzrlib/builtins.py:2310
1578
#: bzrlib/builtins.py:2571
1444
1579
msgid ""
1445
1580
" If parameters are given and the first one is not a branch, the log\n"
1446
1581
" will be filtered to show only those revisions that changed the\n"
1447
1582
" nominated files or directories."
1448
1583
msgstr ""
1449
1584
1450
#: bzrlib/builtins.py:2314
1585
#: bzrlib/builtins.py:2575
1451
1586
msgid ""
1452
1587
" Filenames are interpreted within their historical context. To log a\n"
1453
1588
" deleted file, specify a revision range so that the file existed at\n"
1454
1589
" the end or start of the range."
1455
1590
msgstr ""
1456
1591
1457
#: bzrlib/builtins.py:2318
1592
#: bzrlib/builtins.py:2579
1458
1593
msgid ""
1459
1594
" Historical context is also important when interpreting pathnames of\n"
1460
1595
" renamed files/directories. Consider the following example:"
1461
1596
msgstr ""
1462
1597
1463
#: bzrlib/builtins.py:2321
1598
#: bzrlib/builtins.py:2582
1464
1599
msgid ""
1465
1600
" * revision 1: add tutorial.txt\n"
1466
1601
" * revision 2: modify tutorial.txt\n"
1467
1602
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1468
1603
msgstr ""
1469
1604
1470
#: bzrlib/builtins.py:2325
1605
#: bzrlib/builtins.py:2586
1471
1606
msgid " In this case:"
1472
1607
msgstr ""
1473
1608
1474
#: bzrlib/builtins.py:2327
1609
#: bzrlib/builtins.py:2588
1475
1610
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1476
1611
msgstr ""
1477
1612
1478
#: bzrlib/builtins.py:2329
1613
#: bzrlib/builtins.py:2590
1479
1614
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1480
1615
msgstr ""
1481
1616
1482
#: bzrlib/builtins.py:2331
1617
#: bzrlib/builtins.py:2592
1483
1618
msgid ""
1484
1619
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1485
1620
" the original file in revision 2."
1486
1621
msgstr ""
1487
1622
1488
#: bzrlib/builtins.py:2334
1623
#: bzrlib/builtins.py:2595
1489
1624
msgid ""
1490
1625
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1491
1626
" was no file called guide.txt in revision 2."
1492
1627
msgstr ""
1493
1628
1494
#: bzrlib/builtins.py:2337
1629
#: bzrlib/builtins.py:2598
1495
1630
msgid ""
1496
1631
" Renames are always followed by log. By design, there is no need to\n"
1497
1632
" explicitly ask for this (and no way to stop logging a file back\n"
1498
1633
" until it was last renamed)."
1499
1634
msgstr ""
1500
1635
1501
#: bzrlib/builtins.py:2341
1636
#: bzrlib/builtins.py:2602
1502
1637
msgid ":Other filtering:"
1503
1638
msgstr ""
1504
1639
1505
#: bzrlib/builtins.py:2343
1640
#: bzrlib/builtins.py:2604
1506
1641
msgid ""
1507
1642
" The --match option can be used for finding revisions that match a\n"
1508
1643
" regular expression in a commit message, committer, author or bug.\n"
1511
1646
" --match-message can be used to only match a specific field."
1512
1647
msgstr ""
1513
1648
1514
#: bzrlib/builtins.py:2349
1649
#: bzrlib/builtins.py:2610
1515
1650
msgid ":Tips & tricks:"
1516
1651
msgstr ""
1517
1652
1518
#: bzrlib/builtins.py:2351
1653
#: bzrlib/builtins.py:2612
1519
1654
msgid ""
1520
1655
" GUI tools and IDEs are often better at exploring history than command\n"
1521
1656
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1524
1659
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1525
1660
msgstr ""
1526
1661
1527
#: bzrlib/builtins.py:2357
1662
#: bzrlib/builtins.py:2618
1528
1663
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1529
1664
msgstr ""
1530
1665
1531
#: bzrlib/builtins.py:2359
1666
#: bzrlib/builtins.py:2620
1532
1667
msgid ""
1533
1668
" [ALIASES]\n"
1534
1669
" tip = log -r-1\n"
1536
1671
" show = log -v -p"
1537
1672
msgstr ""
1538
1673
1539
#: bzrlib/builtins.py:2364
1674
#: bzrlib/builtins.py:2625
1540
1675
msgid ""
1541
1676
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1542
1677
" will show the last 10 mainline revisions. To see the details of a\n"
1543
1678
" particular revision X, ``bzr show -rX``."
1544
1679
msgstr ""
1545
1680
1546
#: bzrlib/builtins.py:2368
1681
#: bzrlib/builtins.py:2629
1547
1682
msgid ""
1548
1683
" If you are interested in looking deeper into a particular merge X,\n"
1549
1684
" use ``bzr log -n0 -rX``."
1550
1685
msgstr ""
1551
1686
1552
#: bzrlib/builtins.py:2371
1687
#: bzrlib/builtins.py:2632
1553
1688
msgid ""
1554
1689
" ``bzr log -v`` on a branch with lots of history is currently\n"
1555
1690
" very slow. A fix for this issue is currently under development.\n"
1557
1692
" be given when using the -v option."
1558
1693
msgstr ""
1559
1694
1560
#: bzrlib/builtins.py:2376
1695
#: bzrlib/builtins.py:2637
1561
1696
msgid ""
1562
1697
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1563
1698
" used to find revisions matching user names, commit messages, etc.\n"
1565
1700
" a list of words but not others."
1566
1701
msgstr ""
1567
1702
1568
#: bzrlib/builtins.py:2381
1703
#: bzrlib/builtins.py:2642
1569
1704
msgid ""
1570
1705
" When exploring non-mainline history on large projects with deep\n"
1571
1706
" history, the performance of log can be greatly improved by installing\n"
1574
1709
msgstr ""
1575
1710
1576
1711
# help of 'forward' option of 'log' command
1577
#: bzrlib/builtins.py:2390
1712
#: bzrlib/builtins.py:2651
1578
1713
msgid "Show from oldest to newest."
1579
1714
msgstr ""
1580
1715
1581
1716
# help of 'verbose' option of 'log' command
1582
#: bzrlib/builtins.py:2393
1717
#: bzrlib/builtins.py:2654
1583
1718
msgid "Show files changed in each revision."
1584
1719
msgstr ""
1585
1720
1586
1721
# help of 'change' option of 'log' command
1587
#: bzrlib/builtins.py:2399
1722
#: bzrlib/builtins.py:2660
1588
1723
msgid "Show just the specified revision. See also \"help revisionspec\"."
1589
1724
msgstr ""
1590
1725
1591
1726
# help of 'authors' option of 'log' command
1592
#: bzrlib/builtins.py:2403
1727
#: bzrlib/builtins.py:2664
1593
1728
msgid "What names to list as authors - first, all or committer."
1594
1729
msgstr ""
1595
1730
1596
1731
# title of 'authors' option of 'log' command
1597
#: bzrlib/builtins.py:2404
1732
#: bzrlib/builtins.py:2665
1598
1733
msgid "Authors"
1599
1734
msgstr ""
1600
1735
1601
1736
# help of 'levels' option of 'log' command
1602
#: bzrlib/builtins.py:2409
1737
#: bzrlib/builtins.py:2670
1603
1738
msgid "Number of levels to display - 0 for all, 1 for flat."
1604
1739
msgstr ""
1605
1740
1606
1741
# help of 'limit' option of 'log' command
1607
#: bzrlib/builtins.py:2419
1742
#: bzrlib/builtins.py:2680
1608
1743
msgid "Limit the output to the first N revisions."
1609
1744
msgstr ""
1610
1745
1611
1746
# help of 'show-diff' option of 'log' command
1612
#: bzrlib/builtins.py:2424
1747
#: bzrlib/builtins.py:2685
1613
1748
msgid "Show changes made in each revision as a patch."
1614
1749
msgstr ""
1615
1750
1616
1751
# help of 'include-merged' option of 'log' command
1617
#: bzrlib/builtins.py:2426
1752
#: bzrlib/builtins.py:2687
1618
1753
msgid "Show merged revisions like --levels 0 does."
1619
1754
msgstr ""
1620
1755
1621
1756
# help of 'omit-merges' option of 'log' command
1622
#: bzrlib/builtins.py:2430
1757
#: bzrlib/builtins.py:2691
1623
1758
msgid "Do not report commits with more than one parent."
1624
1759
msgstr ""
1625
1760
1626
1761
# help of 'exclude-common-ancestry' option of 'log' command
1627
#: bzrlib/builtins.py:2432
1762
#: bzrlib/builtins.py:2693
1628
1763
msgid ""
1629
1764
"Display only the revisions that are not part of both ancestries (require -"
1630
"rX..Y)"
1765
"rX..Y)."
1631
1766
msgstr ""
1632
1767
1633
1768
# help of 'signatures' option of 'log' command
1634
#: bzrlib/builtins.py:2436
1635
msgid "Show digital signature validity"
1769
#: bzrlib/builtins.py:2697
1770
msgid "Show digital signature validity."
1636
1771
msgstr ""
1637
1772
1638
1773
# help of 'match' option of 'log' command
1639
#: bzrlib/builtins.py:2439
1774
#: bzrlib/builtins.py:2700
1640
1775
msgid "Show revisions whose properties match this expression."
1641
1776
msgstr ""
1642
1777
1643
1778
# help of 'match-message' option of 'log' command
1644
#: bzrlib/builtins.py:2443
1779
#: bzrlib/builtins.py:2704
1645
1780
msgid "Show revisions whose message matches this expression."
1646
1781
msgstr ""
1647
1782
1648
1783
# help of 'match-committer' option of 'log' command
1649
#: bzrlib/builtins.py:2447
1784
#: bzrlib/builtins.py:2708
1650
1785
msgid "Show revisions whose committer matches this expression."
1651
1786
msgstr ""
1652
1787
1653
1788
# help of 'match-author' option of 'log' command
1654
#: bzrlib/builtins.py:2451
1789
#: bzrlib/builtins.py:2712
1655
1790
msgid "Show revisions whose authors match this expression."
1656
1791
msgstr ""
1657
1792
1658
1793
# help of 'match-bugs' option of 'log' command
1659
#: bzrlib/builtins.py:2455
1794
#: bzrlib/builtins.py:2716
1660
1795
msgid "Show revisions whose bugs match this expression."
1661
1796
msgstr ""
1662
1797
1663
#: bzrlib/builtins.py:2509
1798
#: bzrlib/builtins.py:2770
1664
1799
msgid "--exclude-common-ancestry requires -r with two revisions"
1665
1800
msgstr ""
1666
1801
1667
#: bzrlib/builtins.py:2537
1802
#: bzrlib/builtins.py:2798
1668
1803
#, python-format
1669
1804
msgid "Path unknown at end or start of revision range: %s"
1670
1805
msgstr ""
1671
1806
1672
#: bzrlib/builtins.py:2654
1807
#: bzrlib/builtins.py:2915
1673
1808
#, python-format
1674
1809
msgid "bzr %s doesn't accept two revisions in different branches."
1675
1810
msgstr ""
1676
1811
1677
#: bzrlib/builtins.py:2670
1812
#: bzrlib/builtins.py:2931
1678
1813
#, python-format
1679
1814
msgid "bzr %s --revision takes one or two values."
1680
1815
msgstr ""
1681
1816
1682
#: bzrlib/builtins.py:2715
1817
#: bzrlib/builtins.py:2976
1683
1818
msgid ""
1684
1819
"List files in a tree.\n"
1685
1820
" "
1686
1821
msgstr ""
1687
1822
1688
1823
# help of 'recursive' option of 'ls' command
1689
#: bzrlib/builtins.py:2724
1824
#: bzrlib/builtins.py:2985
1690
1825
msgid "Recurse into subdirectories."
1691
1826
msgstr ""
1692
1827
1693
1828
# help of 'from-root' option of 'ls' command
1694
#: bzrlib/builtins.py:2726
1829
#: bzrlib/builtins.py:2987
1695
1830
msgid "Print paths relative to the root of the branch."
1696
1831
msgstr ""
1697
1832
1698
1833
# help of 'unknown' option of 'ls' command
1699
#: bzrlib/builtins.py:2728
1834
#: bzrlib/builtins.py:2989
1700
1835
msgid "Print unknown files."
1701
1836
msgstr ""
1702
1837
1703
1838
# help of 'versioned' option of 'ls' command
1704
#: bzrlib/builtins.py:2729
1839
#: bzrlib/builtins.py:2990
1705
1840
msgid "Print versioned files."
1706
1841
msgstr ""
1707
1842
1708
1843
# help of 'ignored' option of 'ls' command
1709
#: bzrlib/builtins.py:2732
1844
#: bzrlib/builtins.py:2993
1710
1845
msgid "Print ignored files."
1711
1846
msgstr ""
1712
1847
1713
1848
# help of 'kind' option of 'ls' command
1714
#: bzrlib/builtins.py:2734
1849
#: bzrlib/builtins.py:2995
1715
1850
msgid "List entries of a particular kind: file, directory, symlink."
1716
1851
msgstr ""
1717
1852
1718
#: bzrlib/builtins.py:2747
1853
#: bzrlib/builtins.py:3008
1719
1854
msgid "invalid kind specified"
1720
1855
msgstr ""
1721
1856
1722
#: bzrlib/builtins.py:2750
1857
#: bzrlib/builtins.py:3011
1723
1858
msgid "Cannot set both --verbose and --null"
1724
1859
msgstr ""
1725
1860
1726
#: bzrlib/builtins.py:2759
1861
#: bzrlib/builtins.py:3020
1727
1862
msgid "cannot specify both --from-root and PATH"
1728
1863
msgstr ""
1729
1864
1730
#: bzrlib/builtins.py:2846
1865
#: bzrlib/builtins.py:3107
1731
1866
msgid "Ignore specified files or patterns."
1732
1867
msgstr ""
1733
1868
1734
#: bzrlib/builtins.py:2848
1869
#: bzrlib/builtins.py:3109
1735
1870
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1736
1871
msgstr ""
1737
1872
1738
#: bzrlib/builtins.py:2850
1873
#: bzrlib/builtins.py:3111
1739
1874
msgid ""
1740
1875
"If a .bzrignore file does not exist, the ignore command\n"
1741
1876
"will create one and add the specified files or patterns to the newly\n"
1744
1879
"the use of the ignore command will require an explicit add command."
1745
1880
msgstr ""
1746
1881
1747
#: bzrlib/builtins.py:2856
1882
#: bzrlib/builtins.py:3117
1748
1883
msgid ""
1749
1884
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1750
1885
"After adding, editing or deleting that file either indirectly by\n"
1752
1887
"it."
1753
1888
msgstr ""
1754
1889
1755
#: bzrlib/builtins.py:2861
1890
#: bzrlib/builtins.py:3122
1756
1891
msgid ""
1757
1892
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1758
1893
"the global ignore file can be found in the application data directory as\n"
1761
1896
"can be edited directly using an editor."
1762
1897
msgstr ""
1763
1898
1764
#: bzrlib/builtins.py:2867
1899
#: bzrlib/builtins.py:3128
1765
1900
msgid ""
1766
1901
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1767
1902
"precedence over regular ignores. Such exceptions are used to specify\n"
1768
1903
"files that should be versioned which would otherwise be ignored."
1769
1904
msgstr ""
1770
1905
1771
#: bzrlib/builtins.py:2871
1906
#: bzrlib/builtins.py:3132
1772
1907
msgid ""
1773
1908
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1774
1909
"precedence over the '!' exception patterns."
1775
1910
msgstr ""
1776
1911
1777
#: bzrlib/builtins.py:2874
1912
#: bzrlib/builtins.py:3135
1778
1913
msgid ""
1779
1914
":Notes: \n"
1780
1915
" \n"
1782
1917
" the shell on Unix."
1783
1918
msgstr ""
1784
1919
1785
#: bzrlib/builtins.py:2879
1920
#: bzrlib/builtins.py:3140
1786
1921
msgid ""
1787
1922
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1788
1923
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1789
1924
msgstr ""
1790
1925
1791
#: bzrlib/builtins.py:2882
1926
#: bzrlib/builtins.py:3143
1792
1927
msgid ""
1793
1928
":Examples:\n"
1794
1929
" Ignore the top level Makefile::"
1795
1930
msgstr ""
1796
1931
1797
#: bzrlib/builtins.py:2885
1932
#: bzrlib/builtins.py:3146
1798
1933
msgid " bzr ignore ./Makefile"
1799
1934
msgstr ""
1800
1935
1801
#: bzrlib/builtins.py:2887
1936
#: bzrlib/builtins.py:3148
1802
1937
msgid " Ignore .class files in all directories...::"
1803
1938
msgstr ""
1804
1939
1805
#: bzrlib/builtins.py:2889
1940
#: bzrlib/builtins.py:3150
1806
1941
msgid " bzr ignore \"*.class\""
1807
1942
msgstr ""
1808
1943
1809
#: bzrlib/builtins.py:2891
1944
#: bzrlib/builtins.py:3152
1810
1945
msgid " ...but do not ignore \"special.class\"::"
1811
1946
msgstr ""
1812
1947
1813
#: bzrlib/builtins.py:2893
1948
#: bzrlib/builtins.py:3154
1814
1949
msgid " bzr ignore \"!special.class\""
1815
1950
msgstr ""
1816
1951
1817
#: bzrlib/builtins.py:2895
1952
#: bzrlib/builtins.py:3156
1818
1953
msgid " Ignore files whose name begins with the \"#\" character::"
1819
1954
msgstr ""
1820
1955
1821
#: bzrlib/builtins.py:2897
1956
#: bzrlib/builtins.py:3158
1822
1957
msgid " bzr ignore \"RE:^#\""
1823
1958
msgstr ""
1824
1959
1825
#: bzrlib/builtins.py:2899
1960
#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164
1826
1961
msgid " Ignore .o files under the lib directory::"
1827
1962
msgstr ""
1828
1963
1829
#: bzrlib/builtins.py:2901
1964
#: bzrlib/builtins.py:3162
1830
1965
msgid " bzr ignore \"lib/**/*.o\""
1831
1966
msgstr ""
1832
1967
1833
#: bzrlib/builtins.py:2905
1968
#: bzrlib/builtins.py:3166
1834
1969
msgid " bzr ignore \"RE:lib/.*\\.o\""
1835
1970
msgstr ""
1836
1971
1837
#: bzrlib/builtins.py:2907
1972
#: bzrlib/builtins.py:3168
1838
1973
msgid " Ignore everything but the \"debian\" toplevel directory::"
1839
1974
msgstr ""
1840
1975
1841
#: bzrlib/builtins.py:2909
1976
#: bzrlib/builtins.py:3170
1842
1977
msgid ""
1843
1978
" bzr ignore \"RE:(?!debian/).*\"\n"
1844
1979
" \n"
1851
1986
msgstr ""
1852
1987
1853
1988
# help of 'default-rules' option of 'ignore' command
1854
#: bzrlib/builtins.py:2923
1989
#: bzrlib/builtins.py:3184
1855
1990
msgid "Display the default ignore rules that bzr uses."
1856
1991
msgstr ""
1857
1992
1858
#: bzrlib/builtins.py:2935
1993
#: bzrlib/builtins.py:3196
1859
1994
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1860
1995
msgstr ""
1861
1996
1862
#: bzrlib/builtins.py:2946
1997
#: bzrlib/builtins.py:3207
1863
1998
#, python-format
1864
1999
msgid "Invalid ignore pattern found. %s"
1865
2000
msgid_plural "Invalid ignore patterns found. %s"
1866
2001
msgstr[0] ""
1867
2002
msgstr[1] ""
1868
2003
1869
#: bzrlib/builtins.py:2955
2004
#: bzrlib/builtins.py:3216
1870
2005
msgid "NAME_PATTERN should not be an absolute path"
1871
2006
msgstr ""
1872
2007
1873
#: bzrlib/builtins.py:2968
2008
#: bzrlib/builtins.py:3229
1874
2009
#, python-format
1875
2010
msgid ""
1876
2011
"Warning: the following files are version controlled and match your ignore "
1880
2015
"them.\n"
1881
2016
msgstr ""
1882
2017
1883
#: bzrlib/builtins.py:2975
2018
#: bzrlib/builtins.py:3236
1884
2019
msgid "List ignored files and the patterns that matched them."
1885
2020
msgstr ""
1886
2021
1887
#: bzrlib/builtins.py:2977
2022
#: bzrlib/builtins.py:3238
1888
2023
msgid ""
1889
2024
"List all the ignored files and the ignore pattern that caused the file to\n"
1890
2025
"be ignored."
1891
2026
msgstr ""
1892
2027
1893
#: bzrlib/builtins.py:2980
2028
#: bzrlib/builtins.py:3241
1894
2029
msgid "Alternatively, to list just the files::"
1895
2030
msgstr ""
1896
2031
1897
#: bzrlib/builtins.py:2982
2032
#: bzrlib/builtins.py:3243
1898
2033
msgid " bzr ls --ignored"
1899
2034
msgstr ""
1900
2035
1901
#: bzrlib/builtins.py:3016
2036
#: bzrlib/builtins.py:3277
1902
2037
#, python-format
1903
2038
msgid "not a valid revision-number: %r"
1904
2039
msgstr ""
1905
2040
1906
#: bzrlib/builtins.py:3023
2041
#: bzrlib/builtins.py:3284
1907
2042
msgid "Export current or past revision to a destination directory or archive."
1908
2043
msgstr ""
1909
2044
1910
#: bzrlib/builtins.py:3025
2045
#: bzrlib/builtins.py:3286
1911
2046
msgid "If no revision is specified this exports the last committed revision."
1912
2047
msgstr ""
1913
2048
1914
#: bzrlib/builtins.py:3027
2049
#: bzrlib/builtins.py:3288
1915
2050
msgid ""
1916
2051
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1917
2052
"given, try to find the format with the extension. If no extension\n"
1918
2053
"is found exports to a directory (equivalent to --format=dir)."
1919
2054
msgstr ""
1920
2055
1921
#: bzrlib/builtins.py:3031
2056
#: bzrlib/builtins.py:3292
1922
2057
msgid ""
1923
2058
"If root is supplied, it will be used as the root directory inside\n"
1924
2059
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1925
2060
"to the exported filename. The root option has no effect for 'dir' format."
1926
2061
msgstr ""
1927
2062
1928
#: bzrlib/builtins.py:3035
2063
#: bzrlib/builtins.py:3296
1929
2064
msgid ""
1930
2065
"If branch is omitted then the branch containing the current working\n"
1931
2066
"directory will be used."
1932
2067
msgstr ""
1933
2068
1934
#: bzrlib/builtins.py:3038
2069
#: bzrlib/builtins.py:3299
1935
2070
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1936
2071
msgstr ""
1937
2072
1938
#: bzrlib/builtins.py:3040
2073
#: bzrlib/builtins.py:3301
1939
2074
msgid ""
1940
2075
" ================= =========================\n"
1941
2076
" Supported formats Autodetected by extension\n"
1949
2084
msgstr ""
1950
2085
1951
2086
# help of 'format' option of 'export' command
1952
#: bzrlib/builtins.py:3054
2087
#: bzrlib/builtins.py:3315
1953
2088
msgid "Type of file to export to."
1954
2089
msgstr ""
1955
2090
1956
2091
# help of 'filters' option of 'export' command
1957
#: bzrlib/builtins.py:3057
2092
#: bzrlib/builtins.py:3318
1958
2093
msgid "Apply content filters to export the convenient form."
1959
2094
msgstr ""
1960
2095
1961
2096
# help of 'root' option of 'export' command
1962
#: bzrlib/builtins.py:3061
2097
#: bzrlib/builtins.py:3322
1963
2098
msgid "Name of the root directory inside the exported file."
1964
2099
msgstr ""
1965
2100
1966
2101
# help of 'per-file-timestamps' option of 'export' command
1967
#: bzrlib/builtins.py:3063
2102
#: bzrlib/builtins.py:3324
1968
2103
msgid ""
1969
2104
"Set modification time of files to that of the last revision in which it was "
1970
2105
"changed."
1971
2106
msgstr ""
1972
2107
1973
#: bzrlib/builtins.py:3083
2108
# help of 'uncommitted' option of 'export' command
2109
#: bzrlib/builtins.py:3327
2110
msgid "Export the working tree contents rather than that of the last revision."
2111
msgstr ""
2112
2113
#: bzrlib/builtins.py:3346
2114
msgid "--uncommitted requires a working tree"
2115
msgstr ""
2116
2117
#: bzrlib/builtins.py:3355
1974
2118
#, python-format
1975
2119
msgid "Unsupported export format: %s"
1976
2120
msgstr ""
1977
2121
1978
#: bzrlib/builtins.py:3087
2122
#: bzrlib/builtins.py:3359
1979
2123
msgid "Write the contents of a file as of a given revision to standard output."
1980
2124
msgstr ""
1981
2125
1982
#: bzrlib/builtins.py:3089
2126
#: bzrlib/builtins.py:3361
1983
2127
msgid "If no revision is nominated, the last revision is used."
1984
2128
msgstr ""
1985
2129
1986
#: bzrlib/builtins.py:3091
2130
#: bzrlib/builtins.py:3363
1987
2131
msgid ""
1988
2132
"Note: Take care to redirect standard output when using this command on a\n"
1989
2133
"binary file."
1990
2134
msgstr ""
1991
2135
2136
# help of 'name-from-revision' option of 'cat' command
2137
#: bzrlib/builtins.py:3369
2138
msgid "The path name in the old tree."
2139
msgstr ""
2140
1992
2141
# help of 'filters' option of 'cat' command
1993
#: bzrlib/builtins.py:3098
2142
#: bzrlib/builtins.py:3370
1994
2143
msgid "Apply content filters to display the convenience form."
1995
2144
msgstr ""
1996
2145
1997
#: bzrlib/builtins.py:3109
2146
#: bzrlib/builtins.py:3381
1998
2147
msgid "bzr cat --revision takes exactly one revision specifier"
1999
2148
msgstr ""
2000
2149
2001
#: bzrlib/builtins.py:3134 bzrlib/builtins.py:3146
2150
#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418
2002
2151
msgid "{0!r} is not present in revision {1}"
2003
2152
msgstr ""
2004
2153
2005
#: bzrlib/builtins.py:3169
2154
#: bzrlib/builtins.py:3441
2006
2155
msgid "Commit changes into a new revision."
2007
2156
msgstr ""
2008
2157
2009
#: bzrlib/builtins.py:3171
2158
#: bzrlib/builtins.py:3443
2010
2159
msgid ""
2011
2160
"An explanatory message needs to be given for each commit. This is\n"
2012
2161
"often done by using the --message option (getting the message from the\n"
2016
2165
"boilerplate text loaded into the editor, use the --show-diff option."
2017
2166
msgstr ""
2018
2167
2019
#: bzrlib/builtins.py:3178
2168
#: bzrlib/builtins.py:3450
2020
2169
msgid ""
2021
2170
"By default, the entire tree is committed and the person doing the\n"
2022
2171
"commit is assumed to be the author. These defaults can be overridden\n"
2023
2172
"as explained below."
2024
2173
msgstr ""
2025
2174
2026
#: bzrlib/builtins.py:3182
2175
#: bzrlib/builtins.py:3454
2027
2176
msgid ":Selective commits:"
2028
2177
msgstr ""
2029
2178
2030
#: bzrlib/builtins.py:3184
2179
#: bzrlib/builtins.py:3456
2031
2180
msgid ""
2032
2181
" If selected files are specified, only changes to those files are\n"
2033
2182
" committed. If a directory is specified then the directory and\n"
2034
2183
" everything within it is committed."
2035
2184
msgstr ""
2036
2185
2037
#: bzrlib/builtins.py:3188
2186
#: bzrlib/builtins.py:3460
2038
2187
msgid ""
2039
2188
" When excludes are given, they take precedence over selected files.\n"
2040
2189
" For example, to commit only changes within foo, but not changes\n"
2041
2190
" within foo/bar::"
2042
2191
msgstr ""
2043
2192
2044
#: bzrlib/builtins.py:3192
2193
#: bzrlib/builtins.py:3464
2045
2194
msgid " bzr commit foo -x foo/bar"
2046
2195
msgstr ""
2047
2196
2048
#: bzrlib/builtins.py:3194
2197
#: bzrlib/builtins.py:3466
2049
2198
msgid " A selective commit after a merge is not yet supported."
2050
2199
msgstr ""
2051
2200
2052
#: bzrlib/builtins.py:3196
2201
#: bzrlib/builtins.py:3468
2053
2202
msgid ":Custom authors:"
2054
2203
msgstr ""
2055
2204
2056
#: bzrlib/builtins.py:3198
2205
#: bzrlib/builtins.py:3470
2057
2206
msgid ""
2058
2207
" If the author of the change is not the same person as the committer,\n"
2059
2208
" you can specify the author's name using the --author option. The\n"
2063
2212
" author."
2064
2213
msgstr ""
2065
2214
2066
#: bzrlib/builtins.py:3205
2215
#: bzrlib/builtins.py:3477
2067
2216
msgid ":Checks:"
2068
2217
msgstr ""
2069
2218
2070
#: bzrlib/builtins.py:3207
2219
#: bzrlib/builtins.py:3479
2071
2220
msgid ""
2072
2221
" A common mistake is to forget to add a new file or directory before\n"
2073
2222
" running the commit command. The --strict option checks for unknown\n"
2076
2225
" for details."
2077
2226
msgstr ""
2078
2227
2079
#: bzrlib/builtins.py:3213
2228
#: bzrlib/builtins.py:3485
2080
2229
msgid ":Things to note:"
2081
2230
msgstr ""
2082
2231
2083
#: bzrlib/builtins.py:3215
2232
#: bzrlib/builtins.py:3487
2084
2233
msgid ""
2085
2234
" If you accidentially commit the wrong changes or make a spelling\n"
2086
2235
" mistake in the commit message say, you can use the uncommit command\n"
2087
2236
" to undo it. See ``bzr help uncommit`` for details."
2088
2237
msgstr ""
2089
2238
2090
#: bzrlib/builtins.py:3219
2239
#: bzrlib/builtins.py:3491
2091
2240
msgid ""
2092
2241
" Hooks can also be configured to run after a commit. This allows you\n"
2093
2242
" to trigger updates to external systems like bug trackers. The --fixes\n"
2096
2245
msgstr ""
2097
2246
2098
2247
# help of 'exclude' option of 'commit' command
2099
#: bzrlib/builtins.py:3229
2248
#: bzrlib/builtins.py:3501
2100
2249
msgid "Do not consider changes made to a given path."
2101
2250
msgstr ""
2102
2251
2103
2252
# help of 'message' option of 'commit' command
2104
#: bzrlib/builtins.py:3232
2253
#: bzrlib/builtins.py:3504
2105
2254
msgid "Description of the new revision."
2106
2255
msgstr ""
2107
2256
2108
2257
# help of 'unchanged' option of 'commit' command
2109
#: bzrlib/builtins.py:3235
2258
#: bzrlib/builtins.py:3507
2110
2259
msgid "Commit even if nothing has changed."
2111
2260
msgstr ""
2112
2261
2113
2262
# help of 'file' option of 'commit' command
2114
#: bzrlib/builtins.py:3239
2263
#: bzrlib/builtins.py:3511
2115
2264
msgid "Take commit message from this file."
2116
2265
msgstr ""
2117
2266
2118
2267
# help of 'strict' option of 'commit' command
2119
#: bzrlib/builtins.py:3241
2268
#: bzrlib/builtins.py:3513
2120
2269
msgid "Refuse to commit if there are unknown files in the working tree."
2121
2270
msgstr ""
2122
2271
2123
2272
# help of 'commit-time' option of 'commit' command
2124
#: bzrlib/builtins.py:3244
2273
#: bzrlib/builtins.py:3516
2125
2274
msgid ""
2126
2275
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2127
2276
"08:00:00 +0100'."
2128
2277
msgstr ""
2129
2278
2130
2279
# help of 'fixes' option of 'commit' command
2131
#: bzrlib/builtins.py:3247
2280
#: bzrlib/builtins.py:3519
2132
2281
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2133
2282
msgstr ""
2134
2283
2135
2284
# help of 'author' option of 'commit' command
2136
#: bzrlib/builtins.py:3250
2285
#: bzrlib/builtins.py:3522
2137
2286
msgid "Set the author's name, if it's different from the committer."
2138
2287
msgstr ""
2139
2288
2140
2289
# help of 'local' option of 'commit' command
2141
#: bzrlib/builtins.py:3253
2290
#: bzrlib/builtins.py:3525
2142
2291
msgid ""
2143
2292
"Perform a local commit in a bound branch. Local commits are not pushed to "
2144
2293
"the master branch until a normal commit is performed."
2145
2294
msgstr ""
2146
2295
2147
2296
# help of 'show-diff' option of 'commit' command
2148
#: bzrlib/builtins.py:3259
2297
#: bzrlib/builtins.py:3531
2149
2298
msgid ""
2150
2299
"When no message is supplied, show the diff along with the status summary in "
2151
2300
"the message editor."
2152
2301
msgstr ""
2153
2302
2154
2303
# help of 'lossy' option of 'commit' command
2155
#: bzrlib/builtins.py:3262
2304
#: bzrlib/builtins.py:3534
2156
2305
msgid ""
2157
2306
"When committing to a foreign version control system do not push data that "
2158
2307
"can not be natively represented."
2159
2308
msgstr ""
2160
2309
2161
#: bzrlib/builtins.py:3280
2310
#: bzrlib/builtins.py:3552
2162
2311
#, python-format
2163
2312
msgid ""
2164
2313
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2166
2315
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2167
2316
msgstr ""
2168
2317
2169
#: bzrlib/builtins.py:3289
2318
#: bzrlib/builtins.py:3561
2170
2319
#, python-format
2171
2320
msgid ""
2172
2321
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2174
2323
"Commit refused."
2175
2324
msgstr ""
2176
2325
2177
#: bzrlib/builtins.py:3298
2326
#: bzrlib/builtins.py:3570
2178
2327
#, python-format
2179
2328
msgid "Unrecognized bug %s. Commit refused."
2180
2329
msgstr ""
2181
2330
2182
#: bzrlib/builtins.py:3301
2331
#: bzrlib/builtins.py:3573
2183
2332
#, python-format
2184
2333
msgid ""
2185
2334
"%s\n"
2186
2335
"Commit refused."
2187
2336
msgstr ""
2188
2337
2189
#: bzrlib/builtins.py:3325
2338
#: bzrlib/builtins.py:3597
2190
2339
msgid "Could not parse --commit-time: "
2191
2340
msgstr ""
2192
2341
2193
#: bzrlib/builtins.py:3365
2342
#: bzrlib/builtins.py:3637
2194
2343
msgid "please specify either --message or --file"
2195
2344
msgstr ""
2196
2345
2197
#: bzrlib/builtins.py:3394
2346
#: bzrlib/builtins.py:3666
2198
2347
msgid "please specify a commit message with either --message or --file"
2199
2348
msgstr ""
2200
2349
2201
#: bzrlib/builtins.py:3397
2350
#: bzrlib/builtins.py:3669
2202
2351
msgid ""
2203
2352
"Empty commit message specified. Please specify a commit message with either "
2204
2353
"--message or --file or leave a blank message with --message \"\"."
2205
2354
msgstr ""
2206
2355
2207
#: bzrlib/builtins.py:3417
2356
#: bzrlib/builtins.py:3689
2208
2357
msgid ""
2209
2358
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2210
2359
"--unchanged to force an empty commit."
2211
2360
msgstr ""
2212
2361
2213
#: bzrlib/builtins.py:3421
2362
#: bzrlib/builtins.py:3693
2214
2363
msgid ""
2215
2364
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2216
2365
"resolve FILE\" to resolve."
2217
2366
msgstr ""
2218
2367
2219
#: bzrlib/builtins.py:3425
2368
#: bzrlib/builtins.py:3697
2220
2369
msgid "Commit refused because there are unknown files in the working tree."
2221
2370
msgstr ""
2222
2371
2223
#: bzrlib/builtins.py:3428
2372
#: bzrlib/builtins.py:3700
2224
2373
msgid ""
2225
2374
"\n"
2226
2375
"To commit to master branch, run update and then commit.\n"
2227
2376
"You can also pass --local to commit to continue working disconnected."
2228
2377
msgstr ""
2229
2378
2230
#: bzrlib/builtins.py:3436
2379
#: bzrlib/builtins.py:3708
2231
2380
msgid ""
2232
2381
"Validate working tree structure, branch consistency and repository history."
2233
2382
msgstr ""
2234
2383
2235
#: bzrlib/builtins.py:3438
2384
#: bzrlib/builtins.py:3710
2236
2385
msgid ""
2237
2386
"This command checks various invariants about branch and repository storage\n"
2238
2387
"to detect data corruption or bzr bugs."
2239
2388
msgstr ""
2240
2389
2241
#: bzrlib/builtins.py:3441
2390
#: bzrlib/builtins.py:3713
2242
2391
msgid ""
2243
2392
"The working tree and branch checks will only give output if a problem is\n"
2244
2393
"detected. The output fields of the repository check are:"
2245
2394
msgstr ""
2246
2395
2247
#: bzrlib/builtins.py:3444
2396
#: bzrlib/builtins.py:3716
2248
2397
msgid ""
2249
2398
"revisions\n"
2250
2399
" This is just the number of revisions checked. It doesn't\n"
2251
2400
" indicate a problem."
2252
2401
msgstr ""
2253
2402
2254
#: bzrlib/builtins.py:3448
2403
#: bzrlib/builtins.py:3720
2255
2404
msgid ""
2256
2405
"versionedfiles\n"
2257
2406
" This is just the number of versionedfiles checked. It\n"
2258
2407
" doesn't indicate a problem."
2259
2408
msgstr ""
2260
2409
2261
#: bzrlib/builtins.py:3452
2410
#: bzrlib/builtins.py:3724
2262
2411
msgid ""
2263
2412
"unreferenced ancestors\n"
2264
2413
" Texts that are ancestors of other texts, but\n"
2266
2415
" subtle problem that Bazaar can work around."
2267
2416
msgstr ""
2268
2417
2269
#: bzrlib/builtins.py:3457
2418
#: bzrlib/builtins.py:3729
2270
2419
msgid ""
2271
2420
"unique file texts\n"
2272
2421
" This is the total number of unique file contents\n"
2273
2422
" seen in the checked revisions. It does not indicate a problem."
2274
2423
msgstr ""
2275
2424
2276
#: bzrlib/builtins.py:3461
2425
#: bzrlib/builtins.py:3733
2277
2426
msgid ""
2278
2427
"repeated file texts\n"
2279
2428
" This is the total number of repeated texts seen\n"
2282
2431
" indicate a problem."
2283
2432
msgstr ""
2284
2433
2285
#: bzrlib/builtins.py:3467
2434
#: bzrlib/builtins.py:3739
2286
2435
msgid ""
2287
2436
"If no restrictions are specified, all Bazaar data that is found at the "
2288
2437
"given\n"
2289
2438
"location will be checked."
2290
2439
msgstr ""
2291
2440
2292
#: bzrlib/builtins.py:3470
2293
msgid ":Examples:"
2294
msgstr ""
2295
2296
#: bzrlib/builtins.py:3472
2441
#: bzrlib/builtins.py:3744
2297
2442
msgid " Check the tree and branch at 'foo'::"
2298
2443
msgstr ""
2299
2444
2300
#: bzrlib/builtins.py:3474
2445
#: bzrlib/builtins.py:3746
2301
2446
msgid " bzr check --tree --branch foo"
2302
2447
msgstr ""
2303
2448
2304
#: bzrlib/builtins.py:3476
2449
#: bzrlib/builtins.py:3748
2305
2450
msgid " Check only the repository at 'bar'::"
2306
2451
msgstr ""
2307
2452
2308
#: bzrlib/builtins.py:3478
2453
#: bzrlib/builtins.py:3750
2309
2454
msgid " bzr check --repo bar"
2310
2455
msgstr ""
2311
2456
2312
#: bzrlib/builtins.py:3480
2457
#: bzrlib/builtins.py:3752
2313
2458
msgid " Check everything at 'baz'::"
2314
2459
msgstr ""
2315
2460
2316
#: bzrlib/builtins.py:3482
2461
#: bzrlib/builtins.py:3754
2317
2462
msgid " bzr check baz"
2318
2463
msgstr ""
2319
2464
2320
2465
# help of 'branch' option of 'check' command
2321
#: bzrlib/builtins.py:3488
2466
#: bzrlib/builtins.py:3760
2322
2467
msgid "Check the branch related to the current directory."
2323
2468
msgstr ""
2324
2469
2325
2470
# help of 'repo' option of 'check' command
2326
#: bzrlib/builtins.py:3490
2471
#: bzrlib/builtins.py:3762
2327
2472
msgid "Check the repository related to the current directory."
2328
2473
msgstr ""
2329
2474
2330
2475
# help of 'tree' option of 'check' command
2331
#: bzrlib/builtins.py:3492
2476
#: bzrlib/builtins.py:3764
2332
2477
msgid "Check the working tree related to the current directory."
2333
2478
msgstr ""
2334
2479
2335
#: bzrlib/builtins.py:3506
2480
#: bzrlib/builtins.py:3778
2336
2481
msgid "Upgrade a repository, branch or working tree to a newer format."
2337
2482
msgstr ""
2338
2483
2339
#: bzrlib/builtins.py:3508
2484
#: bzrlib/builtins.py:3780
2340
2485
msgid ""
2341
2486
"When the default format has changed after a major new release of\n"
2342
2487
"Bazaar, you may be informed during certain operations that you\n"
2345
2490
"with older repositories or with older versions of Bazaar."
2346
2491
msgstr ""
2347
2492
2348
#: bzrlib/builtins.py:3514
2493
#: bzrlib/builtins.py:3786
2349
2494
msgid ""
2350
2495
"If you wish to upgrade to a particular format rather than the\n"
2351
2496
"current default, that can be specified using the --format option.\n"
2355
2500
"2.x default) so downgrading is not always possible."
2356
2501
msgstr ""
2357
2502
2358
#: bzrlib/builtins.py:3521
2503
#: bzrlib/builtins.py:3793
2359
2504
msgid ""
2360
2505
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2361
2506
"process (where # is a number). By default, this is left there on\n"
2366
2511
"afterwards."
2367
2512
msgstr ""
2368
2513
2369
#: bzrlib/builtins.py:3529
2514
#: bzrlib/builtins.py:3801
2370
2515
msgid ""
2371
2516
"If the location given is a shared repository, dependent branches\n"
2372
2517
"are also converted provided the repository converts successfully.\n"
2374
2519
"tried."
2375
2520
msgstr ""
2376
2521
2377
#: bzrlib/builtins.py:3534
2522
#: bzrlib/builtins.py:3806
2378
2523
msgid ""
2379
2524
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2380
2525
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2381
2526
msgstr ""
2382
2527
2383
2528
# help of 'format' option of 'upgrade' command
2384
#: bzrlib/builtins.py:3542
2529
#: bzrlib/builtins.py:3814
2385
2530
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2386
2531
msgstr ""
2387
2532
2388
2533
# title of 'format' option of 'init' command
2389
#: bzrlib/builtins.py:3546
2534
# title of 'format' option of 'upgrade' command
2535
#: bzrlib/builtins.py:3818
2390
2536
msgid "Branch format"
2391
2537
msgstr ""
2392
2538
2393
2539
# help of 'clean' option of 'upgrade' command
2394
#: bzrlib/builtins.py:3548
2540
#: bzrlib/builtins.py:3820
2395
2541
msgid "Remove the backup.bzr directory if successful."
2396
2542
msgstr ""
2397
2543
2398
#: bzrlib/builtins.py:3565
2544
# help of 'dry-run' option of 'add' command
2545
# help of 'dry-run' option of 'upgrade' command
2546
#: bzrlib/builtins.py:3822
2547
msgid "Show what would be done, but don't actually do anything."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3837
2399
2551
msgid "Show or set bzr user id."
2400
2552
msgstr ""
2401
2553
2402
#: bzrlib/builtins.py:3567
2554
#: bzrlib/builtins.py:3839
2403
2555
msgid ""
2404
2556
":Examples:\n"
2405
2557
" Show the email of the current user::"
2406
2558
msgstr ""
2407
2559
2408
#: bzrlib/builtins.py:3570
2560
#: bzrlib/builtins.py:3842
2409
2561
msgid " bzr whoami --email"
2410
2562
msgstr ""
2411
2563
2412
#: bzrlib/builtins.py:3572
2564
#: bzrlib/builtins.py:3844
2413
2565
msgid " Set the current user::"
2414
2566
msgstr ""
2415
2567
2416
#: bzrlib/builtins.py:3574
2568
#: bzrlib/builtins.py:3846
2417
2569
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2418
2570
msgstr ""
2419
2571
2420
2572
# help of 'email' option of 'whoami' command
2421
#: bzrlib/builtins.py:3578
2573
#: bzrlib/builtins.py:3850
2422
2574
msgid "Display email address only."
2423
2575
msgstr ""
2424
2576
2425
2577
# help of 'branch' option of 'whoami' command
2426
#: bzrlib/builtins.py:3580
2578
#: bzrlib/builtins.py:3852
2427
2579
msgid "Set identity for the current branch instead of globally."
2428
2580
msgstr ""
2429
2581
2430
#: bzrlib/builtins.py:3604
2582
#: bzrlib/builtins.py:3878
2431
2583
msgid "--email can only be used to display existing identity"
2432
2584
msgstr ""
2433
2585
2434
#: bzrlib/builtins.py:3626
2586
#: bzrlib/builtins.py:3902
2435
2587
msgid "Print or set the branch nickname."
2436
2588
msgstr ""
2437
2589
2438
#: bzrlib/builtins.py:3628
2590
#: bzrlib/builtins.py:3904
2439
2591
msgid ""
2440
"If unset, the tree root directory name is used as the nickname.\n"
2441
"To print the current nickname, execute with no argument."
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."
2442
2595
msgstr ""
2443
2596
2444
#: bzrlib/builtins.py:3631
2597
#: bzrlib/builtins.py:3908
2445
2598
msgid ""
2446
2599
"Bound branches use the nickname of its master branch unless it is set\n"
2447
2600
"locally."
2448
2601
msgstr ""
2449
2602
2450
#: bzrlib/builtins.py:3651
2603
#: bzrlib/builtins.py:3928
2451
2604
msgid "Set/unset and display aliases."
2452
2605
msgstr ""
2453
2606
2454
#: bzrlib/builtins.py:3653
2607
#: bzrlib/builtins.py:3930
2455
2608
msgid ""
2456
2609
":Examples:\n"
2457
2610
" Show the current aliases::"
2458
2611
msgstr ""
2459
2612
2460
#: bzrlib/builtins.py:3656
2613
#: bzrlib/builtins.py:3933
2461
2614
msgid " bzr alias"
2462
2615
msgstr ""
2463
2616
2464
#: bzrlib/builtins.py:3658
2617
#: bzrlib/builtins.py:3935
2465
2618
msgid " Show the alias specified for 'll'::"
2466
2619
msgstr ""
2467
2620
2468
#: bzrlib/builtins.py:3660
2621
#: bzrlib/builtins.py:3937
2469
2622
msgid " bzr alias ll"
2470
2623
msgstr ""
2471
2624
2472
#: bzrlib/builtins.py:3662
2625
#: bzrlib/builtins.py:3939
2473
2626
msgid " Set an alias for 'll'::"
2474
2627
msgstr ""
2475
2628
2476
#: bzrlib/builtins.py:3664
2629
#: bzrlib/builtins.py:3941
2477
2630
msgid " bzr alias ll=\"log --line -r-10..-1\""
2478
2631
msgstr ""
2479
2632
2480
#: bzrlib/builtins.py:3666
2633
#: bzrlib/builtins.py:3943
2481
2634
msgid " To remove an alias for 'll'::"
2482
2635
msgstr ""
2483
2636
2484
#: bzrlib/builtins.py:3668
2637
#: bzrlib/builtins.py:3945
2485
2638
msgid " bzr alias --remove ll"
2486
2639
msgstr ""
2487
2640
2488
2641
# help of 'remove' option of 'alias' command
2489
#: bzrlib/builtins.py:3673
2642
#: bzrlib/builtins.py:3950
2490
2643
msgid "Remove the alias."
2491
2644
msgstr ""
2492
2645
2493
#: bzrlib/builtins.py:3691
2646
#: bzrlib/builtins.py:3968
2494
2647
msgid "bzr alias --remove expects an alias to remove."
2495
2648
msgstr ""
2496
2649
2497
#: bzrlib/builtins.py:3863
2650
#: bzrlib/builtins.py:4149
2498
2651
msgid "subunit not available. subunit needs to be installed to use --subunit."
2499
2652
msgstr ""
2500
2653
2501
#: bzrlib/builtins.py:3880
2654
#: bzrlib/builtins.py:4166
2502
2655
msgid ""
2503
2656
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2504
2657
msgstr ""
2505
2658
2506
#: bzrlib/builtins.py:3927
2659
#: bzrlib/builtins.py:4213
2507
2660
msgid "Show version of bzr."
2508
2661
msgstr ""
2509
2662
2510
2663
# help of 'short' option of 'version' command
2511
#: bzrlib/builtins.py:3931
2664
#: bzrlib/builtins.py:4217
2512
2665
msgid "Print just the version number."
2513
2666
msgstr ""
2514
2667
2515
#: bzrlib/builtins.py:3950
2668
#: bzrlib/builtins.py:4236
2516
2669
msgid "It sure does!\n"
2517
2670
msgstr ""
2518
2671
2519
#: bzrlib/builtins.py:3974
2672
#: bzrlib/builtins.py:4260
2520
2673
#, python-format
2521
2674
msgid "merge base is revision %s\n"
2522
2675
msgstr ""
2523
2676
2524
#: bzrlib/builtins.py:3978
2677
#: bzrlib/builtins.py:4264
2525
2678
msgid "Perform a three-way merge."
2526
2679
msgstr ""
2527
2680
2528
#: bzrlib/builtins.py:3980
2681
#: bzrlib/builtins.py:4266
2529
2682
msgid ""
2530
2683
"The source of the merge can be specified either in the form of a branch,\n"
2531
2684
"or in the form of a path to a file containing a merge directive generated\n"
2536
2689
"the current working tree."
2537
2690
msgstr ""
2538
2691
2539
#: bzrlib/builtins.py:3988
2692
#: bzrlib/builtins.py:4274
2540
2693
msgid ""
2541
2694
"When merging from a branch, by default bzr will try to merge in all new\n"
2542
2695
"work from the other branch, automatically determining an appropriate base\n"
2543
2696
"revision. If this fails, you may need to give an explicit base."
2544
2697
msgstr ""
2545
2698
2546
#: bzrlib/builtins.py:3992
2699
#: bzrlib/builtins.py:4278
2547
2700
msgid ""
2548
2701
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2549
2702
"try to merge in all new work up to and including revision OTHER."
2550
2703
msgstr ""
2551
2704
2552
#: bzrlib/builtins.py:3995
2705
#: bzrlib/builtins.py:4281
2553
2706
msgid ""
2554
2707
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2555
2708
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2560
2713
"changes from the other branch is not stored in the commit."
2561
2714
msgstr ""
2562
2715
2563
#: bzrlib/builtins.py:4003
2716
#: bzrlib/builtins.py:4289
2564
2717
msgid "Revision numbers are always relative to the source branch."
2565
2718
msgstr ""
2566
2719
2567
#: bzrlib/builtins.py:4010
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
2568
2729
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2569
2730
msgstr ""
2570
2731
2571
#: bzrlib/builtins.py:4012
2732
#: bzrlib/builtins.py:4298
2572
2733
msgid ""
2573
2734
"If there is no default branch set, the first merge will set it (use\n"
2574
2735
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2576
2737
"only be saved if the remote location can be accessed."
2577
2738
msgstr ""
2578
2739
2579
#: bzrlib/builtins.py:4017
2740
#: bzrlib/builtins.py:4303
2580
2741
msgid ""
2581
2742
"The results of the merge are placed into the destination working\n"
2582
2743
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2583
2744
"committed to record the result of the merge."
2584
2745
msgstr ""
2585
2746
2586
#: bzrlib/builtins.py:4021
2747
#: bzrlib/builtins.py:4307
2587
2748
msgid ""
2588
2749
"merge refuses to run if there are any uncommitted changes, unless\n"
2589
2750
"--force is given. If --force is given, then the changes from the source \n"
2592
2753
"merge revision which has more than two parents."
2593
2754
msgstr ""
2594
2755
2595
#: bzrlib/builtins.py:4027
2756
#: bzrlib/builtins.py:4313
2596
2757
msgid ""
2597
2758
"If one would like to merge changes from the working tree of the other\n"
2598
2759
"branch without merging any committed revisions, the --uncommitted option\n"
2599
2760
"can be given."
2600
2761
msgstr ""
2601
2762
2602
#: bzrlib/builtins.py:4031
2763
#: bzrlib/builtins.py:4317
2603
2764
msgid ""
2604
2765
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2605
2766
"you to apply each diff hunk and file change, similar to \"shelve\"."
2606
2767
msgstr ""
2607
2768
2608
#: bzrlib/builtins.py:4034
2769
#: bzrlib/builtins.py:4320
2609
2770
msgid ""
2610
2771
":Examples:\n"
2611
2772
" To merge all new revisions from bzr.dev::"
2612
2773
msgstr ""
2613
2774
2614
#: bzrlib/builtins.py:4037
2775
#: bzrlib/builtins.py:4323
2615
2776
msgid " bzr merge ../bzr.dev"
2616
2777
msgstr ""
2617
2778
2618
#: bzrlib/builtins.py:4039
2779
#: bzrlib/builtins.py:4325
2619
2780
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2620
2781
msgstr ""
2621
2782
2622
#: bzrlib/builtins.py:4041
2783
#: bzrlib/builtins.py:4327
2623
2784
msgid " bzr merge -r 82 ../bzr.dev"
2624
2785
msgstr ""
2625
2786
2626
#: bzrlib/builtins.py:4043
2787
#: bzrlib/builtins.py:4329
2627
2788
msgid " To merge the changes introduced by 82, without previous changes::"
2628
2789
msgstr ""
2629
2790
2630
#: bzrlib/builtins.py:4045
2791
#: bzrlib/builtins.py:4331
2631
2792
msgid " bzr merge -r 81..82 ../bzr.dev"
2632
2793
msgstr ""
2633
2794
2634
#: bzrlib/builtins.py:4047
2795
#: bzrlib/builtins.py:4333
2635
2796
msgid " To apply a merge directive contained in /tmp/merge::"
2636
2797
msgstr ""
2637
2798
2638
#: bzrlib/builtins.py:4049
2799
#: bzrlib/builtins.py:4335
2639
2800
msgid " bzr merge /tmp/merge"
2640
2801
msgstr ""
2641
2802
2642
#: bzrlib/builtins.py:4051
2803
#: bzrlib/builtins.py:4337
2643
2804
msgid ""
2644
2805
" To create a merge revision with three parents from two branches\n"
2645
2806
" feature1a and feature1b:"
2646
2807
msgstr ""
2647
2808
2648
#: bzrlib/builtins.py:4054
2809
#: bzrlib/builtins.py:4340
2649
2810
msgid ""
2650
2811
" bzr merge ../feature1a\n"
2651
2812
" bzr merge ../feature1b --force\n"
2653
2814
msgstr ""
2654
2815
2655
2816
# help of 'force' option of 'merge' command
2656
#: bzrlib/builtins.py:4066
2817
#: bzrlib/builtins.py:4352
2657
2818
msgid "Merge even if the destination tree has uncommitted changes."
2658
2819
msgstr ""
2659
2820
2660
2821
# help of 'uncommitted' option of 'merge' command
2661
#: bzrlib/builtins.py:4072
2822
#: bzrlib/builtins.py:4358
2662
2823
msgid ""
2663
2824
"Apply uncommitted changes from a working copy, instead of branch changes."
2664
2825
msgstr ""
2665
2826
2666
2827
# help of 'pull' option of 'merge' command
2667
#: bzrlib/builtins.py:4074
2828
#: bzrlib/builtins.py:4360
2668
2829
msgid ""
2669
2830
"If the destination is already completely merged into the source, pull from "
2670
2831
"the source rather than merging. When this happens, you do not need to "
2672
2833
msgstr ""
2673
2834
2674
2835
# help of 'directory' option of 'merge' command
2675
#: bzrlib/builtins.py:4079
2836
#: bzrlib/builtins.py:4365
2676
2837
msgid ""
2677
2838
"Branch to merge into, rather than the one containing the working directory."
2678
2839
msgstr ""
2679
2840
2680
2841
# help of 'preview' option of 'merge' command
2681
#: bzrlib/builtins.py:4081
2842
#: bzrlib/builtins.py:4367
2682
2843
msgid "Instead of merging, show a diff of the merge."
2683
2844
msgstr ""
2684
2845
2685
2846
# help of 'interactive' option of 'merge' command
2686
#: bzrlib/builtins.py:4083
2847
#: bzrlib/builtins.py:4369
2687
2848
msgid "Select changes interactively."
2688
2849
msgstr ""
2689
2850
2690
#: bzrlib/builtins.py:4105
2851
#: bzrlib/builtins.py:4391
2691
2852
msgid ""
2692
2853
"Merging into empty branches not currently supported, https://bugs.launchpad."
2693
2854
"net/bzr/+bug/308562"
2694
2855
msgstr ""
2695
2856
2696
#: bzrlib/builtins.py:4132
2857
#: bzrlib/builtins.py:4418
2697
2858
msgid "Cannot use --uncommitted with bundles or merge directives."
2698
2859
msgstr ""
2699
2860
2700
#: bzrlib/builtins.py:4143
2861
#: bzrlib/builtins.py:4429
2701
2862
msgid "Cannot use --uncommitted and --revision at the same time."
2702
2863
msgstr ""
2703
2864
2704
#: bzrlib/builtins.py:4163
2865
#: bzrlib/builtins.py:4449
2705
2866
msgid "merger: "
2706
2867
msgstr ""
2707
2868
2708
#: bzrlib/builtins.py:4165 bzrlib/bundle/apply_bundle.py:67
2869
#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
2709
2870
msgid "Nothing to do."
2710
2871
msgstr ""
2711
2872
2712
#: bzrlib/builtins.py:4169
2873
#: bzrlib/builtins.py:4455
2713
2874
msgid "Cannot pull individual files"
2714
2875
msgstr ""
2715
2876
2716
#: bzrlib/builtins.py:4177
2877
#: bzrlib/builtins.py:4463
2717
2878
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2718
2879
msgstr ""
2719
2880
2720
#: bzrlib/builtins.py:4235
2881
#: bzrlib/builtins.py:4521
2721
2882
#, python-format
2722
2883
msgid "Show-base is not supported for this merge type. %s"
2723
2884
msgstr ""
2724
2885
2725
#: bzrlib/builtins.py:4244
2886
#: bzrlib/builtins.py:4530
2726
2887
#, python-format
2727
2888
msgid "Conflict reduction is not supported for merge type %s."
2728
2889
msgstr ""
2729
2890
2730
#: bzrlib/builtins.py:4248
2891
#: bzrlib/builtins.py:4534
2731
2892
msgid "Cannot do conflict reduction and show base."
2732
2893
msgstr ""
2733
2894
2734
#: bzrlib/builtins.py:4359
2895
#: bzrlib/builtins.py:4645
2735
2896
msgid "No location specified or remembered"
2736
2897
msgstr ""
2737
2898
2738
#: bzrlib/builtins.py:4361
2899
#: bzrlib/builtins.py:4647
2739
2900
msgid "{0} remembered {1} location {2}"
2740
2901
msgstr ""
2741
2902
2742
#: bzrlib/builtins.py:4367
2903
#: bzrlib/builtins.py:4653
2743
2904
msgid "Redo a merge."
2744
2905
msgstr ""
2745
2906
2746
#: bzrlib/builtins.py:4369
2907
#: bzrlib/builtins.py:4655
2747
2908
msgid ""
2748
2909
"Use this if you want to try a different merge technique while resolving\n"
2749
2910
"conflicts. Some merge techniques are better than others, and remerge\n"
2750
2911
"lets you try different ones on different files."
2751
2912
msgstr ""
2752
2913
2753
#: bzrlib/builtins.py:4373
2914
#: bzrlib/builtins.py:4659
2754
2915
msgid ""
2755
2916
"The options for remerge have the same meaning and defaults as the ones for\n"
2756
2917
"merge. The difference is that remerge can (only) be run when there is a\n"
2757
2918
"pending merge, and it lets you specify particular files."
2758
2919
msgstr ""
2759
2920
2760
#: bzrlib/builtins.py:4377
2921
#: bzrlib/builtins.py:4663
2761
2922
msgid ""
2762
2923
":Examples:\n"
2763
2924
" Re-do the merge of all conflicted files, and show the base text in\n"
2764
2925
" conflict regions, in addition to the usual THIS and OTHER texts::"
2765
2926
msgstr ""
2766
2927
2767
#: bzrlib/builtins.py:4381
2928
#: bzrlib/builtins.py:4667
2768
2929
msgid " bzr remerge --show-base"
2769
2930
msgstr ""
2770
2931
2771
#: bzrlib/builtins.py:4383
2932
#: bzrlib/builtins.py:4669
2772
2933
msgid ""
2773
2934
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2774
2935
" additional processing to reduce the size of conflict regions::"
2775
2936
msgstr ""
2776
2937
2777
#: bzrlib/builtins.py:4386
2938
#: bzrlib/builtins.py:4672
2778
2939
msgid " bzr remerge --merge-type weave --reprocess foobar"
2779
2940
msgstr ""
2780
2941
2781
2942
# help of 'show-base' option of 'merge' command
2782
#: bzrlib/builtins.py:4393
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
2783
2947
msgid "Show base revision text in conflicts."
2784
2948
msgstr ""
2785
2949
2786
#: bzrlib/builtins.py:4405
2950
#: bzrlib/builtins.py:4691
2787
2951
msgid ""
2788
2952
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2789
2953
"merges."
2790
2954
msgstr ""
2791
2955
2792
#: bzrlib/builtins.py:4461
2793
msgid "Revert files to a previous revision."
2956
#: bzrlib/builtins.py:4749
2957
msgid ""
2958
"Set files in the working tree back to the contents of a previous revision."
2794
2959
msgstr ""
2795
2960
2796
#: bzrlib/builtins.py:4463
2961
#: bzrlib/builtins.py:4751
2797
2962
msgid ""
2798
2963
"Giving a list of files will revert only those files. Otherwise, all files\n"
2799
2964
"will be reverted. If the revision is not specified with '--revision', the\n"
2800
"last committed revision is used."
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."
2801
2968
msgstr ""
2802
2969
2803
#: bzrlib/builtins.py:4467
2970
#: bzrlib/builtins.py:4757
2804
2971
msgid ""
2805
2972
"To remove only some changes, without reverting to a prior version, use\n"
2806
2973
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2807
2974
"will remove the changes introduced by the second last commit (-2), without\n"
2808
2975
"affecting the changes introduced by the last commit (-1). To remove\n"
2809
"certain changes on a hunk-by-hunk basis, see the shelve command."
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."
2810
2980
msgstr ""
2811
2981
2812
#: bzrlib/builtins.py:4473
2982
#: bzrlib/builtins.py:4766
2813
2983
msgid ""
2814
"By default, any files that have been manually changed will be backed up\n"
2815
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2816
"'.~#~' appended to their name, where # is a number."
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."
2817
2988
msgstr ""
2818
2989
2819
#: bzrlib/builtins.py:4477
2990
#: bzrlib/builtins.py:4771
2820
2991
msgid ""
2821
2992
"When you provide files, you can use their current pathname or the pathname\n"
2822
2993
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2824
2995
"reverted."
2825
2996
msgstr ""
2826
2997
2827
#: bzrlib/builtins.py:4482
2998
#: bzrlib/builtins.py:4776
2828
2999
msgid ""
2829
3000
"If you have newly added files since the target revision, they will be\n"
2830
3001
"removed. If the files to be removed have been changed, backups will be\n"
2832
3003
"deleted."
2833
3004
msgstr ""
2834
3005
2835
#: bzrlib/builtins.py:4487
3006
#: bzrlib/builtins.py:4781
2836
3007
msgid ""
2837
3008
"The working tree contains a list of revisions that have been merged but\n"
2838
3009
"not yet committed. These revisions will be included as additional parents\n"
2844
3015
"reverting any files."
2845
3016
msgstr ""
2846
3017
2847
#: bzrlib/builtins.py:4496
3018
#: bzrlib/builtins.py:4790
2848
3019
msgid ""
2849
3020
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2850
3021
"changes from a branch in a single revision. To do this, perform the merge\n"
2859
3030
msgstr ""
2860
3031
2861
3032
# help of 'no-backup' option of 'revert' command
2862
#: bzrlib/builtins.py:4510
3033
#: bzrlib/builtins.py:4804
2863
3034
msgid "Do not save backups of reverted files."
2864
3035
msgstr ""
2865
3036
2866
3037
# help of 'forget-merges' option of 'revert' command
2867
#: bzrlib/builtins.py:4512
3038
#: bzrlib/builtins.py:4806
2868
3039
msgid "Remove pending merge marker, without changing any files."
2869
3040
msgstr ""
2870
3041
2871
#: bzrlib/builtins.py:4543
3042
#: bzrlib/builtins.py:4837
2872
3043
msgid ""
2873
3044
"Show help on a command or other topic.\n"
2874
3045
" "
2875
3046
msgstr ""
2876
3047
2877
3048
# help of 'long' option of 'help' command
2878
#: bzrlib/builtins.py:4548
3049
#: bzrlib/builtins.py:4842
2879
3050
msgid "Show help on all commands."
2880
3051
msgstr ""
2881
3052
2882
#: bzrlib/builtins.py:4577
3053
#: bzrlib/builtins.py:4871
2883
3054
msgid "Show unmerged/unpulled revisions between two branches."
2884
3055
msgstr ""
2885
3056
2886
#: bzrlib/builtins.py:4579
3057
#: bzrlib/builtins.py:4873
2887
3058
msgid "OTHER_BRANCH may be local or remote."
2888
3059
msgstr ""
2889
3060
2890
#: bzrlib/builtins.py:4581
3061
#: bzrlib/builtins.py:4875
2891
3062
msgid ""
2892
3063
"To filter on a range of revisions, you can use the command -r begin..end\n"
2893
3064
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2898
3069
" 0 - no missing revisions"
2899
3070
msgstr ""
2900
3071
2901
#: bzrlib/builtins.py:4591
3072
#: bzrlib/builtins.py:4885
2902
3073
msgid ""
2903
3074
" Determine the missing revisions between this and the branch at the\n"
2904
3075
" remembered pull location::"
2905
3076
msgstr ""
2906
3077
2907
#: bzrlib/builtins.py:4594
3078
#: bzrlib/builtins.py:4888
2908
3079
msgid " bzr missing"
2909
3080
msgstr ""
2910
3081
2911
#: bzrlib/builtins.py:4596
3082
#: bzrlib/builtins.py:4890
2912
3083
msgid " Determine the missing revisions between this and another branch::"
2913
3084
msgstr ""
2914
3085
2915
#: bzrlib/builtins.py:4598
3086
#: bzrlib/builtins.py:4892
2916
3087
msgid " bzr missing http://server/branch"
2917
3088
msgstr ""
2918
3089
2919
#: bzrlib/builtins.py:4600
3090
#: bzrlib/builtins.py:4894
2920
3091
msgid ""
2921
3092
" Determine the missing revisions up to a specific revision on the other\n"
2922
3093
" branch::"
2923
3094
msgstr ""
2924
3095
2925
#: bzrlib/builtins.py:4603
3096
#: bzrlib/builtins.py:4897
2926
3097
msgid " bzr missing -r ..-10"
2927
3098
msgstr ""
2928
3099
2929
#: bzrlib/builtins.py:4605
3100
#: bzrlib/builtins.py:4899
2930
3101
msgid ""
2931
3102
" Determine the missing revisions up to a specific revision on this\n"
2932
3103
" branch::"
2933
3104
msgstr ""
2934
3105
2935
#: bzrlib/builtins.py:4608
3106
#: bzrlib/builtins.py:4902
2936
3107
msgid " bzr missing --my-revision ..-10"
2937
3108
msgstr ""
2938
3109
2939
3110
# help of 'reverse' option of 'missing' command
2940
#: bzrlib/builtins.py:4615
3111
#: bzrlib/builtins.py:4909
2941
3112
msgid "Reverse the order of revisions."
2942
3113
msgstr ""
2943
3114
2944
3115
# help of 'mine-only' option of 'missing' command
2945
#: bzrlib/builtins.py:4617
3116
#: bzrlib/builtins.py:4911
2946
3117
msgid "Display changes in the local branch only."
2947
3118
msgstr ""
2948
3119
2949
3120
# help of 'this' option of 'missing' command
2950
#: bzrlib/builtins.py:4618
3121
#: bzrlib/builtins.py:4912
2951
3122
msgid "Same as --mine-only."
2952
3123
msgstr ""
2953
3124
2954
3125
# help of 'theirs-only' option of 'missing' command
2955
#: bzrlib/builtins.py:4620
3126
#: bzrlib/builtins.py:4914
2956
3127
msgid "Display changes in the remote branch only."
2957
3128
msgstr ""
2958
3129
2959
3130
# help of 'other' option of 'missing' command
2960
#: bzrlib/builtins.py:4621
3131
#: bzrlib/builtins.py:4915
2961
3132
msgid "Same as --theirs-only."
2962
3133
msgstr ""
2963
3134
2964
3135
# help of 'revision' option of 'missing' command
2965
#: bzrlib/builtins.py:4626
3136
#: bzrlib/builtins.py:4920
2966
3137
msgid ""
2967
3138
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2968
3139
"details."
2969
3140
msgstr ""
2970
3141
2971
3142
# help of 'my-revision' option of 'missing' command
2972
#: bzrlib/builtins.py:4630
3143
#: bzrlib/builtins.py:4924
2973
3144
msgid ""
2974
3145
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2975
3146
"details."
2976
3147
msgstr ""
2977
3148
2978
3149
# help of 'include-merged' option of 'missing' command
2979
#: bzrlib/builtins.py:4633
3150
#: bzrlib/builtins.py:4927
2980
3151
msgid "Show all revisions in addition to the mainline ones."
2981
3152
msgstr ""
2982
3153
2983
#: bzrlib/builtins.py:4687
3154
#: bzrlib/builtins.py:4981
2984
3155
msgid "No peer location known or specified."
2985
3156
msgstr ""
2986
3157
2987
#: bzrlib/builtins.py:4691
3158
#: bzrlib/builtins.py:4985
2988
3159
msgid "Using saved parent location: {0}\n"
2989
3160
msgstr ""
2990
3161
2991
#: bzrlib/builtins.py:4724
3162
#: bzrlib/builtins.py:5018
2992
3163
#, python-format
2993
3164
msgid "You have %d extra revision:\n"
2994
3165
msgid_plural "You have %d extra revisions:\n"
2995
3166
msgstr[0] ""
2996
3167
msgstr[1] ""
2997
3168
2998
#: bzrlib/builtins.py:4740
3169
#: bzrlib/builtins.py:5038
2999
3170
#, python-format
3000
3171
msgid "You are missing %d revision:\n"
3001
3172
msgid_plural "You are missing %d revisions:\n"
3002
3173
msgstr[0] ""
3003
3174
msgstr[1] ""
3004
3175
3005
#: bzrlib/builtins.py:4752
3176
#: bzrlib/builtins.py:5053
3006
3177
msgid "This branch has no new revisions.\n"
3007
3178
msgstr ""
3008
3179
3009
#: bzrlib/builtins.py:4755
3180
#: bzrlib/builtins.py:5056
3010
3181
msgid "Other branch has no new revisions.\n"
3011
3182
msgstr ""
3012
3183
3013
#: bzrlib/builtins.py:4760
3184
#: bzrlib/builtins.py:5061
3014
3185
msgid "Branches are up to date.\n"
3015
3186
msgstr ""
3016
3187
3017
#: bzrlib/builtins.py:4771
3188
#: bzrlib/builtins.py:5072
3018
3189
msgid "Compress the data within a repository."
3019
3190
msgstr ""
3020
3191
3021
#: bzrlib/builtins.py:4773
3192
#: bzrlib/builtins.py:5074
3022
3193
msgid ""
3023
3194
"This operation compresses the data within a bazaar repository. As\n"
3024
3195
"bazaar supports automatic packing of repository, this operation is\n"
3025
3196
"normally not required to be done manually."
3026
3197
msgstr ""
3027
3198
3028
#: bzrlib/builtins.py:4777
3199
#: bzrlib/builtins.py:5078
3029
3200
msgid ""
3030
3201
"During the pack operation, bazaar takes a backup of existing repository\n"
3031
3202
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3034
3205
"used."
3035
3206
msgstr ""
3036
3207
3037
#: bzrlib/builtins.py:4783
3208
#: bzrlib/builtins.py:5084
3038
3209
msgid ""
3039
3210
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3040
3211
"during or immediately after repacking, you may be left with a state\n"
3043
3214
msgstr ""
3044
3215
3045
3216
# help of 'clean-obsolete-packs' option of 'pack' command
3046
#: bzrlib/builtins.py:4792
3217
#: bzrlib/builtins.py:5093
3047
3218
msgid "Delete obsolete packs to save disk space."
3048
3219
msgstr ""
3049
3220
3050
#: bzrlib/builtins.py:4806
3221
#: bzrlib/builtins.py:5107
3051
3222
msgid "List the installed plugins."
3052
3223
msgstr ""
3053
3224
3054
#: bzrlib/builtins.py:4808
3225
#: bzrlib/builtins.py:5109
3055
3226
msgid ""
3056
3227
"This command displays the list of installed plugins including\n"
3057
3228
"version of plugin and a short description of each."
3058
3229
msgstr ""
3059
3230
3060
#: bzrlib/builtins.py:4811
3231
#: bzrlib/builtins.py:5112
3061
3232
msgid "--verbose shows the path where each plugin is located."
3062
3233
msgstr ""
3063
3234
3064
#: bzrlib/builtins.py:4813
3235
#: bzrlib/builtins.py:5114
3065
3236
msgid ""
3066
3237
"A plugin is an external component for Bazaar that extends the\n"
3067
3238
"revision control system, by adding or replacing code in Bazaar.\n"
3070
3241
"customizing log output."
3071
3242
msgstr ""
3072
3243
3073
#: bzrlib/builtins.py:4819
3244
#: bzrlib/builtins.py:5120
3074
3245
msgid ""
3075
3246
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3076
3247
"for further information on plugins including where to find them and how to\n"
3078
3249
"plugins using the Python programming language."
3079
3250
msgstr ""
3080
3251
3081
#: bzrlib/builtins.py:4835
3252
#: bzrlib/builtins.py:5136
3082
3253
msgid "Show testament (signing-form) of a revision."
3083
3254
msgstr ""
3084
3255
3085
3256
# help of 'long' option of 'testament' command
3086
#: bzrlib/builtins.py:4838
3257
#: bzrlib/builtins.py:5139
3087
3258
msgid "Produce long-format testament."
3088
3259
msgstr ""
3089
3260
3090
3261
# help of 'strict' option of 'testament' command
3091
#: bzrlib/builtins.py:4840
3262
#: bzrlib/builtins.py:5141
3092
3263
msgid "Produce a strict-format testament."
3093
3264
msgstr ""
3094
3265
3095
#: bzrlib/builtins.py:4866
3266
#: bzrlib/builtins.py:5168
3096
3267
msgid "Show the origin of each line in a file."
3097
3268
msgstr ""
3098
3269
3099
#: bzrlib/builtins.py:4868
3270
#: bzrlib/builtins.py:5170
3100
3271
msgid ""
3101
3272
"This prints out the given file with an annotation on the left side\n"
3102
3273
"indicating which revision, author and date introduced the change."
3103
3274
msgstr ""
3104
3275
3105
#: bzrlib/builtins.py:4871
3276
#: bzrlib/builtins.py:5173
3106
3277
msgid ""
3107
3278
"If the origin is the same for a run of consecutive lines, it is\n"
3108
3279
"shown only at the top, unless the --all option is given."
3109
3280
msgstr ""
3110
3281
3111
3282
# help of 'all' option of 'annotate' command
3112
#: bzrlib/builtins.py:4879
3283
#: bzrlib/builtins.py:5181
3113
3284
msgid "Show annotations on all lines."
3114
3285
msgstr ""
3115
3286
3116
3287
# help of 'long' option of 'annotate' command
3117
#: bzrlib/builtins.py:4880
3288
#: bzrlib/builtins.py:5182
3118
3289
msgid "Show commit date in annotations."
3119
3290
msgstr ""
3120
3291
3121
#: bzrlib/builtins.py:4967
3292
#: bzrlib/builtins.py:5269
3122
3293
msgid "Cannot sign a range of non-revision-history revisions"
3123
3294
msgstr ""
3124
3295
3125
#: bzrlib/builtins.py:4979
3296
#: bzrlib/builtins.py:5281
3126
3297
msgid "Please supply either one revision, or a range."
3127
3298
msgstr ""
3128
3299
3129
#: bzrlib/builtins.py:4983
3300
#: bzrlib/builtins.py:5285
3130
3301
msgid ""
3131
3302
"Convert the current branch into a checkout of the supplied branch.\n"
3132
3303
"If no branch is supplied, rebind to the last bound location."
3133
3304
msgstr ""
3134
3305
3135
#: bzrlib/builtins.py:4986
3306
#: bzrlib/builtins.py:5288
3136
3307
msgid ""
3137
3308
"Once converted into a checkout, commits must succeed on the master branch\n"
3138
3309
"before they will be applied to the local branch."
3139
3310
msgstr ""
3140
3311
3141
#: bzrlib/builtins.py:4989
3312
#: bzrlib/builtins.py:5291
3142
3313
msgid ""
3143
3314
"Bound branches use the nickname of its master branch unless it is set\n"
3144
3315
"locally, in which case binding will update the local nickname to be\n"
3145
3316
"that of the master."
3146
3317
msgstr ""
3147
3318
3148
#: bzrlib/builtins.py:5004
3319
#: bzrlib/builtins.py:5306
3149
3320
msgid "No location supplied. This format does not remember old locations."
3150
3321
msgstr ""
3151
3322
3152
#: bzrlib/builtins.py:5009
3323
#: bzrlib/builtins.py:5312
3153
3324
msgid "Branch is already bound"
3154
3325
msgstr ""
3155
3326
3156
#: bzrlib/builtins.py:5011
3327
#: bzrlib/builtins.py:5315
3157
3328
msgid "No location supplied and no previous location known"
3158
3329
msgstr ""
3159
3330
3160
#: bzrlib/builtins.py:5017
3331
#: bzrlib/builtins.py:5321
3161
3332
msgid "These branches have diverged. Try merging, and then bind again."
3162
3333
msgstr ""
3163
3334
3164
#: bzrlib/builtins.py:5024
3335
#: bzrlib/builtins.py:5328
3165
3336
msgid "Convert the current checkout into a regular branch."
3166
3337
msgstr ""
3167
3338
3168
#: bzrlib/builtins.py:5026
3339
#: bzrlib/builtins.py:5330
3169
3340
msgid ""
3170
3341
"After unbinding, the local branch is considered independent and subsequent\n"
3171
3342
"commits will be local only."
3172
3343
msgstr ""
3173
3344
3174
#: bzrlib/builtins.py:5037
3345
#: bzrlib/builtins.py:5341
3175
3346
msgid "Local branch is not bound"
3176
3347
msgstr ""
3177
3348
3178
#: bzrlib/builtins.py:5041
3349
#: bzrlib/builtins.py:5345
3179
3350
msgid "Remove the last committed revision."
3180
3351
msgstr ""
3181
3352
3182
#: bzrlib/builtins.py:5043
3353
#: bzrlib/builtins.py:5347
3183
3354
msgid ""
3184
3355
"--verbose will print out what is being removed.\n"
3185
3356
"--dry-run will go through all the motions, but not actually\n"
3186
3357
"remove anything."
3187
3358
msgstr ""
3188
3359
3189
#: bzrlib/builtins.py:5047
3360
#: bzrlib/builtins.py:5351
3190
3361
msgid ""
3191
3362
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3192
3363
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3193
3364
"branch at revision 15."
3194
3365
msgstr ""
3195
3366
3196
#: bzrlib/builtins.py:5051
3367
#: bzrlib/builtins.py:5355
3197
3368
msgid ""
3198
3369
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3199
3370
"it may make is to restore any pending merges that were present before\n"
3201
3372
msgstr ""
3202
3373
3203
3374
# help of 'dry-run' option of 'uncommit' command
3204
#: bzrlib/builtins.py:5062
3375
#: bzrlib/builtins.py:5366
3205
3376
msgid "Don't actually make changes."
3206
3377
msgstr ""
3207
3378
3208
3379
# help of 'force' option of 'uncommit' command
3209
#: bzrlib/builtins.py:5063
3380
#: bzrlib/builtins.py:5367
3210
3381
msgid "Say yes to all questions."
3211
3382
msgstr ""
3212
3383
3213
3384
# help of 'keep-tags' option of 'uncommit' command
3214
#: bzrlib/builtins.py:5065
3385
#: bzrlib/builtins.py:5369
3215
3386
msgid "Keep tags that point to removed revisions."
3216
3387
msgstr ""
3217
3388
3218
3389
# help of 'local' option of 'uncommit' command
3219
#: bzrlib/builtins.py:5067
3390
#: bzrlib/builtins.py:5371
3220
3391
msgid "Only remove the commits from the local branch when in a checkout."
3221
3392
msgstr ""
3222
3393
3223
#: bzrlib/builtins.py:5116
3394
#: bzrlib/builtins.py:5420
3224
3395
msgid "No revisions to uncommit.\n"
3225
3396
msgstr ""
3226
3397
3227
#: bzrlib/builtins.py:5131
3398
#: bzrlib/builtins.py:5435
3228
3399
msgid "Dry-run, pretending to remove the above revisions.\n"
3229
3400
msgstr ""
3230
3401
3231
#: bzrlib/builtins.py:5134
3402
#: bzrlib/builtins.py:5438
3232
3403
msgid "The above revision(s) will be removed.\n"
3233
3404
msgstr ""
3234
3405
3235
#: bzrlib/builtins.py:5138
3406
#: bzrlib/builtins.py:5442
3236
3407
msgid "Uncommit these revisions"
3237
3408
msgstr ""
3238
3409
3239
#: bzrlib/builtins.py:5141
3410
#: bzrlib/builtins.py:5445
3240
3411
msgid "Canceled\n"
3241
3412
msgstr ""
3242
3413
3243
#: bzrlib/builtins.py:5148
3414
#: bzrlib/builtins.py:5452
3244
3415
#, python-format
3245
3416
msgid ""
3246
3417
"You can restore the old tip by running:\n"
3247
3418
" bzr pull . -r revid:%s\n"
3248
3419
msgstr ""
3249
3420
3250
#: bzrlib/builtins.py:5153
3421
#: bzrlib/builtins.py:5457
3251
3422
msgid "Break a dead lock."
3252
3423
msgstr ""
3253
3424
3254
#: bzrlib/builtins.py:5155
3425
#: bzrlib/builtins.py:5459
3255
3426
msgid ""
3256
3427
"This command breaks a lock on a repository, branch, working directory or\n"
3257
3428
"config file."
3258
3429
msgstr ""
3259
3430
3260
#: bzrlib/builtins.py:5158
3431
#: bzrlib/builtins.py:5462
3261
3432
msgid ""
3262
3433
"CAUTION: Locks should only be broken when you are sure that the process\n"
3263
3434
"holding the lock has been stopped."
3264
3435
msgstr ""
3265
3436
3266
#: bzrlib/builtins.py:5161
3437
#: bzrlib/builtins.py:5465
3267
3438
msgid ""
3268
3439
"You can get information on what locks are open via the 'bzr info\n"
3269
3440
"[location]' command."
3270
3441
msgstr ""
3271
3442
3272
#: bzrlib/builtins.py:5164
3443
#: bzrlib/builtins.py:5468
3273
3444
msgid ""
3274
3445
":Examples:\n"
3275
3446
" bzr break-lock\n"
3278
3449
msgstr ""
3279
3450
3280
3451
# help of 'config' option of 'break-lock' command
3281
#: bzrlib/builtins.py:5173
3452
#: bzrlib/builtins.py:5477
3282
3453
msgid "LOCATION is the directory where the config lock is."
3283
3454
msgstr ""
3284
3455
3285
3456
# help of 'force' option of 'break-lock' command
3286
#: bzrlib/builtins.py:5175
3457
#: bzrlib/builtins.py:5479
3287
3458
msgid "Do not ask for confirmation before breaking the lock."
3288
3459
msgstr ""
3289
3460
3290
#: bzrlib/builtins.py:5211
3461
# help of 'protocol=bzr' option of 'serve' command
3462
#: bzrlib/builtins.py:5514
3463
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3464
msgstr ""
3465
3466
#: bzrlib/builtins.py:5515
3291
3467
msgid "Run the bzr server."
3292
3468
msgstr ""
3293
3469
3294
3470
# help of 'inet' option of 'serve' command
3295
#: bzrlib/builtins.py:5217
3471
#: bzrlib/builtins.py:5521
3296
3472
msgid "Serve on stdin/out for use from inetd or sshd."
3297
3473
msgstr ""
3298
3474
3299
3475
# title of 'protocol' option of 'serve' command
3300
#: bzrlib/builtins.py:5218
3476
#: bzrlib/builtins.py:5522
3301
3477
msgid "protocol"
3302
3478
msgstr ""
3303
3479
3304
3480
# help of 'protocol' option of 'serve' command
3305
#: bzrlib/builtins.py:5219
3481
#: bzrlib/builtins.py:5523
3306
3482
msgid "Protocol to serve."
3307
3483
msgstr ""
3308
3484
3485
# help of 'listen' option of 'serve' command
3486
#: bzrlib/builtins.py:5527
3487
msgid "Listen for connections on nominated address."
3488
msgstr ""
3489
3309
3490
# help of 'port' option of 'serve' command
3310
#: bzrlib/builtins.py:5223
3491
#: bzrlib/builtins.py:5529
3311
3492
msgid ""
3312
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3313
"Passing 0 as the port number will result in a dynamically allocated port. "
3314
"The default port depends on the protocol."
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."
3315
3496
msgstr ""
3316
3497
3317
3498
# help of 'directory' option of 'serve' command
3318
#: bzrlib/builtins.py:5229
3499
#: bzrlib/builtins.py:5534
3319
3500
msgid "Serve contents of this directory."
3320
3501
msgstr ""
3321
3502
3322
3503
# help of 'allow-writes' option of 'serve' command
3323
#: bzrlib/builtins.py:5231
3504
#: bzrlib/builtins.py:5536
3324
3505
msgid ""
3325
3506
"By default the server is a readonly server. Supplying --allow-writes "
3326
3507
"enables write access to the contents of the served directory and below. "
3329
3510
"uncontrolled write access to your file system."
3330
3511
msgstr ""
3331
3512
3332
#: bzrlib/builtins.py:5276
3513
# help of 'client-timeout' option of 'serve' command
3514
#: bzrlib/builtins.py:5545
3515
msgid "Override the default idle client timeout (5min)."
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5563
3333
3519
msgid "Combine a tree into its containing tree."
3334
3520
msgstr ""
3335
3521
3336
#: bzrlib/builtins.py:5278
3522
#: bzrlib/builtins.py:5565
3337
3523
msgid "This command requires the target tree to be in a rich-root format."
3338
3524
msgstr ""
3339
3525
3340
#: bzrlib/builtins.py:5280
3526
#: bzrlib/builtins.py:5567
3341
3527
msgid ""
3342
3528
"The TREE argument should be an independent tree, inside another tree, but\n"
3343
3529
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3344
3530
"running \"bzr branch\" with the target inside a tree.)"
3345
3531
msgstr ""
3346
3532
3347
#: bzrlib/builtins.py:5284
3533
#: bzrlib/builtins.py:5571
3348
3534
msgid ""
3349
3535
"The result is a combined tree, with the subtree no longer an independent\n"
3350
3536
"part. This is marked as a merge of the subtree into the containing tree,\n"
3351
3537
"and all history is preserved."
3352
3538
msgstr ""
3353
3539
3354
#: bzrlib/builtins.py:5302
3540
#: bzrlib/builtins.py:5589
3355
3541
#, python-format
3356
3542
msgid ""
3357
3543
"Can't join trees because %s doesn't support rich root data.\n"
3358
3544
"You can use bzr upgrade on the repository."
3359
3545
msgstr ""
3360
3546
3361
#: bzrlib/builtins.py:5312 bzrlib/builtins.py:5318
3547
#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605
3362
3548
msgid "Cannot join {0}. {1}"
3363
3549
msgstr ""
3364
3550
3365
#: bzrlib/builtins.py:5322
3551
#: bzrlib/builtins.py:5609
3366
3552
msgid "Split a subdirectory of a tree into a separate tree."
3367
3553
msgstr ""
3368
3554
3369
#: bzrlib/builtins.py:5324
3555
#: bzrlib/builtins.py:5611
3370
3556
msgid ""
3371
3557
"This command will produce a target tree in a format that supports\n"
3372
3558
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3373
3559
"converted into earlier formats like 'dirstate-tags'."
3374
3560
msgstr ""
3375
3561
3376
#: bzrlib/builtins.py:5328
3562
#: bzrlib/builtins.py:5615
3377
3563
msgid ""
3378
3564
"The TREE argument should be a subdirectory of a working tree. That\n"
3379
3565
"subdirectory will be converted into an independent tree, with its own\n"
3380
3566
"branch. Commits in the top-level tree will not apply to the new subtree."
3381
3567
msgstr ""
3382
3568
3383
#: bzrlib/builtins.py:5408
3569
#: bzrlib/builtins.py:5695
3384
3570
msgid "No submit branch specified or known"
3385
3571
msgstr ""
3386
3572
3387
#: bzrlib/builtins.py:5416 bzrlib/send.py:105
3573
#: bzrlib/builtins.py:5704 bzrlib/send.py:109
3388
3574
msgid "No public branch specified or known"
3389
3575
msgstr ""
3390
3576
3391
#: bzrlib/builtins.py:5421
3577
#: bzrlib/builtins.py:5709
3392
3578
msgid "bzr merge-directive takes at most two one revision identifiers"
3393
3579
msgstr ""
3394
3580
3395
#: bzrlib/builtins.py:5430
3581
#: bzrlib/builtins.py:5718
3396
3582
msgid "No revisions to bundle."
3397
3583
msgstr ""
3398
3584
3399
#: bzrlib/builtins.py:5449
3585
#: bzrlib/builtins.py:5737
3400
3586
msgid "Mail or create a merge-directive for submitting changes."
3401
3587
msgstr ""
3402
3588
3403
#: bzrlib/builtins.py:5451
3589
#: bzrlib/builtins.py:5739
3404
3590
msgid "A merge directive provides many things needed for requesting merges:"
3405
3591
msgstr ""
3406
3592
3407
#: bzrlib/builtins.py:5453
3593
#: bzrlib/builtins.py:5741
3408
3594
msgid "* A machine-readable description of the merge to perform"
3409
3595
msgstr ""
3410
3596
3411
#: bzrlib/builtins.py:5455
3597
#: bzrlib/builtins.py:5743
3412
3598
msgid "* An optional patch that is a preview of the changes requested"
3413
3599
msgstr ""
3414
3600
3415
#: bzrlib/builtins.py:5457
3601
#: bzrlib/builtins.py:5745
3416
3602
msgid ""
3417
3603
"* An optional bundle of revision data, so that the changes can be applied\n"
3418
3604
" directly from the merge directive, without retrieving data from a\n"
3419
3605
" branch."
3420
3606
msgstr ""
3421
3607
3422
#: bzrlib/builtins.py:5461
3608
#: bzrlib/builtins.py:5749
3423
3609
msgid ""
3424
3610
"`bzr send` creates a compact data set that, when applied using bzr\n"
3425
3611
"merge, has the same effect as merging from the source branch. "
3426
3612
msgstr ""
3427
3613
3428
#: bzrlib/builtins.py:5464
3614
#: bzrlib/builtins.py:5752
3429
3615
msgid ""
3430
3616
"By default the merge directive is self-contained and can be applied to any\n"
3431
3617
"branch containing submit_branch in its ancestory without needing access to\n"
3432
3618
"the source branch."
3433
3619
msgstr ""
3434
3620
3435
#: bzrlib/builtins.py:5468
3621
#: bzrlib/builtins.py:5756
3436
3622
msgid ""
3437
3623
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3438
3624
"revisions, but only a structured request to merge from the\n"
3441
3627
"included if known, so that people can check it later."
3442
3628
msgstr ""
3443
3629
3444
#: bzrlib/builtins.py:5474
3630
#: bzrlib/builtins.py:5762
3445
3631
msgid ""
3446
3632
"The submit branch defaults to the parent of the source branch, but can be\n"
3447
3633
"overridden. Both submit branch and public branch will be remembered in\n"
3450
3636
"be changed using --from."
3451
3637
msgstr ""
3452
3638
3453
#: bzrlib/builtins.py:5480
3639
#: bzrlib/builtins.py:5768
3454
3640
msgid ""
3455
3641
"Both the submit branch and the public branch follow the usual behavior with\n"
3456
3642
"respect to --remember: If there is no default location set, the first send\n"
3459
3645
"--remember. The value will only be saved if the location can be accessed."
3460
3646
msgstr ""
3461
3647
3462
#: bzrlib/builtins.py:5486
3648
#: bzrlib/builtins.py:5774
3463
3649
msgid ""
3464
3650
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3465
3651
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3467
3653
"in the merge directive."
3468
3654
msgstr ""
3469
3655
3470
#: bzrlib/builtins.py:5491
3656
#: bzrlib/builtins.py:5779
3471
3657
msgid ""
3472
3658
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3473
3659
"given, in which case it is sent to a file."
3474
3660
msgstr ""
3475
3661
3476
#: bzrlib/builtins.py:5494
3662
#: bzrlib/builtins.py:5782
3477
3663
msgid ""
3478
3664
"Mail is sent using your preferred mail program. This should be transparent\n"
3479
3665
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3480
3666
"If the preferred client can't be found (or used), your editor will be used."
3481
3667
msgstr ""
3482
3668
3483
#: bzrlib/builtins.py:5498
3669
#: bzrlib/builtins.py:5786
3484
3670
msgid ""
3485
3671
"To use a specific mail program, set the mail_client configuration option.\n"
3486
3672
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3492
3678
"supported clients."
3493
3679
msgstr ""
3494
3680
3495
#: bzrlib/builtins.py:5505
3681
#: bzrlib/builtins.py:5793
3496
3682
msgid ""
3497
3683
"If mail is being sent, a to address is required. This can be supplied\n"
3498
3684
"either on the commandline, by setting the submit_to configuration\n"
3500
3686
"in the submit branch."
3501
3687
msgstr ""
3502
3688
3503
#: bzrlib/builtins.py:5510
3689
#: bzrlib/builtins.py:5798
3504
3690
msgid ""
3505
3691
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3506
3692
"and\n"
3510
3696
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3511
3697
msgstr ""
3512
3698
3513
#: bzrlib/builtins.py:5516
3699
#: bzrlib/builtins.py:5804
3514
3700
msgid ""
3515
3701
"The merge directives created by bzr send may be applied using bzr merge or\n"
3516
3702
"bzr pull by specifying a file containing a merge directive as the location."
3517
3703
msgstr ""
3518
3704
3519
#: bzrlib/builtins.py:5519
3705
#: bzrlib/builtins.py:5807
3520
3706
msgid ""
3521
3707
"bzr send makes extensive use of public locations to map local locations "
3522
3708
"into\n"
3525
3711
msgstr ""
3526
3712
3527
3713
# help of 'output' option of 'send' command
3528
#: bzrlib/builtins.py:5543
3714
#: bzrlib/builtins.py:5831
3529
3715
msgid "Write merge directive to this file or directory; use - for stdout."
3530
3716
msgstr ""
3531
3717
3532
3718
# help of 'strict' option of 'send' command
3533
#: bzrlib/builtins.py:5547
3719
#: bzrlib/builtins.py:5835
3534
3720
msgid ""
3535
3721
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3536
3722
"strict disables the check."
3537
3723
msgstr ""
3538
3724
3539
3725
# help of 'mail-to' option of 'send' command
3540
#: bzrlib/builtins.py:5549
3726
#: bzrlib/builtins.py:5837
3541
3727
msgid "Mail the request to this address."
3542
3728
msgstr ""
3543
3729
3544
3730
# help of 'body' option of 'send' command
3545
#: bzrlib/builtins.py:5553
3731
#: bzrlib/builtins.py:5841
3546
3732
msgid "Body for the email."
3547
3733
msgstr ""
3548
3734
3549
3735
# help of 'no-bundle' option of 'send' command
3550
#: bzrlib/builtins.py:5606
3736
#: bzrlib/builtins.py:5894
3551
3737
msgid "Do not include a bundle in the merge directive."
3552
3738
msgstr ""
3553
3739
3554
3740
# help of 'no-patch' option of 'send' command
3555
#: bzrlib/builtins.py:5607
3741
#: bzrlib/builtins.py:5895
3556
3742
msgid "Do not include a preview patch in the merge directive."
3557
3743
msgstr ""
3558
3744
3559
3745
# help of 'remember' option of 'send' command
3560
#: bzrlib/builtins.py:5610
3746
#: bzrlib/builtins.py:5898
3561
3747
msgid "Remember submit and public branch."
3562
3748
msgstr ""
3563
3749
3564
3750
# help of 'from' option of 'send' command
3565
#: bzrlib/builtins.py:5612
3751
#: bzrlib/builtins.py:5900
3566
3752
msgid ""
3567
3753
"Branch to generate the submission from, rather than the one containing the "
3568
3754
"working directory."
3569
3755
msgstr ""
3570
3756
3571
3757
# title of 'format' option of 'send' command
3572
#: bzrlib/builtins.py:5622
3758
# title of 'format' option of 'version-info' command
3759
#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76
3573
3760
msgid "format"
3574
3761
msgstr ""
3575
3762
3576
3763
# help of 'format' option of 'send' command
3577
#: bzrlib/builtins.py:5623
3764
#: bzrlib/builtins.py:5911
3578
3765
msgid "Use the specified output format."
3579
3766
msgstr ""
3580
3767
3581
#: bzrlib/builtins.py:5645
3768
#: bzrlib/builtins.py:5933
3582
3769
msgid "Create, remove or modify a tag naming a revision."
3583
3770
msgstr ""
3584
3771
3585
#: bzrlib/builtins.py:5647
3772
#: bzrlib/builtins.py:5935
3586
3773
msgid ""
3587
3774
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3588
3775
"(--revision) option can be given -rtag:X, where X is any previously\n"
3589
3776
"created tag."
3590
3777
msgstr ""
3591
3778
3592
#: bzrlib/builtins.py:5651
3779
#: bzrlib/builtins.py:5939
3593
3780
msgid ""
3594
3781
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3595
3782
"along when you branch, push, pull or merge."
3596
3783
msgstr ""
3597
3784
3598
#: bzrlib/builtins.py:5654
3785
#: bzrlib/builtins.py:5942
3599
3786
msgid ""
3600
3787
"It is an error to give a tag name that already exists unless you pass\n"
3601
3788
"--force, in which case the tag is moved to point to the new revision."
3602
3789
msgstr ""
3603
3790
3604
#: bzrlib/builtins.py:5657
3791
#: bzrlib/builtins.py:5945
3605
3792
msgid ""
3606
3793
"To rename a tag (change the name but keep it on the same revsion), run "
3607
3794
"``bzr\n"
3608
3795
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3609
3796
msgstr ""
3610
3797
3611
#: bzrlib/builtins.py:5660
3798
#: bzrlib/builtins.py:5948
3612
3799
msgid ""
3613
3800
"If no tag name is specified it will be determined through the \n"
3614
3801
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3617
3804
msgstr ""
3618
3805
3619
3806
# help of 'delete' option of 'tag' command
3620
#: bzrlib/builtins.py:5670
3807
#: bzrlib/builtins.py:5958
3621
3808
msgid "Delete this tag rather than placing it."
3622
3809
msgstr ""
3623
3810
3624
3811
# help of 'directory' option of 'tag' command
3625
#: bzrlib/builtins.py:5673
3812
#: bzrlib/builtins.py:5961
3626
3813
msgid "Branch in which to place the tag."
3627
3814
msgstr ""
3628
3815
3629
3816
# help of 'force' option of 'tag' command
3630
#: bzrlib/builtins.py:5675
3817
#: bzrlib/builtins.py:5963
3631
3818
msgid "Replace existing tags."
3632
3819
msgstr ""
3633
3820
3634
#: bzrlib/builtins.py:5690
3821
#: bzrlib/builtins.py:5978
3635
3822
msgid "No tag specified to delete."
3636
3823
msgstr ""
3637
3824
3638
#: bzrlib/builtins.py:5692
3825
#: bzrlib/builtins.py:5980
3639
3826
#, python-format
3640
3827
msgid "Deleted tag %s."
3641
3828
msgstr ""
3642
3829
3643
#: bzrlib/builtins.py:5697
3830
#: bzrlib/builtins.py:5985
3644
3831
msgid "Tags can only be placed on a single revision, not on a range"
3645
3832
msgstr ""
3646
3833
3647
#: bzrlib/builtins.py:5706
3834
#: bzrlib/builtins.py:5994
3648
3835
msgid "Please specify a tag name."
3649
3836
msgstr ""
3650
3837
3651
#: bzrlib/builtins.py:5714
3838
#: bzrlib/builtins.py:6002
3652
3839
#, python-format
3653
3840
msgid "Tag %s already exists for that revision."
3654
3841
msgstr ""
3655
3842
3656
#: bzrlib/builtins.py:5718
3843
#: bzrlib/builtins.py:6006
3657
3844
#, python-format
3658
3845
msgid "Created tag %s."
3659
3846
msgstr ""
3660
3847
3661
#: bzrlib/builtins.py:5720
3848
#: bzrlib/builtins.py:6008
3662
3849
#, python-format
3663
3850
msgid "Updated tag %s."
3664
3851
msgstr ""
3665
3852
3666
#: bzrlib/builtins.py:5724
3853
#: bzrlib/builtins.py:6012
3667
3854
msgid "List tags."
3668
3855
msgstr ""
3669
3856
3670
#: bzrlib/builtins.py:5726
3857
#: bzrlib/builtins.py:6014
3671
3858
msgid ""
3672
3859
"This command shows a table of tag names and the revisions they reference."
3673
3860
msgstr ""
3674
3861
3675
3862
# help of 'directory' option of 'tags' command
3676
#: bzrlib/builtins.py:5732
3863
#: bzrlib/builtins.py:6020
3677
3864
msgid "Branch whose tags should be displayed."
3678
3865
msgstr ""
3679
3866
3680
3867
# help of 'sort' option of 'tags' command
3681
#: bzrlib/builtins.py:5734
3868
#: bzrlib/builtins.py:6022
3682
3869
msgid "Sort tags by different criteria."
3683
3870
msgstr ""
3684
3871
3685
3872
# title of 'sort' option of 'tags' command
3686
#: bzrlib/builtins.py:5734
3873
#: bzrlib/builtins.py:6022
3687
3874
msgid "Sorting"
3688
3875
msgstr ""
3689
3876
3690
#: bzrlib/builtins.py:5779
3877
#: bzrlib/builtins.py:6091
3691
3878
msgid "Reconfigure the type of a bzr directory."
3692
3879
msgstr ""
3693
3880
3694
#: bzrlib/builtins.py:5781
3881
#: bzrlib/builtins.py:6093
3695
3882
msgid "A target configuration must be specified."
3696
3883
msgstr ""
3697
3884
3698
#: bzrlib/builtins.py:5783
3885
#: bzrlib/builtins.py:6095
3699
3886
msgid ""
3700
3887
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3701
3888
"The order of preference is\n"
3707
3894
msgstr ""
3708
3895
3709
3896
# title of 'tree_type' option of 'reconfigure' command
3710
#: bzrlib/builtins.py:5797
3897
#: bzrlib/builtins.py:6109
3711
3898
msgid "Tree type"
3712
3899
msgstr ""
3713
3900
3714
3901
# help of 'tree_type' option of 'reconfigure' command
3715
#: bzrlib/builtins.py:5798
3902
#: bzrlib/builtins.py:6110
3716
3903
msgid "The relation between branch and tree."
3717
3904
msgstr ""
3718
3905
3906
# help of 'tree_type=branch' option of 'reconfigure' command
3907
#: bzrlib/builtins.py:6112
3908
msgid "Reconfigure to be an unbound branch with no working tree."
3909
msgstr ""
3910
3911
# help of 'tree_type=tree' option of 'reconfigure' command
3912
#: bzrlib/builtins.py:6113
3913
msgid "Reconfigure to be an unbound branch with a working tree."
3914
msgstr ""
3915
3916
# help of 'tree_type=checkout' option of 'reconfigure' command
3917
#: bzrlib/builtins.py:6114
3918
msgid "Reconfigure to be a bound branch with a working tree."
3919
msgstr ""
3920
3921
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3922
#: bzrlib/builtins.py:6115
3923
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3924
msgstr ""
3925
3719
3926
# title of 'repository_type' option of 'reconfigure' command
3720
#: bzrlib/builtins.py:5808
3927
#: bzrlib/builtins.py:6120
3721
3928
msgid "Repository type"
3722
3929
msgstr ""
3723
3930
3724
3931
# help of 'repository_type' option of 'reconfigure' command
3725
#: bzrlib/builtins.py:5809
3932
#: bzrlib/builtins.py:6121
3726
3933
msgid "Location fo the repository."
3727
3934
msgstr ""
3728
3935
3936
# help of 'repository_type=standalone' option of 'reconfigure' command
3937
#: bzrlib/builtins.py:6123
3938
msgid ""
3939
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3940
msgstr ""
3941
3942
# help of 'repository_type=use-shared' option of 'reconfigure' command
3943
#: bzrlib/builtins.py:6125
3944
msgid "Reconfigure to use a shared repository."
3945
msgstr ""
3946
3729
3947
# title of 'repository_trees' option of 'reconfigure' command
3730
#: bzrlib/builtins.py:5817
3948
#: bzrlib/builtins.py:6129
3731
3949
msgid "Trees in Repository"
3732
3950
msgstr ""
3733
3951
3734
3952
# help of 'repository_trees' option of 'reconfigure' command
3735
#: bzrlib/builtins.py:5818
3953
#: bzrlib/builtins.py:6130
3736
3954
msgid "Whether new branches in the repository have trees."
3737
3955
msgstr ""
3738
3956
3957
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3958
#: bzrlib/builtins.py:6132
3959
msgid "Reconfigure repository to create working trees on branches by default."
3960
msgstr ""
3961
3962
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3963
#: bzrlib/builtins.py:6134
3964
msgid ""
3965
"Reconfigure repository to not create working trees on branches by default."
3966
msgstr ""
3967
3739
3968
# help of 'bind-to' option of 'reconfigure' command
3740
#: bzrlib/builtins.py:5825
3969
#: bzrlib/builtins.py:6137
3741
3970
msgid "Branch to bind checkout to."
3742
3971
msgstr ""
3743
3972
3744
3973
# help of 'force' option of 'reconfigure' command
3745
#: bzrlib/builtins.py:5827
3974
#: bzrlib/builtins.py:6139
3746
3975
msgid "Perform reconfiguration even if local changes will be lost."
3747
3976
msgstr ""
3748
3977
3749
3978
# help of 'stacked-on' option of 'reconfigure' command
3750
#: bzrlib/builtins.py:5830
3979
#: bzrlib/builtins.py:6142
3751
3980
msgid "Reconfigure a branch to be stacked on another branch."
3752
3981
msgstr ""
3753
3982
3754
3983
# help of 'unstacked' option of 'reconfigure' command
3755
#: bzrlib/builtins.py:5834
3984
#: bzrlib/builtins.py:6146
3756
3985
msgid ""
3757
3986
"Reconfigure a branch to be unstacked. This may require copying substantial "
3758
3987
"data into it."
3759
3988
msgstr ""
3760
3989
3761
#: bzrlib/builtins.py:5844
3990
#: bzrlib/builtins.py:6156
3762
3991
msgid "Can't use both --stacked-on and --unstacked"
3763
3992
msgstr ""
3764
3993
3765
#: bzrlib/builtins.py:5858
3994
#: bzrlib/builtins.py:6170
3766
3995
msgid "No target configuration specified"
3767
3996
msgstr ""
3768
3997
3769
#: bzrlib/builtins.py:5893
3998
#: bzrlib/builtins.py:6205
3770
3999
msgid "Set the branch of a checkout and update."
3771
4000
msgstr ""
3772
4001
3773
#: bzrlib/builtins.py:5895
4002
#: bzrlib/builtins.py:6207
3774
4003
msgid ""
3775
4004
"For lightweight checkouts, this changes the branch being referenced.\n"
3776
4005
"For heavyweight checkouts, this checks that there are no local commits\n"
3778
4007
"of the new location and binds to it."
3779
4008
msgstr ""
3780
4009
3781
#: bzrlib/builtins.py:5900
4010
#: bzrlib/builtins.py:6212
3782
4011
msgid ""
3783
4012
"In both cases, the working tree is updated and uncommitted changes\n"
3784
4013
"are merged. The user can commit or revert these as they desire."
3785
4014
msgstr ""
3786
4015
3787
#: bzrlib/builtins.py:5903
4016
#: bzrlib/builtins.py:6215
3788
4017
msgid "Pending merges need to be committed or reverted before using switch."
3789
4018
msgstr ""
3790
4019
3791
#: bzrlib/builtins.py:5905
4020
#: bzrlib/builtins.py:6217
3792
4021
msgid ""
3793
4022
"The path to the branch to switch to can be specified relative to the parent\n"
3794
4023
"directory of the current branch. For example, if you are currently in a\n"
3796
4025
"/path/to/newbranch."
3797
4026
msgstr ""
3798
4027
3799
#: bzrlib/builtins.py:5910
4028
#: bzrlib/builtins.py:6222
3800
4029
msgid ""
3801
4030
"Bound branches use the nickname of its master branch unless it is set\n"
3802
4031
"locally, in which case switching will update the local nickname to be\n"
3804
4033
msgstr ""
3805
4034
3806
4035
# help of 'force' option of 'switch' command
3807
#: bzrlib/builtins.py:5918
4036
#: bzrlib/builtins.py:6230
3808
4037
msgid "Switch even if local commits will be lost."
3809
4038
msgstr ""
3810
4039
3811
4040
# help of 'create-branch' option of 'switch' command
3812
#: bzrlib/builtins.py:5921
4041
#: bzrlib/builtins.py:6233
3813
4042
msgid "Create the target branch from this one before switching to it."
3814
4043
msgstr ""
3815
4044
3816
#: bzrlib/builtins.py:5933
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
3817
4051
msgid "You must supply either a revision or a location"
3818
4052
msgstr ""
3819
4053
3820
#: bzrlib/builtins.py:5944
4054
#: bzrlib/builtins.py:6263
3821
4055
msgid "cannot create branch without source branch"
3822
4056
msgstr ""
3823
4057
3824
#: bzrlib/builtins.py:5990
4058
#: bzrlib/builtins.py:6289
3825
4059
msgid "Manage filtered views."
3826
4060
msgstr ""
3827
4061
3828
#: bzrlib/builtins.py:5992
4062
#: bzrlib/builtins.py:6291
3829
4063
msgid ""
3830
4064
"Views provide a mask over the tree so that users can focus on\n"
3831
4065
"a subset of a tree when doing their work. After creating a view,\n"
3835
4069
"must be within the current view."
3836
4070
msgstr ""
3837
4071
3838
#: bzrlib/builtins.py:5999
4072
#: bzrlib/builtins.py:6298
3839
4073
msgid ""
3840
4074
"In most cases, a view has a short life-span: it is created to make\n"
3841
4075
"a selected change and is deleted once that change is committed.\n"
3843
4077
"and switch between them."
3844
4078
msgstr ""
3845
4079
3846
#: bzrlib/builtins.py:6004
4080
#: bzrlib/builtins.py:6303
3847
4081
msgid ""
3848
4082
"To disable the current view without deleting it, you can switch to\n"
3849
4083
"the pseudo view called ``off``. This can be useful when you need\n"
3851
4085
"want to switch back to your view after that."
3852
4086
msgstr ""
3853
4087
3854
#: bzrlib/builtins.py:6009
4088
#: bzrlib/builtins.py:6308
3855
4089
msgid ""
3856
4090
":Examples:\n"
3857
4091
" To define the current view::"
3858
4092
msgstr ""
3859
4093
3860
#: bzrlib/builtins.py:6012
4094
#: bzrlib/builtins.py:6311
3861
4095
msgid " bzr view file1 dir1 ..."
3862
4096
msgstr ""
3863
4097
3864
#: bzrlib/builtins.py:6014
4098
#: bzrlib/builtins.py:6313
3865
4099
msgid " To list the current view::"
3866
4100
msgstr ""
3867
4101
3868
#: bzrlib/builtins.py:6016
4102
#: bzrlib/builtins.py:6315
3869
4103
msgid " bzr view"
3870
4104
msgstr ""
3871
4105
3872
#: bzrlib/builtins.py:6018
4106
#: bzrlib/builtins.py:6317
3873
4107
msgid " To delete the current view::"
3874
4108
msgstr ""
3875
4109
3876
#: bzrlib/builtins.py:6020
4110
#: bzrlib/builtins.py:6319
3877
4111
msgid " bzr view --delete"
3878
4112
msgstr ""
3879
4113
3880
#: bzrlib/builtins.py:6022
4114
#: bzrlib/builtins.py:6321
3881
4115
msgid " To disable the current view without deleting it::"
3882
4116
msgstr ""
3883
4117
3884
#: bzrlib/builtins.py:6024
4118
#: bzrlib/builtins.py:6323
3885
4119
msgid " bzr view --switch off"
3886
4120
msgstr ""
3887
4121
3888
#: bzrlib/builtins.py:6026
4122
#: bzrlib/builtins.py:6325
3889
4123
msgid " To define a named view and switch to it::"
3890
4124
msgstr ""
3891
4125
3892
#: bzrlib/builtins.py:6028
4126
#: bzrlib/builtins.py:6327
3893
4127
msgid " bzr view --name view-name file1 dir1 ..."
3894
4128
msgstr ""
3895
4129
3896
#: bzrlib/builtins.py:6030
4130
#: bzrlib/builtins.py:6329
3897
4131
msgid " To list a named view::"
3898
4132
msgstr ""
3899
4133
3900
#: bzrlib/builtins.py:6032
4134
#: bzrlib/builtins.py:6331
3901
4135
msgid " bzr view --name view-name"
3902
4136
msgstr ""
3903
4137
3904
#: bzrlib/builtins.py:6034
4138
#: bzrlib/builtins.py:6333
3905
4139
msgid " To delete a named view::"
3906
4140
msgstr ""
3907
4141
3908
#: bzrlib/builtins.py:6036
4142
#: bzrlib/builtins.py:6335
3909
4143
msgid " bzr view --name view-name --delete"
3910
4144
msgstr ""
3911
4145
3912
#: bzrlib/builtins.py:6038
4146
#: bzrlib/builtins.py:6337
3913
4147
msgid " To switch to a named view::"
3914
4148
msgstr ""
3915
4149
3916
#: bzrlib/builtins.py:6040
4150
#: bzrlib/builtins.py:6339
3917
4151
msgid " bzr view --switch view-name"
3918
4152
msgstr ""
3919
4153
3920
#: bzrlib/builtins.py:6042
4154
#: bzrlib/builtins.py:6341
3921
4155
msgid " To list all views defined::"
3922
4156
msgstr ""
3923
4157
3924
#: bzrlib/builtins.py:6044
4158
#: bzrlib/builtins.py:6343
3925
4159
msgid " bzr view --all"
3926
4160
msgstr ""
3927
4161
3928
#: bzrlib/builtins.py:6046
4162
#: bzrlib/builtins.py:6345
3929
4163
msgid " To delete all views::"
3930
4164
msgstr ""
3931
4165
3932
#: bzrlib/builtins.py:6048
4166
#: bzrlib/builtins.py:6347
3933
4167
msgid " bzr view --delete --all"
3934
4168
msgstr ""
3935
4169
3936
4170
# help of 'all' option of 'view' command
3937
#: bzrlib/builtins.py:6055
4171
#: bzrlib/builtins.py:6354
3938
4172
msgid "Apply list or delete action to all views."
3939
4173
msgstr ""
3940
4174
3941
4175
# help of 'delete' option of 'view' command
3942
#: bzrlib/builtins.py:6058
4176
#: bzrlib/builtins.py:6357
3943
4177
msgid "Delete the view."
3944
4178
msgstr ""
3945
4179
3946
4180
# help of 'name' option of 'view' command
3947
#: bzrlib/builtins.py:6061
4181
#: bzrlib/builtins.py:6360
3948
4182
msgid "Name of the view to define, list or delete."
3949
4183
msgstr ""
3950
4184
3951
4185
# help of 'switch' option of 'view' command
3952
#: bzrlib/builtins.py:6065
4186
#: bzrlib/builtins.py:6364
3953
4187
msgid "Name of the view to switch to."
3954
4188
msgstr ""
3955
4189
3956
#: bzrlib/builtins.py:6084
4190
#: bzrlib/builtins.py:6383
3957
4191
msgid "Both --delete and a file list specified"
3958
4192
msgstr ""
3959
4193
3960
#: bzrlib/builtins.py:6087
4194
#: bzrlib/builtins.py:6386
3961
4195
msgid "Both --delete and --switch specified"
3962
4196
msgstr ""
3963
4197
3964
#: bzrlib/builtins.py:6090
4198
#: bzrlib/builtins.py:6389
3965
4199
msgid "Deleted all views.\n"
3966
4200
msgstr ""
3967
4201
3968
#: bzrlib/builtins.py:6092
4202
#: bzrlib/builtins.py:6391
3969
4203
msgid "No current view to delete"
3970
4204
msgstr ""
3971
4205
3972
#: bzrlib/builtins.py:6095
4206
#: bzrlib/builtins.py:6394
3973
4207
#, python-format
3974
4208
msgid "Deleted '%s' view.\n"
3975
4209
msgstr ""
3976
4210
3977
#: bzrlib/builtins.py:6099
4211
#: bzrlib/builtins.py:6398
3978
4212
msgid "Both --switch and a file list specified"
3979
4213
msgstr ""
3980
4214
3981
#: bzrlib/builtins.py:6102
4215
#: bzrlib/builtins.py:6401
3982
4216
msgid "Both --switch and --all specified"
3983
4217
msgstr ""
3984
4218
3985
#: bzrlib/builtins.py:6105
4219
#: bzrlib/builtins.py:6404
3986
4220
msgid "No current view to disable"
3987
4221
msgstr ""
3988
4222
3989
#: bzrlib/builtins.py:6107
4223
#: bzrlib/builtins.py:6406
3990
4224
#, python-format
3991
4225
msgid "Disabled '%s' view.\n"
3992
4226
msgstr ""
3993
4227
3994
#: bzrlib/builtins.py:6111 bzrlib/builtins.py:6133
4228
#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432
3995
4229
msgid "Using '{0}' view: {1}\n"
3996
4230
msgstr ""
3997
4231
3998
#: bzrlib/builtins.py:6114
4232
#: bzrlib/builtins.py:6413
3999
4233
msgid "Views defined:\n"
4000
4234
msgstr ""
4001
4235
4002
#: bzrlib/builtins.py:6123
4236
#: bzrlib/builtins.py:6422
4003
4237
msgid "No views defined.\n"
4004
4238
msgstr ""
4005
4239
4006
#: bzrlib/builtins.py:6130
4240
#: bzrlib/builtins.py:6429
4007
4241
msgid "Cannot change the 'off' pseudo view"
4008
4242
msgstr ""
4009
4243
4010
#: bzrlib/builtins.py:6138
4244
#: bzrlib/builtins.py:6437
4011
4245
msgid "No current view.\n"
4012
4246
msgstr ""
4013
4247
4014
#: bzrlib/builtins.py:6141
4248
#: bzrlib/builtins.py:6440
4015
4249
msgid "'{0}' view is: {1}\n"
4016
4250
msgstr ""
4017
4251
4018
#: bzrlib/builtins.py:6161
4252
#: bzrlib/builtins.py:6460
4019
4253
msgid " <no hooks installed>\n"
4020
4254
msgstr ""
4021
4255
4022
#: bzrlib/builtins.py:6165
4256
#: bzrlib/builtins.py:6464
4023
4257
msgid "Remove a branch."
4024
4258
msgstr ""
4025
4259
4026
#: bzrlib/builtins.py:6167
4260
#: bzrlib/builtins.py:6466
4027
4261
msgid ""
4028
4262
"This will remove the branch from the specified location but \n"
4029
4263
"will keep any working tree or repository in place."
4030
4264
msgstr ""
4031
4265
4032
#: bzrlib/builtins.py:6172
4266
#: bzrlib/builtins.py:6471
4033
4267
msgid " Remove the branch at repo/trunk::"
4034
4268
msgstr ""
4035
4269
4036
#: bzrlib/builtins.py:6174
4270
#: bzrlib/builtins.py:6473
4037
4271
msgid " bzr remove-branch repo/trunk"
4038
4272
msgstr ""
4039
4273
4040
#: bzrlib/builtins.py:6190
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
# help of 'writer=plain' option of 'shelve' command
4284
#: bzrlib/builtins.py:6498
4285
msgid "Plaintext diff output."
4286
msgstr ""
4287
4288
#: bzrlib/builtins.py:6499
4041
4289
msgid "Temporarily set aside some changes from the current tree."
4042
4290
msgstr ""
4043
4291
4044
#: bzrlib/builtins.py:6192
4292
#: bzrlib/builtins.py:6501
4045
4293
msgid ""
4046
4294
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4047
4295
"ie. out of the way, until a later time when you can bring them back from\n"
4050
4298
"will they survive its deletion."
4051
4299
msgstr ""
4052
4300
4053
#: bzrlib/builtins.py:6198
4301
#: bzrlib/builtins.py:6507
4054
4302
msgid "If shelve --list is specified, previously-shelved changes are listed."
4055
4303
msgstr ""
4056
4304
4057
#: bzrlib/builtins.py:6200
4305
#: bzrlib/builtins.py:6509
4058
4306
msgid ""
4059
4307
"Shelve is intended to help separate several sets of changes that have\n"
4060
4308
"been inappropriately mingled. If you just want to get rid of all changes\n"
4062
4310
"shelve all text changes at once, use shelve --all."
4063
4311
msgstr ""
4064
4312
4065
#: bzrlib/builtins.py:6205
4313
#: bzrlib/builtins.py:6514
4066
4314
msgid ""
4067
4315
"If filenames are specified, only the changes to those files will be\n"
4068
4316
"shelved. Other files will be left untouched."
4069
4317
msgstr ""
4070
4318
4071
#: bzrlib/builtins.py:6208
4319
#: bzrlib/builtins.py:6517
4072
4320
msgid ""
4073
4321
"If a revision is specified, changes since that revision will be shelved."
4074
4322
msgstr ""
4075
4323
4076
#: bzrlib/builtins.py:6210
4324
#: bzrlib/builtins.py:6519
4077
4325
msgid ""
4078
4326
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4079
4327
"restore the most recently shelved changes."
4080
4328
msgstr ""
4081
4329
4082
#: bzrlib/builtins.py:6213
4330
#: bzrlib/builtins.py:6522
4083
4331
msgid ""
4084
4332
"For complicated changes, it is possible to edit the changes in a separate\n"
4085
4333
"editor program to decide what the file remaining in the working copy\n"
4086
4334
"should look like. To do this, add the configuration option"
4087
4335
msgstr ""
4088
4336
4089
#: bzrlib/builtins.py:6217
4337
#: bzrlib/builtins.py:6526
4090
4338
msgid " change_editor = PROGRAM @new_path @old_path"
4091
4339
msgstr ""
4092
4340
4093
#: bzrlib/builtins.py:6219
4341
#: bzrlib/builtins.py:6528
4094
4342
msgid ""
4095
4343
"where @new_path is replaced with the path of the new version of the \n"
4096
4344
"file and @old_path is replaced with the path of the old version of \n"
4100
4348
msgstr ""
4101
4349
4102
4350
# help of 'all' option of 'shelve' command
4103
#: bzrlib/builtins.py:6231
4351
#: bzrlib/builtins.py:6540
4104
4352
msgid "Shelve all changes."
4105
4353
msgstr ""
4106
4354
4107
4355
# help of 'writer' option of 'shelve' command
4108
#: bzrlib/builtins.py:6233
4356
#: bzrlib/builtins.py:6542
4109
4357
msgid "Method to use for writing diffs."
4110
4358
msgstr ""
4111
4359
4112
4360
# title of 'writer' option of 'shelve' command
4113
#: bzrlib/builtins.py:6233
4361
#: bzrlib/builtins.py:6542
4114
4362
msgid "writer"
4115
4363
msgstr ""
4116
4364
4117
4365
# help of 'list' option of 'shelve' command
4118
#: bzrlib/builtins.py:6237
4366
#: bzrlib/builtins.py:6546
4119
4367
msgid "List shelved changes."
4120
4368
msgstr ""
4121
4369
4122
4370
# help of 'destroy' option of 'shelve' command
4123
#: bzrlib/builtins.py:6239
4371
#: bzrlib/builtins.py:6548
4124
4372
msgid "Destroy removed changes instead of shelving them."
4125
4373
msgstr ""
4126
4374
4127
#: bzrlib/builtins.py:6268
4375
#: bzrlib/builtins.py:6577
4128
4376
msgid "No shelved changes."
4129
4377
msgstr ""
4130
4378
4131
#: bzrlib/builtins.py:6279
4379
#: bzrlib/builtins.py:6588
4132
4380
msgid "Restore shelved changes."
4133
4381
msgstr ""
4134
4382
4135
#: bzrlib/builtins.py:6281
4383
#: bzrlib/builtins.py:6590
4136
4384
msgid ""
4137
4385
"By default, the most recently shelved changes are restored. However if you\n"
4138
4386
"specify a shelf by id those changes will be restored instead. This works\n"
4140
4388
msgstr ""
4141
4389
4142
4390
# help of 'action' option of 'unshelve' command
4143
#: bzrlib/builtins.py:6290
4391
#: bzrlib/builtins.py:6599
4144
4392
msgid "The action to perform."
4145
4393
msgstr ""
4146
4394
4147
#: bzrlib/builtins.py:6312
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
# help of 'action=apply' option of 'unshelve' command
4402
#: bzrlib/builtins.py:6601
4403
msgid "Apply changes and remove from the shelf."
4404
msgstr ""
4405
4406
# help of 'action=dry-run' option of 'unshelve' command
4407
#: bzrlib/builtins.py:6602
4408
msgid "Show changes, but do not apply or remove them."
4409
msgstr ""
4410
4411
# help of 'action=preview' option of 'unshelve' command
4412
#: bzrlib/builtins.py:6603
4413
msgid ""
4414
"Instead of unshelving the changes, show the diff that would result from "
4415
"unshelving."
4416
msgstr ""
4417
4418
# help of 'action=delete-only' option of 'unshelve' command
4419
#: bzrlib/builtins.py:6605
4420
msgid "Delete changes without applying them."
4421
msgstr ""
4422
4423
# help of 'action=keep' option of 'unshelve' command
4424
#: bzrlib/builtins.py:6606
4425
msgid "Apply changes but don't delete them."
4426
msgstr ""
4427
4428
#: bzrlib/builtins.py:6621
4148
4429
msgid "Remove unwanted files from working tree."
4149
4430
msgstr ""
4150
4431
4151
#: bzrlib/builtins.py:6314
4432
#: bzrlib/builtins.py:6623
4152
4433
msgid ""
4153
4434
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4154
4435
"files are never deleted."
4155
4436
msgstr ""
4156
4437
4157
#: bzrlib/builtins.py:6317
4438
#: bzrlib/builtins.py:6626
4158
4439
msgid ""
4159
4440
"Another class is 'detritus', which includes files emitted by bzr during\n"
4160
4441
"normal operations and selftests. (The value of these files decreases with\n"
4161
4442
"time.)"
4162
4443
msgstr ""
4163
4444
4164
#: bzrlib/builtins.py:6321
4445
#: bzrlib/builtins.py:6630
4165
4446
msgid ""
4166
4447
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4167
4448
"flags are respected, and may be combined."
4168
4449
msgstr ""
4169
4450
4170
#: bzrlib/builtins.py:6324
4451
#: bzrlib/builtins.py:6633
4171
4452
msgid "To check what clean-tree will do, use --dry-run."
4172
4453
msgstr ""
4173
4454
4174
4455
# help of 'ignored' option of 'clean-tree' command
4175
#: bzrlib/builtins.py:6327
4456
#: bzrlib/builtins.py:6636
4176
4457
msgid "Delete all ignored files."
4177
4458
msgstr ""
4178
4459
4179
4460
# help of 'detritus' option of 'clean-tree' command
4180
#: bzrlib/builtins.py:6328
4461
#: bzrlib/builtins.py:6637
4181
4462
msgid ""
4182
4463
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4183
4464
msgstr ""
4184
4465
4185
4466
# help of 'unknown' option of 'clean-tree' command
4186
#: bzrlib/builtins.py:6331
4467
#: bzrlib/builtins.py:6640
4187
4468
msgid "Delete files unknown to bzr (default)."
4188
4469
msgstr ""
4189
4470
4190
4471
# help of 'dry-run' option of 'clean-tree' command
4191
#: bzrlib/builtins.py:6332
4472
#: bzrlib/builtins.py:6641
4192
4473
msgid "Show files to delete instead of deleting them."
4193
4474
msgstr ""
4194
4475
4195
4476
# help of 'force' option of 'clean-tree' command
4196
#: bzrlib/builtins.py:6334
4477
#: bzrlib/builtins.py:6643
4197
4478
msgid "Do not prompt before deleting."
4198
4479
msgstr ""
4199
4480
4200
#: bzrlib/bundle/__init__.py:57
4481
#: bzrlib/bundle/__init__.py:59
4201
4482
msgid "A directory cannot be a bundle"
4202
4483
msgstr ""
4203
4484
4204
#: bzrlib/bundle/serializer/v4.py:326
4485
#: bzrlib/bundle/apply_bundle.py:40
4486
msgid "Install revisions"
4487
msgstr ""
4488
4489
#: bzrlib/bundle/commands.py:64
4490
msgid "--verbose requires a merge directive"
4491
msgstr ""
4492
4493
#: bzrlib/bundle/commands.py:67
4494
msgid "Bundle format not supported"
4495
msgstr ""
4496
4497
#: bzrlib/bundle/commands.py:77
4498
msgid "Records\n"
4499
msgstr ""
4500
4501
#: bzrlib/bundle/commands.py:81
4502
msgid "{0}: {1} ({2} multiparent)\n"
4503
msgstr ""
4504
4505
#: bzrlib/bundle/commands.py:83
4506
#, python-format
4507
msgid "unique files: %d\n"
4508
msgstr ""
4509
4510
#: bzrlib/bundle/commands.py:92
4511
msgid "Revisions\n"
4512
msgstr ""
4513
4514
#: bzrlib/bundle/commands.py:93
4515
#, python-format
4516
msgid "nicks: %s\n"
4517
msgstr ""
4518
4519
#: bzrlib/bundle/commands.py:95
4520
#, python-format
4521
msgid ""
4522
"committers: \n"
4523
"%s\n"
4524
msgstr ""
4525
4526
#: bzrlib/bundle/commands.py:103
4527
msgid "Decoded contents\n"
4528
msgstr ""
4529
4530
#: bzrlib/bundle/serializer/v4.py:327
4205
4531
#, python-format
4206
4532
msgid "Bundling %d revision."
4207
4533
msgid_plural "Bundling %d revisions."
4208
4534
msgstr[0] ""
4209
4535
msgstr[1] ""
4210
4536
4211
#: bzrlib/bzrdir.py:636
4537
#: bzrlib/bzrdir.py:487
4212
4538
msgid ""
4213
4539
"making backup of {0}\n"
4214
4540
" to {1}"
4215
4541
msgstr ""
4216
4542
4217
#: bzrlib/bzrdir.py:659
4543
#: bzrlib/bzrdir.py:510
4218
4544
msgid "renamed {0} to {1}"
4219
4545
msgstr ""
4220
4546
4221
#: bzrlib/bzrdir.py:851
4222
msgid "{0} is{1} redirected to {2}"
4223
msgstr ""
4224
4225
#: bzrlib/bzrdir.py:1727
4547
#: bzrlib/bzrdir.py:1639
4226
4548
#, python-format
4227
4549
msgid ""
4228
4550
"Source repository format does not support stacking, using format:\n"
4229
4551
" %s"
4230
4552
msgstr ""
4231
4553
4232
#: bzrlib/bzrdir.py:1747
4554
#: bzrlib/bzrdir.py:1659
4233
4555
#, python-format
4234
4556
msgid ""
4235
4557
"Source branch format does not support stacking, using format:\n"
4236
4558
" %s"
4237
4559
msgstr ""
4238
4560
4239
#: bzrlib/bzrdir.py:1858
4561
#: bzrlib/bzrdir.py:1805
4240
4562
msgid "starting repository conversion"
4241
4563
msgstr ""
4242
4564
4243
#: bzrlib/check.py:106
4565
#: bzrlib/bzrdir.py:2026
4566
msgid "Using default stacking branch {0} at {1}"
4567
msgstr ""
4568
4569
#: bzrlib/check.py:108
4244
4570
msgid "check"
4245
4571
msgstr ""
4246
4572
4247
#: bzrlib/check.py:108
4573
#: bzrlib/check.py:110
4248
4574
msgid "checking revisions"
4249
4575
msgstr ""
4250
4576
4251
#: bzrlib/check.py:110
4577
#: bzrlib/check.py:112
4252
4578
msgid "checking commit contents"
4253
4579
msgstr ""
4254
4580
4255
#: bzrlib/check.py:112
4581
#: bzrlib/check.py:114
4256
4582
msgid "checking file graphs"
4257
4583
msgstr ""
4258
4584
4259
#: bzrlib/check.py:116
4585
#: bzrlib/check.py:118
4260
4586
msgid "checking branches and trees"
4261
4587
msgstr ""
4262
4588
4263
#: bzrlib/check.py:203
4589
#: bzrlib/check.py:205
4264
4590
msgid "checked repository {0} format {1}"
4265
4591
msgstr ""
4266
4592
4267
#: bzrlib/check.py:206
4593
#: bzrlib/check.py:208
4268
4594
#, python-format
4269
4595
msgid "%6d revisions"
4270
4596
msgstr ""
4271
4597
4272
#: bzrlib/check.py:207
4598
#: bzrlib/check.py:209
4273
4599
#, python-format
4274
4600
msgid "%6d file-ids"
4275
4601
msgstr ""
4276
4602
4277
#: bzrlib/check.py:209
4603
#: bzrlib/check.py:211
4278
4604
#, python-format
4279
4605
msgid "%6d unreferenced text versions"
4280
4606
msgstr ""
4281
4607
4282
#: bzrlib/check.py:213
4608
#: bzrlib/check.py:215
4283
4609
msgid "unreferenced version: {{{0}}} in {1}"
4284
4610
msgstr ""
4285
4611
4286
#: bzrlib/check.py:216
4612
#: bzrlib/check.py:218
4287
4613
#, python-format
4288
4614
msgid "%6d revisions are missing inventory_sha1"
4289
4615
msgstr ""
4290
4616
4291
#: bzrlib/check.py:219
4617
#: bzrlib/check.py:221
4292
4618
#, python-format
4293
4619
msgid "%6d revisions are mentioned but not present"
4294
4620
msgstr ""
4295
4621
4296
#: bzrlib/check.py:222
4622
#: bzrlib/check.py:224
4297
4623
#, python-format
4298
4624
msgid "%6d ghost revisions"
4299
4625
msgstr ""
4300
4626
4301
#: bzrlib/check.py:227
4627
#: bzrlib/check.py:229
4302
4628
#, python-format
4303
4629
msgid "%6d revisions missing parents in ancestry"
4304
4630
msgstr ""
4305
4631
4306
#: bzrlib/check.py:231
4632
#: bzrlib/check.py:233
4307
4633
#, python-format
4308
4634
msgid " %s should be in the ancestry for:"
4309
4635
msgstr ""
4310
4636
4311
#: bzrlib/check.py:235
4637
#: bzrlib/check.py:237
4312
4638
#, python-format
4313
4639
msgid "%6d inconsistent parents"
4314
4640
msgstr ""
4315
4641
4316
#: bzrlib/check.py:239
4642
#: bzrlib/check.py:241
4317
4643
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4318
4644
msgstr ""
4319
4645
4320
#: bzrlib/check.py:245
4646
#: bzrlib/check.py:247
4321
4647
#, python-format
4322
4648
msgid "%6d revisions have incorrect parents in the revision index"
4323
4649
msgstr ""
4324
4650
4325
#: bzrlib/check.py:251
4651
#: bzrlib/check.py:253
4326
4652
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4327
4653
msgstr ""
4328
4654
4329
#: bzrlib/check.py:265
4655
#: bzrlib/check.py:267
4330
4656
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4331
4657
msgstr ""
4332
4658
4333
#: bzrlib/check.py:294
4659
#: bzrlib/check.py:296
4334
4660
msgid ""
4335
4661
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4336
4662
"{{{4}}}"
4337
4663
msgstr ""
4338
4664
4339
#: bzrlib/check.py:352
4665
#: bzrlib/check.py:354
4340
4666
#, python-format
4341
4667
msgid "Checking branch at '%s'."
4342
4668
msgstr ""
4343
4669
4344
#: bzrlib/check.py:372
4670
#: bzrlib/check.py:374
4345
4671
#, python-format
4346
4672
msgid "Checking working tree at '%s'."
4347
4673
msgstr ""
4348
4674
4349
#: bzrlib/check.py:425 bzrlib/check.py:439
4675
#: bzrlib/check.py:427 bzrlib/check.py:441
4350
4676
msgid "No branch found at specified location."
4351
4677
msgstr ""
4352
4678
4353
#: bzrlib/check.py:427 bzrlib/check.py:437
4679
#: bzrlib/check.py:429 bzrlib/check.py:439
4354
4680
msgid "No working tree found at specified location."
4355
4681
msgstr ""
4356
4682
4357
#: bzrlib/check.py:430
4683
#: bzrlib/check.py:432
4358
4684
#, python-format
4359
4685
msgid "Checking repository at '%s'."
4360
4686
msgstr ""
4361
4687
4362
#: bzrlib/check.py:441
4688
#: bzrlib/check.py:443
4363
4689
msgid "No repository found at specified location."
4364
4690
msgstr ""
4365
4691
4366
#: bzrlib/clean_tree.py:62
4692
#: bzrlib/clean_tree.py:63
4367
4693
msgid "Nothing to delete."
4368
4694
msgstr ""
4369
4695
4370
#: bzrlib/clean_tree.py:108
4696
#: bzrlib/clean_tree.py:68
4697
msgid "Are you sure you wish to delete these"
4698
msgstr ""
4699
4700
#: bzrlib/clean_tree.py:70
4701
msgid "Canceled"
4702
msgstr ""
4703
4704
#: bzrlib/clean_tree.py:107
4371
4705
#, python-format
4372
4706
msgid "unable to remove %s"
4373
4707
msgstr ""
4374
4708
4375
#: bzrlib/clean_tree.py:112
4709
#: bzrlib/clean_tree.py:111
4376
4710
msgid "deleting paths:"
4377
4711
msgstr ""
4378
4712
4379
#: bzrlib/clean_tree.py:126
4713
#: bzrlib/clean_tree.py:125
4380
4714
msgid "unable to remove \"{0}\": {1}."
4381
4715
msgstr ""
4382
4716
4383
#: bzrlib/clean_tree.py:131
4717
#: bzrlib/clean_tree.py:130
4384
4718
msgid "No files deleted."
4385
4719
msgstr ""
4386
4720
4387
#: bzrlib/cmd_version_info.py:45
4721
#: bzrlib/cmd_version_info.py:47
4388
4722
msgid "No known version info format {0}. Supported types are: {1}"
4389
4723
msgstr ""
4390
4724
4391
#: bzrlib/cmd_version_info.py:51
4725
# help of 'format=custom' option of 'version-info' command
4726
#: bzrlib/cmd_version_info.py:52
4727
msgid "Version info in Custom template-based format."
4728
msgstr ""
4729
4730
# help of 'format=python' option of 'version-info' command
4731
#: bzrlib/cmd_version_info.py:52
4732
msgid "Version info in Python format."
4733
msgstr ""
4734
4735
# help of 'format=rio' option of 'version-info' command
4736
#: bzrlib/cmd_version_info.py:52
4737
msgid "Version info in RIO (simple text) format (default)."
4738
msgstr ""
4739
4740
#: bzrlib/cmd_version_info.py:53
4392
4741
msgid "Show version information about this tree."
4393
4742
msgstr ""
4394
4743
4395
#: bzrlib/cmd_version_info.py:53
4744
#: bzrlib/cmd_version_info.py:55
4396
4745
msgid ""
4397
4746
"You can use this command to add information about version into\n"
4398
4747
"source code of an application. The output can be in one of the\n"
4399
4748
"supported formats or in a custom format based on a template."
4400
4749
msgstr ""
4401
4750
4402
#: bzrlib/cmd_version_info.py:57
4751
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4752
#: en/help_topics/configuration.txt:738
4403
4753
msgid "For example::"
4404
4754
msgstr ""
4405
4755
4406
#: bzrlib/cmd_version_info.py:59
4756
#: bzrlib/cmd_version_info.py:61
4407
4757
msgid ""
4408
4758
" bzr version-info --custom \\\n"
4409
4759
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4410
4760
msgstr ""
4411
4761
4412
#: bzrlib/cmd_version_info.py:62
4762
#: bzrlib/cmd_version_info.py:64
4413
4763
msgid ""
4414
4764
"will produce a C header file with formatted string containing the\n"
4415
4765
"current revision number. Other supported variables in templates are:"
4416
4766
msgstr ""
4417
4767
4418
#: bzrlib/cmd_version_info.py:65
4768
#: bzrlib/cmd_version_info.py:67
4419
4769
msgid ""
4420
4770
" * {date} - date of the last revision\n"
4421
4771
" * {build_date} - current date\n"
4427
4777
msgstr ""
4428
4778
4429
4779
# help of 'format' option of 'version-info' command
4430
#: bzrlib/cmd_version_info.py:75
4780
#: bzrlib/cmd_version_info.py:77
4431
4781
msgid "Select the output format."
4432
4782
msgstr ""
4433
4783
4434
4784
# help of 'all' option of 'version-info' command
4435
#: bzrlib/cmd_version_info.py:79
4785
#: bzrlib/cmd_version_info.py:81
4436
4786
msgid "Include all possible information."
4437
4787
msgstr ""
4438
4788
4439
4789
# help of 'check-clean' option of 'version-info' command
4440
#: bzrlib/cmd_version_info.py:80
4790
#: bzrlib/cmd_version_info.py:82
4441
4791
msgid "Check if tree is clean."
4442
4792
msgstr ""
4443
4793
4444
4794
# help of 'include-history' option of 'version-info' command
4445
#: bzrlib/cmd_version_info.py:82
4795
#: bzrlib/cmd_version_info.py:84
4446
4796
msgid "Include the revision-history."
4447
4797
msgstr ""
4448
4798
4449
4799
# help of 'include-file-revisions' option of 'version-info' command
4450
#: bzrlib/cmd_version_info.py:84
4800
#: bzrlib/cmd_version_info.py:86
4451
4801
msgid "Include the last revision for each file."
4452
4802
msgstr ""
4453
4803
4454
4804
# help of 'template' option of 'version-info' command
4455
#: bzrlib/cmd_version_info.py:85
4805
#: bzrlib/cmd_version_info.py:87
4456
4806
msgid "Template for the output."
4457
4807
msgstr ""
4458
4808
4459
#: bzrlib/commands.py:232
4809
#: bzrlib/cmd_version_info.py:101
4810
msgid "bzr version-info --revision takes exactly one revision specifier"
4811
msgstr ""
4812
4813
#: bzrlib/commands.py:229
4460
4814
#, python-format
4461
4815
msgid "unknown command \"%s\""
4462
4816
msgstr ""
4463
4817
4464
#: bzrlib/commands.py:479
4818
#: bzrlib/commands.py:476
4465
4819
msgid "No help for this command."
4466
4820
msgstr ""
4467
4821
4468
#: bzrlib/commands.py:492
4822
#: bzrlib/commands.py:489
4469
4823
#, python-format
4470
4824
msgid ":Purpose: %s\n"
4471
4825
msgstr ""
4472
4826
4473
#: bzrlib/commands.py:494
4827
#: bzrlib/commands.py:491
4474
4828
#, python-format
4475
4829
msgid ""
4476
4830
":Usage:\n"
4477
4831
"%s\n"
4478
4832
msgstr ""
4479
4833
4480
#: bzrlib/commands.py:496
4834
#: bzrlib/commands.py:493
4481
4835
#, python-format
4482
4836
msgid ":Usage: %s\n"
4483
4837
msgstr ""
4484
4838
4485
#: bzrlib/commands.py:515
4839
#: bzrlib/commands.py:512
4486
4840
#, python-format
4487
4841
msgid ":Options:%s"
4488
4842
msgstr ""
4489
4843
4490
#: bzrlib/commands.py:526
4844
#: bzrlib/commands.py:523
4491
4845
#, python-format
4492
4846
msgid ""
4493
4847
":Description:\n"
4495
4849
"\n"
4496
4850
msgstr ""
4497
4851
4498
#: bzrlib/commands.py:536
4852
#: bzrlib/commands.py:533
4499
4853
#, python-format
4500
4854
msgid ""
4501
4855
"See bzr help %s for more details and examples.\n"
4502
4856
"\n"
4503
4857
msgstr ""
4504
4858
4505
#: bzrlib/commands.py:541
4859
#: bzrlib/commands.py:538
4506
4860
msgid ":Aliases: "
4507
4861
msgstr ""
4508
4862
4509
#: bzrlib/commands.py:545
4863
#: bzrlib/commands.py:542
4510
4864
#, python-format
4511
4865
msgid ":From: plugin \"%s\"\n"
4512
4866
msgstr ""
4513
4867
4514
#: bzrlib/commands.py:557
4868
#: bzrlib/commands.py:554
4515
4869
msgid ":doc:`{0} <{1}-help>`"
4516
4870
msgstr ""
4517
4871
4518
#: bzrlib/commands.py:561
4872
#: bzrlib/commands.py:558
4519
4873
#, python-format
4520
4874
msgid ":See also: %s"
4521
4875
msgstr ""
4522
4876
4523
#: bzrlib/commands.py:819 bzrlib/gpg.py:317
4877
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4524
4878
msgid "Only ASCII permitted in option names"
4525
4879
msgstr ""
4526
4880
4527
#: bzrlib/commands.py:844 bzrlib/commands.py:852
4881
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4528
4882
msgid "command {0!r} needs one or more {1}"
4529
4883
msgstr ""
4530
4884
4531
#: bzrlib/commands.py:861
4885
#: bzrlib/commands.py:868
4532
4886
msgid "command {0!r} requires argument {1}"
4533
4887
msgstr ""
4534
4888
4535
#: bzrlib/commands.py:868
4889
#: bzrlib/commands.py:875
4536
4890
msgid "extra argument to command {0}: {1}"
4537
4891
msgstr ""
4538
4892
4539
#: bzrlib/commands.py:965
4893
#: bzrlib/commands.py:952
4540
4894
#, python-format
4541
4895
msgid "Profile data written to \"%s\"."
4542
4896
msgstr ""
4543
4897
4544
#: bzrlib/commit.py:116 bzrlib/commit.py:709
4898
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4545
4899
msgid "added"
4546
4900
msgstr ""
4547
4901
4548
#: bzrlib/commit.py:116 bzrlib/commit.py:717
4902
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4549
4903
msgid "modified"
4550
4904
msgstr ""
4551
4905
4552
#: bzrlib/commit.py:130
4906
#: bzrlib/commit.py:131
4553
4907
#, python-format
4554
4908
msgid "Committing%s"
4555
4909
msgstr ""
4556
4910
4557
#: bzrlib/commit.py:133
4911
#: bzrlib/commit.py:134
4558
4912
#, python-format
4559
4913
msgid "Committed revision %d."
4560
4914
msgstr ""
4561
4915
4562
#: bzrlib/commit.py:142
4916
#: bzrlib/commit.py:143
4563
4917
#, python-format
4564
4918
msgid "deleted %s"
4565
4919
msgstr ""
4566
4920
4567
#: bzrlib/commit.py:145
4921
#: bzrlib/commit.py:146
4568
4922
#, python-format
4569
4923
msgid "missing %s"
4570
4924
msgstr ""
4571
4925
4572
#: bzrlib/commit.py:471
4926
#: bzrlib/commit.py:511
4573
4927
msgid ""
4574
4928
"Conflicting tags in bound branch:\n"
4575
4929
"{0}"
4576
4930
msgstr ""
4577
4931
4578
#: bzrlib/commit.py:711
4932
#: bzrlib/commit.py:742
4579
4933
msgid "renamed"
4580
4934
msgstr ""
4581
4935
4582
#: bzrlib/commit.py:946
4936
#: bzrlib/commit.py:976
4583
4937
msgid "unchanged"
4584
4938
msgstr ""
4585
4939
4586
#: bzrlib/commit.py:968
4940
#: bzrlib/commit.py:998
4587
4941
msgid "{0} [{1}] - Stage"
4588
4942
msgstr ""
4589
4943
4590
#: bzrlib/commit.py:971
4944
#: bzrlib/commit.py:1001
4591
4945
#, python-format
4592
4946
msgid "%s - Stage"
4593
4947
msgstr ""
4612
4966
"Don't actually sign anything, just print the revisions that would be signed."
4613
4967
msgstr ""
4614
4968
4615
#: bzrlib/commit_signature_commands.py:101
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] ""
4975
4976
#: bzrlib/commit_signature_commands.py:103
4616
4977
msgid "Verify all commit signatures."
4617
4978
msgstr ""
4618
4979
4619
#: bzrlib/commit_signature_commands.py:103
4980
#: bzrlib/commit_signature_commands.py:105
4620
4981
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4621
4982
msgstr ""
4622
4983
4623
4984
# help of 'acceptable-keys' option of 'verify-signatures' command
4624
#: bzrlib/commit_signature_commands.py:108
4985
#: bzrlib/commit_signature_commands.py:110
4625
4986
msgid ""
4626
4987
"Comma separated list of GPG key patterns which are acceptable for "
4627
4988
"verification."
4628
4989
msgstr ""
4629
4990
4630
#: bzrlib/commit_signature_commands.py:145
4991
#: bzrlib/commit_signature_commands.py:148
4631
4992
msgid "Cannot verify a range of non-revision-history revisions"
4632
4993
msgstr ""
4633
4994
4635
4996
msgid "All commits signed with verifiable keys"
4636
4997
msgstr ""
4637
4998
4638
#: bzrlib/config.py:448
4999
#: bzrlib/config.py:438
4639
5000
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4640
5001
msgstr ""
4641
5002
4642
#: bzrlib/config.py:3293
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
5014
#, python-format
5015
msgid "Invalid '%s', should be of the form 'name=value'"
5016
msgstr ""
5017
5018
#: bzrlib/config.py:4089
4643
5019
msgid "Display, set or remove a configuration option."
4644
5020
msgstr ""
4645
5021
4646
#: bzrlib/config.py:3295
4647
msgid "Display the active value for a given option."
5022
#: bzrlib/config.py:4091
5023
msgid "Display the active value for option NAME."
4648
5024
msgstr ""
4649
5025
4650
#: bzrlib/config.py:3297
5026
#: bzrlib/config.py:4093
4651
5027
msgid ""
4652
5028
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4653
"matching options are displayed mentioning their scope. The active value\n"
4654
"that bzr will take into account is the first one displayed for each option."
4655
msgstr ""
4656
4657
#: bzrlib/config.py:3301
4658
msgid "If no NAME is given, --all .* is implied."
4659
msgstr ""
4660
4661
#: bzrlib/config.py:3303
4662
msgid ""
4663
"Setting a value is achieved by using name=value without spaces. The value\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"
4664
5044
"is set in the most relevant scope and can be checked by displaying the\n"
4665
5045
"option again."
4666
5046
msgstr ""
4667
5047
5048
#: bzrlib/config.py:4105
5049
msgid "Removing a value is achieved by using --remove NAME."
5050
msgstr ""
5051
4668
5052
# help of 'scope' option of 'config' command
4669
#: bzrlib/config.py:3314
4670
msgid "Reduce the scope to the specified configuration file"
5053
#: bzrlib/config.py:4115
5054
msgid "Reduce the scope to the specified configuration file."
4671
5055
msgstr ""
4672
5056
4673
5057
# help of 'all' option of 'config' command
4674
#: bzrlib/config.py:3318
5058
#: bzrlib/config.py:4119
4675
5059
msgid "Display all the defined values for the matching options."
4676
5060
msgstr ""
4677
5061
4678
5062
# help of 'remove' option of 'config' command
4679
#: bzrlib/config.py:3320
4680
msgid "Remove the option from the configuration file"
5063
#: bzrlib/config.py:4121
5064
msgid "Remove the option from the configuration file."
4681
5065
msgstr ""
4682
5066
4683
#: bzrlib/conflicts.py:48
5067
#: bzrlib/conflicts.py:50
4684
5068
msgid "List files with conflicts."
4685
5069
msgstr ""
4686
5070
4687
#: bzrlib/conflicts.py:50
4688
msgid ""
4689
"Merge will do its best to combine the changes in two branches, but there\n"
4690
"are some kinds of problems only a human can fix. When it encounters those,\n"
4691
"it will mark a conflict. A conflict means that you need to fix something,\n"
4692
"before you should commit."
4693
msgstr ""
4694
4695
#: bzrlib/conflicts.py:55
5071
#: bzrlib/conflicts.py:57
4696
5072
msgid ""
4697
5073
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4698
5074
"is supplied, the pathnames of files with text conflicts are listed,\n"
4699
5075
"instead. (This is useful for editing all files with text conflicts.)"
4700
5076
msgstr ""
4701
5077
4702
#: bzrlib/conflicts.py:59
5078
#: bzrlib/conflicts.py:61
4703
5079
msgid "Use bzr resolve when you have fixed a problem."
4704
5080
msgstr ""
4705
5081
4706
5082
# help of 'text' option of 'conflicts' command
4707
#: bzrlib/conflicts.py:64
5083
#: bzrlib/conflicts.py:66
4708
5084
msgid "List paths of files with text conflicts."
4709
5085
msgstr ""
4710
5086
5087
# help of 'action=done' option of 'resolve' command
5088
#: bzrlib/conflicts.py:85
5089
msgid "Marks the conflict as resolved."
5090
msgstr ""
5091
5092
# help of 'action=take-this' option of 'resolve' command
5093
#: bzrlib/conflicts.py:88
5094
msgid "Resolve the conflict preserving the version in the working tree."
5095
msgstr ""
5096
5097
# help of 'action=take-other' option of 'resolve' command
5098
#: bzrlib/conflicts.py:91
5099
msgid "Resolve the conflict taking the merged version into account."
5100
msgstr ""
5101
4711
5102
# help of 'action' option of 'resolve' command
4712
#: bzrlib/conflicts.py:96
5103
#: bzrlib/conflicts.py:98
4713
5104
msgid "How to resolve the conflict."
4714
5105
msgstr ""
4715
5106
4716
#: bzrlib/conflicts.py:102
5107
#: bzrlib/conflicts.py:104
4717
5108
msgid "Mark a conflict as resolved."
4718
5109
msgstr ""
4719
5110
4720
#: bzrlib/conflicts.py:109
5111
#: bzrlib/conflicts.py:111
4721
5112
msgid ""
4722
5113
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4723
5114
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4726
5117
msgstr ""
4727
5118
4728
5119
# help of 'all' option of 'resolve' command
4729
#: bzrlib/conflicts.py:117
5120
#: bzrlib/conflicts.py:119
4730
5121
msgid "Resolve all conflicts in this tree."
4731
5122
msgstr ""
4732
5123
4733
#: bzrlib/conflicts.py:124
5124
#: bzrlib/conflicts.py:126
4734
5125
msgid "If --all is specified, no FILE may be provided"
4735
5126
msgstr ""
4736
5127
4737
#: bzrlib/conflicts.py:149
5128
#: bzrlib/conflicts.py:151
4738
5129
#, python-format
4739
5130
msgid "%d conflict auto-resolved."
4740
5131
msgid_plural "%d conflicts auto-resolved."
4741
5132
msgstr[0] ""
4742
5133
msgstr[1] ""
4743
5134
4744
#: bzrlib/conflicts.py:152
5135
#: bzrlib/conflicts.py:154
4745
5136
msgid "Remaining conflicts:"
4746
5137
msgstr ""
4747
5138
4748
#: bzrlib/conflicts.py:157
5139
#: bzrlib/conflicts.py:159
4749
5140
msgid "All conflicts resolved."
4750
5141
msgstr ""
4751
5142
4752
#: bzrlib/conflicts.py:166
5143
#: bzrlib/conflicts.py:168
4753
5144
msgid "{0} conflict resolved, {1} remaining"
4754
5145
msgid_plural "{0} conflicts resolved, {1} remaining"
4755
5146
msgstr[0] ""
4756
5147
msgstr[1] ""
4757
5148
4758
# title of 'action' option of 'resolve' command
4759
#: bzrlib/conflicts.py:692
4760
msgid "action"
5149
#: bzrlib/controldir.py:712
5150
msgid "{0} is{1} redirected to {2}"
4761
5151
msgstr ""
4762
5152
4763
#: bzrlib/diff.py:397
5153
#: bzrlib/diff.py:400
4764
5154
#, python-format
4765
5155
msgid "*** Ignoring files outside view. View is %s"
4766
5156
msgstr ""
4767
5157
4768
#: bzrlib/errors.py:215
5158
#: bzrlib/errors.py:157
4769
5159
msgid "The tree builder is already building a tree."
4770
5160
msgstr ""
4771
5161
4772
#: bzrlib/errors.py:236
5162
#: bzrlib/errors.py:178
4773
5163
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4774
5164
msgstr ""
4775
5165
4776
#: bzrlib/errors.py:255
5166
#: bzrlib/errors.py:197
4777
5167
msgid ""
4778
5168
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4779
5169
"versions \"%(minimum)s\" to \"%(current)s\"."
4780
5170
msgstr ""
4781
5171
4782
#: bzrlib/errors.py:267
5172
#: bzrlib/errors.py:209
4783
5173
msgid "The transport '%(transport)s' is only accessible within this process."
4784
5174
msgstr ""
4785
5175
4786
#: bzrlib/errors.py:285
5176
#: bzrlib/errors.py:227
4787
5177
msgid "Invalid revision number %(revno)s"
4788
5178
msgstr ""
4789
5179
4790
#: bzrlib/errors.py:294
5180
#: bzrlib/errors.py:236
4791
5181
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4792
5182
msgstr ""
4793
5183
4794
#: bzrlib/errors.py:305
5184
#: bzrlib/errors.py:247
4795
5185
msgid "Reserved revision-id {%(revision_id)s}"
4796
5186
msgstr ""
4797
5187
4798
#: bzrlib/errors.py:319
5188
#: bzrlib/errors.py:261
4799
5189
msgid "There is no public branch set for \"%(branch_url)s\"."
4800
5190
msgstr ""
4801
5191
4802
#: bzrlib/errors.py:329
5192
#: bzrlib/errors.py:271
4803
5193
msgid ""
4804
5194
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4805
5195
"obtain a list of topics."
4806
5196
msgstr ""
4807
5197
4808
#: bzrlib/errors.py:338
5198
#: bzrlib/errors.py:280
4809
5199
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4810
5200
msgstr ""
4811
5201
4812
#: bzrlib/errors.py:348
5202
#: bzrlib/errors.py:290
4813
5203
msgid ""
4814
5204
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4815
5205
msgstr ""
4816
5206
4817
#: bzrlib/errors.py:357
5207
#: bzrlib/errors.py:299
4818
5208
msgid "The branch '%(branch)s' is not stacked."
4819
5209
msgstr ""
4820
5210
4821
#: bzrlib/errors.py:371
5211
#: bzrlib/errors.py:313
4822
5212
msgid "No WorkingTree exists for \"%(base)s\"."
4823
5213
msgstr ""
4824
5214
4825
#: bzrlib/errors.py:380
5215
#: bzrlib/errors.py:322
4826
5216
msgid "Not currently building a tree."
4827
5217
msgstr ""
4828
5218
4829
#: bzrlib/errors.py:385
5219
#: bzrlib/errors.py:327
4830
5220
msgid "%(url)s is not a local path."
4831
5221
msgstr ""
4832
5222
4833
#: bzrlib/errors.py:413
5223
#: bzrlib/errors.py:355
4834
5224
msgid "%(not_locked)r is not write locked but needs to be."
4835
5225
msgstr ""
4836
5226
4837
#: bzrlib/errors.py:421
5227
#: bzrlib/errors.py:363
4838
5228
msgid "Error in command line options"
4839
5229
msgstr ""
4840
5230
4841
#: bzrlib/errors.py:426
5231
#: bzrlib/errors.py:368
4842
5232
msgid "%(value)s is not an index of type %(_type)s."
4843
5233
msgstr ""
4844
5234
4845
#: bzrlib/errors.py:436
5235
#: bzrlib/errors.py:378
4846
5236
msgid "Error in data for index %(value)s."
4847
5237
msgstr ""
4848
5238
4849
#: bzrlib/errors.py:445
5239
#: bzrlib/errors.py:387
4850
5240
msgid "The key '%(key)s' is already in index '%(index)s'."
4851
5241
msgstr ""
4852
5242
4853
#: bzrlib/errors.py:455
5243
#: bzrlib/errors.py:397
4854
5244
msgid "The key '%(key)s' is not a valid key."
4855
5245
msgstr ""
4856
5246
4857
#: bzrlib/errors.py:464
5247
#: bzrlib/errors.py:406
4858
5248
msgid "Could not parse options for index %(value)s."
4859
5249
msgstr ""
4860
5250
4861
#: bzrlib/errors.py:473
5251
#: bzrlib/errors.py:415
4862
5252
msgid "The value '%(value)s' is not a valid value."
4863
5253
msgstr ""
4864
5254
4865
#: bzrlib/errors.py:501
5255
#: bzrlib/errors.py:424
5256
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:443
4866
5260
msgid "Generic path error: %(path)r%(extra)s)"
4867
5261
msgstr ""
4868
5262
4869
#: bzrlib/errors.py:514
5263
#: bzrlib/errors.py:456
4870
5264
msgid "No such file: %(path)r%(extra)s"
4871
5265
msgstr ""
4872
5266
4873
#: bzrlib/errors.py:519
5267
#: bzrlib/errors.py:461
4874
5268
msgid "File exists: %(path)r%(extra)s"
4875
5269
msgstr ""
4876
5270
4877
#: bzrlib/errors.py:525
5271
#: bzrlib/errors.py:467
4878
5272
msgid ""
4879
5273
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
4880
5274
"after to tell bzr about a rename that has already happened)%(extra)s"
4881
5275
msgstr ""
4882
5276
4883
#: bzrlib/errors.py:541
5277
#: bzrlib/errors.py:483
4884
5278
msgid "\"%(path)s\" is not a directory %(extra)s"
4885
5279
msgstr ""
4886
5280
4887
#: bzrlib/errors.py:546
5281
#: bzrlib/errors.py:488
4888
5282
msgid "\"%(path)s\" is not in the working directory %(extra)s"
4889
5283
msgstr ""
4890
5284
4891
#: bzrlib/errors.py:551
5285
#: bzrlib/errors.py:493
4892
5286
msgid "Directory not empty: \"%(path)s\"%(extra)s"
4893
5287
msgstr ""
4894
5288
4895
#: bzrlib/errors.py:556
5289
#: bzrlib/errors.py:498
4896
5290
msgid "Hard-linking \"%(path)s\" is not supported"
4897
5291
msgstr ""
4898
5292
4899
#: bzrlib/errors.py:571
5293
#: bzrlib/errors.py:513
4900
5294
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
4901
5295
msgstr ""
4902
5296
4903
#: bzrlib/errors.py:576
5297
#: bzrlib/errors.py:518
4904
5298
msgid "Permission denied: \"%(path)s\"%(extra)s"
4905
5299
msgstr ""
4906
5300
4907
#: bzrlib/errors.py:581
5301
#: bzrlib/errors.py:523
4908
5302
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
4909
5303
msgstr ""
4910
5304
4911
#: bzrlib/errors.py:586
5305
#: bzrlib/errors.py:528
4912
5306
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
4913
5307
msgstr ""
4914
5308
4915
#: bzrlib/errors.py:597
5309
#: bzrlib/errors.py:539
4916
5310
msgid "URLs differ by more than path: %(from_)r and %(to)r"
4917
5311
msgstr ""
4918
5312
4919
#: bzrlib/errors.py:619
5313
#: bzrlib/errors.py:561
4920
5314
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
4921
5315
msgstr ""
4922
5316
4923
#: bzrlib/errors.py:629
5317
#: bzrlib/errors.py:571
4924
5318
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
4925
5319
msgstr ""
4926
5320
4927
#: bzrlib/errors.py:637
5321
#: bzrlib/errors.py:579
4928
5322
msgid ""
4929
5323
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
4930
5324
"upgrade the branch to permit branch stacking."
4931
5325
msgstr ""
4932
5326
4933
#: bzrlib/errors.py:648
5327
#: bzrlib/errors.py:590
4934
5328
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
4935
5329
msgstr ""
4936
5330
4937
#: bzrlib/errors.py:658
5331
#: bzrlib/errors.py:600
4938
5332
msgid ""
4939
5333
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
4940
5334
"need to upgrade the repository to permit branch stacking."
4941
5335
msgstr ""
4942
5336
4943
#: bzrlib/errors.py:669
5337
#: bzrlib/errors.py:611
4944
5338
msgid "Error reading from %(path)r."
4945
5339
msgstr ""
4946
5340
4947
#: bzrlib/errors.py:688
5341
#: bzrlib/errors.py:630
4948
5342
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
4949
5343
msgstr ""
4950
5344
4951
#: bzrlib/errors.py:704
5345
#: bzrlib/errors.py:646
4952
5346
msgid "Path \"%(path)s\" is not unicode normalized"
4953
5347
msgstr ""
4954
5348
4955
#: bzrlib/errors.py:712
5349
#: bzrlib/errors.py:654
4956
5350
msgid "Not a branch: \"%(path)s\"%(detail)s."
4957
5351
msgstr ""
4958
5352
4959
#: bzrlib/errors.py:754
5353
#: bzrlib/errors.py:696
4960
5354
msgid "No submit branch available for branch \"%(path)s\""
4961
5355
msgstr ""
4962
5356
4963
#: bzrlib/errors.py:763
5357
#: bzrlib/errors.py:705
5358
msgid "A control directory already exists: \"%(path)s\"."
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:710
4964
5362
msgid "Already a branch: \"%(path)s\"."
4965
5363
msgstr ""
4966
5364
4967
#: bzrlib/errors.py:769
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
4968
5374
msgid ""
4969
5375
"Directory contains a branch, but no working tree (use bzr checkout if you "
4970
5376
"wish to build a working tree): \"%(path)s\""
4971
5377
msgstr ""
4972
5378
4973
#: bzrlib/errors.py:774
5379
#: bzrlib/errors.py:735
4974
5380
msgid ""
4975
5381
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
4976
5382
msgstr ""
4977
5383
4978
#: bzrlib/errors.py:784
5384
#: bzrlib/errors.py:745
4979
5385
msgid ""
4980
5386
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
4981
5387
msgstr ""
4982
5388
4983
#: bzrlib/errors.py:794
5389
#: bzrlib/errors.py:755
4984
5390
msgid "No repository present: \"%(path)s\""
4985
5391
msgstr ""
4986
5392
4987
#: bzrlib/errors.py:802
4988
msgid "File \"%(path)s\" is not in branch %(branch_base)s."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:814
5393
#: bzrlib/errors.py:762
4992
5394
msgid ""
4993
5395
"Unsupported branch format: %(format)s\n"
4994
5396
"Please run 'bzr upgrade'"
4995
5397
msgstr ""
4996
5398
4997
#: bzrlib/errors.py:820
5399
#: bzrlib/errors.py:768
4998
5400
msgid "Unknown %(kind)s format: %(format)r"
4999
5401
msgstr ""
5000
5402
5001
#: bzrlib/errors.py:829
5403
#: bzrlib/errors.py:777
5002
5404
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5003
5405
msgstr ""
5004
5406
5005
#: bzrlib/errors.py:842
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
5006
5412
msgid ""
5007
5413
"%(target)s\n"
5008
5414
"is not compatible with\n"
5010
5416
"%(details)s"
5011
5417
msgstr ""
5012
5418
5013
#: bzrlib/errors.py:858
5419
#: bzrlib/errors.py:818
5014
5420
msgid "Revision is not compatible with %(repo_format)s"
5015
5421
msgstr ""
5016
5422
5017
#: bzrlib/errors.py:868
5423
#: bzrlib/errors.py:828
5018
5424
msgid "%(context_info)s%(path)s is already versioned."
5019
5425
msgstr ""
5020
5426
5021
#: bzrlib/errors.py:889
5427
#: bzrlib/errors.py:849
5022
5428
msgid "%(context_info)s%(path)s is not versioned."
5023
5429
msgstr ""
5024
5430
5025
#: bzrlib/errors.py:910
5431
#: bzrlib/errors.py:870
5026
5432
msgid "Path(s) are not versioned: %(paths_as_string)s"
5027
5433
msgstr ""
5028
5434
5029
#: bzrlib/errors.py:921
5435
#: bzrlib/errors.py:881
5030
5436
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5031
5437
msgstr ""
5032
5438
5033
#: bzrlib/errors.py:940
5439
#: bzrlib/errors.py:900
5034
5440
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5035
5441
msgstr ""
5036
5442
5037
#: bzrlib/errors.py:948
5443
#: bzrlib/errors.py:908
5038
5444
msgid ""
5039
5445
"Filename %(filename)r is not valid in your current filesystem encoding "
5040
5446
"%(fs_encoding)s"
5041
5447
msgstr ""
5042
5448
5043
#: bzrlib/errors.py:959
5449
#: bzrlib/errors.py:919
5044
5450
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5045
5451
msgstr ""
5046
5452
5047
#: bzrlib/errors.py:977
5453
#: bzrlib/errors.py:937
5048
5454
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5049
5455
msgstr ""
5050
5456
5051
#: bzrlib/errors.py:1016
5457
#: bzrlib/errors.py:976
5052
5458
msgid "Cannot lock %(lock)s: %(why)s"
5053
5459
msgstr ""
5054
5460
5055
#: bzrlib/errors.py:1026
5461
#: bzrlib/errors.py:986
5056
5462
msgid ""
5057
5463
"A transaction related operation was attempted after the transaction finished."
5058
5464
msgstr ""
5059
5465
5060
#: bzrlib/errors.py:1053
5466
#: bzrlib/errors.py:1013
5061
5467
msgid "Cannot lock: transport is read only: %(transport)s"
5062
5468
msgstr ""
5063
5469
5064
#: bzrlib/errors.py:1061
5470
#: bzrlib/errors.py:1021
5065
5471
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5066
5472
msgstr ""
5067
5473
5068
#: bzrlib/errors.py:1072
5474
#: bzrlib/errors.py:1032
5069
5475
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5070
5476
msgstr ""
5071
5477
5072
#: bzrlib/errors.py:1083
5478
#: bzrlib/errors.py:1043
5073
5479
msgid ""
5074
5480
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5075
5481
"%(holder)r, wanted to break %(target)r"
5076
5482
msgstr ""
5077
5483
5078
#: bzrlib/errors.py:1095
5484
#: bzrlib/errors.py:1055
5079
5485
msgid ""
5080
5486
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5081
5487
"Use 'bzr break-lock' to clear it"
5082
5488
msgstr ""
5083
5489
5084
#: bzrlib/errors.py:1108
5490
#: bzrlib/errors.py:1068
5085
5491
msgid "Lock not held: %(lock)s"
5086
5492
msgstr ""
5087
5493
5088
#: bzrlib/errors.py:1137
5494
#: bzrlib/errors.py:1097
5089
5495
msgid "No changes to commit"
5090
5496
msgstr ""
5091
5497
5092
#: bzrlib/errors.py:1142
5498
#: bzrlib/errors.py:1102
5093
5499
msgid ""
5094
5500
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5095
5501
msgstr ""
5096
5502
5097
#: bzrlib/errors.py:1152
5503
#: bzrlib/errors.py:1112
5098
5504
msgid ""
5099
5505
"Excluding paths during commit is not supported by repository at %(repository)"
5100
5506
"r."
5101
5507
msgstr ""
5102
5508
5103
#: bzrlib/errors.py:1161
5509
#: bzrlib/errors.py:1121
5104
5510
msgid ""
5105
5511
"The specified commit message contains characters unsupported by the current "
5106
5512
"encoding."
5107
5513
msgstr ""
5108
5514
5109
#: bzrlib/errors.py:1167
5515
#: bzrlib/errors.py:1127
5110
5516
msgid "Upgrade URL cannot work with readonly URLs."
5111
5517
msgstr ""
5112
5518
5113
#: bzrlib/errors.py:1172
5519
#: bzrlib/errors.py:1132
5114
5520
msgid "The branch format %(format)s is already at the most recent format."
5115
5521
msgstr ""
5116
5522
5117
#: bzrlib/errors.py:1195
5523
#: bzrlib/errors.py:1155
5118
5524
msgid "Option --change does not accept revision ranges"
5119
5525
msgstr ""
5120
5526
5121
#: bzrlib/errors.py:1200
5527
#: bzrlib/errors.py:1160
5122
5528
msgid "No namespace registered for string: %(spec)r"
5123
5529
msgstr ""
5124
5530
5125
#: bzrlib/errors.py:1219
5531
#: bzrlib/errors.py:1179
5126
5532
msgid ""
5127
5533
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5128
5534
"%(extra)s"
5129
5535
msgstr ""
5130
5536
5131
#: bzrlib/errors.py:1233
5132
msgid "%(branch)s is missing %(object_type)s {%(object_id)s}"
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:1238
5537
#: bzrlib/errors.py:1193
5136
5538
msgid ""
5137
5539
"Operation denied because it would change the main history, which is not "
5138
5540
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5139
5541
msgstr ""
5140
5542
5141
#: bzrlib/errors.py:1249
5543
#: bzrlib/errors.py:1204
5142
5544
msgid ""
5143
5545
"These branches have diverged. Use the missing command to see how.\n"
5144
5546
"Use the merge command to reconcile them."
5145
5547
msgstr ""
5146
5548
5147
#: bzrlib/errors.py:1269
5549
#: bzrlib/errors.py:1224
5148
5550
msgid ""
5149
5551
"Branches have no common ancestor, and no merge base revision was specified."
5150
5552
msgstr ""
5151
5553
5152
#: bzrlib/errors.py:1275
5554
#: bzrlib/errors.py:1230
5153
5555
msgid ""
5154
5556
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5155
5557
msgstr ""
5156
5558
5157
#: bzrlib/errors.py:1281
5559
#: bzrlib/errors.py:1236
5158
5560
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5159
5561
msgstr ""
5160
5562
5161
#: bzrlib/errors.py:1290
5563
#: bzrlib/errors.py:1245
5162
5564
msgid ""
5163
5565
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5164
5566
msgstr ""
5165
5567
5166
#: bzrlib/errors.py:1299
5568
#: bzrlib/errors.py:1254
5167
5569
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5168
5570
msgstr ""
5169
5571
5170
#: bzrlib/errors.py:1319
5572
#: bzrlib/errors.py:1263
5171
5573
msgid "Branch %(branch)s has no commits."
5172
5574
msgstr ""
5173
5575
5174
#: bzrlib/errors.py:1337
5576
#: bzrlib/errors.py:1281
5175
5577
msgid ""
5176
5578
"Bound branch %(branch)s is out of date with master branch %(master)s."
5177
5579
"%(extra_help)s"
5178
5580
msgstr ""
5179
5581
5180
#: bzrlib/errors.py:1349
5582
#: bzrlib/errors.py:1293
5181
5583
msgid ""
5182
5584
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5183
5585
"bound to %(remote)s."
5184
5586
msgstr ""
5185
5587
5186
#: bzrlib/errors.py:1361
5588
#: bzrlib/errors.py:1305
5187
5589
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5188
5590
msgstr ""
5189
5591
5190
#: bzrlib/errors.py:1370
5592
#: bzrlib/errors.py:1314
5191
5593
msgid ""
5192
5594
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5193
5595
"%(error)s"
5194
5596
msgstr ""
5195
5597
5196
#: bzrlib/errors.py:1382
5598
#: bzrlib/errors.py:1326
5197
5599
msgid "Error in processing weave: %(msg)s"
5198
5600
msgstr ""
5199
5601
5200
#: bzrlib/errors.py:1391
5602
#: bzrlib/errors.py:1335
5201
5603
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5202
5604
msgstr ""
5203
5605
5204
#: bzrlib/errors.py:1402
5606
#: bzrlib/errors.py:1346
5205
5607
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5206
5608
msgstr ""
5207
5609
5208
#: bzrlib/errors.py:1412
5610
#: bzrlib/errors.py:1356
5209
5611
msgid "Weave invariant violated: %(what)s"
5210
5612
msgstr ""
5211
5613
5212
#: bzrlib/errors.py:1421
5614
#: bzrlib/errors.py:1365
5213
5615
msgid "Parents are mismatched between two revisions. %(msg)s"
5214
5616
msgstr ""
5215
5617
5216
#: bzrlib/errors.py:1443
5618
#: bzrlib/errors.py:1387
5217
5619
msgid ""
5218
5620
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5219
5621
"%(weave_b)s"
5220
5622
msgstr ""
5221
5623
5222
#: bzrlib/errors.py:1455
5624
#: bzrlib/errors.py:1399
5223
5625
msgid "Versioned file error"
5224
5626
msgstr ""
5225
5627
5226
#: bzrlib/errors.py:1460
5628
#: bzrlib/errors.py:1404
5227
5629
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5228
5630
msgstr ""
5229
5631
5230
#: bzrlib/errors.py:1470
5632
#: bzrlib/errors.py:1414
5231
5633
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5232
5634
msgstr ""
5233
5635
5234
#: bzrlib/errors.py:1480
5636
#: bzrlib/errors.py:1424
5235
5637
msgid "Text did not match its checksum: %(msg)s"
5236
5638
msgstr ""
5237
5639
5238
#: bzrlib/errors.py:1605
5640
#: bzrlib/errors.py:1550
5239
5641
msgid "Export format %(format)r not supported"
5240
5642
msgstr ""
5241
5643
5242
#: bzrlib/errors.py:1614
5644
#: bzrlib/errors.py:1559
5243
5645
msgid "Transport error: %(msg)s %(orig_error)s"
5244
5646
msgstr ""
5245
5647
5246
#: bzrlib/errors.py:1640
5648
#: bzrlib/errors.py:1585
5247
5649
msgid "Generic bzr smart protocol error: %(details)s"
5248
5650
msgstr ""
5249
5651
5250
#: bzrlib/errors.py:1648
5652
#: bzrlib/errors.py:1593
5251
5653
msgid "Received bad protocol version marker: %(marker)r"
5252
5654
msgstr ""
5253
5655
5254
#: bzrlib/errors.py:1679
5656
#: bzrlib/errors.py:1625
5255
5657
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5256
5658
msgstr ""
5257
5659
5258
#: bzrlib/errors.py:1684
5660
#: bzrlib/errors.py:1630
5259
5661
msgid "Connection error: %(msg)s %(orig_error)s"
5260
5662
msgstr ""
5261
5663
5262
#: bzrlib/errors.py:1689
5664
#: bzrlib/errors.py:1635
5263
5665
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5264
5666
msgstr ""
5265
5667
5266
#: bzrlib/errors.py:1710
5668
#: bzrlib/errors.py:1656
5267
5669
msgid "Connection closed: %(msg)s %(orig_error)s"
5268
5670
msgstr ""
5269
5671
5270
#: bzrlib/errors.py:1715
5672
#: bzrlib/errors.py:1661
5673
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:1666
5271
5677
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5272
5678
msgstr ""
5273
5679
5274
#: bzrlib/errors.py:1725
5680
#: bzrlib/errors.py:1676
5275
5681
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5276
5682
msgstr ""
5277
5683
5278
#: bzrlib/errors.py:1740
5684
#: bzrlib/errors.py:1691
5685
msgid "Certificate error: %(error)s"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:1699
5279
5689
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5280
5690
msgstr ""
5281
5691
5282
#: bzrlib/errors.py:1754
5692
#: bzrlib/errors.py:1713
5283
5693
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5284
5694
msgstr ""
5285
5695
5286
#: bzrlib/errors.py:1762
5696
#: bzrlib/errors.py:1721
5287
5697
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5288
5698
msgstr ""
5289
5699
5290
#: bzrlib/errors.py:1771
5700
#: bzrlib/errors.py:1730
5291
5701
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5292
5702
msgstr ""
5293
5703
5294
#: bzrlib/errors.py:1785
5704
#: bzrlib/errors.py:1744
5295
5705
msgid "Too many redirections"
5296
5706
msgstr ""
5297
5707
5298
#: bzrlib/errors.py:1790
5708
#: bzrlib/errors.py:1749
5299
5709
msgid "Working tree has conflicts."
5300
5710
msgstr ""
5301
5711
5302
#: bzrlib/errors.py:1794
5712
#: bzrlib/errors.py:1753
5303
5713
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5304
5714
msgstr ""
5305
5715
5306
#: bzrlib/errors.py:1803
5716
#: bzrlib/errors.py:1762
5307
5717
msgid ""
5308
5718
"Error(s) parsing config file %(filename)s:\n"
5309
5719
"%(errors)s"
5310
5720
msgstr ""
5311
5721
5312
#: bzrlib/errors.py:1814
5313
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5722
#: bzrlib/errors.py:1772
5723
msgid ""
5724
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5725
"See ``bzr help %(name)s``"
5314
5726
msgstr ""
5315
5727
5316
#: bzrlib/errors.py:1822
5728
#: bzrlib/errors.py:1782
5317
5729
msgid "%(username)r does not seem to contain a reasonable email address"
5318
5730
msgstr ""
5319
5731
5320
#: bzrlib/errors.py:1831
5732
#: bzrlib/errors.py:1791
5321
5733
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5322
5734
msgstr ""
5323
5735
5324
#: bzrlib/errors.py:1839
5736
#: bzrlib/errors.py:1799
5325
5737
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5326
5738
msgstr ""
5327
5739
5328
#: bzrlib/errors.py:1847
5740
#: bzrlib/errors.py:1807
5329
5741
msgid "Unable to import library \"%(library)s\": %(error)s"
5330
5742
msgstr ""
5331
5743
5332
#: bzrlib/errors.py:1855
5744
#: bzrlib/errors.py:1815
5333
5745
msgid "python-gpgme is not installed, it is needed to verify signatures"
5334
5746
msgstr ""
5335
5747
5336
#: bzrlib/errors.py:1863
5748
#: bzrlib/errors.py:1823
5337
5749
msgid ""
5338
5750
"The working tree for %(basedir)s has changed since the last commit, but "
5339
5751
"weave merge requires that it be unchanged"
5340
5752
msgstr ""
5341
5753
5342
#: bzrlib/errors.py:1873
5754
#: bzrlib/errors.py:1833
5343
5755
msgid ""
5344
5756
"Can't reprocess and show base, because reprocessing obscures the "
5345
5757
"relationship of conflicting lines to the base"
5346
5758
msgstr ""
5347
5759
5348
#: bzrlib/errors.py:1879
5760
#: bzrlib/errors.py:1839
5349
5761
msgid "Cycle in graph %(graph)r"
5350
5762
msgstr ""
5351
5763
5352
#: bzrlib/errors.py:1907
5764
#: bzrlib/errors.py:1867
5353
5765
msgid "File %(filename)s is not conflicted."
5354
5766
msgstr ""
5355
5767
5356
#: bzrlib/errors.py:1929
5768
#: bzrlib/errors.py:1889
5357
5769
msgid "No bundle was found in \"%(filename)s\"."
5358
5770
msgstr ""
5359
5771
5360
#: bzrlib/errors.py:1938
5772
#: bzrlib/errors.py:1898
5361
5773
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5362
5774
msgstr ""
5363
5775
5364
#: bzrlib/errors.py:1948
5776
#: bzrlib/errors.py:1908
5365
5777
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5366
5778
msgstr ""
5367
5779
5368
#: bzrlib/errors.py:1961
5780
#: bzrlib/errors.py:1921
5369
5781
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5370
5782
msgstr ""
5371
5783
5372
#: bzrlib/errors.py:1971
5784
#: bzrlib/errors.py:1931
5373
5785
msgid "Key %(key)s is already present in map"
5374
5786
msgstr ""
5375
5787
5376
#: bzrlib/errors.py:1976
5788
#: bzrlib/errors.py:1936
5377
5789
msgid "The prefix %(prefix)s is in the help search path twice."
5378
5790
msgstr ""
5379
5791
5380
#: bzrlib/errors.py:1984
5381
msgid "Tree transform is malformed %(conflicts)r"
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:1986
5792
#: bzrlib/errors.py:1946
5385
5793
msgid ""
5386
5794
"No final name for trans_id %(trans_id)r\n"
5387
5795
"file-id: %(file_id)r\n"
5388
5796
"root trans-id: %(root_trans_id)r\n"
5389
5797
msgstr ""
5390
5798
5391
#: bzrlib/errors.py:2018
5799
#: bzrlib/errors.py:1978
5392
5800
msgid "Attempt to reuse a transform that has already been applied."
5393
5801
msgstr ""
5394
5802
5395
#: bzrlib/errors.py:2023
5803
#: bzrlib/errors.py:1983
5396
5804
msgid "Moving the root directory is not supported at this time"
5397
5805
msgstr ""
5398
5806
5399
#: bzrlib/errors.py:2028
5807
#: bzrlib/errors.py:1988
5400
5808
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5401
5809
msgstr ""
5402
5810
5403
#: bzrlib/errors.py:2039
5811
#: bzrlib/errors.py:1999
5404
5812
msgid ""
5405
5813
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5406
5814
msgstr ""
5407
5815
5408
#: bzrlib/errors.py:2075
5816
#: bzrlib/errors.py:2035
5409
5817
msgid ""
5410
5818
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5411
5819
msgstr ""
5412
5820
5413
#: bzrlib/errors.py:2084
5414
msgid ""
5415
"Can't safely remove modified or unknown files:\n"
5416
"%(changes_as_text)sUse --keep to not delete them, or --force to delete them "
5417
"regardless."
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:2121
5821
#: bzrlib/errors.py:2065
5421
5822
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5422
5823
msgstr ""
5423
5824
5424
#: bzrlib/errors.py:2129
5825
#: bzrlib/errors.py:2073
5425
5826
msgid "Nothing to merge."
5426
5827
msgstr ""
5427
5828
5428
#: bzrlib/errors.py:2134
5829
#: bzrlib/errors.py:2078
5429
5830
msgid "Format %(format)s cannot be initialised by this version of bzr."
5430
5831
msgstr ""
5431
5832
5432
#: bzrlib/errors.py:2143
5833
#: bzrlib/errors.py:2087
5433
5834
msgid ""
5434
5835
"Cannot convert from format %(from_format)s to format %(format)s. "
5435
5836
"%(problem)s"
5436
5837
msgstr ""
5437
5838
5438
#: bzrlib/errors.py:2155
5839
#: bzrlib/errors.py:2099
5439
5840
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5440
5841
msgstr ""
5441
5842
5442
#: bzrlib/errors.py:2163
5843
#: bzrlib/errors.py:2107
5443
5844
msgid "%(exe_name)s could not be found on this machine"
5444
5845
msgstr ""
5445
5846
5446
#: bzrlib/errors.py:2171
5847
#: bzrlib/errors.py:2115
5447
5848
msgid "Diff is not installed on this machine: %(msg)s"
5448
5849
msgstr ""
5449
5850
5450
#: bzrlib/errors.py:2179
5851
#: bzrlib/errors.py:2123
5451
5852
msgid "Diff3 is not installed on this machine."
5452
5853
msgstr ""
5453
5854
5454
#: bzrlib/errors.py:2185
5855
#: bzrlib/errors.py:2129
5455
5856
msgid "The content being inserted is already present."
5456
5857
msgstr ""
5457
5858
5458
#: bzrlib/errors.py:2190
5859
#: bzrlib/errors.py:2134
5459
5860
msgid ""
5460
5861
"This tree contains left-over files from a failed operation.\n"
5461
5862
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5463
5864
" keep, and delete it when you are done."
5464
5865
msgstr ""
5465
5866
5466
#: bzrlib/errors.py:2201
5867
#: bzrlib/errors.py:2145
5467
5868
msgid ""
5468
5869
"This tree contains left-over files from a failed operation.\n"
5469
5870
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5470
5871
" wish to keep, and delete it when you are done."
5471
5872
msgstr ""
5472
5873
5473
#: bzrlib/errors.py:2211
5874
#: bzrlib/errors.py:2155
5474
5875
msgid ""
5475
5876
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5476
5877
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5478
5879
" keep, and delete it when you are done."
5479
5880
msgstr ""
5480
5881
5481
#: bzrlib/errors.py:2222
5882
#: bzrlib/errors.py:2166
5482
5883
msgid ""
5483
5884
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5484
5885
"examine %(pending_deletion)s to see if it contains any files you wish to "
5485
5886
"keep, and delete it when you are done."
5486
5887
msgstr ""
5487
5888
5488
#: bzrlib/errors.py:2232
5889
#: bzrlib/errors.py:2176
5489
5890
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5490
5891
msgstr ""
5491
5892
5492
#: bzrlib/errors.py:2246
5893
#: bzrlib/errors.py:2190
5493
5894
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5494
5895
msgstr ""
5495
5896
5496
#: bzrlib/errors.py:2259
5897
#: bzrlib/errors.py:2203
5497
5898
msgid "Error in merge modified format"
5498
5899
msgstr ""
5499
5900
5500
#: bzrlib/errors.py:2264
5901
#: bzrlib/errors.py:2208
5501
5902
msgid "Format error in conflict listings"
5502
5903
msgstr ""
5503
5904
5504
#: bzrlib/errors.py:2268
5905
#: bzrlib/errors.py:2212
5505
5906
msgid ""
5506
5907
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5507
5908
"Error: %(description)s"
5508
5909
msgstr ""
5509
5910
5510
#: bzrlib/errors.py:2279
5911
#: bzrlib/errors.py:2223
5511
5912
msgid ""
5512
5913
"An error has been detected in the repository %(repo_path)s.\n"
5513
5914
"Please run bzr reconcile on this repository."
5514
5915
msgstr ""
5515
5916
5516
#: bzrlib/errors.py:2290
5917
#: bzrlib/errors.py:2234
5517
5918
msgid ""
5518
5919
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5519
5920
"reason: %(reason)s"
5520
5921
msgstr ""
5521
5922
5522
#: bzrlib/errors.py:2303
5923
#: bzrlib/errors.py:2247
5523
5924
msgid ""
5524
5925
"An inconsistent delta was supplied: %(delta)r\n"
5525
5926
"reason: %(reason)s"
5526
5927
msgstr ""
5527
5928
5528
#: bzrlib/errors.py:2315
5929
#: bzrlib/errors.py:2259
5529
5930
msgid "To use this feature you must upgrade your branch at %(path)s."
5530
5931
msgstr ""
5531
5932
5532
#: bzrlib/errors.py:2324
5933
#: bzrlib/errors.py:2268
5533
5934
msgid "To use this feature you must upgrade your repository at %(path)s."
5534
5935
msgstr ""
5535
5936
5536
#: bzrlib/errors.py:2329
5937
#: bzrlib/errors.py:2273
5537
5938
msgid ""
5538
5939
"To use this feature you must upgrade your branch at %(path)s to a format "
5539
5940
"which supports rich roots."
5540
5941
msgstr ""
5541
5942
5542
#: bzrlib/errors.py:2335
5943
#: bzrlib/errors.py:2279
5543
5944
msgid "Cannot perform local-only commits on unbound branches."
5544
5945
msgstr ""
5545
5946
5546
#: bzrlib/errors.py:2340
5947
#: bzrlib/errors.py:2284
5547
5948
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5548
5949
msgstr ""
5549
5950
5550
#: bzrlib/errors.py:2361
5951
#: bzrlib/errors.py:2305
5551
5952
msgid "Ghost tags not supported by format %(format)r."
5552
5953
msgstr ""
5553
5954
5554
#: bzrlib/errors.py:2369
5955
#: bzrlib/errors.py:2313
5555
5956
msgid "File is binary but should be text."
5556
5957
msgstr ""
5557
5958
5558
#: bzrlib/errors.py:2374
5959
#: bzrlib/errors.py:2318
5559
5960
msgid "The path %(path)s is not permitted on this platform"
5560
5961
msgstr ""
5561
5962
5562
#: bzrlib/errors.py:2383
5963
#: bzrlib/errors.py:2327
5563
5964
msgid ""
5564
5965
"Testament did not match expected value.\n"
5565
5966
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5566
5967
" {%(measured)s}"
5567
5968
msgstr ""
5568
5969
5569
#: bzrlib/errors.py:2395
5970
#: bzrlib/errors.py:2339
5570
5971
msgid "Not a bzr revision-bundle: %(text)r"
5571
5972
msgstr ""
5572
5973
5573
#: bzrlib/errors.py:2404
5974
#: bzrlib/errors.py:2348
5574
5975
msgid "Bad bzr revision-bundle: %(text)r"
5575
5976
msgstr ""
5576
5977
5577
#: bzrlib/errors.py:2413
5978
#: bzrlib/errors.py:2357
5578
5979
msgid "Malformed bzr revision-bundle header: %(text)r"
5579
5980
msgstr ""
5580
5981
5581
#: bzrlib/errors.py:2418
5982
#: bzrlib/errors.py:2362
5582
5983
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5583
5984
msgstr ""
5584
5985
5585
#: bzrlib/errors.py:2423
5986
#: bzrlib/errors.py:2367
5586
5987
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5587
5988
msgstr ""
5588
5989
5589
#: bzrlib/errors.py:2428
5990
#: bzrlib/errors.py:2372
5590
5991
msgid "End of line marker was not \\n in bzr revision-bundle"
5591
5992
msgstr ""
5592
5993
5593
#: bzrlib/errors.py:2438
5994
#: bzrlib/errors.py:2382
5594
5995
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5595
5996
msgstr ""
5596
5997
5597
#: bzrlib/errors.py:2448
5998
#: bzrlib/errors.py:2392
5598
5999
msgid "Root class for inventory serialization errors"
5599
6000
msgstr ""
5600
6001
5601
#: bzrlib/errors.py:2452
6002
#: bzrlib/errors.py:2396
5602
6003
msgid ""
5603
6004
"The inventory was not in the expected format:\n"
5604
6005
" %(msg)s"
5605
6006
msgstr ""
5606
6007
5607
#: bzrlib/errors.py:2461
6008
#: bzrlib/errors.py:2405
5608
6009
msgid "This operation requires rich root data storage"
5609
6010
msgstr ""
5610
6011
5611
#: bzrlib/errors.py:2474
6012
#: bzrlib/errors.py:2418
5612
6013
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5613
6014
msgstr ""
5614
6015
5615
#: bzrlib/errors.py:2483
6016
#: bzrlib/errors.py:2427
5616
6017
msgid ""
5617
6018
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5618
6019
"variable."
5619
6020
msgstr ""
5620
6021
5621
#: bzrlib/errors.py:2490
6022
#: bzrlib/errors.py:2434
5622
6023
msgid ""
5623
6024
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5624
6025
"ghost at {%(ghost_revision_id)s}"
5625
6026
msgstr ""
5626
6027
5627
#: bzrlib/errors.py:2500
6028
#: bzrlib/errors.py:2444
5628
6029
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5629
6030
msgstr ""
5630
6031
5631
#: bzrlib/errors.py:2551
6032
#: bzrlib/errors.py:2495
5632
6033
msgid ""
5633
6034
"A merge directive must provide either a bundle or a public branch location."
5634
6035
msgstr ""
5635
6036
5636
#: bzrlib/errors.py:2558
6037
#: bzrlib/errors.py:2502
5637
6038
msgid "Bad merge directive payload %(start)r"
5638
6039
msgstr ""
5639
6040
5640
#: bzrlib/errors.py:2568
6041
#: bzrlib/errors.py:2512
5641
6042
msgid "Preview patch does not match requested changes."
5642
6043
msgstr ""
5643
6044
5644
#: bzrlib/errors.py:2574
6045
#: bzrlib/errors.py:2518
5645
6046
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5646
6047
msgstr ""
5647
6048
5648
#: bzrlib/errors.py:2584
6049
#: bzrlib/errors.py:2528
5649
6050
msgid ""
5650
6051
"Your branch does not have all of the revisions required in order to merge "
5651
6052
"this merge directive and the target location specified in the merge "
5652
6053
"directive is not a branch: %(location)s."
5653
6054
msgstr ""
5654
6055
5655
#: bzrlib/errors.py:2596
6056
#: bzrlib/errors.py:2540
5656
6057
msgid "Unsupported entry kind %(kind)s"
5657
6058
msgstr ""
5658
6059
5659
#: bzrlib/errors.py:2604
6060
#: bzrlib/errors.py:2548
5660
6061
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5661
6062
msgstr ""
5662
6063
5663
#: bzrlib/errors.py:2614
6064
#: bzrlib/errors.py:2558
5664
6065
msgid "Subsume target %(other_tree)s needs to be upgraded."
5665
6066
msgstr ""
5666
6067
5667
#: bzrlib/errors.py:2633
6068
#: bzrlib/errors.py:2577
5668
6069
msgid "No such tag: %(tag_name)s"
5669
6070
msgstr ""
5670
6071
5671
#: bzrlib/errors.py:2641
6072
#: bzrlib/errors.py:2585
5672
6073
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5673
6074
msgstr ""
5674
6075
5675
#: bzrlib/errors.py:2650
6076
#: bzrlib/errors.py:2594
5676
6077
msgid "Tag %(tag_name)s already exists."
5677
6078
msgstr ""
5678
6079
5679
#: bzrlib/errors.py:2658
6080
#: bzrlib/errors.py:2602
5680
6081
msgid ""
5681
6082
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
5682
6083
"\" for more information on this feature."
5683
6084
msgstr ""
5684
6085
5685
#: bzrlib/errors.py:2668
6086
#: bzrlib/errors.py:2612
5686
6087
msgid ""
5687
6088
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5688
6089
msgstr ""
5689
6090
5690
#: bzrlib/errors.py:2678
6091
#: bzrlib/errors.py:2622
5691
6092
msgid ""
5692
6093
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5693
6094
msgstr ""
5694
6095
5695
#: bzrlib/errors.py:2688
6096
#: bzrlib/errors.py:2632
5696
6097
msgid "Invalid line in bugs property: '%(line)s'"
5697
6098
msgstr ""
5698
6099
5699
#: bzrlib/errors.py:2696
6100
#: bzrlib/errors.py:2640
5700
6101
msgid "Invalid bug status: '%(status)s'"
5701
6102
msgstr ""
5702
6103
5703
#: bzrlib/errors.py:2704
6104
#: bzrlib/errors.py:2648
5704
6105
msgid "Could not understand response from smart server: %(response_tuple)r"
5705
6106
msgstr ""
5706
6107
5707
#: bzrlib/errors.py:2743
6108
#: bzrlib/errors.py:2687
5708
6109
msgid "Server sent an unexpected error: %(error_tuple)r"
5709
6110
msgstr ""
5710
6111
5711
#: bzrlib/errors.py:2762
6112
#: bzrlib/errors.py:2706
5712
6113
msgid "Unrecognised container format: %(container_format)r"
5713
6114
msgstr ""
5714
6115
5715
#: bzrlib/errors.py:2770
6116
#: bzrlib/errors.py:2714
5716
6117
msgid "Unexpected end of container stream"
5717
6118
msgstr ""
5718
6119
5719
#: bzrlib/errors.py:2775
6120
#: bzrlib/errors.py:2719
5720
6121
msgid "Unknown record type: %(record_type)r"
5721
6122
msgstr ""
5722
6123
5723
#: bzrlib/errors.py:2783
6124
#: bzrlib/errors.py:2727
5724
6125
msgid "Invalid record: %(reason)s"
5725
6126
msgstr ""
5726
6127
5727
#: bzrlib/errors.py:2791
6128
#: bzrlib/errors.py:2735
5728
6129
msgid "Container has data after end marker: %(excess)r"
5729
6130
msgstr ""
5730
6131
5731
#: bzrlib/errors.py:2799
6132
#: bzrlib/errors.py:2743
5732
6133
msgid "Container has multiple records with the same name: %(name)s"
5733
6134
msgstr ""
5734
6135
5735
#: bzrlib/errors.py:2812
6136
#: bzrlib/errors.py:2756
5736
6137
msgid "Corrupt or incompatible data stream: %(reason)s"
5737
6138
msgstr ""
5738
6139
5739
#: bzrlib/errors.py:2820
6140
#: bzrlib/errors.py:2764
5740
6141
msgid "SMTP error: %(error)s"
5741
6142
msgstr ""
5742
6143
5743
#: bzrlib/errors.py:2828
6144
#: bzrlib/errors.py:2772
5744
6145
msgid "No message supplied."
5745
6146
msgstr ""
5746
6147
5747
#: bzrlib/errors.py:2833
6148
#: bzrlib/errors.py:2777
5748
6149
msgid "No mail-to address (--mail-to) or output (-o) specified."
5749
6150
msgstr ""
5750
6151
5751
#: bzrlib/errors.py:2838
5752
msgid "Unknown mail client: %(mail_client)s"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2846
6152
#: bzrlib/errors.py:2782
5756
6153
msgid ""
5757
6154
"Unable to find mail client with the following names: "
5758
6155
"%(mail_command_list_string)s"
5759
6156
msgstr ""
5760
6157
5761
#: bzrlib/errors.py:2856
6158
#: bzrlib/errors.py:2792
5762
6159
msgid "SMTP connection to %(host)s refused"
5763
6160
msgstr ""
5764
6161
5765
#: bzrlib/errors.py:2865
6162
#: bzrlib/errors.py:2801
5766
6163
msgid "Please specify smtp_server. No server at default %(host)s."
5767
6164
msgstr ""
5768
6165
5769
#: bzrlib/errors.py:2879
6166
#: bzrlib/errors.py:2815
5770
6167
msgid ""
5771
6168
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5772
6169
"reconfigure."
5773
6170
msgstr ""
5774
6171
5775
#: bzrlib/errors.py:2891
6172
#: bzrlib/errors.py:2827
5776
6173
msgid "'%(display_url)s' is already a branch."
5777
6174
msgstr ""
5778
6175
5779
#: bzrlib/errors.py:2896
6176
#: bzrlib/errors.py:2832
5780
6177
msgid "'%(display_url)s' is already a tree."
5781
6178
msgstr ""
5782
6179
5783
#: bzrlib/errors.py:2901
6180
#: bzrlib/errors.py:2837
5784
6181
msgid "'%(display_url)s' is already a checkout."
5785
6182
msgstr ""
5786
6183
5787
#: bzrlib/errors.py:2906
6184
#: bzrlib/errors.py:2842
5788
6185
msgid "'%(display_url)s' is already a lightweight checkout."
5789
6186
msgstr ""
5790
6187
5791
#: bzrlib/errors.py:2911
6188
#: bzrlib/errors.py:2847
5792
6189
msgid "'%(display_url)s' is already using a shared repository."
5793
6190
msgstr ""
5794
6191
5795
#: bzrlib/errors.py:2916
6192
#: bzrlib/errors.py:2852
5796
6193
msgid "'%(display_url)s' is already standalone."
5797
6194
msgstr ""
5798
6195
5799
#: bzrlib/errors.py:2921
6196
#: bzrlib/errors.py:2857
5800
6197
msgid "Shared repository '%(display_url)s' already creates working trees."
5801
6198
msgstr ""
5802
6199
5803
#: bzrlib/errors.py:2927
6200
#: bzrlib/errors.py:2863
5804
6201
msgid ""
5805
6202
"Shared repository '%(display_url)s' already doesn't create working trees."
5806
6203
msgstr ""
5807
6204
5808
#: bzrlib/errors.py:2933
6205
#: bzrlib/errors.py:2869
5809
6206
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5810
6207
msgstr ""
5811
6208
5812
#: bzrlib/errors.py:2938
6209
#: bzrlib/errors.py:2874
5813
6210
msgid "No location could be found to bind to at %(display_url)s."
5814
6211
msgstr ""
5815
6212
5816
#: bzrlib/errors.py:2943
6213
#: bzrlib/errors.py:2879
5817
6214
msgid ""
5818
6215
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
5819
6216
"%(more)s"
5820
6217
msgstr ""
5821
6218
5822
#: bzrlib/errors.py:2962
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
5823
6225
msgid ""
5824
6226
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
5825
6227
"%(more)s"
5826
6228
msgstr ""
5827
6229
5828
#: bzrlib/errors.py:2968
6230
#: bzrlib/errors.py:2919
5829
6231
msgid "Variable {%(name)s} is not available."
5830
6232
msgstr ""
5831
6233
5832
#: bzrlib/errors.py:2976
6234
#: bzrlib/errors.py:2927
5833
6235
msgid "No template specified."
5834
6236
msgstr ""
5835
6237
5836
#: bzrlib/errors.py:2981
6238
#: bzrlib/errors.py:2932
5837
6239
msgid "Unable to create symlink %(path_str)son this platform"
5838
6240
msgstr ""
5839
6241
5840
#: bzrlib/errors.py:2996
6242
#: bzrlib/errors.py:2947
5841
6243
msgid ""
5842
6244
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
5843
6245
"\", \"local\"."
5844
6246
msgstr ""
5845
6247
5846
#: bzrlib/errors.py:3030
6248
#: bzrlib/errors.py:2981
5847
6249
msgid ""
5848
6250
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5849
6251
msgstr ""
5850
6252
5851
#: bzrlib/errors.py:3042
6253
#: bzrlib/errors.py:2993
5852
6254
msgid "The \"%(config_id)s\" configuration does not exist."
5853
6255
msgstr ""
5854
6256
5855
#: bzrlib/errors.py:3050
6257
#: bzrlib/errors.py:3001
5856
6258
msgid "The \"%(option_name)s\" configuration option does not exist."
5857
6259
msgstr ""
5858
6260
5859
#: bzrlib/errors.py:3058
6261
#: bzrlib/errors.py:3009
5860
6262
msgid "The alias \"%(alias_name)s\" does not exist."
5861
6263
msgstr ""
5862
6264
5863
#: bzrlib/errors.py:3072
6265
#: bzrlib/errors.py:3023
5864
6266
msgid "\"%(alias_name)s\" is not a valid location alias."
5865
6267
msgstr ""
5866
6268
5867
#: bzrlib/errors.py:3080
6269
#: bzrlib/errors.py:3031
5868
6270
msgid "No %(alias_name)s location assigned."
5869
6271
msgstr ""
5870
6272
5871
#: bzrlib/errors.py:3088
6273
#: bzrlib/errors.py:3039
5872
6274
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5873
6275
msgstr ""
5874
6276
5875
#: bzrlib/errors.py:3098
6277
#: bzrlib/errors.py:3049
5876
6278
msgid "Unknown rules detected: %(unknowns_str)s."
5877
6279
msgstr ""
5878
6280
5879
#: bzrlib/errors.py:3111
5880
msgid ""
5881
"Hook '%(hook_name)s' during %(hook_stage)s failed:\n"
5882
"%(traceback_text)s%(exc_value)s"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:3134
6281
#: bzrlib/errors.py:3060
5886
6282
msgid "Tip change rejected: %(msg)s"
5887
6283
msgstr ""
5888
6284
5889
#: bzrlib/errors.py:3142
6285
#: bzrlib/errors.py:3068
5890
6286
msgid "Shelf corrupt."
5891
6287
msgstr ""
5892
6288
5893
#: bzrlib/errors.py:3147
6289
#: bzrlib/errors.py:3073
5894
6290
msgid "Corruption while decompressing repository file%(orig_error)s"
5895
6291
msgstr ""
5896
6292
5897
#: bzrlib/errors.py:3159
6293
#: bzrlib/errors.py:3085
5898
6294
msgid "No changes are shelved with id \"%(shelf_id)d\"."
5899
6295
msgstr ""
5900
6296
5901
#: bzrlib/errors.py:3167
6297
#: bzrlib/errors.py:3093
5902
6298
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
5903
6299
msgstr ""
5904
6300
5905
#: bzrlib/errors.py:3175
6301
#: bzrlib/errors.py:3101
5906
6302
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
5907
6303
msgstr ""
5908
6304
5909
#: bzrlib/errors.py:3183
6305
#: bzrlib/errors.py:3109
5910
6306
msgid "The user aborted the operation."
5911
6307
msgstr ""
5912
6308
5913
#: bzrlib/errors.py:3188
6309
#: bzrlib/errors.py:3114
5914
6310
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
5915
6311
msgstr ""
5916
6312
5917
#: bzrlib/errors.py:3198
6313
#: bzrlib/errors.py:3124
5918
6314
msgid "No such view: %(view_name)s."
5919
6315
msgstr ""
5920
6316
5921
#: bzrlib/errors.py:3208
6317
#: bzrlib/errors.py:3134
5922
6318
msgid ""
5923
6319
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
5924
6320
"to a later format."
5925
6321
msgstr ""
5926
6322
5927
#: bzrlib/errors.py:3217
6323
#: bzrlib/errors.py:3143
5928
6324
msgid ""
5929
6325
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
5930
6326
msgstr ""
5931
6327
5932
#: bzrlib/errors.py:3284
6328
#: bzrlib/errors.py:3210
5933
6329
msgid "%(bzrdir)r does not support co-located branches."
5934
6330
msgstr ""
5935
6331
5936
#: bzrlib/errors.py:3290
6332
#: bzrlib/errors.py:3216
5937
6333
msgid ""
5938
6334
"Unable to determine your name.\n"
5939
6335
"Please, set your name with the 'whoami' command.\n"
5940
6336
"E.g. bzr whoami \"Your Name <name@example.com>\""
5941
6337
msgstr ""
5942
6338
5943
#: bzrlib/errors.py:3299
6339
#: bzrlib/errors.py:3225
5944
6340
msgid "Invalid pattern(s) found. %(msg)s"
5945
6341
msgstr ""
5946
6342
5947
#: bzrlib/errors.py:3307
6343
#: bzrlib/errors.py:3233
5948
6344
msgid ""
5949
6345
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
5950
6346
"unbind` to fix."
5951
6347
msgstr ""
5952
6348
5953
#: bzrlib/errors.py:3318
6349
#: bzrlib/errors.py:3244
5954
6350
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
5955
6351
msgstr ""
5956
6352
5957
#: bzrlib/errors.py:3327
6353
#: bzrlib/errors.py:3253
5958
6354
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
5959
6355
msgstr ""
5960
6356
5961
#: bzrlib/errors.py:3336
6357
#: bzrlib/errors.py:3262
5962
6358
msgid ""
5963
6359
"No compatible object available for operations from %(source)r to %(target)r."
5964
6360
msgstr ""
5965
6361
5966
#: bzrlib/errors.py:3346
6362
#: bzrlib/errors.py:3272
5967
6363
msgid ""
5968
6364
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
5969
6365
"%(arguments)s."
5970
6366
msgstr ""
5971
6367
5972
#: bzrlib/export_pot.py:123 bzrlib/export_pot.py:129
5973
#, python-format
5974
msgid "%r is not found in bzrlib/option.py"
5975
msgstr ""
5976
5977
#: bzrlib/export_pot.py:185
6368
#: bzrlib/errors.py:3282
6369
msgid ""
6370
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6371
"format %(format)r"
6372
msgstr ""
6373
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
6381
msgid "Binary files section encountered."
6382
msgstr ""
6383
6384
#: bzrlib/errors.py:3315
6385
msgid ""
6386
"Malformed patch header. %(desc)s\n"
6387
"%(line)r"
6388
msgstr ""
6389
6390
#: bzrlib/errors.py:3324
6391
msgid ""
6392
"Malformed hunk header. %(desc)s\n"
6393
"%(line)r"
6394
msgstr ""
6395
6396
#: bzrlib/errors.py:3333
6397
msgid ""
6398
"Malformed line. %(desc)s\n"
6399
"%(line)r"
6400
msgstr ""
6401
6402
#: bzrlib/errors.py:3343
6403
msgid ""
6404
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6405
"but patch says it should be \"%(patch_line)s\""
6406
msgstr ""
6407
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
5978
6419
#, python-format
5979
6420
msgid "Exporting messages from builtin command: %s"
5980
6421
msgstr ""
5981
6422
5982
#: bzrlib/export_pot.py:201
6423
#: bzrlib/export_pot.py:271
5983
6424
msgid "Exporting messages from plugin command: {0} in {1}"
5984
6425
msgstr ""
5985
6426
5986
#: bzrlib/export_pot.py:226
6427
#: bzrlib/export_pot.py:292
5987
6428
#, python-format
5988
6429
msgid "Exporting message from error: %s"
5989
6430
msgstr ""
5990
6431
5991
#: bzrlib/fetch.py:97
6432
#: bzrlib/fetch.py:98
5992
6433
msgid "Finding revisions"
5993
6434
msgstr ""
5994
6435
5995
#: bzrlib/fetch.py:102
6436
#: bzrlib/fetch.py:103
5996
6437
msgid "Fetching revisions"
5997
6438
msgstr ""
5998
6439
6440
#: bzrlib/foreign.py:262
6441
msgid "Push into a different VCS without any custom bzr metadata."
6442
msgstr ""
6443
6444
#: bzrlib/foreign.py:264
6445
msgid ""
6446
"This will afterwards rebase the local branch on the remote\n"
6447
"branch unless the --no-rebase option is used, in which case \n"
6448
"the two branches will be out of sync after the push. "
6449
msgstr ""
6450
6451
# help of 'no-rebase' option of 'dpush' command
6452
#: bzrlib/foreign.py:277
6453
msgid "Do not rebase after push."
6454
msgstr ""
6455
5999
6456
#: bzrlib/foreign.py:311
6000
6457
#, python-format
6001
6458
msgid "Using saved location: %s\n"
6007
6464
"regular push."
6008
6465
msgstr ""
6009
6466
6010
#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
6467
#: bzrlib/gpg.py:366
6468
msgid "No GnuPG key results for pattern: {0}"
6469
msgstr ""
6470
6471
#: bzrlib/gpg.py:439
6011
6472
msgid "{0} commits with valid signatures"
6012
6473
msgstr ""
6013
6474
6014
#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
6475
#: bzrlib/gpg.py:445
6015
6476
msgid "{0} commit with unknown key"
6016
6477
msgid_plural "{0} commits with unknown keys"
6017
6478
msgstr[0] ""
6018
6479
msgstr[1] ""
6019
6480
6020
#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
6481
#: bzrlib/gpg.py:453
6021
6482
msgid "{0} commit not valid"
6022
6483
msgid_plural "{0} commits not valid"
6023
6484
msgstr[0] ""
6024
6485
msgstr[1] ""
6025
6486
6026
#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
6487
#: bzrlib/gpg.py:461
6027
6488
msgid "{0} commit not signed"
6028
6489
msgid_plural "{0} commits not signed"
6029
6490
msgstr[0] ""
6030
6491
msgstr[1] ""
6031
6492
6032
#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
6493
#: bzrlib/gpg.py:469
6033
6494
msgid "{0} commit with key now expired"
6034
6495
msgid_plural "{0} commits with key now expired"
6035
6496
msgstr[0] ""
6036
6497
msgstr[1] ""
6037
6498
6038
#: bzrlib/gpg.py:336
6039
msgid "No GnuPG key results for pattern: {0}"
6040
msgstr ""
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] ""
6041
6504
6042
#: bzrlib/gpg.py:379
6505
#: bzrlib/gpg.py:505
6043
6506
msgid "{0} signed {1} commit"
6044
6507
msgid_plural "{0} signed {1} commits"
6045
6508
msgstr[0] ""
6046
6509
msgstr[1] ""
6047
6510
6048
#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
6511
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6049
6512
msgid "{0} commit by author {1}"
6050
6513
msgid_plural "{0} commits by author {1}"
6051
6514
msgstr[0] ""
6052
6515
msgstr[1] ""
6053
6516
6054
#: bzrlib/gpg.py:426
6517
#: bzrlib/gpg.py:554
6055
6518
msgid "Unknown key {0} signed {1} commit"
6056
6519
msgid_plural "Unknown key {0} signed {1} commits"
6057
6520
msgstr[0] ""
6058
6521
msgstr[1] ""
6059
6522
6060
#: bzrlib/gpg.py:444
6061
msgid "{0} commit by author {1} with key {2} now expired"
6062
msgid_plural "{0} commits by author {1} with key {2} now expired"
6063
msgstr[0] ""
6064
msgstr[1] ""
6065
6066
#: bzrlib/groupcompress.py:1758
6523
#: bzrlib/groupcompress.py:1739
6067
6524
#, python-format
6068
6525
msgid "Insert claimed random_id=True, but then inserted %r two times"
6069
6526
msgstr ""
6070
6527
6071
#: bzrlib/knit.py:1764 bzrlib/knit.py:1800
6528
#: bzrlib/hooks.py:313
6529
#, python-format
6530
msgid "Introduced in: %s"
6531
msgstr ""
6532
6533
#: bzrlib/hooks.py:316
6534
#, python-format
6535
msgid "Deprecated in: %s"
6536
msgstr ""
6537
6538
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6072
6539
msgid "Walking content"
6073
6540
msgstr ""
6074
6541
6075
#: bzrlib/knit.py:3467
6542
#: bzrlib/knit.py:3330
6076
6543
msgid "annotating"
6077
6544
msgstr ""
6078
6545
6079
#: bzrlib/lock.py:547
6546
#: bzrlib/lock.py:549
6080
6547
msgid "{0!r} was {1} locked again"
6081
6548
msgstr ""
6082
6549
6083
#: bzrlib/log.py:569
6550
#: bzrlib/lockdir.py:321
6551
#, python-format
6552
msgid "error removing pending lock: %s"
6553
msgstr ""
6554
6555
#: bzrlib/lockdir.py:616
6556
msgid "Unable to obtain"
6557
msgstr ""
6558
6559
#: bzrlib/lockdir.py:618
6560
msgid "Lock owner changed for"
6561
msgstr ""
6562
6563
#: bzrlib/lockdir.py:620
6564
msgid "{0} lock {1} {2}."
6565
msgstr ""
6566
6567
#: bzrlib/lockdir.py:627
6568
#, python-format
6569
msgid "Will continue to try until %s, unless you press Ctrl-C."
6570
msgstr ""
6571
6572
#: bzrlib/lockdir.py:629
6573
msgid "See \"bzr help break-lock\" for more."
6574
msgstr ""
6575
6576
#: bzrlib/lockdir.py:739
6577
#, python-format
6578
msgid ""
6579
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6580
msgstr ""
6581
6582
#: bzrlib/log.py:563
6084
6583
msgid "--exclude-common-ancestry requires two different revisions"
6085
6584
msgstr ""
6086
6585
6087
#: bzrlib/log.py:571
6586
#: bzrlib/log.py:565
6088
6587
#, python-format
6089
6588
msgid "invalid direction %r"
6090
6589
msgstr ""
6091
6590
6092
#: bzrlib/log.py:618
6093
msgid "Start revision not found in left-hand history of end revision."
6094
msgstr ""
6095
6096
#: bzrlib/log.py:664
6591
#: bzrlib/log.py:653
6097
6592
msgid "Start revision not found in history of end revision."
6098
6593
msgstr ""
6099
6594
6100
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6595
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6101
6596
msgid "Logging revision 0 is invalid."
6102
6597
msgstr ""
6103
6598
6104
#: bzrlib/log.py:1084 bzrlib/log.py:1142
6599
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6105
6600
msgid "Start revision must be older than the end revision."
6106
6601
msgstr ""
6107
6602
6108
#: bzrlib/log.py:1828
6603
#: bzrlib/log.py:1818
6109
6604
#, python-format
6110
6605
msgid "unknown log formatter: %r"
6111
6606
msgstr ""
6112
6607
6113
#: bzrlib/log.py:2123
6608
#: bzrlib/log.py:2114
6114
6609
msgid "fixes bug"
6115
6610
msgid_plural "fixes bugs"
6116
6611
msgstr[0] ""
6117
6612
msgstr[1] ""
6118
6613
6119
#: bzrlib/merge.py:715
6614
#: bzrlib/merge.py:689
6120
6615
msgid "All changes applied successfully."
6121
6616
msgstr ""
6122
6617
6123
#: bzrlib/merge.py:717
6618
#: bzrlib/merge.py:691
6124
6619
#, python-format
6125
6620
msgid "%d conflicts encountered."
6126
6621
msgstr ""
6127
6622
6128
#: bzrlib/merge.py:862 bzrlib/merge.py:1910
6623
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6129
6624
msgid "Preparing file merge"
6130
6625
msgstr ""
6131
6626
6132
#: bzrlib/multiparent.py:424
6627
#: bzrlib/multiparent.py:426
6133
6628
msgid "Importing revisions"
6134
6629
msgstr ""
6135
6630
6136
6631
# help of 'help' option
6137
#: bzrlib/option.py:530
6632
#: bzrlib/option.py:526
6138
6633
msgid "Show help message."
6139
6634
msgstr ""
6140
6635
6636
# help of 'quiet' option
6637
#: bzrlib/option.py:528
6638
msgid "Only display errors and warnings."
6639
msgstr ""
6640
6141
6641
# help of 'usage' option
6142
#: bzrlib/option.py:532
6642
#: bzrlib/option.py:531
6143
6643
msgid "Show usage message and options."
6144
6644
msgstr ""
6145
6645
6146
6646
# help of 'verbose' option
6147
#: bzrlib/option.py:534
6647
#: bzrlib/option.py:533
6148
6648
msgid "Display more information."
6149
6649
msgstr ""
6150
6650
6151
# help of 'quiet' option
6152
#: bzrlib/option.py:537
6153
msgid "Only display errors and warnings."
6154
msgstr ""
6155
6156
# help of 'overwrite' option
6157
#: bzrlib/option.py:542
6158
msgid "Ignore differences between branches and overwrite unconditionally."
6159
msgstr ""
6160
6161
# help of 'message' option
6162
#: bzrlib/option.py:553
6163
msgid "Message string."
6164
msgstr ""
6165
6166
# help of 'null' option
6167
#: bzrlib/option.py:556
6168
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6169
msgstr ""
6170
6171
# help of 'profile' option
6172
#: bzrlib/option.py:559
6173
msgid "Show performance profiling information."
6174
msgstr ""
6175
6176
# help of 'revision' option
6177
#: bzrlib/option.py:563
6178
msgid "See \"help revisionspec\" for details."
6179
msgstr ""
6180
6181
6651
# help of 'change' option
6182
#: bzrlib/option.py:568
6652
#: bzrlib/option.py:541
6183
6653
msgid ""
6184
6654
"Select changes introduced by the specified revision. See also \"help "
6185
6655
"revisionspec\"."
6186
6656
msgstr ""
6187
6657
6188
# help of 'show-ids' option
6189
#: bzrlib/option.py:570
6190
msgid "Show internal object ids."
6191
msgstr ""
6192
6193
# help of 'timezone' option
6194
#: bzrlib/option.py:573
6195
msgid "Display timezone as local, original, or utc."
6658
# help of 'directory' option
6659
#: bzrlib/option.py:543
6660
msgid "Branch to operate on, instead of working directory."
6661
msgstr ""
6662
6663
# help of 'log-format=long' option
6664
#: bzrlib/option.py:545
6665
msgid "Detailed log format."
6666
msgstr ""
6667
6668
# help of 'log-format=gnu-changelog' option
6669
#: bzrlib/option.py:545
6670
msgid "Format used by GNU ChangeLog files."
6671
msgstr ""
6672
6673
# help of 'log-format=line' option
6674
#: bzrlib/option.py:545
6675
msgid "Log format with one line per revision."
6676
msgstr ""
6677
6678
# help of 'log-format=short' option
6679
#: bzrlib/option.py:545
6680
msgid "Moderately short log format."
6196
6681
msgstr ""
6197
6682
6198
6683
# help of 'log-format' option
6199
#: bzrlib/option.py:578
6684
#: bzrlib/option.py:545
6200
6685
msgid "Use specified log format."
6201
6686
msgstr ""
6202
6687
6203
6688
# title of 'log-format' option
6204
#: bzrlib/option.py:580
6689
#: bzrlib/option.py:547
6205
6690
msgid "Log format"
6206
6691
msgstr ""
6207
6692
6208
# help of 'long' option
6209
#: bzrlib/option.py:582
6210
msgid "Use detailed log format. Same as --log-format long"
6211
msgstr ""
6212
6213
# help of 'short' option
6214
#: bzrlib/option.py:584
6215
msgid "Use moderately short log format. Same as --log-format short"
6216
msgstr ""
6217
6218
# help of 'line' option
6219
#: bzrlib/option.py:585
6220
msgid "Use log format with one line per revision. Same as --log-format line"
6693
# help of 'merge-type=lca' option
6694
#: bzrlib/option.py:549
6695
msgid "LCA-newness merge."
6696
msgstr ""
6697
6698
# help of 'merge-type=diff3' option
6699
#: bzrlib/option.py:549
6700
msgid "Merge using external diff3."
6701
msgstr ""
6702
6703
# help of 'merge-type=merge3' option
6704
#: bzrlib/option.py:549
6705
msgid "Native diff3-style merge."
6221
6706
msgstr ""
6222
6707
6223
6708
# help of 'merge-type' option
6224
#: bzrlib/option.py:588
6709
#: bzrlib/option.py:549
6225
6710
msgid "Select a particular merge algorithm."
6226
6711
msgstr ""
6227
6712
6713
# help of 'merge-type=weave' option
6714
#: bzrlib/option.py:549
6715
msgid "Weave-based merge."
6716
msgstr ""
6717
6228
6718
# title of 'merge-type' option
6229
#: bzrlib/option.py:590
6719
#: bzrlib/option.py:551
6230
6720
msgid "Merge algorithm"
6231
6721
msgstr ""
6232
6722
6723
# help of 'message' option
6724
#: bzrlib/option.py:554
6725
msgid "Message string."
6726
msgstr ""
6727
6728
# help of 'null' option
6729
#: bzrlib/option.py:556
6730
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6731
msgstr ""
6732
6733
# help of 'overwrite' option
6734
#: bzrlib/option.py:558
6735
msgid "Ignore differences between branches and overwrite unconditionally."
6736
msgstr ""
6737
6233
6738
# help of 'remember' option
6234
#: bzrlib/option.py:592
6739
#: bzrlib/option.py:560
6235
6740
msgid "Remember the specified location as a default."
6236
6741
msgstr ""
6237
6742
6238
6743
# help of 'reprocess' option
6239
#: bzrlib/option.py:594
6744
#: bzrlib/option.py:562
6240
6745
msgid "Reprocess to reduce spurious conflicts."
6241
6746
msgstr ""
6242
6747
6243
# help of 'dry-run' option
6244
#: bzrlib/option.py:597
6245
msgid "Show what would be done, but don't actually do anything."
6246
msgstr ""
6247
6248
# help of 'name-from-revision' option
6249
#: bzrlib/option.py:598
6250
msgid "The path name in the old tree."
6251
msgstr ""
6252
6253
# help of 'directory' option
6254
#: bzrlib/option.py:600
6255
msgid "Branch to operate on, instead of working directory"
6256
msgstr ""
6257
6258
#: bzrlib/osutils.py:93
6748
# help of 'revision' option
6749
#: bzrlib/option.py:566
6750
msgid "See \"help revisionspec\" for details."
6751
msgstr ""
6752
6753
# help of 'show-ids' option
6754
#: bzrlib/option.py:568
6755
msgid "Show internal object ids."
6756
msgstr ""
6757
6758
# help of 'timezone' option
6759
#: bzrlib/option.py:571
6760
msgid "Display timezone as local, original, or utc."
6761
msgstr ""
6762
6763
#: bzrlib/osutils.py:100
6259
6764
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6260
6765
msgstr ""
6261
6766
6262
#: bzrlib/osutils.py:194
6767
#: bzrlib/osutils.py:220
6263
6768
msgid "lstat/stat of ({0!r}): {1!r}"
6264
6769
msgstr ""
6265
6770
6266
#: bzrlib/osutils.py:929 bzrlib/osutils.py:940
6771
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6267
6772
#, python-format
6268
6773
msgid "sorry, %r not allowed in path"
6269
6774
msgstr ""
6270
6775
6271
#: bzrlib/osutils.py:1158
6776
#: bzrlib/osutils.py:1259
6272
6777
#, python-format
6273
6778
msgid "%r is too short to calculate a relative path"
6274
6779
msgstr ""
6275
6780
6781
#: bzrlib/plugin.py:143
6782
#, python-format
6783
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6784
msgstr ""
6785
6276
6786
# help of 'plugin' option of 'bash-completion' command
6277
#: bzrlib/plugins/bash_completion/bashcomp.py:407
6787
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6278
6788
msgid "Enable completions for the selected plugin (default: all plugins)"
6279
6789
msgstr ""
6280
6790
6281
#: bzrlib/plugins/bash_completion/bashcomp.py:409
6791
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6282
6792
msgid "Generate a shell function for bash command line completion."
6283
6793
msgstr ""
6284
6794
6285
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6795
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6286
6796
msgid ""
6287
6797
"This command generates a shell function which can be used by bash to\n"
6288
6798
"automatically complete the currently typed command when the user presses\n"
6289
6799
"the completion key (usually tab)."
6290
6800
msgstr ""
6291
6801
6292
#: bzrlib/plugins/bash_completion/bashcomp.py:415
6802
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6293
6803
msgid ""
6294
6804
"Commonly used like this:\n"
6295
6805
" eval \"`bzr bash-completion`\""
6296
6806
msgstr ""
6297
6807
6298
6808
# help of 'function-name' option of 'bash-completion' command
6299
#: bzrlib/plugins/bash_completion/bashcomp.py:421
6809
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6300
6810
msgid "Name of the generated function (default: _bzr)"
6301
6811
msgstr ""
6302
6812
6303
6813
# help of 'function-only' option of 'bash-completion' command
6304
#: bzrlib/plugins/bash_completion/bashcomp.py:423
6814
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6305
6815
msgid "Generate only the shell function, don't enable it"
6306
6816
msgstr ""
6307
6817
6308
#: bzrlib/plugins/launchpad/__init__.py:78
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
6309
6937
msgid "Register a branch with launchpad.net."
6310
6938
msgstr ""
6311
6939
6312
#: bzrlib/plugins/launchpad/__init__.py:80
6940
#: bzrlib/plugins/launchpad/cmds.py:45
6313
6941
msgid ""
6314
6942
"This command lists a bzr branch in the directory of branches on\n"
6315
6943
"launchpad.net. Registration allows the branch to be associated with\n"
6316
6944
"bugs or specifications."
6317
6945
msgstr ""
6318
6946
6319
#: bzrlib/plugins/launchpad/__init__.py:84
6947
#: bzrlib/plugins/launchpad/cmds.py:49
6320
6948
msgid ""
6321
6949
"Before using this command you must register the project to which the\n"
6322
6950
"branch belongs, and create an account for yourself on launchpad.net."
6323
6951
msgstr ""
6324
6952
6325
#: bzrlib/plugins/launchpad/__init__.py:87
6953
#: bzrlib/plugins/launchpad/cmds.py:52
6326
6954
msgid ""
6327
6955
"arguments:\n"
6328
6956
" public_url: The publicly visible url for the branch to register.\n"
6334
6962
" otherwise error."
6335
6963
msgstr ""
6336
6964
6337
#: bzrlib/plugins/launchpad/__init__.py:96
6965
#: bzrlib/plugins/launchpad/cmds.py:61
6338
6966
msgid ""
6339
6967
"example:\n"
6340
6968
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6342
6970
msgstr ""
6343
6971
6344
6972
# help of 'project' option of 'register-branch' command
6345
#: bzrlib/plugins/launchpad/__init__.py:103
6973
#: bzrlib/plugins/launchpad/cmds.py:68
6346
6974
msgid "Launchpad project short name to associate with the branch."
6347
6975
msgstr ""
6348
6976
6349
6977
# help of 'branch-name' option of 'register-branch' command
6350
#: bzrlib/plugins/launchpad/__init__.py:110
6978
#: bzrlib/plugins/launchpad/cmds.py:75
6351
6979
msgid ""
6352
6980
"Short name for the branch; by default taken from the last component of the "
6353
6981
"url."
6354
6982
msgstr ""
6355
6983
6356
6984
# help of 'branch-title' option of 'register-branch' command
6357
#: bzrlib/plugins/launchpad/__init__.py:114
6985
#: bzrlib/plugins/launchpad/cmds.py:79
6358
6986
msgid "One-sentence description of the branch."
6359
6987
msgstr ""
6360
6988
6361
6989
# help of 'branch-description' option of 'register-branch' command
6362
#: bzrlib/plugins/launchpad/__init__.py:117
6990
#: bzrlib/plugins/launchpad/cmds.py:82
6363
6991
msgid "Longer description of the purpose or contents of the branch."
6364
6992
msgstr ""
6365
6993
6366
6994
# help of 'author' option of 'register-branch' command
6367
#: bzrlib/plugins/launchpad/__init__.py:120
6995
#: bzrlib/plugins/launchpad/cmds.py:85
6368
6996
msgid "Branch author's email address, if not yourself."
6369
6997
msgstr ""
6370
6998
6371
6999
# help of 'link-bug' option of 'register-branch' command
6372
#: bzrlib/plugins/launchpad/__init__.py:123
7000
#: bzrlib/plugins/launchpad/cmds.py:88
6373
7001
msgid "The bug this branch fixes."
6374
7002
msgstr ""
6375
7003
6376
7004
# help of 'dry-run' option of 'register-branch' command
6377
#: bzrlib/plugins/launchpad/__init__.py:126
7005
#: bzrlib/plugins/launchpad/cmds.py:91
6378
7006
msgid "Prepare the request but don't actually send it."
6379
7007
msgstr ""
6380
7008
6381
#: bzrlib/plugins/launchpad/__init__.py:186
7009
#: bzrlib/plugins/launchpad/cmds.py:113
7010
msgid ""
7011
"register-branch requires a public branch url - see bzr help register-branch."
7012
msgstr ""
7013
7014
#: bzrlib/plugins/launchpad/cmds.py:121
7015
msgid "--product is deprecated; please use --project."
7016
msgstr ""
7017
7018
#: bzrlib/plugins/launchpad/cmds.py:151
6382
7019
msgid "Open a Launchpad branch page in your web browser."
6383
7020
msgstr ""
6384
7021
6385
7022
# help of 'dry-run' option of 'launchpad-open' command
6386
#: bzrlib/plugins/launchpad/__init__.py:191
7023
#: bzrlib/plugins/launchpad/cmds.py:156
6387
7024
msgid "Do not actually open the browser. Just say the URL we would use."
6388
7025
msgstr ""
6389
7026
6390
#: bzrlib/plugins/launchpad/__init__.py:236
7027
#: bzrlib/plugins/launchpad/cmds.py:191
7028
#, python-format
7029
msgid "Opening %s in web browser"
7030
msgstr ""
7031
7032
#: bzrlib/plugins/launchpad/cmds.py:199
6391
7033
msgid "Show or set the Launchpad user ID."
6392
7034
msgstr ""
6393
7035
6394
#: bzrlib/plugins/launchpad/__init__.py:238
7036
#: bzrlib/plugins/launchpad/cmds.py:201
6395
7037
msgid ""
6396
7038
"When communicating with Launchpad, some commands need to know your\n"
6397
7039
"Launchpad user ID. This command can be used to set or show the\n"
6398
7040
"user ID that Bazaar will use for such communication."
6399
7041
msgstr ""
6400
7042
6401
#: bzrlib/plugins/launchpad/__init__.py:242
7043
#: bzrlib/plugins/launchpad/cmds.py:205
6402
7044
msgid ""
6403
7045
":Examples:\n"
6404
7046
" Show the Launchpad ID of the current user::"
6405
7047
msgstr ""
6406
7048
6407
#: bzrlib/plugins/launchpad/__init__.py:245
7049
#: bzrlib/plugins/launchpad/cmds.py:208
6408
7050
msgid " bzr launchpad-login"
6409
7051
msgstr ""
6410
7052
6411
#: bzrlib/plugins/launchpad/__init__.py:247
7053
#: bzrlib/plugins/launchpad/cmds.py:210
6412
7054
msgid " Set the Launchpad ID of the current user to 'bob'::"
6413
7055
msgstr ""
6414
7056
6415
#: bzrlib/plugins/launchpad/__init__.py:249
7057
#: bzrlib/plugins/launchpad/cmds.py:212
6416
7058
msgid " bzr launchpad-login bob"
6417
7059
msgstr ""
6418
7060
6419
7061
# help of 'no-check' option of 'launchpad-login' command
6420
#: bzrlib/plugins/launchpad/__init__.py:256
7062
#: bzrlib/plugins/launchpad/cmds.py:219
6421
7063
msgid "Don't check that the user name is valid."
6422
7064
msgstr ""
6423
7065
6424
#: bzrlib/plugins/launchpad/__init__.py:292
7066
#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245
7067
msgid "Launchpad user ID exists and has SSH keys.\n"
7068
msgstr ""
7069
7070
#: bzrlib/plugins/launchpad/cmds.py:237
7071
msgid "No Launchpad user ID configured.\n"
7072
msgstr ""
7073
7074
#: bzrlib/plugins/launchpad/cmds.py:248
7075
#, python-format
7076
msgid "Launchpad user ID set to '%s'.\n"
7077
msgstr ""
7078
7079
#: bzrlib/plugins/launchpad/cmds.py:254
6425
7080
msgid "Ask Launchpad to mirror a branch now."
6426
7081
msgstr ""
6427
7082
6428
#: bzrlib/plugins/launchpad/__init__.py:312
7083
#: bzrlib/plugins/launchpad/cmds.py:271
6429
7084
msgid "Propose merging a branch on Launchpad."
6430
7085
msgstr ""
6431
7086
6432
#: bzrlib/plugins/launchpad/__init__.py:314
7087
#: bzrlib/plugins/launchpad/cmds.py:273
6433
7088
msgid ""
6434
7089
"This will open your usual editor to provide the initial comment. When it\n"
6435
7090
"has created the proposal, it will open it in your default web browser."
6436
7091
msgstr ""
6437
7092
6438
#: bzrlib/plugins/launchpad/__init__.py:317
7093
#: bzrlib/plugins/launchpad/cmds.py:276
6439
7094
msgid ""
6440
7095
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6441
7096
"is not supplied, the remembered submit branch will be used. If no submit\n"
6442
7097
"branch is remembered, the development focus will be used."
6443
7098
msgstr ""
6444
7099
6445
#: bzrlib/plugins/launchpad/__init__.py:321
7100
#: bzrlib/plugins/launchpad/cmds.py:280
6446
7101
msgid ""
6447
7102
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6448
7103
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6450
7105
"may optionally be followed by '=' and the review type. For example:"
6451
7106
msgstr ""
6452
7107
6453
#: bzrlib/plugins/launchpad/__init__.py:326
7108
#: bzrlib/plugins/launchpad/cmds.py:285
6454
7109
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6455
7110
msgstr ""
6456
7111
6457
#: bzrlib/plugins/launchpad/__init__.py:328
7112
#: bzrlib/plugins/launchpad/cmds.py:287
6458
7113
msgid ""
6459
7114
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6460
7115
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6461
7116
msgstr ""
6462
7117
6463
7118
# help of 'staging' option of 'lp-propose-merge' command
6464
#: bzrlib/plugins/launchpad/__init__.py:333
7119
#: bzrlib/plugins/launchpad/cmds.py:292
6465
7120
msgid "Propose the merge on staging."
6466
7121
msgstr ""
6467
7122
6468
7123
# help of 'message' option of 'lp-propose-merge' command
6469
#: bzrlib/plugins/launchpad/__init__.py:335
7124
#: bzrlib/plugins/launchpad/cmds.py:294
6470
7125
msgid "Commit message."
6471
7126
msgstr ""
6472
7127
6473
7128
# help of 'approve' option of 'lp-propose-merge' command
6474
#: bzrlib/plugins/launchpad/__init__.py:337
6475
msgid "Mark the proposal as approved immediately."
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."
6476
7138
msgstr ""
6477
7139
6478
7140
# help of 'review' option of 'lp-propose-merge' command
6479
#: bzrlib/plugins/launchpad/__init__.py:339
7141
#: bzrlib/plugins/launchpad/cmds.py:300
6480
7142
msgid "Requested reviewer and optional type."
6481
7143
msgstr ""
6482
7144
6483
#: bzrlib/plugins/launchpad/__init__.py:376
7145
#: bzrlib/plugins/launchpad/cmds.py:335
6484
7146
msgid "Find the proposal to merge this revision."
6485
7147
msgstr ""
6486
7148
6487
#: bzrlib/plugins/launchpad/__init__.py:378
7149
#: bzrlib/plugins/launchpad/cmds.py:337
6488
7150
msgid ""
6489
7151
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6490
"This works only if the selected branch was the merge proposal target, and\n"
6491
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6492
"are opened in a web browser."
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."
6493
7154
msgstr ""
6494
7155
6495
#: bzrlib/plugins/launchpad/__init__.py:383
7156
#: bzrlib/plugins/launchpad/cmds.py:341
6496
7157
msgid ""
6497
"Any revision involved in the merge may be specified-- the revision in\n"
6498
"which the merge was performed, or one of the revisions that was merged."
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."
6499
7160
msgstr ""
6500
7161
6501
#: bzrlib/plugins/launchpad/__init__.py:386
7162
#: bzrlib/plugins/launchpad/cmds.py:344
6502
7163
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6503
7164
msgstr ""
6504
7165
6505
#: bzrlib/plugins/launchpad/__init__.py:388
6506
msgid " bzr lp-find-proposal -r annotate:README:1"
6507
msgstr ""
6508
6509
#: bzrlib/push.py:54
7166
#: bzrlib/plugins/launchpad/cmds.py:346
7167
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
7168
msgstr ""
7169
7170
#: bzrlib/plugins/launchpad/cmds.py:365
7171
msgid "No review found."
7172
msgstr ""
7173
7174
#: bzrlib/plugins/launchpad/cmds.py:366
7175
#, python-format
7176
msgid "%d proposals(s) found."
7177
msgstr ""
7178
7179
#: bzrlib/plugins/launchpad/cmds.py:378
7180
msgid "Finding proposals"
7181
msgstr ""
7182
7183
#: bzrlib/plugins/launchpad/lp_api.py:228
7184
#: bzrlib/plugins/launchpad/lp_api.py:233
7185
#, python-format
7186
msgid "%s is not registered on Launchpad"
7187
msgstr ""
7188
7189
#: bzrlib/plugins/launchpad/lp_api.py:243
7190
#, python-format
7191
msgid "%s has no development focus."
7192
msgstr ""
7193
7194
#: bzrlib/plugins/launchpad/lp_api.py:248
7195
#, python-format
7196
msgid "development focus %s has no branch."
7197
msgstr ""
7198
7199
#: bzrlib/plugins/launchpad/lp_api.py:253
7200
#, python-format
7201
msgid "source package %s has no branch."
7202
msgstr ""
7203
7204
#: bzrlib/plugins/launchpad/lp_api.py:257
7205
#, python-format
7206
msgid "%s has no associated product or source package."
7207
msgstr ""
7208
7209
#: bzrlib/plugins/launchpad/lp_api.py:269
7210
#, python-format
7211
msgid "%s is already up-to-date."
7212
msgstr ""
7213
7214
#: bzrlib/plugins/launchpad/lp_api.py:276
7215
#, python-format
7216
msgid "Pushing to %s"
7217
msgstr ""
7218
7219
#: bzrlib/plugins/launchpad/lp_directory.py:170
7220
msgid ""
7221
"resolution for {0}\n"
7222
" local: {1}\n"
7223
" remote: {2}"
7224
msgstr ""
7225
7226
#: bzrlib/plugins/launchpad/lp_propose.py:159
7227
#, python-format
7228
msgid "There is already a branch merge proposal: %s"
7229
msgstr ""
7230
7231
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7232
msgid "pb parameter to convert() is deprecated"
7233
msgstr ""
7234
7235
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7236
msgid "starting upgrade from format 4 to 5"
7237
msgstr ""
7238
7239
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7240
msgid "note: upgrade may be faster if all store files are ungzipped first"
7241
msgstr ""
7242
7243
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7244
msgid "converting revision"
7245
msgstr ""
7246
7247
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7248
msgid "upgraded to weaves:"
7249
msgstr ""
7250
7251
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7252
#, python-format
7253
msgid "%6d revisions and inventories"
7254
msgstr ""
7255
7256
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7257
#, python-format
7258
msgid "%6d revisions not present"
7259
msgstr ""
7260
7261
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7262
#, python-format
7263
msgid "%6d texts"
7264
msgstr ""
7265
7266
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7267
msgid "writing weave"
7268
msgstr ""
7269
7270
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7271
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7272
msgid "inventory"
7273
msgstr ""
7274
7275
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7276
msgid "write revision"
7277
msgstr ""
7278
7279
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7280
msgid "loading revision"
7281
msgstr ""
7282
7283
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7284
#, python-format
7285
msgid "revision {%s} not present in branch; will be converted as a ghost"
7286
msgstr ""
7287
7288
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7289
msgid "starting upgrade from format 5 to 6"
7290
msgstr ""
7291
7292
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7293
#, python-format
7294
msgid "adding prefixes to %s"
7295
msgstr ""
7296
7297
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7298
msgid "starting upgrade from format 6 to metadir"
7299
msgstr ""
7300
7301
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7302
msgid "Removing ancestry.weave"
7303
msgstr ""
7304
7305
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7306
msgid "Finding branch files"
7307
msgstr ""
7308
7309
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7310
msgid "Upgrading repository"
7311
msgstr ""
7312
7313
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7314
msgid "Upgrading branch"
7315
msgstr ""
7316
7317
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7318
msgid "No working tree."
7319
msgstr ""
7320
7321
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7322
msgid "Upgrading working tree"
7323
msgstr ""
7324
7325
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7326
#, python-format
7327
msgid "Make %s lock"
7328
msgstr ""
7329
7330
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7331
#, python-format
7332
msgid "Moving %s"
7333
msgstr ""
7334
7335
#: bzrlib/push.py:56
6510
7336
msgid "Created new branch."
6511
7337
msgstr ""
6512
7338
6513
#: bzrlib/push.py:96
7339
#: bzrlib/push.py:97
6514
7340
#, python-format
6515
7341
msgid ""
6516
7342
"Target directory %s already contains a .bzr directory, but it is not valid."
6517
7343
msgstr ""
6518
7344
6519
#: bzrlib/push.py:99
7345
#: bzrlib/push.py:101
6520
7346
#, python-format
6521
7347
msgid ""
6522
7348
"Target directory %s already exists, but does not have a .bzr directory. "
6523
7349
"Supply --use-existing-dir to push there anyway."
6524
7350
msgstr ""
6525
7351
6526
#: bzrlib/push.py:120
7352
#: bzrlib/push.py:122
6527
7353
#, python-format
6528
7354
msgid "Too many redirections trying to make %s."
6529
7355
msgstr ""
6530
7356
6531
#: bzrlib/push.py:145
7357
#: bzrlib/push.py:148
6532
7358
msgid ""
6533
7359
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6534
7360
"information."
6535
7361
msgstr ""
6536
7362
6537
#: bzrlib/push.py:149
7363
#: bzrlib/push.py:152
6538
7364
#, python-format
6539
7365
msgid ""
6540
7366
"It is not possible to losslessly push to %s. You may want to use dpush "
6541
7367
"instead."
6542
7368
msgstr ""
6543
7369
6544
#: bzrlib/push.py:155
7370
#: bzrlib/push.py:158
6545
7371
#, python-format
6546
7372
msgid ""
6547
7373
"At %s you have a valid .bzr control directory, but not a branch or "
6549
7375
"directory out of the way and try again."
6550
7376
msgstr ""
6551
7377
6552
#: bzrlib/reconcile.py:96
7378
#: bzrlib/reconcile.py:97
6553
7379
#, python-format
6554
7380
msgid "Reconciling branch %s"
6555
7381
msgstr ""
6556
7382
6557
#: bzrlib/reconcile.py:102
7383
#: bzrlib/reconcile.py:103
6558
7384
#, python-format
6559
7385
msgid "Reconciling repository %s"
6560
7386
msgstr ""
6561
7387
6562
#: bzrlib/reconcile.py:104
7388
#: bzrlib/reconcile.py:105
6563
7389
msgid "Reconciling repository"
6564
7390
msgstr ""
6565
7391
6566
#: bzrlib/reconcile.py:110
7392
#: bzrlib/reconcile.py:111
6567
7393
#, python-format
6568
7394
msgid "%s cannot canonicalize CHKs."
6569
7395
msgstr ""
6570
7396
6571
#: bzrlib/reconcile.py:118
7397
#: bzrlib/reconcile.py:119
6572
7398
msgid "Reconcile aborted: revision index has inconsistent parents."
6573
7399
msgstr ""
6574
7400
6575
#: bzrlib/reconcile.py:120
7401
#: bzrlib/reconcile.py:121
6576
7402
msgid "Run \"bzr check\" for more details."
6577
7403
msgstr ""
6578
7404
6579
#: bzrlib/reconcile.py:122
7405
#: bzrlib/reconcile.py:123
6580
7406
msgid "Reconciliation complete."
6581
7407
msgstr ""
6582
7408
6583
#: bzrlib/reconcile.py:165
7409
#: bzrlib/reconcile.py:166
6584
7410
msgid "Fixing last revision info {0} => {1}"
6585
7411
msgstr ""
6586
7412
6587
#: bzrlib/reconcile.py:172
7413
#: bzrlib/reconcile.py:173
6588
7414
msgid "revision_history ok."
6589
7415
msgstr ""
6590
7416
6591
#: bzrlib/reconcile.py:233
7417
#: bzrlib/reconcile.py:234
6592
7418
msgid "Reading inventory data"
6593
7419
msgstr ""
6594
7420
6595
#: bzrlib/reconcile.py:253 bzrlib/reconcile.py:383
7421
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6596
7422
msgid "Inventory ok."
6597
7423
msgstr ""
6598
7424
6599
#: bzrlib/reconcile.py:255 bzrlib/reconcile.py:385
7425
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
6600
7426
msgid "Backing up inventory"
6601
7427
msgstr ""
6602
7428
6603
#: bzrlib/reconcile.py:257
7429
#: bzrlib/reconcile.py:258
6604
7430
msgid "Backup inventory created."
6605
7431
msgstr ""
6606
7432
6607
#: bzrlib/reconcile.py:273 bzrlib/reconcile.py:404
7433
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
6608
7434
msgid "Writing weave"
6609
7435
msgstr ""
6610
7436
6611
#: bzrlib/reconcile.py:276 bzrlib/reconcile.py:407
7437
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
6612
7438
msgid "Inventory regenerated."
6613
7439
msgstr ""
6614
7440
6615
#: bzrlib/reconcile.py:370 bzrlib/reconcile.py:372 bzrlib/reconcile.py:375
7441
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
6616
7442
msgid "Reading indexes"
6617
7443
msgstr ""
6618
7444
6619
#: bzrlib/reconcile.py:379 bzrlib/reconcile.py:381
7445
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
6620
7446
msgid "Checking unused inventories"
6621
7447
msgstr ""
6622
7448
6623
#: bzrlib/reconcile.py:387
7449
#: bzrlib/reconcile.py:388
6624
7450
msgid "Backup Inventory created"
6625
7451
msgstr ""
6626
7452
6627
#: bzrlib/reconcile.py:445
7453
#: bzrlib/reconcile.py:446
6628
7454
msgid "Fixing text parents"
6629
7455
msgstr ""
6630
7456
6631
#: bzrlib/reconfigure.py:52
7457
#: bzrlib/reconfigure.py:54
6632
7458
msgid "{0} is now stacked on {1}\n"
6633
7459
msgstr ""
6634
7460
6635
#: bzrlib/reconfigure.py:67
7461
#: bzrlib/reconfigure.py:69
6636
7462
#, python-format
6637
7463
msgid "%s is now not stacked\n"
6638
7464
msgstr ""
6639
7465
6640
#: bzrlib/remote.py:1886
7466
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7467
#, python-format
7468
msgid "bzr: ERROR (ignored): %s"
7469
msgstr ""
7470
7471
#: bzrlib/remote.py:2534
6641
7472
msgid "Copying repository content as tarball..."
6642
7473
msgstr ""
6643
7474
6644
#: bzrlib/rename_map.py:68
7475
#: bzrlib/rename_map.py:69
6645
7476
msgid "Calculating hashes"
6646
7477
msgstr ""
6647
7478
6648
#: bzrlib/rename_map.py:106
7479
#: bzrlib/rename_map.py:107
6649
7480
msgid "Determining hash hits"
6650
7481
msgstr ""
6651
7482
6652
#: bzrlib/rename_map.py:241
7483
#: bzrlib/rename_map.py:242
6653
7484
msgid "{0} => {1}"
6654
7485
msgstr ""
6655
7486
6656
#: bzrlib/repository.py:284
6657
#, python-format
6658
msgid "bzr: ERROR (ignored): %s"
6659
msgstr ""
6660
6661
#: bzrlib/repository.py:1806
7487
#: bzrlib/repository.py:1738
6662
7488
msgid "Moving repository to repository.backup"
6663
7489
msgstr ""
6664
7490
6665
#: bzrlib/repository.py:1813
7491
#: bzrlib/repository.py:1745
6666
7492
msgid "Creating new repository"
6667
7493
msgstr ""
6668
7494
6669
#: bzrlib/repository.py:1818
7495
#: bzrlib/repository.py:1750
6670
7496
msgid "Copying content"
6671
7497
msgstr ""
6672
7498
6673
#: bzrlib/repository.py:1822
7499
#: bzrlib/repository.py:1754
6674
7500
msgid "Deleting old repository content"
6675
7501
msgstr ""
6676
7502
6677
#: bzrlib/repository.py:1824
7503
#: bzrlib/repository.py:1756
6678
7504
msgid "repository converted"
6679
7505
msgstr ""
6680
7506
6681
#: bzrlib/revisionspec.py:914
7507
#: bzrlib/revisionspec.py:903
6682
7508
msgid "Using {0} {1}"
6683
7509
msgstr ""
6684
7510
6685
#: bzrlib/send.py:56
7511
#: bzrlib/send.py:59
6686
7512
#, python-format
6687
7513
msgid "Mail client \"%s\" does not support specifying body"
6688
7514
msgstr ""
6689
7515
6690
#: bzrlib/send.py:60
7516
#: bzrlib/send.py:63
6691
7517
msgid "--remember requires a branch to be specified."
6692
7518
msgstr ""
6693
7519
6694
#: bzrlib/send.py:74
7520
#: bzrlib/send.py:78
6695
7521
msgid "No submit branch known or specified"
6696
7522
msgstr ""
6697
7523
6698
#: bzrlib/send.py:77
7524
#: bzrlib/send.py:81
6699
7525
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
6700
7526
msgstr ""
6701
7527
6702
#: bzrlib/send.py:94
7528
#: bzrlib/send.py:99
6703
7529
#, python-format
6704
7530
msgid "No such send format '%s'."
6705
7531
msgstr ""
6706
7532
6707
#: bzrlib/send.py:111
7533
#: bzrlib/send.py:115
6708
7534
msgid "bzr send takes at most two one revision identifiers"
6709
7535
msgstr ""
6710
7536
6711
#: bzrlib/send.py:124
7537
#: bzrlib/send.py:128
6712
7538
msgid "No revisions to submit."
6713
7539
msgstr ""
6714
7540
6715
#: bzrlib/send.py:135
7541
#: bzrlib/send.py:140
6716
7542
msgid ""
6717
7543
"- not supported for merge directives that use more than one output file."
6718
7544
msgstr ""
6719
7545
6720
#: bzrlib/send.py:177
7546
#: bzrlib/send.py:186
6721
7547
msgid "Format 0.9 does not permit bundle with no patch"
6722
7548
msgstr ""
6723
7549
6724
#: bzrlib/shelf_ui.py:45
7550
#: bzrlib/shelf_ui.py:46
6725
7551
#, python-format
6726
7552
msgid "Shelve adding file \"%(path)s\"?"
6727
7553
msgstr ""
6728
7554
6729
#: bzrlib/shelf_ui.py:46
7555
#: bzrlib/shelf_ui.py:47
6730
7556
msgid "Shelve binary changes?"
6731
7557
msgstr ""
6732
7558
6733
#: bzrlib/shelf_ui.py:47
7559
#: bzrlib/shelf_ui.py:48
6734
7560
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
6735
7561
msgstr ""
6736
7562
6737
#: bzrlib/shelf_ui.py:49
7563
#: bzrlib/shelf_ui.py:50
6738
7564
#, python-format
6739
7565
msgid "Shelve removing file \"%(path)s\"?"
6740
7566
msgstr ""
6741
7567
6742
#: bzrlib/shelf_ui.py:50
7568
#: bzrlib/shelf_ui.py:51
6743
7569
#, python-format
6744
7570
msgid "Shelve %d change(s)?"
6745
7571
msgstr ""
6746
7572
6747
#: bzrlib/shelf_ui.py:51
7573
#: bzrlib/shelf_ui.py:52
6748
7574
msgid "Shelve?"
6749
7575
msgstr ""
6750
7576
6751
#: bzrlib/shelf_ui.py:52
7577
#: bzrlib/shelf_ui.py:53
6752
7578
#, python-format
6753
7579
msgid ""
6754
7580
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
6755
7581
msgstr ""
6756
7582
6757
#: bzrlib/shelf_ui.py:54
7583
#: bzrlib/shelf_ui.py:55
6758
7584
#, python-format
6759
7585
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
6760
7586
msgstr ""
6761
7587
6762
#: bzrlib/shelf_ui.py:69
7588
#: bzrlib/shelf_ui.py:70
6763
7589
#, python-format
6764
7590
msgid "Changes shelved with id \"%d\"."
6765
7591
msgstr ""
6766
7592
6767
#: bzrlib/shelf_ui.py:73
7593
#: bzrlib/shelf_ui.py:74
6768
7594
msgid "Selected changes destroyed."
6769
7595
msgstr ""
6770
7596
6771
#: bzrlib/shelf_ui.py:77
7597
#: bzrlib/shelf_ui.py:78
6772
7598
msgid "Selected changes:"
6773
7599
msgstr ""
6774
7600
6775
#: bzrlib/shelf_ui.py:97
7601
#: bzrlib/shelf_ui.py:98
6776
7602
#, python-format
6777
7603
msgid "Delete file \"%(path)s\"?"
6778
7604
msgstr ""
6779
7605
6780
#: bzrlib/shelf_ui.py:98
7606
#: bzrlib/shelf_ui.py:99
6781
7607
msgid "Apply binary changes?"
6782
7608
msgstr ""
6783
7609
6784
#: bzrlib/shelf_ui.py:99
7610
#: bzrlib/shelf_ui.py:100
6785
7611
#, python-format
6786
7612
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
6787
7613
msgstr ""
6788
7614
6789
#: bzrlib/shelf_ui.py:101
7615
#: bzrlib/shelf_ui.py:102
6790
7616
#, python-format
6791
7617
msgid "Add file \"%(path)s\"?"
6792
7618
msgstr ""
6793
7619
6794
#: bzrlib/shelf_ui.py:102
7620
#: bzrlib/shelf_ui.py:103
6795
7621
#, python-format
6796
7622
msgid "Apply %d change(s)?"
6797
7623
msgstr ""
6798
7624
6799
#: bzrlib/shelf_ui.py:103
7625
#: bzrlib/shelf_ui.py:104
6800
7626
msgid "Apply change?"
6801
7627
msgstr ""
6802
7628
6803
#: bzrlib/shelf_ui.py:104
7629
#: bzrlib/shelf_ui.py:105
6804
7630
#, python-format
6805
7631
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
6806
7632
msgstr ""
6807
7633
6808
#: bzrlib/shelf_ui.py:106
7634
#: bzrlib/shelf_ui.py:107
6809
7635
#, python-format
6810
7636
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
6811
7637
msgstr ""
6812
7638
6813
#: bzrlib/shelf_ui.py:265
6814
msgid "You need a controlling terminal."
6815
msgstr ""
6816
6817
#: bzrlib/shelf_ui.py:415
7639
#: bzrlib/shelf_ui.py:402
6818
7640
msgid "No changes are shelved."
6819
7641
msgstr ""
6820
7642
6821
#: bzrlib/shelf_ui.py:473
7643
#: bzrlib/shelf_ui.py:460
6822
7644
#, python-format
6823
7645
msgid "Using changes with id \"%d\"."
6824
7646
msgstr ""
6825
7647
6826
#: bzrlib/shelf_ui.py:477
7648
#: bzrlib/shelf_ui.py:464
6827
7649
#, python-format
6828
7650
msgid "Message: %s"
6829
7651
msgstr ""
6830
7652
6831
#: bzrlib/shelf_ui.py:489
7653
#: bzrlib/shelf_ui.py:476
6832
7654
#, python-format
6833
7655
msgid "Deleted changes with id \"%d\"."
6834
7656
msgstr ""
6835
7657
6836
#: bzrlib/smart/medium.py:565
7658
#: bzrlib/smart/medium.py:714
6837
7659
msgid "HPSS calls: {0} ({1} vfs) {2}"
6838
7660
msgstr ""
6839
7661
6840
#: bzrlib/smart/server.py:355
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
7673
msgid "Requested to stop gracefully"
7674
msgstr ""
7675
7676
#: bzrlib/smart/server.py:179
7677
#, python-format
7678
msgid "Waiting for %d client(s) to finish"
7679
msgstr ""
7680
7681
#: bzrlib/smart/server.py:185
7682
#, python-format
7683
msgid "Still waiting for %d client(s) to finish"
7684
msgstr ""
7685
7686
#: bzrlib/smart/server.py:219
7687
#, python-format
7688
msgid "listening socket error: %s"
7689
msgstr ""
7690
7691
#: bzrlib/smart/server.py:452
6841
7692
#, python-format
6842
7693
msgid "listening on port: %s"
6843
7694
msgstr ""
6844
7695
6845
#: bzrlib/switch.py:67
7696
#: bzrlib/switch.py:84
6846
7697
msgid "Pending merges must be committed or reverted before using switch."
6847
7698
msgstr ""
6848
7699
6849
#: bzrlib/switch.py:94
7700
#: bzrlib/switch.py:111
6850
7701
msgid ""
6851
7702
"Cannot switch as local commits found in the checkout. Commit these to the "
6852
7703
"bound branch or use --force to throw them away."
6853
7704
msgstr ""
6854
7705
6855
#: bzrlib/switch.py:99
7706
#: bzrlib/switch.py:116
6856
7707
#, python-format
6857
7708
msgid ""
6858
7709
"Unable to connect to current master branch %(target)s: %(error)s To switch "
6859
7710
"anyway, use --force."
6860
7711
msgstr ""
6861
7712
6862
#: bzrlib/switch.py:108
7713
#: bzrlib/switch.py:140
6863
7714
msgid "Cannot switch a branch, only a checkout."
6864
7715
msgstr ""
6865
7716
6866
#: bzrlib/switch.py:144
7717
#: bzrlib/switch.py:183
6867
7718
#, python-format
6868
7719
msgid "Tree is up to date at revision %d."
6869
7720
msgstr ""
6870
7721
6871
#: bzrlib/switch.py:150
7722
#: bzrlib/switch.py:190
6872
7723
#, python-format
6873
7724
msgid "Updated to revision %d."
6874
7725
msgstr ""
6875
7726
6876
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7727
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
6877
7728
msgid "Apply phase"
6878
7729
msgstr ""
6879
7730
6880
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7731
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
6881
7732
msgid "removing file"
6882
7733
msgstr ""
6883
7734
6884
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7735
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
6885
7736
msgid "adding file"
6886
7737
msgstr ""
6887
7738
6888
#: bzrlib/transform.py:2587
7739
#: bzrlib/transform.py:2598
6889
7740
msgid "Building tree"
6890
7741
msgstr ""
6891
7742
6892
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7743
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
6893
7744
msgid "Adding file contents"
6894
7745
msgstr ""
6895
7746
6896
#: bzrlib/transform.py:3051
7747
#: bzrlib/transform.py:3017
6897
7748
msgid "Resolution pass"
6898
7749
msgstr ""
6899
7750
6900
#: bzrlib/tree.py:635
7751
#: bzrlib/transport/ftp/_gssapi.py:88
7752
#, python-format
7753
msgid "Authenticated as %s"
7754
msgstr ""
7755
7756
#: bzrlib/tree.py:647
6901
7757
msgid "*** {0} content-filter: {1} => {2!r}"
6902
7758
msgstr ""
6903
7759
6904
#: bzrlib/upgrade.py:76
7760
#: bzrlib/upgrade.py:77
6905
7761
#, python-format
6906
7762
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
6907
7763
msgstr ""
6908
7764
6909
#: bzrlib/upgrade.py:99
7765
#: bzrlib/upgrade.py:100
6910
7766
#, python-format
6911
7767
msgid "cannot upgrade from bzrdir format %s"
6912
7768
msgstr ""
6913
7769
6914
#: bzrlib/upgrade.py:102
7770
#: bzrlib/upgrade.py:103
6915
7771
#, python-format
6916
7772
msgid "starting upgrade of %s"
6917
7773
msgstr ""
6918
7774
6919
#: bzrlib/upgrade.py:109
7775
#: bzrlib/upgrade.py:110
6920
7776
msgid "finished"
6921
7777
msgstr ""
6922
7778
6923
#: bzrlib/upgrade.py:119
7779
#: bzrlib/upgrade.py:120
6924
7780
msgid "Deleting backup.bzr"
6925
7781
msgstr ""
6926
7782
6927
#: bzrlib/upgrade.py:150
7783
#: bzrlib/upgrade.py:151
6928
7784
msgid ""
6929
7785
"\n"
6930
7786
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
6931
7787
msgstr ""
6932
7788
6933
#: bzrlib/upgrade.py:207
7789
#: bzrlib/upgrade.py:208
6934
7790
#, python-format
6935
7791
msgid "Found %d dependent branches - upgrading ..."
6936
7792
msgstr ""
6937
7793
6938
#: bzrlib/upgrade.py:275
7794
#: bzrlib/upgrade.py:276
6939
7795
msgid "Upgrading bzrdirs"
6940
7796
msgstr ""
6941
7797
6942
#: bzrlib/upgrade.py:281
7798
#: bzrlib/upgrade.py:282
6943
7799
#, python-format
6944
7800
msgid "Upgrading %s"
6945
7801
msgstr ""
6946
7802
6947
#: bzrlib/upgrade.py:282
7803
#: bzrlib/upgrade.py:283
6948
7804
msgid "Upgrading {0} {1} ..."
6949
7805
msgstr ""
6950
7806
6951
#: bzrlib/upgrade.py:296
7807
#: bzrlib/upgrade.py:301
6952
7808
msgid "Removing backup ..."
6953
7809
msgstr ""
6954
7810
6955
#: bzrlib/upgrade.py:300
7811
#: bzrlib/upgrade.py:305
6956
7812
msgid "failed to clean-up {0}: {1}"
6957
7813
msgstr ""
6958
7814
6964
7820
msgid "texts"
6965
7821
msgstr ""
6966
7822
6967
#: bzrlib/vf_repository.py:1572 bzrlib/vf_repository.py:1581
7823
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
6968
7824
msgid "Calculating text parents"
6969
7825
msgstr ""
6970
7826
6971
#: bzrlib/vf_repository.py:1657
7827
#: bzrlib/vf_repository.py:1707
6972
7828
msgid "Fetch texts"
6973
7829
msgstr ""
6974
7830
6975
#: bzrlib/vf_repository.py:2468
7831
#: bzrlib/vf_repository.py:2536
6976
7832
msgid "loading text store"
6977
7833
msgstr ""
6978
7834
6979
#: bzrlib/vf_repository.py:2474
7835
#: bzrlib/vf_repository.py:2542
6980
7836
msgid "checking text graph"
6981
7837
msgstr ""
6982
7838
6983
#: bzrlib/vf_repository.py:2924 bzrlib/vf_repository.py:2938
6984
#: bzrlib/vf_repository.py:3053
7839
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7840
#: bzrlib/vf_repository.py:3127
6985
7841
msgid "Transferring revisions"
6986
7842
msgstr ""
6987
7843
6988
#: bzrlib/win32utils.py:132
7844
#: bzrlib/win32utils.py:146
6989
7845
msgid "Failed to GetProcessMemoryInfo()"
6990
7846
msgstr ""
6991
7847
6992
#: bzrlib/win32utils.py:153
7848
#: bzrlib/win32utils.py:167
6993
7849
msgid "Cannot debug memory on win32 without ctypes or win32process"
6994
7850
msgstr ""
6995
7851
6996
#: bzrlib/win32utils.py:158
7852
#: bzrlib/win32utils.py:172
6997
7853
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
6998
7854
msgstr ""
6999
7855
7000
#: bzrlib/win32utils.py:166
7856
#: bzrlib/win32utils.py:180
7001
7857
#, python-format
7002
7858
msgid "WorkingSize %8d KiB"
7003
7859
msgstr ""
7004
7860
7005
#: bzrlib/win32utils.py:167
7861
#: bzrlib/win32utils.py:181
7006
7862
#, python-format
7007
7863
msgid "PeakWorking %8d KiB"
7008
7864
msgstr ""
7009
7865
7010
#: bzrlib/win32utils.py:168
7866
#: bzrlib/win32utils.py:182
7011
7867
#, python-format
7012
7868
msgid "PagefileUsage %8d KiB"
7013
7869
msgstr ""
7014
7870
7015
#: bzrlib/win32utils.py:169
7871
#: bzrlib/win32utils.py:183
7016
7872
#, python-format
7017
7873
msgid "PeakPagefileUsage %8d KiB"
7018
7874
msgstr ""
7019
7875
7020
#: bzrlib/win32utils.py:171
7876
#: bzrlib/win32utils.py:185
7021
7877
#, python-format
7022
7878
msgid "PrivateUsage %8d KiB"
7023
7879
msgstr ""
7024
7880
7025
#: bzrlib/win32utils.py:172
7881
#: bzrlib/win32utils.py:186
7026
7882
#, python-format
7027
7883
msgid "PageFaultCount %8d"
7028
7884
msgstr ""
7029
7885
7030
#: bzrlib/workingtree.py:1502
7886
#: bzrlib/workingtree.py:1516
7031
7887
msgid "Rerun update after fixing the conflicts."
7032
7888
msgstr ""
7033
7889
7037
7893
7038
7894
#: dummy/help_topics/basic/detail.txt:1
7039
7895
msgid ""
7040
"Bazaar 2.5.0dev2 -- a free distributed version-control tool\n"
7896
"Bazaar 2.6.0 -- a free distributed version-control tool\n"
7041
7897
"http://bazaar.canonical.com/"
7042
7898
msgstr ""
7043
7899
7108
7964
msgstr ""
7109
7965
7110
7966
#: dummy/help_topics/branches/detail.txt:15
7967
#: dummy/help_topics/checkouts/detail.txt:66
7968
#: dummy/help_topics/repositories/detail.txt:36
7111
7969
msgid "Related commands::"
7112
7970
msgstr ""
7113
7971
7353
8211
msgid "How to fix diverged branches"
7354
8212
msgstr ""
7355
8213
7356
#: dummy/help_topics/env-variables/detail.txt:1
7357
msgid "Environment Variables"
7358
msgstr ""
7359
7360
#: dummy/help_topics/env-variables/detail.txt:3
7361
msgid ""
7362
"=================== "
7363
"===========================================================\n"
7364
"BZRPATH Path where bzr is to look for shell plugin external\n"
7365
" commands.\n"
7366
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7367
"EMAIL E-Mail address of the user.\n"
7368
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7369
"EDITOR Editor for editing commit messages.\n"
7370
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7371
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7372
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7373
"BZR_PLUGIN_PATH.\n"
7374
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7375
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7376
"and\n"
7377
" HOME.\n"
7378
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7379
"URLs).\n"
7380
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7381
"sshcorp,\n"
7382
" plink or lsh.\n"
7383
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7384
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7385
"BZR_COLUMNS Override implicit terminal width.\n"
7386
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7387
"(selftest)\n"
7388
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7389
"'text'.\n"
7390
"BZR_PDB Control whether to launch a debugger on error.\n"
7391
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7392
" breakin debugger.\n"
7393
"=================== "
7394
"===========================================================\n"
7395
msgstr ""
7396
7397
8214
#: dummy/help_topics/env-variables/summary.txt:1
7398
8215
msgid "Environment variable names and values"
7399
8216
msgstr ""
7533
8350
7534
8351
#: dummy/help_topics/global-options/detail.txt:24
7535
8352
msgid ""
8353
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8354
"for\n"
8355
" the duration of the command. This can be used multiple times "
8356
"if\n"
8357
" several options need to be overridden."
8358
msgstr ""
8359
8360
#: dummy/help_topics/global-options/detail.txt:28
8361
msgid ""
7536
8362
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7537
8363
"information on profiling."
7538
8364
msgstr ""
7539
8365
7540
#: dummy/help_topics/global-options/detail.txt:27
8366
#: dummy/help_topics/global-options/detail.txt:31
7541
8367
msgid ""
7542
8368
"A number of debug flags are also available to assist troubleshooting and\n"
7543
8369
"development. See :doc:`debug-flags-help`.\n"
8384
9210
msgid " bzr commit --fixes <tracker>:<id>"
8385
9211
msgstr ""
8386
9212
8387
#: en/help_topics/bugs.txt:13
9213
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8388
9214
msgid "or::"
8389
9215
msgstr ""
8390
9216
8553
9379
8554
9380
#: en/help_topics/commands.txt:1
8555
9381
msgid ""
8556
"add Add specified files or directories.\n"
8557
"alias Set/unset and display aliases.\n"
8558
"annotate Show the origin of each line in a file.\n"
8559
"bash-completion Generate a shell function for bash command line "
9382
"add Add specified files or directories.\n"
9383
"alias Set/unset and display aliases.\n"
9384
"annotate Show the origin of each line in a file.\n"
9385
"bash-completion Generate a shell function for bash command line "
8560
9386
"completion.\n"
8561
" [bash_completion]\n"
8562
"bd-do Run a command in an exported package, copying the result\n"
8563
" back. [builddeb]\n"
8564
"bind Convert the current branch into a checkout of the "
8565
"supplied\n"
8566
" branch.\n"
8567
"branch Create a new branch that is a copy of an existing "
8568
"branch.\n"
8569
"branch-history Display the development history of a branch. [bzrtools]\n"
8570
"branches Scan a location for branches [bzrtools]\n"
8571
"break-lock Break a dead lock.\n"
8572
"bug-url Print full URL to a specific bug, or open it in your\n"
8573
" browser. [qbzr]\n"
8574
"builddeb Builds a Debian package from a branch. [builddeb]\n"
8575
"cat Write the contents of a file as of a given revision to\n"
8576
" standard output.\n"
8577
"cbranch Create a new checkout, associated with a new repository\n"
8578
" branch. [bzrtools]\n"
8579
"cdiff A color version of bzr's diff [bzrtools]\n"
8580
"check Validate working tree structure, branch consistency and\n"
8581
" repository history.\n"
8582
"checkout Create a new checkout of an existing branch.\n"
8583
"clean-tree Remove unwanted files from working tree.\n"
8584
"commit Commit changes into a new revision.\n"
8585
"config Display, set or remove a configuration option.\n"
8586
"conflict-diff Compare a conflicted file against BASE. [bzrtools]\n"
8587
"conflicts List files with conflicts.\n"
8588
"create-mirror Create a mirror of another branch. [bzrtools]\n"
8589
"deleted List files deleted in the working tree.\n"
8590
"dep3-patch Format the changes in a branch as a DEP-3 patch. "
8591
"[builddeb]\n"
8592
"dh-make Helps you create a new package. [builddeb]\n"
8593
"diff Show differences in the working tree, between revisions "
8594
"or\n"
8595
" branches.\n"
8596
"explorer Desktop application for Bazaar. [explorer]\n"
8597
"export Export current or past revision to a destination "
8598
"directory\n"
8599
" or archive.\n"
8600
"fetch-ghosts Attempt to retrieve ghosts from another branch. "
8601
"[bzrtools]\n"
8602
"graph-ancestry Produce ancestry graphs using dot. [bzrtools]\n"
8603
"heads Show all revisions in a repository not having "
8604
"descendants.\n"
8605
" [bzrtools]\n"
8606
"help Show help on a command or other topic.\n"
8607
"ignore Ignore specified files or patterns.\n"
8608
"ignored List ignored files and the patterns that matched them.\n"
8609
"import Import sources from a directory, tarball or zip file\n"
8610
" [bzrtools]\n"
8611
"import-dsc Import a series of source packages. [builddeb]\n"
8612
"import-upstream Imports an upstream tarball. [builddeb]\n"
8613
"info Show information about a working tree, branch or "
8614
"repository.\n"
8615
"init Make a directory into a versioned branch.\n"
8616
"init-repository Create a shared repository for branches to share storage\n"
8617
" space.\n"
8618
"init-workspace Start a new workspace. [explorer]\n"
8619
"join Combine a tree into its containing tree.\n"
8620
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
8621
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
8622
"launchpad-open Open a Launchpad branch page in your web browser.\n"
8623
" [launchpad]\n"
8624
"link-tree Hardlink matching files to another tree. [bzrtools]\n"
8625
"log Show historical log for a branch or subset of a branch.\n"
8626
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
8627
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
8628
"ls List files in a tree.\n"
8629
"mark-uploaded Mark that this branch has been uploaded, prior to "
8630
"pushing\n"
8631
" it. [builddeb]\n"
8632
"merge Perform a three-way merge.\n"
8633
"merge-package Merges source packaging branch into target packaging "
8634
"branch.\n"
8635
" [builddeb]\n"
8636
"merge-upstream Merges a new upstream version into the current branch.\n"
8637
" [builddeb]\n"
8638
"missing Show unmerged/unpulled revisions between two branches.\n"
8639
"mkdir Create a new versioned directory.\n"
8640
"multi-pull Pull all the branches under a location, e.g. a "
8641
"repository.\n"
8642
" [bzrtools]\n"
8643
"mv Move or rename a file.\n"
8644
"nick Print or set the branch nickname.\n"
8645
"pack Compress the data within a repository.\n"
8646
"patch Apply a named patch to the current tree. [bzrtools]\n"
8647
"plugins List the installed plugins.\n"
8648
"pull Turn this branch into a mirror of another branch.\n"
8649
"push Update a mirror of this branch.\n"
8650
"qadd GUI for adding files or directories. [qbzr]\n"
8651
"qannotate Show the origin of each line in a file. [qbzr]\n"
8652
"qbind Convert the current branch into a checkout of the "
8653
"supplied\n"
8654
" branch. [qbzr]\n"
8655
"qbranch Create a new copy of a branch. [qbzr]\n"
8656
"qbrowse Show inventory or working tree. [qbzr]\n"
8657
"qcat View the contents of a file as of a given revision. "
8658
"[qbzr]\n"
8659
"qcommit GUI for committing revisions. [qbzr]\n"
8660
"qconfig Configure Bazaar and QBzr. [qbzr]\n"
8661
"qconflicts Show conflicts. [qbzr]\n"
8662
"qdiff Show differences in working tree in a GUI window. [qbzr]\n"
8663
"qexport Export current or past revision to a destination "
8664
"directory\n"
8665
" or archive. [qbzr]\n"
8666
"qgetnew Creates a new working tree (either a checkout or full\n"
8667
" branch). [qbzr]\n"
8668
"qgetupdates Fetches external changes into the working tree. [qbzr]\n"
8669
"qinfo Shows information about the current location. [qbzr]\n"
8670
"qinit Initializes a new branch or shared repository. [qbzr]\n"
8671
"qinit-workspace Start a new workspace using a GUI. [explorer]\n"
8672
"qlog Show log of a repository, branch, file, or directory in a "
8673
"Qt\n"
8674
" window. [qbzr]\n"
8675
"qmerge Perform a three-way merge. [qbzr]\n"
8676
"qplugins Show information about installed plugins. [qbzr]\n"
8677
"qpull Turn this branch into a mirror of another branch. [qbzr]\n"
8678
"qpush Update a mirror of this branch. [qbzr]\n"
8679
"qrevert Revert changes files. [qbzr]\n"
8680
"qrun Run arbitrary bzr command. [qbzr]\n"
8681
"qsend Mail or create a merge-directive for submitting changes.\n"
8682
" [qbzr]\n"
8683
"qshelve Shelve selected changes away. [qbzr]\n"
8684
"qswitch Set the branch of a checkout and update. [qbzr]\n"
8685
"qtag Edit tags. [qbzr]\n"
8686
"qunbind Convert the current checkout into a regular branch. "
8687
"[qbzr]\n"
8688
"quncommit Move the tip of a branch to an earlier revision. [qbzr]\n"
8689
"qunshelve Restore shalved changes. [qbzr]\n"
8690
"qupdate Update working tree with latest changes in the branch.\n"
8691
" [qbzr]\n"
8692
"qverify-signatures Shows digital signature statuses for branch commits "
8693
"[qbzr]\n"
8694
"qversion Show version/system information. [qbzr]\n"
8695
"qviewer Simple file viewer. [qbzr]\n"
8696
"reconcile Reconcile bzr metadata in a branch.\n"
8697
"reconfigure Reconfigure the type of a bzr directory.\n"
8698
"register-branch Register a branch with launchpad.net. [launchpad]\n"
8699
"remerge Redo a merge.\n"
8700
"remove Remove files or directories.\n"
8701
"remove-branch Remove a branch.\n"
8702
"remove-tree Remove the working tree from a given branch/checkout.\n"
8703
"renames Show list of renamed files.\n"
8704
"resolve Mark a conflict as resolved.\n"
8705
"revert Revert files to a previous revision.\n"
8706
"revno Show current revision number.\n"
8707
"root Show the tree root directory.\n"
8708
"rspush Upload this branch to another location using rsync.\n"
8709
" [bzrtools]\n"
8710
"send Mail or create a merge-directive for submitting changes.\n"
8711
"serve Run the bzr server.\n"
8712
"shelf1 Perform various operations on your shelved patches. See "
8713
"also\n"
8714
" shelve1. [bzrtools]\n"
8715
"shell Begin an interactive shell tailored for bzr. [bzrtools]\n"
8716
"shelve Temporarily set aside some changes from the current "
8717
"tree.\n"
8718
"shelve1 Temporarily set aside some changes from the current "
8719
"tree.\n"
8720
" [bzrtools]\n"
8721
"sign-my-commits Sign all commits by a given committer.\n"
8722
"split Split a subdirectory of a tree into a separate tree.\n"
8723
"status Display status summary.\n"
8724
"switch Set the branch of a checkout and update.\n"
8725
"tag Create, remove or modify a tag naming a revision.\n"
8726
"tags List tags.\n"
8727
"testament Show testament (signing-form) of a revision.\n"
8728
"trees Scan a location for trees [bzrtools]\n"
8729
"unbind Convert the current checkout into a regular branch.\n"
8730
"uncommit Remove the last committed revision.\n"
8731
"unshelve Restore shelved changes.\n"
8732
"unshelve1 Restore shelved changes. [bzrtools]\n"
8733
"update Update a tree to have the latest code committed to its\n"
8734
" branch.\n"
8735
"upgrade Upgrade a repository, branch or working tree to a newer\n"
8736
" format.\n"
8737
"verify-signatures Verify all commit signatures.\n"
8738
"version Show version of bzr.\n"
8739
"version-info Show version information about this tree.\n"
8740
"view Manage filtered views.\n"
8741
"whoami Show or set bzr user id.\n"
8742
"zap Remove a lightweight checkout, if it can be done safely.\n"
8743
" [bzrtools]\n"
9387
" [bash_completion]\n"
9388
"bind Convert the current branch into a checkout of the "
9389
"supplied\n"
9390
" branch.\n"
9391
"branch Create a new branch that is a copy of an existing branch.\n"
9392
"branches List the branches available at the current location.\n"
9393
"break-lock Break a dead lock.\n"
9394
"cat Write the contents of a file as of a given revision to\n"
9395
" standard output.\n"
9396
"check Validate working tree structure, branch consistency and\n"
9397
" repository history.\n"
9398
"checkout Create a new checkout of an existing branch.\n"
9399
"clean-tree Remove unwanted files from working tree.\n"
9400
"commit Commit changes into a new revision.\n"
9401
"config Display, set or remove a configuration option.\n"
9402
"conflicts List files with conflicts.\n"
9403
"deleted List files deleted in the working tree.\n"
9404
"diff Show differences in the working tree, between revisions "
9405
"or\n"
9406
" branches.\n"
9407
"dpush Push into a different VCS without any custom bzr "
9408
"metadata.\n"
9409
"export Export current or past revision to a destination directory "
9410
"or\n"
9411
" archive.\n"
9412
"grep Print lines matching PATTERN for specified files and\n"
9413
" revisions. [grep]\n"
9414
"help Show help on a command or other topic.\n"
9415
"ignore Ignore specified files or patterns.\n"
9416
"ignored List ignored files and the patterns that matched them.\n"
9417
"info Show information about a working tree, branch or "
9418
"repository.\n"
9419
"init Make a directory into a versioned branch.\n"
9420
"init-repository Create a shared repository for branches to share storage\n"
9421
" space.\n"
9422
"join Combine a tree into its containing tree.\n"
9423
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9424
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9425
"launchpad-open Open a Launchpad branch page in your web browser. "
9426
"[launchpad]\n"
9427
"log Show historical log for a branch or subset of a branch.\n"
9428
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9429
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9430
"ls List files in a tree.\n"
9431
"merge Perform a three-way merge.\n"
9432
"missing Show unmerged/unpulled revisions between two branches.\n"
9433
"mkdir Create a new versioned directory.\n"
9434
"mv Move or rename a file.\n"
9435
"nick Print or set the branch nickname.\n"
9436
"pack Compress the data within a repository.\n"
9437
"ping Pings a Bazaar smart server.\n"
9438
"plugins List the installed plugins.\n"
9439
"pull Turn this branch into a mirror of another branch.\n"
9440
"push Update a mirror of this branch.\n"
9441
"reconcile Reconcile bzr metadata in a branch.\n"
9442
"reconfigure Reconfigure the type of a bzr directory.\n"
9443
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9444
"remerge Redo a merge.\n"
9445
"remove Remove files or directories.\n"
9446
"remove-branch Remove a branch.\n"
9447
"remove-tree Remove the working tree from a given branch/checkout.\n"
9448
"renames Show list of renamed files.\n"
9449
"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"
9452
"revno Show current revision number.\n"
9453
"root Show the tree root directory.\n"
9454
"send Mail or create a merge-directive for submitting changes.\n"
9455
"serve Run the bzr server.\n"
9456
"shelve Temporarily set aside some changes from the current tree.\n"
9457
"sign-my-commits Sign all commits by a given committer.\n"
9458
"split Split a subdirectory of a tree into a separate tree.\n"
9459
"status Display status summary.\n"
9460
"switch Set the branch of a checkout and update.\n"
9461
"tag Create, remove or modify a tag naming a revision.\n"
9462
"tags List tags.\n"
9463
"testament Show testament (signing-form) of a revision.\n"
9464
"unbind Convert the current checkout into a regular branch.\n"
9465
"uncommit Remove the last committed revision.\n"
9466
"unshelve Restore shelved changes.\n"
9467
"update Update a working tree to a new revision.\n"
9468
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9469
" format.\n"
9470
"verify-signatures Verify all commit signatures.\n"
9471
"version Show version of bzr.\n"
9472
"version-info Show version information about this tree.\n"
9473
"view Manage filtered views.\n"
9474
"whoami Show or set bzr user id.\n"
8744
9475
msgstr ""
8745
9476
8746
9477
#: en/help_topics/configuration.txt:1
9170
9901
#: en/help_topics/configuration.txt:223
9171
9902
msgid ""
9172
9903
"An ini file has three types of contructs: section headers, section\n"
9173
"variables and comments."
9904
"options and comments."
9174
9905
msgstr ""
9175
9906
9176
9907
#: en/help_topics/configuration.txt:226
9207
9938
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9208
9939
"[ALIASES]. Section headers are case sensitive. The default section provides "
9209
9940
"for\n"
9210
"setting variables which can be overridden with the branch config file."
9941
"setting options which can be overridden with the branch config file."
9211
9942
msgstr ""
9212
9943
9213
9944
#: en/help_topics/configuration.txt:245
9214
9945
msgid ""
9215
"For ``locations.conf``, the variables from the section with the\n"
9946
"For ``locations.conf``, the options from the section with the\n"
9216
9947
"longest matching section header are used to the exclusion of other\n"
9217
9948
"potentially valid section headers. A section header uses the path for\n"
9218
9949
"the branch as the section header. Some examples include::"
9227
9958
#: en/help_topics/configuration.txt:253
9228
9959
msgid ""
9229
9960
"\n"
9230
"Section variables\n"
9231
"^^^^^^^^^^^^^^^^^"
9961
"Section options\n"
9962
"^^^^^^^^^^^^^^^"
9232
9963
msgstr ""
9233
9964
9234
9965
#: en/help_topics/configuration.txt:257
9235
9966
msgid ""
9236
"A section variable resides within a section. A section variable contains a\n"
9237
"variable name, an equals sign and a value. For example::"
9967
"A section option resides within a section. A section option contains an\n"
9968
"option name, an equals sign and a value. For example::"
9238
9969
msgstr ""
9239
9970
9240
9971
#: en/help_topics/configuration.txt:260
9245
9976
9246
9977
#: en/help_topics/configuration.txt:263
9247
9978
msgid ""
9248
"A variable can reference other variables **in the same configuration file** "
9249
"by\n"
9250
"enclosing them in curly brackets::"
9979
"A option can reference other options by enclosing them in curly brackets::"
9251
9980
msgstr ""
9252
9981
9253
#: en/help_topics/configuration.txt:266
9982
#: en/help_topics/configuration.txt:265
9254
9983
msgid ""
9255
9984
" my_branch_name = feature_x\n"
9256
9985
" my_server = bzr+ssh://example.com\n"
9257
9986
" push_location = {my_server}/project/{my_branch_name}"
9258
9987
msgstr ""
9259
9988
9260
#: en/help_topics/configuration.txt:270
9989
#: en/help_topics/configuration.txt:269
9261
9990
msgid ""
9262
"\n"
9263
"Variable policies\n"
9264
"^^^^^^^^^^^^^^^^^"
9991
"Option policies\n"
9992
"^^^^^^^^^^^^^^^"
9265
9993
msgstr ""
9266
9994
9267
#: en/help_topics/configuration.txt:274
9995
#: en/help_topics/configuration.txt:272
9268
9996
msgid ""
9269
"Variables defined in a section affect the named directory or URL plus\n"
9270
"any locations they contain. Policies can be used to change how a\n"
9271
"variable value is interpreted for contained locations. Currently\n"
9997
"Options defined in a section affect the named directory or URL plus\n"
9998
"any locations they contain. Policies can be used to change how an\n"
9999
"option value is interpreted for contained locations. Currently\n"
9272
10000
"there are three policies available:"
9273
10001
msgstr ""
9274
10002
9275
#: en/help_topics/configuration.txt:279
10003
#: en/help_topics/configuration.txt:277
9276
10004
msgid ""
9277
10005
" none:\n"
9278
10006
" the value is interpreted the same for contained locations. This is\n"
9285
10013
" appended to the value."
9286
10014
msgstr ""
9287
10015
9288
#: en/help_topics/configuration.txt:289
10016
#: en/help_topics/configuration.txt:287
9289
10017
msgid ""
9290
"Policies are specified by keys with names of the form \"$var:policy\".\n"
10018
"Policies are specified by keys with names of the form \"<option_name>:policy"
10019
"\".\n"
9291
10020
"For example, to define the push location for a tree of branches, the\n"
9292
10021
"following could be used::"
9293
10022
msgstr ""
9294
10023
9295
#: en/help_topics/configuration.txt:293
10024
#: en/help_topics/configuration.txt:291
9296
10025
msgid ""
9297
10026
" [/top/location]\n"
9298
10027
" push_location = sftp://example.com/location\n"
9299
10028
" push_location:policy = appendpath"
9300
10029
msgstr ""
9301
10030
9302
#: en/help_topics/configuration.txt:297
10031
#: en/help_topics/configuration.txt:295
9303
10032
msgid ""
9304
10033
"With this configuration, the push location for ``/top/location/branch1``\n"
9305
10034
"would be ``sftp://example.com/location/branch1``."
9306
10035
msgstr ""
9307
10036
9308
#: en/help_topics/configuration.txt:300
10037
#: en/help_topics/configuration.txt:298
10038
msgid ""
10039
"Section local options\n"
10040
"^^^^^^^^^^^^^^^^^^^^^"
10041
msgstr ""
10042
10043
#: en/help_topics/configuration.txt:301
10044
msgid ""
10045
"Some options are defined automatically inside a given section and can be\n"
10046
"refered to in this section only. "
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:304
10050
msgid "For example, the ``appendpath`` policy can be used like this::"
10051
msgstr ""
10052
10053
#: en/help_topics/configuration.txt:306
10054
msgid ""
10055
" [/home/vila/src/bzr/bugs]\n"
10056
" mypush = lp:~vila/bzr\n"
10057
" mypush:policy=appendpath"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:310
10061
msgid "Using ``relpath`` to achieve the same result is done like this::"
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:312
10065
msgid ""
10066
" [/home/vila/src/bzr/bugs]\n"
10067
" mypush = lp:~vila/bzr/{relpath}"
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:315
10071
msgid ""
10072
"In both cases, when used in a directory like\n"
10073
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10074
msgstr ""
10075
10076
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10077
msgid ""
10078
" $ bzr config mypush\n"
10079
" lp:~vila/bzr/832013-expand-in-stack"
10080
msgstr ""
10081
10082
#: en/help_topics/configuration.txt:321
10083
msgid "Another such option is ``basename`` which can be used like this::"
10084
msgstr ""
10085
10086
#: en/help_topics/configuration.txt:323
10087
msgid ""
10088
" [/home/vila/src/bzr]\n"
10089
" mypush = lp:~vila/bzr/{basename}"
10090
msgstr ""
10091
10092
#: en/help_topics/configuration.txt:326
10093
msgid ""
10094
"When used in a directory like\n"
10095
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10096
msgstr ""
10097
10098
#: en/help_topics/configuration.txt:332
10099
msgid ""
10100
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10101
"itself is defined as the relative path between the section name and the\n"
10102
"location it matches."
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:336
10106
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
"When an option is local to a Section, it cannot be referred to from option\n"
10135
"values in any other section from the same ``Store`` nor from any other\n"
10136
"``Store``."
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:352
9309
10140
msgid ""
9310
10141
"\n"
9311
10142
"The main configuration file, bazaar.conf\n"
9312
10143
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9313
10144
msgstr ""
9314
10145
9315
#: en/help_topics/configuration.txt:304
10146
#: en/help_topics/configuration.txt:356
9316
10147
msgid ""
9317
10148
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9318
10149
"The default section contains the default\n"
9320
10151
"overriden by providing a branch-specific section in ``locations.conf``."
9321
10152
msgstr ""
9322
10153
9323
#: en/help_topics/configuration.txt:309
10154
#: en/help_topics/configuration.txt:361
9324
10155
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9325
10156
msgstr ""
9326
10157
9327
#: en/help_topics/configuration.txt:311
10158
#: en/help_topics/configuration.txt:363
9328
10159
msgid ""
9329
10160
" [DEFAULT]\n"
9330
10161
" email = John Doe <jdoe@isp.com>\n"
9332
10163
" create_signatures = when-required"
9333
10164
msgstr ""
9334
10165
9335
#: en/help_topics/configuration.txt:316
10166
#: en/help_topics/configuration.txt:368
9336
10167
msgid ""
9337
10168
"\n"
9338
10169
"The branch location configuration file, locations.conf\n"
9339
10170
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9340
10171
msgstr ""
9341
10172
9342
#: en/help_topics/configuration.txt:320
10173
#: en/help_topics/configuration.txt:372
9343
10174
msgid ""
9344
10175
"``locations.conf`` allows one to specify overriding settings for\n"
9345
10176
"a specific branch. The format is almost identical to the default section in\n"
9349
10180
"for. The '?' and '*' wildcards are supported::"
9350
10181
msgstr ""
9351
10182
9352
#: en/help_topics/configuration.txt:326
10183
#: en/help_topics/configuration.txt:378
9353
10184
msgid ""
9354
10185
" [/home/jdoe/branches/nethack]\n"
9355
10186
" email = Nethack Admin <nethack@nethack.com>"
9356
10187
msgstr ""
9357
10188
9358
#: en/help_topics/configuration.txt:329
10189
#: en/help_topics/configuration.txt:381
9359
10190
msgid ""
9360
10191
" [http://hypothetical.site.com/branches/devel-branch]\n"
9361
10192
" create_signatures = always"
9362
10193
msgstr ""
9363
10194
9364
#: en/help_topics/configuration.txt:332
10195
#: en/help_topics/configuration.txt:384
9365
10196
msgid ""
9366
10197
"The authentication configuration file, authentication.conf\n"
9367
10198
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9368
10199
msgstr ""
9369
10200
9370
#: en/help_topics/configuration.txt:335
10201
#: en/help_topics/configuration.txt:387
9371
10202
msgid ""
9372
10203
"``authentication.conf`` allows one to specify credentials for\n"
9373
10204
"remote servers. This can be used for all the supported transports and any "
9375
10206
"of bzr that requires authentication (smtp for example)."
9376
10207
msgstr ""
9377
10208
9378
#: en/help_topics/configuration.txt:339
10209
#: en/help_topics/configuration.txt:391
9379
10210
msgid ""
9380
10211
"The syntax of the file obeys the same rules as the others except for the\n"
9381
"variable policies which don't apply."
10212
"option policies which don't apply."
9382
10213
msgstr ""
9383
10214
9384
#: en/help_topics/configuration.txt:342
10215
#: en/help_topics/configuration.txt:394
9385
10216
msgid ""
9386
10217
"For more information on the possible uses of the authentication "
9387
10218
"configuration\n"
9388
10219
"file see :doc:`authentication-help`."
9389
10220
msgstr ""
9390
10221
9391
#: en/help_topics/configuration.txt:345
10222
#: en/help_topics/configuration.txt:397
9392
10223
msgid ""
9393
10224
"\n"
9394
"Common variable options\n"
9395
"-----------------------"
10225
"Common options\n"
10226
"--------------"
9396
10227
msgstr ""
9397
10228
9398
#: en/help_topics/configuration.txt:349
10229
#: en/help_topics/configuration.txt:401
9399
10230
msgid ""
9400
10231
"debug_flags\n"
9401
10232
"~~~~~~~~~~~"
9402
10233
msgstr ""
9403
10234
9404
#: en/help_topics/configuration.txt:352
10235
#: en/help_topics/configuration.txt:404
9405
10236
msgid ""
9406
10237
"A comma-separated list of debugging options to turn on. The same values\n"
9407
10238
"can be used as with the -D command-line option (see `help global-options`).\n"
9408
10239
"For example::"
9409
10240
msgstr ""
9410
10241
9411
#: en/help_topics/configuration.txt:356
10242
#: en/help_topics/configuration.txt:408
9412
10243
msgid " debug_flags = hpss"
9413
10244
msgstr ""
9414
10245
9415
#: en/help_topics/configuration.txt:360
10246
#: en/help_topics/configuration.txt:412
9416
10247
msgid " debug_flags = hpss,evil"
9417
10248
msgstr ""
9418
10249
9419
#: en/help_topics/configuration.txt:362
10250
#: en/help_topics/configuration.txt:414
9420
10251
msgid ""
9421
10252
"email\n"
9422
10253
"~~~~~"
9423
10254
msgstr ""
9424
10255
9425
#: en/help_topics/configuration.txt:365
10256
#: en/help_topics/configuration.txt:417
9426
10257
msgid ""
9427
10258
"The email address to use when committing a branch. Typically takes the form\n"
9428
10259
"of::"
9429
10260
msgstr ""
9430
10261
9431
#: en/help_topics/configuration.txt:368
10262
#: en/help_topics/configuration.txt:420
9432
10263
msgid " email = Full Name <account@hostname.tld>"
9433
10264
msgstr ""
9434
10265
9435
#: en/help_topics/configuration.txt:370
10266
#: en/help_topics/configuration.txt:422
9436
10267
msgid ""
9437
10268
"editor\n"
9438
10269
"~~~~~~"
9439
10270
msgstr ""
9440
10271
9441
#: en/help_topics/configuration.txt:373
10272
#: en/help_topics/configuration.txt:425
9442
10273
msgid ""
9443
10274
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9444
10275
"a commit message. This setting is trumped by the environment variable\n"
9446
10277
"variables."
9447
10278
msgstr ""
9448
10279
9449
#: en/help_topics/configuration.txt:378
10280
#: en/help_topics/configuration.txt:430
9450
10281
msgid ""
9451
10282
"log_format\n"
9452
10283
"~~~~~~~~~~"
9453
10284
msgstr ""
9454
10285
9455
#: en/help_topics/configuration.txt:381
10286
#: en/help_topics/configuration.txt:433
9456
10287
msgid ""
9457
10288
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9458
10289
"and ``line``. Additional formats may be provided by plugins. The default\n"
9459
10290
"value is ``long``."
9460
10291
msgstr ""
9461
10292
9462
#: en/help_topics/configuration.txt:385
10293
#: en/help_topics/configuration.txt:437
9463
10294
msgid ""
9464
10295
"check_signatures\n"
9465
10296
"~~~~~~~~~~~~~~~~"
9466
10297
msgstr ""
9467
10298
9468
#: en/help_topics/configuration.txt:388
10299
#: en/help_topics/configuration.txt:440
9469
10300
msgid ""
9470
10301
"Reserved for future use. These options will allow a policy for branches to\n"
9471
10302
"require signatures."
9472
10303
msgstr ""
9473
10304
9474
#: en/help_topics/configuration.txt:391
10305
#: en/help_topics/configuration.txt:443
9475
10306
msgid ""
9476
10307
"require\n"
9477
10308
" The gnupg signature for revisions must be present and must be valid."
9478
10309
msgstr ""
9479
10310
9480
#: en/help_topics/configuration.txt:394
10311
#: en/help_topics/configuration.txt:446
9481
10312
msgid ""
9482
10313
"ignore\n"
9483
10314
" Do not check gnupg signatures of revisions."
9484
10315
msgstr ""
9485
10316
9486
#: en/help_topics/configuration.txt:397
10317
#: en/help_topics/configuration.txt:449
9487
10318
msgid ""
9488
10319
"check-available\n"
9489
10320
" (default) If gnupg signatures for revisions are present, check them.\n"
9491
10322
" no signature is present."
9492
10323
msgstr ""
9493
10324
9494
#: en/help_topics/configuration.txt:402
10325
#: en/help_topics/configuration.txt:454
9495
10326
msgid ""
9496
10327
"create_signatures\n"
9497
10328
"~~~~~~~~~~~~~~~~~"
9498
10329
msgstr ""
9499
10330
9500
#: en/help_topics/configuration.txt:405
10331
#: en/help_topics/configuration.txt:457
9501
10332
msgid ""
9502
10333
"Defines the behaviour of signing revisions on commits. By default bzr will "
9503
10334
"not\n"
9504
10335
"sign new commits."
9505
10336
msgstr ""
9506
10337
9507
#: en/help_topics/configuration.txt:408
10338
#: en/help_topics/configuration.txt:460
9508
10339
msgid ""
9509
10340
"always\n"
9510
10341
" Sign every new revision that is committed. If the signing fails then "
9512
10343
" commit will not be made."
9513
10344
msgstr ""
9514
10345
9515
#: en/help_topics/configuration.txt:412
10346
#: en/help_topics/configuration.txt:464
9516
10347
msgid ""
9517
10348
"when-required\n"
9518
10349
" Reserved for future use."
9519
10350
msgstr ""
9520
10351
9521
#: en/help_topics/configuration.txt:415
10352
#: en/help_topics/configuration.txt:467
9522
10353
msgid ""
9523
10354
"never\n"
9524
10355
" Reserved for future use."
9525
10356
msgstr ""
9526
10357
9527
#: en/help_topics/configuration.txt:418
10358
#: en/help_topics/configuration.txt:470
9528
10359
msgid ""
9529
10360
"In future it is planned that ``when-required`` will sign newly\n"
9530
10361
"committed revisions only when the branch requires them. ``never`` will "
9532
10363
"to sign newly committed revisions, even if the branch requires signatures."
9533
10364
msgstr ""
9534
10365
9535
#: en/help_topics/configuration.txt:422
10366
#: en/help_topics/configuration.txt:474
9536
10367
msgid ""
9537
10368
"dirstate.fdatasync\n"
9538
10369
"~~~~~~~~~~~~~~~~~~"
9539
10370
msgstr ""
9540
10371
9541
#: en/help_topics/configuration.txt:425
10372
#: en/help_topics/configuration.txt:477
9542
10373
msgid ""
9543
10374
"If true (default), working tree metadata changes are flushed through the\n"
9544
10375
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9545
10376
"should not be lost if the machine crashes. See also repository.fdatasync."
9546
10377
msgstr ""
9547
10378
9548
#: en/help_topics/configuration.txt:429
10379
#: en/help_topics/configuration.txt:481
9549
10380
msgid ""
9550
10381
"gpg_signing_key\n"
9551
10382
"~~~~~~~~~~~~~~~"
9552
10383
msgstr ""
9553
10384
9554
#: en/help_topics/configuration.txt:432
10385
#: en/help_topics/configuration.txt:484
9555
10386
msgid ""
9556
10387
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9557
10388
"address, key fingerprint or full key ID. When unset or when set to\n"
9558
10389
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9559
10390
msgstr ""
9560
10391
9561
#: en/help_topics/configuration.txt:436
10392
#: en/help_topics/configuration.txt:488
9562
10393
msgid ""
9563
10394
"recurse\n"
9564
10395
"~~~~~~~"
9565
10396
msgstr ""
9566
10397
9567
#: en/help_topics/configuration.txt:439
10398
#: en/help_topics/configuration.txt:491
9568
10399
msgid ""
9569
10400
"Only useful in ``locations.conf``. Defines whether or not the\n"
9570
10401
"configuration for this section applies to subdirectories:"
9571
10402
msgstr ""
9572
10403
9573
#: en/help_topics/configuration.txt:442
10404
#: en/help_topics/configuration.txt:494
9574
10405
msgid ""
9575
10406
"true\n"
9576
10407
" (default) This section applies to subdirectories as well."
9577
10408
msgstr ""
9578
10409
9579
#: en/help_topics/configuration.txt:445
10410
#: en/help_topics/configuration.txt:497
9580
10411
msgid ""
9581
10412
"false\n"
9582
10413
" This section only applies to the branch at this directory and not\n"
9583
10414
" branches below it."
9584
10415
msgstr ""
9585
10416
9586
#: en/help_topics/configuration.txt:449
10417
#: en/help_topics/configuration.txt:501
9587
10418
msgid ""
9588
10419
"gpg_signing_command\n"
9589
10420
"~~~~~~~~~~~~~~~~~~~"
9590
10421
msgstr ""
9591
10422
9592
#: en/help_topics/configuration.txt:452
10423
#: en/help_topics/configuration.txt:504
9593
10424
msgid ""
9594
10425
"(Default: \"gpg\"). Which program should be used to sign and check "
9595
10426
"revisions.\n"
9596
10427
"For example::"
9597
10428
msgstr ""
9598
10429
9599
#: en/help_topics/configuration.txt:455
10430
#: en/help_topics/configuration.txt:507
9600
10431
msgid " gpg_signing_command = /usr/bin/gnpg"
9601
10432
msgstr ""
9602
10433
9603
#: en/help_topics/configuration.txt:457
10434
#: en/help_topics/configuration.txt:509
9604
10435
msgid ""
9605
10436
"The specified command must accept the options \"--clearsign\" and \"-u "
9606
10437
"<email>\"."
9607
10438
msgstr ""
9608
10439
9609
#: en/help_topics/configuration.txt:459
10440
#: en/help_topics/configuration.txt:511
9610
10441
msgid ""
9611
10442
"bzr_remote_path\n"
9612
10443
"~~~~~~~~~~~~~~~"
9613
10444
msgstr ""
9614
10445
9615
#: en/help_topics/configuration.txt:462
10446
#: en/help_topics/configuration.txt:514
9616
10447
msgid ""
9617
10448
"(Default: \"bzr\"). The path to the command that should be used to run the "
9618
10449
"smart\n"
9619
10450
"server for bzr. This value may only be specified in locations.conf, because:"
9620
10451
msgstr ""
9621
10452
9622
#: en/help_topics/configuration.txt:465
10453
#: en/help_topics/configuration.txt:517
9623
10454
msgid ""
9624
10455
"- it's needed before branch.conf is accessible\n"
9625
10456
"- allowing remote branch.conf files to specify commands would be a security\n"
9626
10457
" risk"
9627
10458
msgstr ""
9628
10459
9629
#: en/help_topics/configuration.txt:469
10460
#: en/help_topics/configuration.txt:521
9630
10461
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
9631
10462
msgstr ""
9632
10463
9633
#: en/help_topics/configuration.txt:471
10464
#: en/help_topics/configuration.txt:523
9634
10465
msgid ""
9635
10466
"smtp_server\n"
9636
10467
"~~~~~~~~~~~"
9637
10468
msgstr ""
9638
10469
9639
#: en/help_topics/configuration.txt:474
10470
#: en/help_topics/configuration.txt:526
9640
10471
msgid ""
9641
10472
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
9642
10473
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
9643
10474
msgstr ""
9644
10475
9645
#: en/help_topics/configuration.txt:477
10476
#: en/help_topics/configuration.txt:529
9646
10477
msgid ""
9647
10478
"smtp_username, smtp_password\n"
9648
10479
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9649
10480
msgstr ""
9650
10481
9651
#: en/help_topics/configuration.txt:480
10482
#: en/help_topics/configuration.txt:532
9652
10483
msgid ""
9653
10484
"User and password to authenticate to the SMTP server. If smtp_username\n"
9654
10485
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
9656
10487
"to send mail."
9657
10488
msgstr ""
9658
10489
9659
#: en/help_topics/configuration.txt:485
10490
#: en/help_topics/configuration.txt:537
9660
10491
msgid ""
9661
10492
"locks.steal_dead\n"
9662
10493
"~~~~~~~~~~~~~~~~"
9663
10494
msgstr ""
9664
10495
9665
#: en/help_topics/configuration.txt:488
10496
#: en/help_topics/configuration.txt:540
9666
10497
msgid ""
9667
10498
"If set to true, bzr will automatically break locks held by processes from\n"
9668
10499
"the same machine and user that are no longer alive. Otherwise, it will\n"
9670
10501
"the object is no longer in use."
9671
10502
msgstr ""
9672
10503
9673
#: en/help_topics/configuration.txt:493
10504
#: en/help_topics/configuration.txt:545
9674
10505
msgid ""
9675
10506
"mail_client\n"
9676
10507
"~~~~~~~~~~~"
9677
10508
msgstr ""
9678
10509
9679
#: en/help_topics/configuration.txt:496
10510
#: en/help_topics/configuration.txt:548
9680
10511
msgid ""
9681
10512
"A mail client to use for sending merge requests.\n"
9682
10513
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
9685
10516
"``editor``."
9686
10517
msgstr ""
9687
10518
9688
#: en/help_topics/configuration.txt:501
10519
#: en/help_topics/configuration.txt:553
9689
10520
msgid "Supported values for specific clients:"
9690
10521
msgstr ""
9691
10522
9692
#: en/help_topics/configuration.txt:503
10523
#: en/help_topics/configuration.txt:555
9693
10524
msgid ""
9694
10525
":claws: Use Claws. This skips a dialog for attaching files.\n"
9695
10526
":evolution: Use Evolution.\n"
9700
10531
" this works around some bugs that xdg-email doesn't handle."
9701
10532
msgstr ""
9702
10533
9703
#: en/help_topics/configuration.txt:510
10534
#: en/help_topics/configuration.txt:562
9704
10535
msgid "Supported generic values are:"
9705
10536
msgstr ""
9706
10537
9707
#: en/help_topics/configuration.txt:512
10538
#: en/help_topics/configuration.txt:564
9708
10539
msgid ""
9709
10540
":default: See above.\n"
9710
10541
":editor: Use your editor to compose the merge request. This also uses\n"
9714
10545
":xdg-email: Use xdg-email to run your preferred mail program"
9715
10546
msgstr ""
9716
10547
9717
#: en/help_topics/configuration.txt:519
10548
#: en/help_topics/configuration.txt:571
9718
10549
msgid ""
9719
10550
"repository.fdatasync\n"
9720
10551
"~~~~~~~~~~~~~~~~~~~~"
9721
10552
msgstr ""
9722
10553
9723
#: en/help_topics/configuration.txt:522
10554
#: en/help_topics/configuration.txt:574
9724
10555
msgid ""
9725
10556
"If true (default), repository changes are flushed through the OS buffers\n"
9726
10557
"to physical disk. This is somewhat slower, but means data should not be\n"
9727
10558
"lost if the machine crashes. See also dirstate.fdatasync."
9728
10559
msgstr ""
9729
10560
9730
#: en/help_topics/configuration.txt:526
10561
#: en/help_topics/configuration.txt:578
9731
10562
msgid ""
9732
10563
"submit_branch\n"
9733
10564
"~~~~~~~~~~~~~"
9734
10565
msgstr ""
9735
10566
9736
#: en/help_topics/configuration.txt:529
10567
#: en/help_topics/configuration.txt:581
9737
10568
msgid ""
9738
10569
"The branch you intend to submit your current work to. This is "
9739
10570
"automatically\n"
9742
10573
"should usually be set on a per-branch or per-location basis."
9743
10574
msgstr ""
9744
10575
9745
#: en/help_topics/configuration.txt:533
10576
#: en/help_topics/configuration.txt:585
9746
10577
msgid ""
9747
10578
"public_branch\n"
9748
10579
"~~~~~~~~~~~~~"
9749
10580
msgstr ""
9750
10581
9751
#: en/help_topics/configuration.txt:536
10582
#: en/help_topics/configuration.txt:588
9752
10583
msgid ""
9753
10584
"A publically-accessible version of this branch (implying that this version "
9754
10585
"is\n"
9755
10586
"not publically-accessible). Used (and set) by ``bzr send``."
9756
10587
msgstr ""
9757
10588
9758
#: en/help_topics/configuration.txt:539
10589
#: en/help_topics/configuration.txt:591
9759
10590
msgid ""
9760
10591
"suppress_warnings\n"
9761
10592
"~~~~~~~~~~~~~~~~~"
9762
10593
msgstr ""
9763
10594
9764
#: en/help_topics/configuration.txt:542
10595
#: en/help_topics/configuration.txt:594
9765
10596
msgid ""
9766
10597
"A list of strings, each string represent a warning that can be emitted by\n"
9767
10598
"bzr. Mentioning a warning in this list tells bzr to not emit it."
9768
10599
msgstr ""
9769
10600
9770
#: en/help_topics/configuration.txt:545
10601
#: en/help_topics/configuration.txt:597
9771
10602
msgid "Valid values:"
9772
10603
msgstr ""
9773
10604
9774
#: en/help_topics/configuration.txt:547
10605
#: en/help_topics/configuration.txt:599
9775
10606
msgid ""
9776
10607
"* ``format_deprecation``:\n"
9777
10608
" whether the format deprecation warning is shown on repositories that "
9779
10610
" using deprecated formats."
9780
10611
msgstr ""
9781
10612
9782
#: en/help_topics/configuration.txt:551
10613
#: en/help_topics/configuration.txt:603
9783
10614
msgid ""
9784
10615
"default_format\n"
9785
10616
"~~~~~~~~~~~~~~"
9786
10617
msgstr ""
9787
10618
9788
#: en/help_topics/configuration.txt:554
10619
#: en/help_topics/configuration.txt:606
9789
10620
msgid ""
9790
10621
"A format name for the default format used when creating branches. See "
9791
10622
"``bzr\n"
9792
10623
"help formats`` for possible values."
9793
10624
msgstr ""
9794
10625
9795
#: en/help_topics/configuration.txt:557
10626
#: en/help_topics/configuration.txt:609
9796
10627
msgid ""
9797
10628
"\n"
9798
10629
"Unicode options\n"
9799
10630
"---------------"
9800
10631
msgstr ""
9801
10632
9802
#: en/help_topics/configuration.txt:561
10633
#: en/help_topics/configuration.txt:613
9803
10634
msgid ""
9804
10635
"output_encoding\n"
9805
10636
"~~~~~~~~~~~~~~~"
9806
10637
msgstr ""
9807
10638
9808
#: en/help_topics/configuration.txt:564
10639
#: en/help_topics/configuration.txt:616
9809
10640
msgid ""
9810
10641
"A Python unicode encoding name for text output from bzr, such as log\n"
9811
10642
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
9812
10643
"is the terminal encoding prefered by the operating system."
9813
10644
msgstr ""
9814
10645
9815
#: en/help_topics/configuration.txt:568
10646
#: en/help_topics/configuration.txt:620
9816
10647
msgid ""
9817
10648
"\n"
9818
10649
"Branch type specific options\n"
9819
10650
"----------------------------"
9820
10651
msgstr ""
9821
10652
9822
#: en/help_topics/configuration.txt:572
10653
#: en/help_topics/configuration.txt:624
9823
10654
msgid ""
9824
10655
"These options apply only to branches that use the ``dirstate-tags`` or\n"
9825
10656
"later format. They\n"
9827
10658
"manually set in ``locations.conf`` or ``bazaar.conf``."
9828
10659
msgstr ""
9829
10660
9830
#: en/help_topics/configuration.txt:577
10661
#: en/help_topics/configuration.txt:629
9831
10662
msgid ""
9832
10663
"append_revisions_only\n"
9833
10664
"~~~~~~~~~~~~~~~~~~~~~"
9834
10665
msgstr ""
9835
10666
9836
#: en/help_topics/configuration.txt:580
10667
#: en/help_topics/configuration.txt:632
9837
10668
msgid ""
9838
10669
"If set to \"True\" then revisions can only be appended to the log, not\n"
9839
10670
"removed. A branch with this setting enabled can only pull from another\n"
9843
10674
"compatibility with previous bzr versions (older than 2.2)."
9844
10675
msgstr ""
9845
10676
9846
#: en/help_topics/configuration.txt:587
10677
#: en/help_topics/configuration.txt:639
9847
10678
msgid ""
9848
10679
"parent_location\n"
9849
10680
"~~~~~~~~~~~~~~~"
9850
10681
msgstr ""
9851
10682
9852
#: en/help_topics/configuration.txt:590
10683
#: en/help_topics/configuration.txt:642
9853
10684
msgid ""
9854
10685
"If present, the location of the default branch for pull or merge. This "
9855
10686
"option\n"
9857
10688
"--remember``."
9858
10689
msgstr ""
9859
10690
9860
#: en/help_topics/configuration.txt:594
10691
#: en/help_topics/configuration.txt:646
9861
10692
msgid ""
9862
10693
"push_location\n"
9863
10694
"~~~~~~~~~~~~~"
9864
10695
msgstr ""
9865
10696
9866
#: en/help_topics/configuration.txt:597
10697
#: en/help_topics/configuration.txt:649
9867
10698
msgid ""
9868
10699
"If present, the location of the default branch for push. This option\n"
9869
10700
"is normally set by the first ``push`` or ``push --remember``."
9870
10701
msgstr ""
9871
10702
9872
#: en/help_topics/configuration.txt:600
10703
#: en/help_topics/configuration.txt:652
9873
10704
msgid ""
9874
10705
"push_strict\n"
9875
10706
"~~~~~~~~~~~"
9876
10707
msgstr ""
9877
10708
9878
#: en/help_topics/configuration.txt:603
10709
#: en/help_topics/configuration.txt:655
9879
10710
msgid ""
9880
10711
"If present, defines the ``--strict`` option default value for checking\n"
9881
10712
"uncommitted changes before pushing."
9882
10713
msgstr ""
9883
10714
9884
#: en/help_topics/configuration.txt:606
10715
#: en/help_topics/configuration.txt:658
9885
10716
msgid ""
9886
10717
"dpush_strict\n"
9887
10718
"~~~~~~~~~~~~"
9888
10719
msgstr ""
9889
10720
9890
#: en/help_topics/configuration.txt:609
10721
#: en/help_topics/configuration.txt:661
9891
10722
msgid ""
9892
10723
"If present, defines the ``--strict`` option default value for checking\n"
9893
10724
"uncommitted changes before pushing into a different VCS without any\n"
9894
10725
"custom bzr metadata."
9895
10726
msgstr ""
9896
10727
9897
#: en/help_topics/configuration.txt:613
10728
#: en/help_topics/configuration.txt:665
9898
10729
msgid ""
9899
10730
"bound_location\n"
9900
10731
"~~~~~~~~~~~~~~"
9901
10732
msgstr ""
9902
10733
9903
#: en/help_topics/configuration.txt:616
10734
#: en/help_topics/configuration.txt:668
9904
10735
msgid ""
9905
10736
"The location that commits should go to when acting as a checkout.\n"
9906
10737
"This option is normally set by ``bind``."
9907
10738
msgstr ""
9908
10739
9909
#: en/help_topics/configuration.txt:619
10740
#: en/help_topics/configuration.txt:671
9910
10741
msgid ""
9911
10742
"bound\n"
9912
10743
"~~~~~"
9913
10744
msgstr ""
9914
10745
9915
#: en/help_topics/configuration.txt:622
10746
#: en/help_topics/configuration.txt:674
9916
10747
msgid ""
9917
10748
"If set to \"True\", the branch should act as a checkout, and push each "
9918
10749
"commit to\n"
9919
10750
"the bound_location. This option is normally set by ``bind``/``unbind``."
9920
10751
msgstr ""
9921
10752
9922
#: en/help_topics/configuration.txt:625
10753
#: en/help_topics/configuration.txt:677
9923
10754
msgid ""
9924
10755
"send_strict\n"
9925
10756
"~~~~~~~~~~~"
9926
10757
msgstr ""
9927
10758
9928
#: en/help_topics/configuration.txt:628
10759
#: en/help_topics/configuration.txt:680
9929
10760
msgid ""
9930
10761
"If present, defines the ``--strict`` option default value for checking\n"
9931
10762
"uncommitted changes before sending a merge directive."
9932
10763
msgstr ""
9933
10764
9934
#: en/help_topics/configuration.txt:631
10765
#: en/help_topics/configuration.txt:683
9935
10766
msgid ""
9936
10767
"add.maximum_file_size\n"
9937
10768
"~~~~~~~~~~~~~~~~~~~~~"
9938
10769
msgstr ""
9939
10770
9940
#: en/help_topics/configuration.txt:634
10771
#: en/help_topics/configuration.txt:686
9941
10772
msgid ""
9942
10773
"Defines the maximum file size the command line \"add\" operation will allow\n"
9943
10774
"in recursive mode, with files larger than this value being skipped. You "
9949
10780
"will disable skipping."
9950
10781
msgstr ""
9951
10782
9952
#: en/help_topics/configuration.txt:640
10783
#: en/help_topics/configuration.txt:692
9953
10784
msgid ""
9954
10785
"External Merge Tools\n"
9955
10786
"--------------------"
9956
10787
msgstr ""
9957
10788
9958
#: en/help_topics/configuration.txt:643
10789
#: en/help_topics/configuration.txt:695
9959
10790
msgid ""
9960
10791
"bzr.mergetool.<name>\n"
9961
10792
"~~~~~~~~~~~~~~~~~~~~"
9962
10793
msgstr ""
9963
10794
9964
#: en/help_topics/configuration.txt:646
10795
#: en/help_topics/configuration.txt:698
9965
10796
msgid ""
9966
10797
"Defines an external merge tool called <name> with the given command-line.\n"
9967
10798
"Arguments containing spaces should be quoted using single or double quotes. "
9969
10800
"executable may omit its path if it can be found on the PATH."
9970
10801
msgstr ""
9971
10802
9972
#: en/help_topics/configuration.txt:650
10803
#: en/help_topics/configuration.txt:702
9973
10804
msgid ""
9974
10805
"The following markers can be used in the command-line to substitute "
9975
10806
"filenames\n"
9976
10807
"involved in the merge conflict::"
9977
10808
msgstr ""
9978
10809
9979
#: en/help_topics/configuration.txt:653
10810
#: en/help_topics/configuration.txt:705
9980
10811
msgid ""
9981
10812
" {base} file.BASE\n"
9982
10813
" {this} file.THIS\n"
9987
10818
" succeeds."
9988
10819
msgstr ""
9989
10820
9990
#: en/help_topics/configuration.txt:662
10821
#: en/help_topics/configuration.txt:714
9991
10822
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
9992
10823
msgstr ""
9993
10824
9994
#: en/help_topics/configuration.txt:664
9995
msgid ""
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"
9996
10857
"bzr.default_mergetool\n"
9997
10858
"~~~~~~~~~~~~~~~~~~~~~"
9998
10859
msgstr ""
9999
10860
10000
#: en/help_topics/configuration.txt:667
10861
#: en/help_topics/configuration.txt:735
10001
10862
msgid ""
10002
10863
"Specifies which external merge tool (as defined above) should be selected "
10003
10864
"by\n"
10004
10865
"default in tools such as ``bzr qconflicts``."
10005
10866
msgstr ""
10006
10867
10007
#: en/help_topics/configuration.txt:672
10868
#: en/help_topics/configuration.txt:740
10008
10869
msgid " bzr.default_mergetool = kdiff3\n"
10009
10870
msgstr ""
10010
10871
10133
10994
"--------------"
10134
10995
msgstr ""
10135
10996
10136
#: en/help_topics/conflict-types.txt:63
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
10137
11002
msgid "Typical message::"
10138
11003
msgstr ""
10139
11004
10265
11130
"copy\" has been renamed to THIS or OTHER."
10266
11131
msgstr ""
10267
11132
10268
#: en/help_topics/conflict-types.txt:134
11133
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10269
11134
msgid ""
10270
11135
"To resolve that kind of conflict, you should rebuild FILE from either "
10271
11136
"version\n"
10272
11137
"or a combination of both."
10273
11138
msgstr ""
10274
11139
10275
#: en/help_topics/conflict-types.txt:137
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
10276
11144
msgid "``bzr resolve`` recognizes the following actions:"
10277
11145
msgstr ""
10278
11146
10290
11158
"``.OTHER`` files if they are still present in the working tree."
10291
11159
msgstr ""
10292
11160
10293
#: en/help_topics/conflict-types.txt:146
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
10294
11165
msgid ""
10295
11166
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10296
11167
msgstr ""
10408
11279
"Resolving this issue depends very much on the particular scenario."
10409
11280
msgstr ""
10410
11281
10411
#: en/help_topics/conflict-types.txt:223
11282
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10412
11283
msgid ""
10413
11284
"To resolve that kind of conflict, you should either remove or rename the\n"
10414
11285
"children or the directory or a combination of both."
10797
11668
#: en/help_topics/current-formats.txt:3
10798
11669
msgid ""
10799
11670
":2a:\n"
10800
" (native) (default) First format for bzr 2.0 series. Uses group-\n"
11671
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
10801
11672
" compress storage. Provides rich roots which are a one-way\n"
10802
11673
" transition."
10803
11674
msgstr ""
10804
11675
10805
#: en/help_topics/current-formats.txt:8
10806
msgid ""
10807
":pack-0.92:\n"
10808
" (native) New in 0.92: Pack-based format with data compatible with\n"
10809
" dirstate-tags format repositories. Interoperates with bzr\n"
10810
" repositories before 0.92 but cannot be read by bzr < 0.92."
10811
msgstr ""
10812
10813
#: en/help_topics/current-formats.txt:13
10814
msgid ""
10815
":1.14:\n"
10816
" (native) A working-tree format that supports content filtering."
10817
msgstr ""
10818
10819
#: en/help_topics/current-formats.txt:16
10820
msgid ""
10821
":1.14-rich-root:\n"
10822
" (native) A variant of 1.14 that supports rich-root data (needed\n"
10823
" for bzr-svn and bzr-git)."
10824
msgstr ""
10825
10826
#: en/help_topics/current-formats.txt:20
11676
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
10827
11677
msgid ""
10828
11678
"\n"
10829
11679
"See :doc:`formats-help` for more about storage formats."
10866
11716
"-Dindex Trace major index operations.\n"
10867
11717
"-Dknit Trace knit operations.\n"
10868
11718
"-Dlock Trace when lockdir locks are taken or released.\n"
11719
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11720
" retrying the request.\n"
10869
11721
"-Dprogress Trace progress bar operations.\n"
10870
11722
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
10871
11723
"-Dmerge Emit information for debugging merges.\n"
10963
11815
"branch can now be pushed to the mainline.\n"
10964
11816
msgstr ""
10965
11817
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
10966
11866
#: en/help_topics/eol.txt:1
10967
11867
msgid ""
10968
11868
"End of Line Conversion\n"
11028
11928
"to use as a starting point::"
11029
11929
msgstr ""
11030
11930
11031
#: en/help_topics/eol.txt:42
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
11032
11933
msgid ""
11033
11934
" [name *]\n"
11034
11935
" eol = native"
11157
12058
11158
12059
#: en/help_topics/hidden-commands.txt:1
11159
12060
msgid ""
11160
"added List files added in working tree.\n"
11161
"ancestry List all revisions merged into this branch.\n"
11162
"assert-fail Test reporting of assertion failures\n"
11163
"bundle-info Output interesting stats about a bundle\n"
11164
"bundle-revisions Create a merge-directive for submitting changes.\n"
11165
"cat-revision Write out metadata for a revision.\n"
11166
"dpush Push into a different VCS without any custom bzr\n"
11167
" metadata.\n"
11168
"dump-btree Dump the contents of a btree index file to stdout.\n"
11169
"export-pot Export command helps and error messages in po "
11170
"format.\n"
11171
"file-id Print file_id of a particular file or directory.\n"
11172
"file-path Print path of file_ids to a file or directory.\n"
11173
"find-merge-base Find and print a base revision for merging two "
12061
"added List files added in working tree.\n"
12062
"ancestry List all revisions merged into this branch.\n"
12063
"assert-fail Test reporting of assertion failures\n"
12064
"bundle-info Output interesting stats about a bundle\n"
12065
"bundle-revisions Create a merge-directive for submitting changes.\n"
12066
"cat-revision Write out metadata for a revision.\n"
12067
"dump-btree Dump the contents of a btree index file to stdout.\n"
12068
"export-pot Export command helps and error messages in po format.\n"
12069
"file-id Print file_id of a particular file or directory.\n"
12070
"file-path Print path of file_ids to a file or directory.\n"
12071
"find-merge-base Find and print a base revision for merging two "
11174
12072
"branches.\n"
11175
"hooks Show hooks.\n"
11176
"inventory Show inventory of the current working copy or a\n"
11177
" revision.\n"
11178
"is-ignored Check if a path is ignored. [qbzr]\n"
11179
"is-versioned Check if a path is versioned. [qbzr]\n"
11180
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11181
"lookup-revision Lookup the revision-id from a revision-number\n"
11182
"merge-directive Generate a merge directive for auto-merge tools.\n"
11183
"modified List files modified in working tree.\n"
11184
"qcheckout-ala-explorer Checkout a branch. The checkout is always "
11185
"lightweight.\n"
11186
" [explorer]\n"
11187
"qhelp Shows a help window [qbzr]\n"
11188
"qmain The QBzr main application. [qbzr]\n"
11189
"qsubprocess Run some bzr command as subprocess. [qbzr]\n"
11190
"re-sign Create a digital signature for an existing revision.\n"
11191
"reference list, view and set branch locations for nested "
11192
"trees.\n"
11193
"relpath Show path of a file relative to root\n"
11194
"repair-workingtree Reset the working tree state file.\n"
11195
"revision-history Display the list of revision ids on a branch.\n"
11196
"revision-info Show revision number and revision id for a given\n"
11197
" revision identifier.\n"
11198
"rocks Statement of optimism.\n"
11199
"selftest Run internal test suite.\n"
11200
"shell-complete Show appropriate completions for context.\n"
11201
"test-script Run a shell-like test from a file.\n"
11202
"touching-revisions Return revision-ids which affected a particular "
11203
"file.\n"
11204
"unknowns List unknown files.\n"
11205
"wait-until-signalled Test helper for\n"
11206
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12073
"hooks Show hooks.\n"
12074
"inventory Show inventory of the current working copy or a "
12075
"revision.\n"
12076
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12077
"lookup-revision Lookup the revision-id from a revision-number\n"
12078
"merge-directive Generate a merge directive for auto-merge tools.\n"
12079
"modified List files modified in working tree.\n"
12080
"re-sign Create a digital signature for an existing revision.\n"
12081
"reference list, view and set branch locations for nested trees.\n"
12082
"relpath Show path of a file relative to root\n"
12083
"repair-workingtree Reset the working tree state file.\n"
12084
"revision-history Display the list of revision ids on a branch.\n"
12085
"revision-info Show revision number and revision id for a given "
12086
"revision\n"
12087
" identifier.\n"
12088
"rocks Statement of optimism.\n"
12089
"selftest Run internal test suite.\n"
12090
"shell-complete Show appropriate completions for context.\n"
12091
"test-script Run a shell-like test from a file.\n"
12092
"touching-revisions Return revision-ids which affected a particular file.\n"
12093
"unknowns List unknown files.\n"
12094
"wait-until-signalled Test helper for\n"
12095
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11207
12096
msgstr ""
11208
12097
11209
12098
#: en/help_topics/hooks.txt:1
11213
12102
"====="
11214
12103
msgstr ""
11215
12104
11216
#: en/help_topics/hooks.txt:5
12105
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11217
12106
msgid ""
11218
12107
"Introduction\n"
11219
12108
"------------"
11280
12169
"~~~~~~~~~~~~~~~~~~"
11281
12170
msgstr ""
11282
12171
11283
#: en/help_topics/hooks.txt:38
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
11284
12174
msgid "Introduced in: 2.2"
11285
12175
msgstr ""
11286
12176
11298
12188
"~~~~"
11299
12189
msgstr ""
11300
12190
11301
#: en/help_topics/hooks.txt:48
12191
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12192
#: en/help_topics/hooks.txt:307
11302
12193
msgid "Introduced in: 1.8"
11303
12194
msgstr ""
11304
12195
11328
12219
"~~~~~~~~~~~~~~~~~~~~~~"
11329
12220
msgstr ""
11330
12221
11331
#: en/help_topics/hooks.txt:66
12222
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11332
12223
msgid "Introduced in: 1.4"
11333
12224
msgstr ""
11334
12225
11340
12231
"uncommit will all trigger this hook."
11341
12232
msgstr ""
11342
12233
11343
#: en/help_topics/hooks.txt:73
12234
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11344
12235
msgid ""
11345
12236
"post_commit\n"
11346
12237
"~~~~~~~~~~~"
11347
12238
msgstr ""
11348
12239
11349
#: en/help_topics/hooks.txt:76
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
11350
12242
msgid "Introduced in: 0.15"
11351
12243
msgstr ""
11352
12244
11451
12343
11452
12344
#: en/help_topics/hooks.txt:142
11453
12345
msgid ""
11454
"set_rh\n"
11455
"~~~~~~"
11456
msgstr ""
11457
11458
#: en/help_topics/hooks.txt:147
11459
msgid ""
11460
"Invoked whenever the revision history has been set via\n"
11461
"set_revision_history. The api signature is (branch, revision_history),\n"
11462
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11463
"for bzr to trigger, a better hook to use is\n"
11464
"Branch.post_change_branch_tip."
11465
msgstr ""
11466
11467
#: en/help_topics/hooks.txt:153
11468
msgid ""
11469
12346
"transform_fallback_location\n"
11470
12347
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11471
12348
msgstr ""
11472
12349
11473
#: en/help_topics/hooks.txt:156
12350
#: en/help_topics/hooks.txt:145
11474
12351
msgid "Introduced in: 1.9"
11475
12352
msgstr ""
11476
12353
11477
#: en/help_topics/hooks.txt:158
12354
#: en/help_topics/hooks.txt:147
11478
12355
msgid ""
11479
12356
"Called when a stacked branch is activating its fallback locations.\n"
11480
12357
"transform_fallback_location is called with (branch, url), and should\n"
11488
12365
"however undefined."
11489
12366
msgstr ""
11490
12367
11491
#: en/help_topics/hooks.txt:169
11492
msgid ""
11493
"BzrDirHooks\n"
11494
"-----------"
11495
msgstr ""
11496
11497
#: en/help_topics/hooks.txt:172
11498
msgid ""
11499
"post_repo_init\n"
11500
"~~~~~~~~~~~~~~"
11501
msgstr ""
11502
11503
#: en/help_topics/hooks.txt:177
11504
msgid ""
11505
"Invoked after a repository has been initialized. post_repo_init is\n"
11506
"called with a bzrlib.bzrdir.RepoInitHookParams."
11507
msgstr ""
11508
11509
#: en/help_topics/hooks.txt:180
11510
msgid ""
11511
"pre_open\n"
11512
"~~~~~~~~"
11513
msgstr ""
11514
11515
#: en/help_topics/hooks.txt:183
11516
msgid "Introduced in: 1.14"
11517
msgstr ""
11518
11519
#: en/help_topics/hooks.txt:185
11520
msgid ""
11521
"Invoked before attempting to open a BzrDir with the transport that the\n"
11522
"open will use."
11523
msgstr ""
11524
11525
#: en/help_topics/hooks.txt:188
12368
#: en/help_topics/hooks.txt:158
11526
12369
msgid ""
11527
12370
"CommandHooks\n"
11528
12371
"------------"
11529
12372
msgstr ""
11530
12373
11531
#: en/help_topics/hooks.txt:191
12374
#: en/help_topics/hooks.txt:161
11532
12375
msgid ""
11533
12376
"extend_command\n"
11534
12377
"~~~~~~~~~~~~~~"
11535
12378
msgstr ""
11536
12379
11537
#: en/help_topics/hooks.txt:194
12380
#: en/help_topics/hooks.txt:164
11538
12381
msgid "Introduced in: 1.13"
11539
12382
msgstr ""
11540
12383
11541
#: en/help_topics/hooks.txt:196
12384
#: en/help_topics/hooks.txt:166
11542
12385
msgid ""
11543
12386
"Called after creating a command object to allow modifications such as\n"
11544
12387
"adding or removing options, docs etc. Called with the new\n"
11545
12388
"bzrlib.commands.Command object."
11546
12389
msgstr ""
11547
12390
11548
#: en/help_topics/hooks.txt:200
12391
#: en/help_topics/hooks.txt:170
11549
12392
msgid ""
11550
12393
"get_command\n"
11551
12394
"~~~~~~~~~~~"
11552
12395
msgstr ""
11553
12396
11554
#: en/help_topics/hooks.txt:203
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
11555
12399
msgid "Introduced in: 1.17"
11556
12400
msgstr ""
11557
12401
11558
#: en/help_topics/hooks.txt:205
12402
#: en/help_topics/hooks.txt:175
11559
12403
msgid ""
11560
12404
"Called when creating a single command. Called with (cmd_or_None,\n"
11561
12405
"command_name). get_command should either return the cmd_or_None\n"
11565
12409
"plugin_cmds.register_lazy."
11566
12410
msgstr ""
11567
12411
11568
#: en/help_topics/hooks.txt:212
12412
#: en/help_topics/hooks.txt:182
11569
12413
msgid ""
11570
12414
"get_missing_command\n"
11571
12415
"~~~~~~~~~~~~~~~~~~~"
11572
12416
msgstr ""
11573
12417
11574
#: en/help_topics/hooks.txt:217
12418
#: en/help_topics/hooks.txt:187
11575
12419
msgid ""
11576
12420
"Called when creating a single command if no command could be found.\n"
11577
12421
"Called with (command_name). get_missing_command should either return\n"
11578
12422
"None, or a Command object to be used for the command."
11579
12423
msgstr ""
11580
12424
11581
#: en/help_topics/hooks.txt:221
12425
#: en/help_topics/hooks.txt:191
11582
12426
msgid ""
11583
12427
"list_commands\n"
11584
12428
"~~~~~~~~~~~~~"
11585
12429
msgstr ""
11586
12430
11587
#: en/help_topics/hooks.txt:226
12431
#: en/help_topics/hooks.txt:196
11588
12432
msgid ""
11589
12433
"Called when enumerating commands. Called with a set of cmd_name\n"
11590
12434
"strings for all the commands found so far. This set is safe to mutate\n"
11592
12436
"set of command names."
11593
12437
msgstr ""
11594
12438
11595
#: en/help_topics/hooks.txt:231
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."
12461
msgstr ""
12462
12463
#: en/help_topics/hooks.txt:215
11596
12464
msgid ""
11597
12465
"_ConfigHooks\n"
11598
12466
"------------"
11599
12467
msgstr ""
11600
12468
11601
#: en/help_topics/hooks.txt:234
12469
#: en/help_topics/hooks.txt:218
11602
12470
msgid ""
11603
12471
"get\n"
11604
12472
"~~~"
11605
12473
msgstr ""
11606
12474
11607
#: en/help_topics/hooks.txt:237
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
11608
12479
msgid "Introduced in: 2.4"
11609
12480
msgstr ""
11610
12481
11611
#: en/help_topics/hooks.txt:239
12482
#: en/help_topics/hooks.txt:223
11612
12483
msgid ""
11613
12484
"Invoked when a config option is read. The signature is (stack, name,\n"
11614
12485
"value)."
11615
12486
msgstr ""
11616
12487
11617
#: en/help_topics/hooks.txt:242
12488
#: en/help_topics/hooks.txt:226
11618
12489
msgid ""
11619
12490
"load\n"
11620
12491
"~~~~"
11621
12492
msgstr ""
11622
12493
11623
#: en/help_topics/hooks.txt:247
12494
#: en/help_topics/hooks.txt:231
11624
12495
msgid "Invoked when a config store is loaded. The signature is (store)."
11625
12496
msgstr ""
11626
12497
11627
#: en/help_topics/hooks.txt:249
12498
#: en/help_topics/hooks.txt:233
11628
12499
msgid ""
11629
12500
"remove\n"
11630
12501
"~~~~~~"
11631
12502
msgstr ""
11632
12503
11633
#: en/help_topics/hooks.txt:254
12504
#: en/help_topics/hooks.txt:238
11634
12505
msgid ""
11635
12506
"Invoked when a config option is removed. The signature is (stack,\n"
11636
12507
"name)."
11637
12508
msgstr ""
11638
12509
11639
#: en/help_topics/hooks.txt:257
12510
#: en/help_topics/hooks.txt:241
11640
12511
msgid ""
11641
12512
"save\n"
11642
12513
"~~~~"
11643
12514
msgstr ""
11644
12515
11645
#: en/help_topics/hooks.txt:262
12516
#: en/help_topics/hooks.txt:246
11646
12517
msgid "Invoked when a config store is saved. The signature is (store)."
11647
12518
msgstr ""
11648
12519
11649
#: en/help_topics/hooks.txt:264
12520
#: en/help_topics/hooks.txt:248
11650
12521
msgid ""
11651
12522
"set\n"
11652
12523
"~~~"
11653
12524
msgstr ""
11654
12525
11655
#: en/help_topics/hooks.txt:269
12526
#: en/help_topics/hooks.txt:253
11656
12527
msgid ""
11657
12528
"Invoked when a config option is set. The signature is (stack, name,\n"
11658
12529
"value)."
11659
12530
msgstr ""
11660
12531
12532
#: en/help_topics/hooks.txt:256
12533
msgid ""
12534
"ControlDirHooks\n"
12535
"---------------"
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:259
12539
msgid ""
12540
"post_repo_init\n"
12541
"~~~~~~~~~~~~~~"
12542
msgstr ""
12543
12544
#: en/help_topics/hooks.txt:264
12545
msgid ""
12546
"Invoked after a repository has been initialized. post_repo_init is\n"
12547
"called with a bzrlib.controldir.RepoInitHookParams."
12548
msgstr ""
12549
12550
#: en/help_topics/hooks.txt:267
12551
msgid ""
12552
"pre_open\n"
12553
"~~~~~~~~"
12554
msgstr ""
12555
12556
#: en/help_topics/hooks.txt:270
12557
msgid "Introduced in: 1.14"
12558
msgstr ""
12559
11661
12560
#: en/help_topics/hooks.txt:272
11662
12561
msgid ""
12562
"Invoked before attempting to open a ControlDir with the transport that\n"
12563
"the open will use."
12564
msgstr ""
12565
12566
#: en/help_topics/hooks.txt:275
12567
msgid ""
11663
12568
"InfoHooks\n"
11664
12569
"---------"
11665
12570
msgstr ""
11666
12571
11667
#: en/help_topics/hooks.txt:275
12572
#: en/help_topics/hooks.txt:278
11668
12573
msgid ""
11669
12574
"repository\n"
11670
12575
"~~~~~~~~~~"
11671
12576
msgstr ""
11672
12577
11673
#: en/help_topics/hooks.txt:278
12578
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12579
#: en/help_topics/hooks.txt:524
11674
12580
msgid "Introduced in: 1.15"
11675
12581
msgstr ""
11676
12582
11677
#: en/help_topics/hooks.txt:280
12583
#: en/help_topics/hooks.txt:283
11678
12584
msgid ""
11679
12585
"Invoked when displaying the statistics for a repository. repository is\n"
11680
12586
"called with a statistics dictionary as returned by the repository and\n"
11681
12587
"a file-like object to write to."
11682
12588
msgstr ""
11683
12589
11684
#: en/help_topics/hooks.txt:284
12590
#: en/help_topics/hooks.txt:287
11685
12591
msgid ""
11686
12592
"LockHooks\n"
11687
12593
"---------"
11688
12594
msgstr ""
11689
12595
11690
#: en/help_topics/hooks.txt:287
12596
#: en/help_topics/hooks.txt:290
11691
12597
msgid ""
11692
12598
"lock_acquired\n"
11693
12599
"~~~~~~~~~~~~~"
11694
12600
msgstr ""
11695
12601
11696
#: en/help_topics/hooks.txt:292
12602
#: en/help_topics/hooks.txt:295
11697
12603
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
11698
12604
msgstr ""
11699
12605
11700
#: en/help_topics/hooks.txt:294
12606
#: en/help_topics/hooks.txt:297
11701
12607
msgid ""
11702
12608
"lock_broken\n"
11703
12609
"~~~~~~~~~~~"
11704
12610
msgstr ""
11705
12611
11706
#: en/help_topics/hooks.txt:299
12612
#: en/help_topics/hooks.txt:302
11707
12613
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
11708
12614
msgstr ""
11709
12615
11710
#: en/help_topics/hooks.txt:301
12616
#: en/help_topics/hooks.txt:304
11711
12617
msgid ""
11712
12618
"lock_released\n"
11713
12619
"~~~~~~~~~~~~~"
11714
12620
msgstr ""
11715
12621
11716
#: en/help_topics/hooks.txt:306
12622
#: en/help_topics/hooks.txt:309
11717
12623
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
11718
12624
msgstr ""
11719
12625
11720
#: en/help_topics/hooks.txt:308
12626
#: en/help_topics/hooks.txt:311
11721
12627
msgid ""
11722
12628
"MergeHooks\n"
11723
12629
"----------"
11724
12630
msgstr ""
11725
12631
11726
#: en/help_topics/hooks.txt:311
12632
#: en/help_topics/hooks.txt:314
11727
12633
msgid ""
11728
12634
"merge_file_content\n"
11729
12635
"~~~~~~~~~~~~~~~~~~"
11730
12636
msgstr ""
11731
12637
11732
#: en/help_topics/hooks.txt:314
12638
#: en/help_topics/hooks.txt:317
11733
12639
msgid "Introduced in: 2.1"
11734
12640
msgstr ""
11735
12641
11736
#: en/help_topics/hooks.txt:316
12642
#: en/help_topics/hooks.txt:319
11737
12643
msgid ""
11738
12644
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
11739
12645
"object when starting a merge. Should return either None or a subclass\n"
11743
12649
"AbstractPerFileMerger API docs for details on how it is used by merge."
11744
12650
msgstr ""
11745
12651
11746
#: en/help_topics/hooks.txt:323
12652
#: en/help_topics/hooks.txt:326
12653
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
11747
12683
msgid ""
11748
12684
"MergeDirectiveHooks\n"
11749
12685
"-------------------"
11750
12686
msgstr ""
11751
12687
11752
#: en/help_topics/hooks.txt:326
12688
#: en/help_topics/hooks.txt:345
11753
12689
msgid ""
11754
12690
"merge_request_body\n"
11755
12691
"~~~~~~~~~~~~~~~~~~"
11756
12692
msgstr ""
11757
12693
11758
#: en/help_topics/hooks.txt:329
12694
#: en/help_topics/hooks.txt:348
11759
12695
msgid "Introduced in: 1.15.0"
11760
12696
msgstr ""
11761
12697
11762
#: en/help_topics/hooks.txt:331
12698
#: en/help_topics/hooks.txt:350
11763
12699
msgid ""
11764
12700
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
11765
12701
"request. Callbacks must return a body. If more than one callback is\n"
11766
12702
"registered, the output of one callback is provided to the next."
11767
12703
msgstr ""
11768
12704
11769
#: en/help_topics/hooks.txt:335
12705
#: en/help_topics/hooks.txt:354
11770
12706
msgid ""
11771
12707
"MessageEditorHooks\n"
11772
12708
"------------------"
11773
12709
msgstr ""
11774
12710
11775
#: en/help_topics/hooks.txt:338
12711
#: en/help_topics/hooks.txt:357
11776
12712
msgid ""
11777
12713
"commit_message_template\n"
11778
12714
"~~~~~~~~~~~~~~~~~~~~~~~"
11779
12715
msgstr ""
11780
12716
11781
#: en/help_topics/hooks.txt:341
12717
#: en/help_topics/hooks.txt:360
11782
12718
msgid "Introduced in: 1.10"
11783
12719
msgstr ""
11784
12720
11785
#: en/help_topics/hooks.txt:343
12721
#: en/help_topics/hooks.txt:362
11786
12722
msgid ""
11787
12723
"Called when a commit message is being generated.\n"
11788
12724
"commit_message_template is called with the bzrlib.commit.Commit object\n"
11793
12729
"second, and so on."
11794
12730
msgstr ""
11795
12731
11796
#: en/help_topics/hooks.txt:351
12732
#: en/help_topics/hooks.txt:370
11797
12733
msgid ""
11798
12734
"set_commit_message\n"
11799
12735
"~~~~~~~~~~~~~~~~~~"
11800
12736
msgstr ""
11801
12737
11802
#: en/help_topics/hooks.txt:356
12738
#: en/help_topics/hooks.txt:375
11803
12739
msgid ""
11804
12740
"Set a fixed commit message. set_commit_message is called with the\n"
11805
12741
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
11808
12744
"should use the message editor as normal."
11809
12745
msgstr ""
11810
12746
11811
#: en/help_topics/hooks.txt:362
12747
#: en/help_topics/hooks.txt:381
11812
12748
msgid ""
11813
12749
"MutableTreeHooks\n"
11814
12750
"----------------"
11815
12751
msgstr ""
11816
12752
11817
#: en/help_topics/hooks.txt:368
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
11818
12766
msgid "Introduced in: 2.0"
11819
12767
msgstr ""
11820
12768
11821
#: en/help_topics/hooks.txt:370
12769
#: en/help_topics/hooks.txt:397
11822
12770
msgid ""
11823
12771
"Called after a commit is performed on a tree. The hook is called with\n"
11824
12772
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
11826
12774
"that object."
11827
12775
msgstr ""
11828
12776
11829
#: en/help_topics/hooks.txt:375
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
11830
12802
msgid ""
11831
12803
"start_commit\n"
11832
12804
"~~~~~~~~~~~~"
11833
12805
msgstr ""
11834
12806
11835
#: en/help_topics/hooks.txt:380
12807
#: en/help_topics/hooks.txt:423
11836
12808
msgid ""
11837
12809
"Called before a commit is performed on a tree. The start commit hook\n"
11838
12810
"is able to change the tree before the commit takes place. start_commit\n"
11840
12812
"being performed on."
11841
12813
msgstr ""
11842
12814
11843
#: en/help_topics/hooks.txt:385
12815
#: en/help_topics/hooks.txt:428
11844
12816
msgid ""
11845
12817
"SmartClientHooks\n"
11846
12818
"----------------"
11847
12819
msgstr ""
11848
12820
11849
#: en/help_topics/hooks.txt:388
12821
#: en/help_topics/hooks.txt:431
11850
12822
msgid ""
11851
12823
"call\n"
11852
12824
"~~~~"
11853
12825
msgstr ""
11854
12826
11855
#: en/help_topics/hooks.txt:391
12827
#: en/help_topics/hooks.txt:434
11856
12828
msgid "Introduced in: unknown"
11857
12829
msgstr ""
11858
12830
11859
#: en/help_topics/hooks.txt:393
12831
#: en/help_topics/hooks.txt:436
11860
12832
msgid ""
11861
12833
"Called when the smart client is submitting a request to the smart\n"
11862
12834
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
11863
12835
"Streaming request bodies, and responses, are not accessible."
11864
12836
msgstr ""
11865
12837
11866
#: en/help_topics/hooks.txt:397
12838
#: en/help_topics/hooks.txt:440
11867
12839
msgid ""
11868
12840
"SmartServerHooks\n"
11869
12841
"----------------"
11870
12842
msgstr ""
11871
12843
11872
#: en/help_topics/hooks.txt:400
12844
#: en/help_topics/hooks.txt:443
11873
12845
msgid ""
11874
12846
"server_exception\n"
11875
12847
"~~~~~~~~~~~~~~~~"
11876
12848
msgstr ""
11877
12849
11878
#: en/help_topics/hooks.txt:405
12850
#: en/help_topics/hooks.txt:448
11879
12851
msgid ""
11880
12852
"Called by the bzr server when an exception occurs. server_exception is\n"
11881
12853
"called with the sys.exc_info() tuple return true for the hook if the\n"
11883
12855
"normally."
11884
12856
msgstr ""
11885
12857
11886
#: en/help_topics/hooks.txt:410
12858
#: en/help_topics/hooks.txt:453
11887
12859
msgid ""
11888
12860
"server_started\n"
11889
12861
"~~~~~~~~~~~~~~"
11890
12862
msgstr ""
11891
12863
11892
#: en/help_topics/hooks.txt:413
12864
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
11893
12865
msgid "Introduced in: 0.16"
11894
12866
msgstr ""
11895
12867
11896
#: en/help_topics/hooks.txt:415
12868
#: en/help_topics/hooks.txt:458
11897
12869
msgid ""
11898
12870
"Called by the bzr server when it starts serving a directory.\n"
11899
12871
"server_started is called with (backing urls, public url), where\n"
11902
12874
"served."
11903
12875
msgstr ""
11904
12876
11905
#: en/help_topics/hooks.txt:421
12877
#: en/help_topics/hooks.txt:464
11906
12878
msgid ""
11907
12879
"server_started_ex\n"
11908
12880
"~~~~~~~~~~~~~~~~~"
11909
12881
msgstr ""
11910
12882
11911
#: en/help_topics/hooks.txt:426
12883
#: en/help_topics/hooks.txt:469
11912
12884
msgid ""
11913
12885
"Called by the bzr server when it starts serving a directory.\n"
11914
12886
"server_started is called with (backing_urls, server_obj)."
11915
12887
msgstr ""
11916
12888
11917
#: en/help_topics/hooks.txt:429
12889
#: en/help_topics/hooks.txt:472
11918
12890
msgid ""
11919
12891
"server_stopped\n"
11920
12892
"~~~~~~~~~~~~~~"
11921
12893
msgstr ""
11922
12894
11923
#: en/help_topics/hooks.txt:434
12895
#: en/help_topics/hooks.txt:477
11924
12896
msgid ""
11925
12897
"Called by the bzr server when it stops serving a directory.\n"
11926
12898
"server_stopped is called with the same parameters as the\n"
11927
12899
"server_started hook: (backing_urls, public_url)."
11928
12900
msgstr ""
11929
12901
11930
#: en/help_topics/hooks.txt:438
12902
#: en/help_topics/hooks.txt:481
11931
12903
msgid ""
11932
12904
"StatusHooks\n"
11933
12905
"-----------"
11934
12906
msgstr ""
11935
12907
11936
#: en/help_topics/hooks.txt:441
12908
#: en/help_topics/hooks.txt:484
11937
12909
msgid ""
11938
12910
"post_status\n"
11939
12911
"~~~~~~~~~~~"
11940
12912
msgstr ""
11941
12913
11942
#: en/help_topics/hooks.txt:444
12914
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
11943
12915
msgid "Introduced in: 2.3"
11944
12916
msgstr ""
11945
12917
11946
#: en/help_topics/hooks.txt:446
12918
#: en/help_topics/hooks.txt:489
11947
12919
msgid ""
11948
12920
"Called with argument StatusHookParams after Bazaar has displayed the\n"
11949
12921
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
11952
12924
"status command. to_file is the output stream for writing."
11953
12925
msgstr ""
11954
12926
11955
#: en/help_topics/hooks.txt:452
12927
#: en/help_topics/hooks.txt:495
11956
12928
msgid ""
11957
12929
"pre_status\n"
11958
12930
"~~~~~~~~~~"
11959
12931
msgstr ""
11960
12932
11961
#: en/help_topics/hooks.txt:457
12933
#: en/help_topics/hooks.txt:500
11962
12934
msgid ""
11963
12935
"Called with argument StatusHookParams before Bazaar displays the\n"
11964
12936
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
11967
12939
"status command. to_file is the output stream for writing."
11968
12940
msgstr ""
11969
12941
11970
#: en/help_topics/hooks.txt:463
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
11971
12962
msgid ""
11972
12963
"RioVersionInfoBuilderHooks\n"
11973
12964
"--------------------------"
11974
12965
msgstr ""
11975
12966
11976
#: en/help_topics/hooks.txt:466
12967
#: en/help_topics/hooks.txt:521
11977
12968
msgid ""
11978
12969
"revision\n"
11979
12970
"~~~~~~~~"
11980
12971
msgstr ""
11981
12972
11982
#: en/help_topics/hooks.txt:471
12973
#: en/help_topics/hooks.txt:526
11983
12974
msgid ""
11984
12975
"Invoked when adding information about a revision to the RIO stanza\n"
11985
12976
"that is printed. revision is called with a revision object and a RIO\n"
12005
12996
12006
12997
#: en/help_topics/location-alias.txt:9
12007
12998
msgid ""
12008
" :parent the parent of this branch\n"
12009
" :submit the submit branch for this branch\n"
12010
" :public the public location of this branch\n"
12011
" :bound the branch this branch is bound to, for bound branches\n"
12012
" :push the saved location used for `bzr push` with no arguments\n"
12013
" :this this branch"
12999
" :bound The branch this branch is bound to, for bound branches.\n"
13000
" :parent The parent of this branch.\n"
13001
" :public The public location of this branch.\n"
13002
" :push The saved location used for `bzr push` with no arguments.\n"
13003
" :submit The submit branch for this branch.\n"
13004
" :this This branch."
12014
13005
msgstr ""
12015
13006
12016
13007
#: en/help_topics/location-alias.txt:16
12018
13009
msgstr ""
12019
13010
12020
13011
#: en/help_topics/location-alias.txt:18
12021
msgid " bzr push :parent"
13012
msgid " bzr push :parent\n"
12022
13013
msgstr ""
12023
13014
12024
13015
#: en/help_topics/log-formats.txt:1
12082
13073
msgstr ""
12083
13074
12084
13075
#: en/help_topics/other-formats.txt:3
12085
msgid "No experimental formats are available."
13076
msgid "Experimental formats are shown below."
12086
13077
msgstr ""
12087
13078
12088
13079
#: en/help_topics/other-formats.txt:5
12089
13080
msgid ""
13081
":development-colo:\n"
13082
" (native) The 2a format with experimental support for colocated\n"
13083
" branches."
13084
msgstr ""
13085
13086
#: en/help_topics/other-formats.txt:9
13087
msgid ""
12090
13088
"\n"
12091
"No deprecated formats are available."
13089
"Deprecated formats are shown below."
13090
msgstr ""
13091
13092
#: en/help_topics/other-formats.txt:12
13093
msgid ""
13094
":pack-0.92:\n"
13095
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13096
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13097
" by bzr < 0.92."
12092
13098
msgstr ""
12093
13099
12094
13100
#: en/help_topics/patterns.txt:1
12226
13232
"\tSelects the last revision of a specified branch.\n"
12227
13233
":tag:\n"
12228
13234
"\tSelects a revision identified by a tag name.\n"
12229
":package:\n"
12230
"\tSelects the revision corresponding to a version of a package.\n"
12231
13235
":revno:\n"
12232
13236
"\tSelects a revision using a number.\n"
12233
13237
":before:\n"
12240
13244
"\tSelects the nth revision from the end."
12241
13245
msgstr ""
12242
13246
13247
#: en/help_topics/revisionspec.txt:53
13248
msgid "In addition, plugins can provide other keywords."
13249
msgstr ""
13250
12243
13251
#: en/help_topics/revisionspec.txt:55
12244
msgid "In addition, plugins can provide other keywords."
13252
msgid "A detailed description of each keyword is given below."
12245
13253
msgstr ""
12246
13254
12247
13255
#: en/help_topics/revisionspec.txt:57
12248
msgid "A detailed description of each keyword is given below."
13256
msgid ":revid:"
12249
13257
msgstr ""
12250
13258
12251
13259
#: en/help_topics/revisionspec.txt:59
12252
msgid ":revid:"
12253
msgstr ""
12254
12255
#: en/help_topics/revisionspec.txt:61
12256
13260
msgid ""
12257
13261
" Supply a specific revision id, that can be used to specify any\n"
12258
13262
" revision id in the ancestry of the branch.\n"
12260
13264
" Examples::"
12261
13265
msgstr ""
12262
13266
13267
#: en/help_topics/revisionspec.txt:64
13268
msgid ""
13269
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13270
msgstr ""
13271
12263
13272
#: en/help_topics/revisionspec.txt:66
12264
msgid ""
12265
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13273
msgid ":submit:"
12266
13274
msgstr ""
12267
13275
12268
13276
#: en/help_topics/revisionspec.txt:68
12269
msgid ":submit:"
12270
msgstr ""
12271
12272
#: en/help_topics/revisionspec.txt:70
12273
13277
msgid ""
12274
13278
" Diffing against this shows all the changes that were made in this "
12275
13279
"branch,\n"
12278
13282
" is specified, the parent branch is used instead."
12279
13283
msgstr ""
12280
13284
12281
#: en/help_topics/revisionspec.txt:75
13285
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12282
13286
msgid ""
12283
13287
" The common ancestor is the last revision that existed in both\n"
12284
13288
" branches. Usually this is the branch point, but it could also be\n"
12285
13289
" a revision that was merged."
12286
13290
msgstr ""
12287
13291
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
13295
msgid " Examples::"
13296
msgstr ""
13297
12288
13298
#: en/help_topics/revisionspec.txt:79
12289
msgid " Examples::"
13299
msgid " $ bzr diff -r submit:"
12290
13300
msgstr ""
12291
13301
12292
13302
#: en/help_topics/revisionspec.txt:81
12293
msgid " $ bzr diff -r submit:"
13303
msgid ":ancestor:"
12294
13304
msgstr ""
12295
13305
12296
13306
#: en/help_topics/revisionspec.txt:83
12297
msgid ":ancestor:"
12298
msgstr ""
12299
12300
#: en/help_topics/revisionspec.txt:85
12301
13307
msgid " Supply the path to a branch to select the common ancestor."
12302
13308
msgstr ""
12303
13309
12304
#: en/help_topics/revisionspec.txt:91
13310
#: en/help_topics/revisionspec.txt:89
12305
13311
msgid ""
12306
13312
" This is frequently used with 'diff' to return all of the changes\n"
12307
13313
" that your branch introduces, while excluding the changes that you\n"
12308
13314
" have not merged from the remote branch."
12309
13315
msgstr ""
12310
13316
12311
#: en/help_topics/revisionspec.txt:97
13317
#: en/help_topics/revisionspec.txt:95
12312
13318
msgid ""
12313
13319
" ancestor:/path/to/branch\n"
12314
13320
" $ bzr diff -r ancestor:../../mainline/branch"
12315
13321
msgstr ""
12316
13322
13323
#: en/help_topics/revisionspec.txt:98
13324
msgid ":date:"
13325
msgstr ""
13326
12317
13327
#: en/help_topics/revisionspec.txt:100
12318
msgid ":date:"
12319
msgstr ""
12320
12321
#: en/help_topics/revisionspec.txt:102
12322
13328
msgid ""
12323
13329
" Supply a datestamp to select the first revision that matches the date.\n"
12324
13330
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12326
13332
" at a specified time)."
12327
13333
msgstr ""
12328
13334
13335
#: en/help_topics/revisionspec.txt:105
13336
msgid " One way to display all the changes since yesterday would be::"
13337
msgstr ""
13338
12329
13339
#: en/help_topics/revisionspec.txt:107
12330
msgid " One way to display all the changes since yesterday would be::"
12331
msgstr ""
12332
12333
#: en/help_topics/revisionspec.txt:109
12334
13340
msgid " bzr log -r date:yesterday.."
12335
13341
msgstr ""
12336
13342
12337
#: en/help_topics/revisionspec.txt:113
13343
#: en/help_topics/revisionspec.txt:111
12338
13344
msgid ""
12339
13345
" date:yesterday -> select the first revision since "
12340
13346
"yesterday\n"
12342
13348
" August 14th, 2006 at 5:10pm."
12343
13349
msgstr ""
12344
13350
13351
#: en/help_topics/revisionspec.txt:115
13352
msgid ":branch:"
13353
msgstr ""
13354
12345
13355
#: en/help_topics/revisionspec.txt:117
12346
msgid ":branch:"
12347
msgstr ""
12348
12349
#: en/help_topics/revisionspec.txt:119
12350
13356
msgid " Supply the path to a branch to select its last revision."
12351
13357
msgstr ""
12352
13358
13359
#: en/help_topics/revisionspec.txt:121
13360
msgid " branch:/path/to/branch"
13361
msgstr ""
13362
12353
13363
#: en/help_topics/revisionspec.txt:123
12354
msgid " branch:/path/to/branch"
13364
msgid ":tag:"
12355
13365
msgstr ""
12356
13366
12357
13367
#: en/help_topics/revisionspec.txt:125
12358
msgid ":tag:"
13368
msgid " Tags are stored in the branch and created by the 'tag' command."
12359
13369
msgstr ""
12360
13370
12361
13371
#: en/help_topics/revisionspec.txt:127
12362
msgid " Tags are stored in the branch and created by the 'tag' command."
13372
msgid ":revno:"
12363
13373
msgstr ""
12364
13374
12365
13375
#: en/help_topics/revisionspec.txt:129
12366
msgid ":package:"
12367
msgstr ""
12368
12369
#: en/help_topics/revisionspec.txt:131
12370
msgid ""
12371
" Given a package version number this revision specifier will allow you\n"
12372
" specify the revision corresponding to the upload of that version of\n"
12373
" the package."
12374
msgstr ""
12375
12376
#: en/help_topics/revisionspec.txt:135
12377
msgid ":revno:"
12378
msgstr ""
12379
12380
#: en/help_topics/revisionspec.txt:137
12381
13376
msgid ""
12382
13377
" Use an integer to specify a revision in the history of the branch.\n"
12383
13378
" Optionally a branch can be specified. A negative number will count\n"
12387
13382
" Examples::"
12388
13383
msgstr ""
12389
13384
12390
#: en/help_topics/revisionspec.txt:144
13385
#: en/help_topics/revisionspec.txt:136
12391
13386
msgid ""
12392
13387
" revno:1 -> return the first revision of this branch\n"
12393
13388
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12399
13394
" your history is very long."
12400
13395
msgstr ""
12401
13396
12402
#: en/help_topics/revisionspec.txt:153
13397
#: en/help_topics/revisionspec.txt:145
12403
13398
msgid ":before:"
12404
13399
msgstr ""
12405
13400
12406
#: en/help_topics/revisionspec.txt:155
13401
#: en/help_topics/revisionspec.txt:147
12407
13402
msgid ""
12408
13403
" Supply any revision spec to return the parent of that revision. This "
12409
13404
"is\n"
12412
13407
" of a branch."
12413
13408
msgstr ""
12414
13409
12415
#: en/help_topics/revisionspec.txt:159
13410
#: en/help_topics/revisionspec.txt:151
12416
13411
msgid ""
12417
13412
" It is an error to request the parent of the null revision (before:0)."
12418
13413
msgstr ""
12419
13414
12420
#: en/help_topics/revisionspec.txt:163
13415
#: en/help_topics/revisionspec.txt:155
12421
13416
msgid ""
12422
13417
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12423
13418
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12429
13424
" This is equivalent to: bzr diff -c 1913"
12430
13425
msgstr ""
12431
13426
12432
#: en/help_topics/revisionspec.txt:171
13427
#: en/help_topics/revisionspec.txt:163
12433
13428
msgid ":annotate:"
12434
13429
msgstr ""
12435
13430
12436
#: en/help_topics/revisionspec.txt:173
13431
#: en/help_topics/revisionspec.txt:165
12437
13432
msgid ""
12438
13433
" Select the revision that last modified the specified line. Line is\n"
12439
13434
" specified as path:number. Path is a relative path to the file. "
12442
13437
" committed version of the file."
12443
13438
msgstr ""
12444
13439
12445
#: en/help_topics/revisionspec.txt:178
13440
#: en/help_topics/revisionspec.txt:170
12446
13441
msgid ":mainline:"
12447
13442
msgstr ""
12448
13443
12449
#: en/help_topics/revisionspec.txt:180
13444
#: en/help_topics/revisionspec.txt:172
12450
13445
msgid ""
12451
13446
" Select the revision that merged the specified revision into mainline."
12452
13447
msgstr ""
12453
13448
12454
#: en/help_topics/revisionspec.txt:182
13449
#: en/help_topics/revisionspec.txt:174
12455
13450
msgid ":last:"
12456
13451
msgstr ""
12457
13452
12458
#: en/help_topics/revisionspec.txt:184
13453
#: en/help_topics/revisionspec.txt:176
12459
13454
msgid ""
12460
13455
" Supply a positive number to get the nth revision from the end.\n"
12461
13456
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12462
13457
" Examples::"
12463
13458
msgstr ""
12464
13459
12465
#: en/help_topics/revisionspec.txt:188
13460
#: en/help_topics/revisionspec.txt:180
12466
13461
msgid ""
12467
13462
" last:1 -> return the last revision\n"
12468
13463
" last:3 -> return the revision 2 before the end.\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1