« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6405.2.11
- compare with another revision
- compare with revision 692
- download diff
- download tarball
- view history from revision 6405.2.11
- Committer: Jelmer Vernooij
- Date: 2012-01-24 16:19:04 UTC
- mfrom: (6445.3.1 tree-fileids-are-tuples)
- mto: This revision was merged to the branch mainline in revision 6464.
- Revision ID: jelmer@samba.org-20120124161904-6qw35tdkhd62k3e4
Merge bzr.dev and tree-file-ids-as-tuples.
- files added:
- bzrlib/tests/test_https_urllib.py
- files modified:
- bzr
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-12-08 09:21+0100\n"
11
"POT-Creation-Date: 2012-01-16 15:18+0100\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr ""
24
24
25
#: bzrlib/branch.py:871
25
#: bzrlib/branch.py:872
26
26
msgid "Unstacking"
27
27
msgstr ""
28
28
29
#: bzrlib/branch.py:3173
29
#: bzrlib/branch.py:3183
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr ""
33
33
34
#: bzrlib/branch.py:3175
34
#: bzrlib/branch.py:3185
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:3178
41
#: bzrlib/branch.py:3188
42
42
msgid "No new revisions or tags to push."
43
43
msgstr ""
44
44
45
#: bzrlib/branch.py:3180
45
#: bzrlib/branch.py:3190
46
46
msgid "No new revisions to push."
47
47
msgstr ""
48
48
49
#: bzrlib/branch.py:3200
49
#: bzrlib/branch.py:3210
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3203
53
#: bzrlib/branch.py:3213
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr ""
57
57
58
#: bzrlib/builtins.py:118 bzrlib/builtins.py:2868 bzrlib/workingtree.py:304
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr ""
62
62
63
#: bzrlib/builtins.py:127
63
#: bzrlib/builtins.py:130
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr ""
67
67
68
#: bzrlib/builtins.py:212
68
#: bzrlib/builtins.py:215
69
69
msgid "Display status summary."
70
70
msgstr ""
71
71
72
#: bzrlib/builtins.py:214
72
#: bzrlib/builtins.py:217
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:217
78
#: bzrlib/builtins.py:220
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:220
84
#: bzrlib/builtins.py:223
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:224
91
#: bzrlib/builtins.py:227
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:229
99
#: bzrlib/builtins.py:232
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:232
105
#: bzrlib/builtins.py:235
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:235
111
#: bzrlib/builtins.py:238
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:238
117
#: bzrlib/builtins.py:241
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:243
125
#: bzrlib/builtins.py:246
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:246
131
#: bzrlib/builtins.py:249
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:250
138
#: bzrlib/builtins.py:253
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:255
146
#: bzrlib/builtins.py:258
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:260
154
#: bzrlib/builtins.py:263
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:263
160
#: bzrlib/builtins.py:266
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:272
168
#: bzrlib/builtins.py:275
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:274
173
#: bzrlib/builtins.py:277
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:276
178
#: bzrlib/builtins.py:279
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:279
183
#: bzrlib/builtins.py:282
184
184
msgid "Do not mark object type using indicator."
185
185
msgstr ""
186
186
187
#: bzrlib/builtins.py:294
187
#: bzrlib/builtins.py:297
188
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
189
msgstr ""
190
190
191
#: bzrlib/builtins.py:338 bzrlib/builtins.py:5024
191
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
192
192
msgid "You can only supply one of revision_id or --revision"
193
193
msgstr ""
194
194
195
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5026
195
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
196
196
msgid "You must supply either --revision or a revision_id"
197
197
msgstr ""
198
198
199
#: bzrlib/builtins.py:348
199
#: bzrlib/builtins.py:351
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:359
204
#: bzrlib/builtins.py:362
205
205
msgid "The repository {0} contains no revision {1}."
206
206
msgstr ""
207
207
208
#: bzrlib/builtins.py:366
208
#: bzrlib/builtins.py:369
209
209
msgid "You cannot specify a NULL revision."
210
210
msgstr ""
211
211
212
#: bzrlib/builtins.py:458
212
#: bzrlib/builtins.py:461
213
213
msgid "Remove the working tree from a given branch/checkout."
214
214
msgstr ""
215
215
216
#: bzrlib/builtins.py:460
216
#: bzrlib/builtins.py:463
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:463
222
#: bzrlib/builtins.py:466
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:469
227
#: bzrlib/builtins.py:472
228
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
229
msgstr ""
230
230
231
#: bzrlib/builtins.py:483
231
#: bzrlib/builtins.py:486
232
232
msgid "No working tree to remove"
233
233
msgstr ""
234
234
235
#: bzrlib/builtins.py:485
235
#: bzrlib/builtins.py:488
236
236
msgid "You cannot remove the working tree of a remote path"
237
237
msgstr ""
238
238
239
#: bzrlib/builtins.py:494
239
#: bzrlib/builtins.py:497
240
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
241
msgstr ""
242
242
243
#: bzrlib/builtins.py:534
243
#: bzrlib/builtins.py:537
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:545
249
#: bzrlib/builtins.py:548
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:549
255
#: bzrlib/builtins.py:552
256
256
msgid "failed to reset the tree state{0}"
257
257
msgstr ""
258
258
259
#: bzrlib/builtins.py:553
259
#: bzrlib/builtins.py:556
260
260
msgid "Show current revision number."
261
261
msgstr ""
262
262
263
#: bzrlib/builtins.py:555
263
#: bzrlib/builtins.py:558
264
264
msgid "This is equal to the number of revisions on this branch."
265
265
msgstr ""
266
266
267
#: bzrlib/builtins.py:568
267
#: bzrlib/builtins.py:571
268
268
msgid "--tree and --revision can not be used together"
269
269
msgstr ""
270
270
271
#: bzrlib/builtins.py:585 bzrlib/builtins.py:5808
271
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
272
272
msgid "Tags can only be placed on a single revision, not on a range"
273
273
msgstr ""
274
274
275
275
# help of 'tree' option of 'revno' command
276
#: bzrlib/builtins.py:609
276
#: bzrlib/builtins.py:612
277
277
msgid "Show revno of working tree."
278
278
msgstr ""
279
279
280
#: bzrlib/builtins.py:657
280
#: bzrlib/builtins.py:660
281
281
msgid "Add specified files or directories."
282
282
msgstr ""
283
283
284
#: bzrlib/builtins.py:659
284
#: bzrlib/builtins.py:662
285
285
msgid ""
286
286
"In non-recursive mode, all the named items are added, regardless\n"
287
287
"of whether they were previously ignored. A warning is given if\n"
288
288
"any of the named files are already versioned."
289
289
msgstr ""
290
290
291
#: bzrlib/builtins.py:663
291
#: bzrlib/builtins.py:666
292
292
msgid ""
293
293
"In recursive mode (the default), files are treated the same way\n"
294
294
"but the behaviour for directories is different. Directories that\n"
299
299
"directories. If no names are given '.' is assumed."
300
300
msgstr ""
301
301
302
#: bzrlib/builtins.py:671
302
#: bzrlib/builtins.py:674
303
303
msgid ""
304
304
"A warning will be printed when nested trees are encountered,\n"
305
305
"unless they are explicitly ignored."
306
306
msgstr ""
307
307
308
#: bzrlib/builtins.py:674
308
#: bzrlib/builtins.py:677
309
309
msgid ""
310
310
"Therefore simply saying 'bzr add' will version all files that\n"
311
311
"are currently unknown."
312
312
msgstr ""
313
313
314
#: bzrlib/builtins.py:677
314
#: bzrlib/builtins.py:680
315
315
msgid ""
316
316
"Adding a file whose parent directory is not versioned will\n"
317
317
"implicitly add the parent, and so on up to the root. This means\n"
319
319
"get added when you add a file in the directory."
320
320
msgstr ""
321
321
322
#: bzrlib/builtins.py:682
322
#: bzrlib/builtins.py:685
323
323
msgid ""
324
324
"--dry-run will show which files would be added, but not actually\n"
325
325
"add them."
326
326
msgstr ""
327
327
328
#: bzrlib/builtins.py:685
328
#: bzrlib/builtins.py:688
329
329
msgid ""
330
330
"--file-ids-from will try to use the file ids from the supplied path.\n"
331
331
"It looks up ids trying to find a matching parent directory with the\n"
336
336
"into a subdirectory of this one."
337
337
msgstr ""
338
338
339
#: bzrlib/builtins.py:693
339
#: bzrlib/builtins.py:696
340
340
msgid ""
341
341
"Any files matching patterns in the ignore list will not be added\n"
342
342
"unless they are explicitly mentioned."
343
343
msgstr ""
344
344
345
#: bzrlib/builtins.py:696
345
#: bzrlib/builtins.py:699
346
346
msgid ""
347
347
"In recursive mode, files larger than the configuration option \n"
348
348
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
350
350
msgstr ""
351
351
352
352
# help of 'no-recurse' option of 'add' command
353
#: bzrlib/builtins.py:703
353
#: bzrlib/builtins.py:706
354
354
msgid "Don't recursively add the contents of directories."
355
355
msgstr ""
356
356
357
357
# help of 'file-ids-from' option of 'add' command
358
#: bzrlib/builtins.py:709
358
#: bzrlib/builtins.py:712
359
359
msgid "Lookup file ids from this tree."
360
360
msgstr ""
361
361
362
#: bzrlib/builtins.py:745
362
#: bzrlib/builtins.py:748
363
363
msgid "ignored {0} matching \"{1}\"\n"
364
364
msgstr ""
365
365
366
#: bzrlib/builtins.py:750
366
#: bzrlib/builtins.py:753
367
367
msgid "Create a new versioned directory."
368
368
msgstr ""
369
369
370
#: bzrlib/builtins.py:752
370
#: bzrlib/builtins.py:755
371
371
msgid "This is equivalent to creating the directory and then adding it."
372
372
msgstr ""
373
373
374
#: bzrlib/builtins.py:767
374
# help of 'parents' option of 'mkdir' command
375
#: bzrlib/builtins.py:762
376
msgid "No error if existing, make parent directories as needed."
377
msgstr ""
378
379
#: bzrlib/builtins.py:796
375
380
#, python-format
376
381
msgid "added %s\n"
377
382
msgstr ""
378
383
379
#: bzrlib/builtins.py:811
384
#: bzrlib/builtins.py:838
380
385
#, python-format
381
386
msgid "invalid kind %r specified"
382
387
msgstr ""
383
388
384
#: bzrlib/builtins.py:848
389
#: bzrlib/builtins.py:875
385
390
msgid "Move or rename a file."
386
391
msgstr ""
387
392
388
#: bzrlib/builtins.py:850
393
#: bzrlib/builtins.py:877
389
394
msgid " bzr mv SOURCE... DESTINATION"
390
395
msgstr ""
391
396
392
#: bzrlib/builtins.py:852
397
#: bzrlib/builtins.py:879
393
398
msgid ""
394
399
"If the last argument is a versioned directory, all the other names\n"
395
400
"are moved into it. Otherwise, there must be exactly two arguments\n"
396
401
"and the file is changed to a new name."
397
402
msgstr ""
398
403
399
#: bzrlib/builtins.py:856
404
#: bzrlib/builtins.py:883
400
405
msgid ""
401
406
"If OLDNAME does not exist on the filesystem but is versioned and\n"
402
407
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
405
410
"The same is valid when moving many SOURCE files to a DESTINATION."
406
411
msgstr ""
407
412
408
#: bzrlib/builtins.py:862
413
#: bzrlib/builtins.py:889
409
414
msgid "Files cannot be moved between branches."
410
415
msgstr ""
411
416
412
417
# help of 'after' option of 'mv' command
413
#: bzrlib/builtins.py:869
418
#: bzrlib/builtins.py:896
414
419
msgid ""
415
420
"Move only the bzr identifier of the file, because the file has already been "
416
421
"moved."
417
422
msgstr ""
418
423
419
424
# help of 'auto' option of 'mv' command
420
#: bzrlib/builtins.py:871
425
#: bzrlib/builtins.py:898
421
426
msgid "Automatically guess renames."
422
427
msgstr ""
423
428
424
429
# help of 'dry-run' option of 'mv' command
425
#: bzrlib/builtins.py:872
430
#: bzrlib/builtins.py:899
426
431
msgid "Avoid making changes when guessing renames."
427
432
msgstr ""
428
433
429
#: bzrlib/builtins.py:881
434
#: bzrlib/builtins.py:908
430
435
msgid "--dry-run requires --auto."
431
436
msgstr ""
432
437
433
#: bzrlib/builtins.py:885
438
#: bzrlib/builtins.py:912
434
439
msgid "missing file argument"
435
440
msgstr ""
436
441
437
#: bzrlib/builtins.py:889
442
#: bzrlib/builtins.py:916
438
443
msgid "can not move root of branch"
439
444
msgstr ""
440
445
441
#: bzrlib/builtins.py:895
446
#: bzrlib/builtins.py:922
442
447
msgid "Only one path may be specified to --auto."
443
448
msgstr ""
444
449
445
#: bzrlib/builtins.py:898
450
#: bzrlib/builtins.py:925
446
451
msgid "--after cannot be specified with --auto."
447
452
msgstr ""
448
453
449
#: bzrlib/builtins.py:935
454
#: bzrlib/builtins.py:962
450
455
msgid "to mv multiple files the destination must be a versioned directory"
451
456
msgstr ""
452
457
453
#: bzrlib/builtins.py:987
458
#: bzrlib/builtins.py:1014
454
459
msgid "Turn this branch into a mirror of another branch."
455
460
msgstr ""
456
461
457
#: bzrlib/builtins.py:989
462
#: bzrlib/builtins.py:1016
458
463
msgid ""
459
464
"By default, this command only works on branches that have not diverged.\n"
460
465
"Branches are considered diverged if the destination branch's most recent \n"
462
467
"parent."
463
468
msgstr ""
464
469
465
#: bzrlib/builtins.py:994
470
#: bzrlib/builtins.py:1021
466
471
msgid ""
467
472
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
468
473
"from one into the other. Once one branch has merged, the other should\n"
469
474
"be able to pull it again."
470
475
msgstr ""
471
476
472
#: bzrlib/builtins.py:998
477
#: bzrlib/builtins.py:1025
473
478
msgid ""
474
479
"If you want to replace your local changes and just want your branch to\n"
475
480
"match the remote one, use pull --overwrite. This will work even if the two\n"
476
481
"branches have diverged."
477
482
msgstr ""
478
483
479
#: bzrlib/builtins.py:1002
484
#: bzrlib/builtins.py:1029
480
485
msgid ""
481
486
"If there is no default location set, the first pull will set it (use\n"
482
487
"--no-remember to avoid setting it). After that, you can omit the\n"
484
489
"value will only be saved if the remote location can be accessed."
485
490
msgstr ""
486
491
487
#: bzrlib/builtins.py:1007
492
#: bzrlib/builtins.py:1034
488
493
msgid ""
489
494
"The --verbose option will display the revisions pulled using the log_format\n"
490
495
"configuration option. You can use a different format by overriding it with\n"
491
496
"-Olog_format=<other_format>."
492
497
msgstr ""
493
498
494
#: bzrlib/builtins.py:1011
499
#: bzrlib/builtins.py:1038
495
500
msgid ""
496
501
"Note: The location can be specified either in the form of a branch,\n"
497
502
"or in the form of a path to a file containing a merge directive generated\n"
499
504
msgstr ""
500
505
501
506
# help of 'verbose' option of 'pull' command
502
#: bzrlib/builtins.py:1019
507
#: bzrlib/builtins.py:1046
503
508
msgid "Show logs of pulled revisions."
504
509
msgstr ""
505
510
506
511
# help of 'directory' option of 'pull' command
507
#: bzrlib/builtins.py:1021
512
#: bzrlib/builtins.py:1048
508
513
msgid ""
509
514
"Branch to pull into, rather than the one containing the working directory."
510
515
msgstr ""
511
516
512
517
# help of 'local' option of 'pull' command
513
#: bzrlib/builtins.py:1024
518
#: bzrlib/builtins.py:1051
514
519
msgid ""
515
520
"Perform a local pull in a bound branch. Local pulls are not applied to the "
516
521
"master branch."
517
522
msgstr ""
518
523
519
#: bzrlib/builtins.py:1053
524
#: bzrlib/builtins.py:1080
520
525
msgid "Need working tree for --show-base."
521
526
msgstr ""
522
527
523
#: bzrlib/builtins.py:1069
528
#: bzrlib/builtins.py:1096
524
529
msgid "No pull location known or specified."
525
530
msgstr ""
526
531
527
#: bzrlib/builtins.py:1075
532
#: bzrlib/builtins.py:1102
528
533
#, python-format
529
534
msgid "Using saved parent location: %s\n"
530
535
msgstr ""
531
536
532
#: bzrlib/builtins.py:1082 bzrlib/builtins.py:4234
537
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
533
538
msgid "Cannot use -r with merge directives or bundles"
534
539
msgstr ""
535
540
536
#: bzrlib/builtins.py:1123
541
#: bzrlib/builtins.py:1150
537
542
msgid "Update a mirror of this branch."
538
543
msgstr ""
539
544
540
#: bzrlib/builtins.py:1125
545
#: bzrlib/builtins.py:1152
541
546
msgid ""
542
547
"The target branch will not have its working tree populated because this\n"
543
548
"is both expensive, and is not supported on remote file systems."
544
549
msgstr ""
545
550
546
#: bzrlib/builtins.py:1128
551
#: bzrlib/builtins.py:1155
547
552
msgid ""
548
553
"Some smart servers or protocols *may* put the working tree in place in\n"
549
554
"the future."
550
555
msgstr ""
551
556
552
#: bzrlib/builtins.py:1131
557
#: bzrlib/builtins.py:1158
553
558
msgid ""
554
559
"This command only works on branches that have not diverged. Branches are\n"
555
560
"considered diverged if the destination branch's most recent commit is one\n"
556
561
"that has not been merged (directly or indirectly) by the source branch."
557
562
msgstr ""
558
563
559
#: bzrlib/builtins.py:1135
564
#: bzrlib/builtins.py:1162
560
565
msgid ""
561
566
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
562
567
"the other branch completely, discarding its unmerged changes."
563
568
msgstr ""
564
569
565
#: bzrlib/builtins.py:1138
570
#: bzrlib/builtins.py:1165
566
571
msgid ""
567
572
"If you want to ensure you have the different changes in the other branch,\n"
568
573
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
569
574
"After that you will be able to do a push without '--overwrite'."
570
575
msgstr ""
571
576
572
#: bzrlib/builtins.py:1142
577
#: bzrlib/builtins.py:1169
573
578
msgid ""
574
579
"If there is no default push location set, the first push will set it (use\n"
575
580
"--no-remember to avoid setting it). After that, you can omit the\n"
577
582
"value will only be saved if the remote location can be accessed."
578
583
msgstr ""
579
584
580
#: bzrlib/builtins.py:1147
585
#: bzrlib/builtins.py:1174
581
586
msgid ""
582
587
"The --verbose option will display the revisions pushed using the log_format\n"
583
588
"configuration option. You can use a different format by overriding it with\n"
584
589
"-Olog_format=<other_format>."
585
590
msgstr ""
586
591
592
# help of 'directory' option of 'dpush' command
593
# help of 'directory' option of 'push' command
594
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
595
msgid ""
596
"Branch to push from, rather than the one containing the working directory."
597
msgstr ""
598
587
599
# help of 'use-existing-dir' option of 'push' command
588
#: bzrlib/builtins.py:1161
600
#: bzrlib/builtins.py:1188
589
601
msgid ""
590
602
"By default push will fail if the target directory exists, but does not "
591
603
"already have a control directory. This flag will allow push to proceed."
592
604
msgstr ""
593
605
594
606
# help of 'stacked' option of 'push' command
595
#: bzrlib/builtins.py:1166
607
#: bzrlib/builtins.py:1193
596
608
msgid ""
597
609
"Create a stacked branch that references the public location of the parent "
598
610
"branch."
599
611
msgstr ""
600
612
601
613
# help of 'stacked-on' option of 'push' command
602
#: bzrlib/builtins.py:1169
614
#: bzrlib/builtins.py:1196
603
615
msgid ""
604
616
"Create a stacked branch that refers to another branch for the commit "
605
617
"history. Only the work not present in the referenced branch is included in "
606
618
"the branch created."
607
619
msgstr ""
608
620
621
# help of 'strict' option of 'dpush' command
622
# help of 'strict' option of 'push' command
623
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
624
msgid ""
625
"Refuse to push if there are uncommitted changes in the working tree, --no-"
626
"strict disables the check."
627
msgstr ""
628
609
629
# help of 'no-tree' option of 'push' command
610
#: bzrlib/builtins.py:1177
630
#: bzrlib/builtins.py:1204
611
631
msgid "Don't populate the working tree, even for protocols that support it."
612
632
msgstr ""
613
633
614
#: bzrlib/builtins.py:1221
634
#: bzrlib/builtins.py:1248
615
635
msgid "Could not determine branch to refer to."
616
636
msgstr ""
617
637
618
#: bzrlib/builtins.py:1228 bzrlib/foreign.py:305
638
#: bzrlib/builtins.py:1257
639
#, python-format
640
msgid ""
641
"No push location known or specified. To push to the parent branch (at %s), "
642
"use 'bzr push :parent'."
643
msgstr ""
644
645
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
619
646
msgid "No push location known or specified."
620
647
msgstr ""
621
648
622
#: bzrlib/builtins.py:1232
649
#: bzrlib/builtins.py:1267
623
650
#, python-format
624
651
msgid "Using saved push location: %s"
625
652
msgstr ""
626
653
627
#: bzrlib/builtins.py:1242
654
#: bzrlib/builtins.py:1277
628
655
msgid "Create a new branch that is a copy of an existing branch."
629
656
msgstr ""
630
657
631
#: bzrlib/builtins.py:1244
658
#: bzrlib/builtins.py:1279
632
659
msgid ""
633
660
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
634
661
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
639
666
"create ./foo-bar."
640
667
msgstr ""
641
668
642
#: bzrlib/builtins.py:1251
669
#: bzrlib/builtins.py:1286
643
670
msgid ""
644
671
"To retrieve the branch as of a particular revision, supply the --revision\n"
645
672
"parameter, as in \"branch foo/bar -r 5\"."
646
673
msgstr ""
647
674
648
#: bzrlib/builtins.py:1254
675
#: bzrlib/builtins.py:1289
649
676
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
650
677
msgstr ""
651
678
652
679
# help of 'no-tree' option of 'branch' command
653
#: bzrlib/builtins.py:1264
680
#: bzrlib/builtins.py:1299
654
681
msgid "Create a branch without a working-tree."
655
682
msgstr ""
656
683
657
684
# help of 'switch' option of 'branch' command
658
#: bzrlib/builtins.py:1266
685
#: bzrlib/builtins.py:1301
659
686
msgid "Switch the checkout in the current directory to the new branch."
660
687
msgstr ""
661
688
662
689
# help of 'stacked' option of 'branch' command
663
#: bzrlib/builtins.py:1269
690
#: bzrlib/builtins.py:1304
664
691
msgid ""
665
692
"Create a stacked branch referring to the source branch. The new branch will "
666
693
"depend on the availability of the source branch for all operations."
667
694
msgstr ""
668
695
669
696
# help of 'standalone' option of 'branch' command
670
#: bzrlib/builtins.py:1273
697
#: bzrlib/builtins.py:1308
671
698
msgid "Do not use a shared repository, even if available."
672
699
msgstr ""
673
700
674
701
# help of 'use-existing-dir' option of 'branch' command
675
#: bzrlib/builtins.py:1275
702
#: bzrlib/builtins.py:1310
676
703
msgid ""
677
704
"By default branch will fail if the target directory exists, but does not "
678
705
"already have a control directory. This flag will allow branch to proceed."
679
706
msgstr ""
680
707
681
708
# help of 'bind' option of 'branch' command
682
#: bzrlib/builtins.py:1280
709
#: bzrlib/builtins.py:1315
683
710
msgid "Bind new branch to from location."
684
711
msgstr ""
685
712
686
#: bzrlib/builtins.py:1327
713
#: bzrlib/builtins.py:1362
687
714
#, python-format
688
715
msgid "Target directory \"%s\" already exists."
689
716
msgstr ""
690
717
691
#: bzrlib/builtins.py:1339
718
#: bzrlib/builtins.py:1374
692
719
#, python-format
693
720
msgid "Parent of \"%s\" does not exist."
694
721
msgstr ""
695
722
696
#: bzrlib/builtins.py:1358
723
#: bzrlib/builtins.py:1393
697
724
msgid "The branch {0} has no revision {1}."
698
725
msgstr ""
699
726
700
#: bzrlib/builtins.py:1368 bzrlib/push.py:51
727
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
701
728
#, python-format
702
729
msgid "Created new stacked branch referring to %s."
703
730
msgstr ""
704
731
705
#: bzrlib/builtins.py:1372
732
#: bzrlib/builtins.py:1407
706
733
#, python-format
707
734
msgid "Branched %d revision."
708
735
msgid_plural "Branched %d revisions."
709
736
msgstr[0] ""
710
737
msgstr[1] ""
711
738
712
#: bzrlib/builtins.py:1377
739
#: bzrlib/builtins.py:1412
713
740
#, python-format
714
741
msgid "New branch bound to %s"
715
742
msgstr ""
716
743
717
#: bzrlib/builtins.py:1382 bzrlib/builtins.py:6121
744
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
718
745
#, python-format
719
746
msgid "Switched to branch: %s"
720
747
msgstr ""
721
748
722
#: bzrlib/builtins.py:1387
749
#: bzrlib/builtins.py:1422
723
750
msgid "List the branches available at the current location."
724
751
msgstr ""
725
752
726
#: bzrlib/builtins.py:1389
753
#: bzrlib/builtins.py:1424
727
754
msgid ""
728
755
"This command will print the names of all the branches at the current\n"
729
756
"location."
730
757
msgstr ""
731
758
732
759
# help of 'recursive' option of 'branches' command
733
#: bzrlib/builtins.py:1396
760
#: bzrlib/builtins.py:1431
734
761
msgid ""
735
762
"Recursively scan for branches rather than just looking in the specified "
736
763
"location."
737
764
msgstr ""
738
765
739
#: bzrlib/builtins.py:1413
740
msgid " (default)\n"
766
#: bzrlib/builtins.py:1461
767
msgid "(default)"
741
768
msgstr ""
742
769
743
#: bzrlib/builtins.py:1420
770
#: bzrlib/builtins.py:1473
744
771
msgid "Create a new checkout of an existing branch."
745
772
msgstr ""
746
773
747
#: bzrlib/builtins.py:1422
774
#: bzrlib/builtins.py:1475
748
775
msgid ""
749
776
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
750
777
"for\n"
754
781
"location using SFTP."
755
782
msgstr ""
756
783
757
#: bzrlib/builtins.py:1427
784
#: bzrlib/builtins.py:1480
758
785
msgid ""
759
786
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
760
787
"will\n"
766
793
"create ./foo-bar."
767
794
msgstr ""
768
795
769
#: bzrlib/builtins.py:1434
796
#: bzrlib/builtins.py:1487
770
797
msgid ""
771
798
"To retrieve the branch as of a particular revision, supply the --revision\n"
772
799
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
777
804
msgstr ""
778
805
779
806
# help of 'lightweight' option of 'checkout' command
780
#: bzrlib/builtins.py:1444
807
#: bzrlib/builtins.py:1497
781
808
msgid ""
782
809
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
783
810
"the branch for every operation. Normal checkouts can perform common "
786
813
msgstr ""
787
814
788
815
# help of 'files-from' option of 'branch' command
789
#: bzrlib/builtins.py:1451
816
# help of 'files-from' option of 'checkout' command
817
#: bzrlib/builtins.py:1504
790
818
msgid "Get file contents from this tree."
791
819
msgstr ""
792
820
793
821
# help of 'hardlink' option of 'branch' command
794
#: bzrlib/builtins.py:1453
822
# help of 'hardlink' option of 'checkout' command
823
#: bzrlib/builtins.py:1506
795
824
msgid "Hard-link working tree files where possible."
796
825
msgstr ""
797
826
798
#: bzrlib/builtins.py:1494
827
#: bzrlib/builtins.py:1547
799
828
msgid ""
800
829
"Show list of renamed files.\n"
801
830
" "
802
831
msgstr ""
803
832
804
#: bzrlib/builtins.py:1524
833
#: bzrlib/builtins.py:1577
805
834
msgid "Update a working tree to a new revision."
806
835
msgstr ""
807
836
808
#: bzrlib/builtins.py:1526
837
#: bzrlib/builtins.py:1579
809
838
msgid ""
810
839
"This will perform a merge of the destination revision (the tip of the\n"
811
840
"branch, or the specified revision) into the working tree, and then make\n"
812
841
"that revision the basis revision for the working tree. "
813
842
msgstr ""
814
843
815
#: bzrlib/builtins.py:1530
844
#: bzrlib/builtins.py:1583
816
845
msgid ""
817
846
"You can use this to visit an older revision, or to update a working tree\n"
818
847
"that is out of date from its branch."
819
848
msgstr ""
820
849
821
#: bzrlib/builtins.py:1533
850
#: bzrlib/builtins.py:1586
822
851
msgid ""
823
852
"If there are any uncommitted changes in the tree, they will be carried\n"
824
853
"across and remain as uncommitted changes after the update. To discard\n"
826
855
"with the changes brought in by the change in basis revision."
827
856
msgstr ""
828
857
829
#: bzrlib/builtins.py:1538
858
#: bzrlib/builtins.py:1591
830
859
msgid ""
831
860
"If the tree's branch is bound to a master branch, bzr will also update\n"
832
861
"the branch from the master."
833
862
msgstr ""
834
863
835
#: bzrlib/builtins.py:1541
864
#: bzrlib/builtins.py:1594
836
865
msgid ""
837
866
"You cannot update just a single file or directory, because each Bazaar\n"
838
867
"working tree has just a single basis revision. If you want to restore a\n"
842
871
"out the old content of that file to a new location."
843
872
msgstr ""
844
873
845
#: bzrlib/builtins.py:1548
874
#: bzrlib/builtins.py:1601
846
875
msgid ""
847
876
"The 'dir' argument, if given, must be the location of the root of a\n"
848
877
"working tree to update. By default, the working tree that contains the \n"
849
878
"current working directory is used."
850
879
msgstr ""
851
880
852
#: bzrlib/builtins.py:1564
881
#: bzrlib/builtins.py:1617
853
882
msgid "bzr update --revision takes exactly one revision"
854
883
msgstr ""
855
884
856
#: bzrlib/builtins.py:1572
885
#: bzrlib/builtins.py:1625
857
886
msgid "bzr update can only update a whole tree, not a file or subdirectory"
858
887
msgstr ""
859
888
860
#: bzrlib/builtins.py:1603
889
#: bzrlib/builtins.py:1656
861
890
msgid "Tree is up to date at revision {0} of branch {1}"
862
891
msgstr ""
863
892
864
#: bzrlib/builtins.py:1619
893
#: bzrlib/builtins.py:1672
865
894
#, python-format
866
895
msgid ""
867
896
"branch has no revision %s\n"
868
897
"bzr update --revision only works for a revision in the branch history"
869
898
msgstr ""
870
899
871
#: bzrlib/builtins.py:1625
900
#: bzrlib/builtins.py:1678
872
901
msgid "Updated to revision {0} of branch {1}"
873
902
msgstr ""
874
903
875
#: bzrlib/builtins.py:1629
904
#: bzrlib/builtins.py:1682
876
905
msgid ""
877
906
"Your local commits will now show as pending merges with 'bzr status', and "
878
907
"can be committed with 'bzr commit'."
879
908
msgstr ""
880
909
881
#: bzrlib/builtins.py:1638
910
#: bzrlib/builtins.py:1691
882
911
msgid "Show information about a working tree, branch or repository."
883
912
msgstr ""
884
913
885
#: bzrlib/builtins.py:1640
914
#: bzrlib/builtins.py:1693
886
915
msgid ""
887
916
"This command will show all known locations and formats associated to the\n"
888
917
"tree, branch or repository."
889
918
msgstr ""
890
919
891
#: bzrlib/builtins.py:1643
920
#: bzrlib/builtins.py:1696
892
921
msgid ""
893
922
"In verbose mode, statistical information is included with each report.\n"
894
923
"To see extended statistic information, use a verbosity level of 2 or\n"
895
924
"higher by specifying the verbose option multiple times, e.g. -vv."
896
925
msgstr ""
897
926
898
#: bzrlib/builtins.py:1647
927
#: bzrlib/builtins.py:1700
899
928
msgid "Branches and working trees will also report any missing revisions."
900
929
msgstr ""
901
930
902
#: bzrlib/builtins.py:1651
931
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
932
#: bzrlib/builtins.py:6389
933
msgid ":Examples:"
934
msgstr ""
935
936
#: bzrlib/builtins.py:1704
903
937
msgid " Display information on the format and related locations:"
904
938
msgstr ""
905
939
906
#: bzrlib/builtins.py:1653
940
#: bzrlib/builtins.py:1706
907
941
msgid " bzr info"
908
942
msgstr ""
909
943
910
#: bzrlib/builtins.py:1655
944
#: bzrlib/builtins.py:1708
911
945
msgid ""
912
946
" Display the above together with extended format information and\n"
913
947
" basic statistics (like the number of files in the working tree and\n"
914
948
" number of revisions in the branch and repository):"
915
949
msgstr ""
916
950
917
#: bzrlib/builtins.py:1659
951
#: bzrlib/builtins.py:1712
918
952
msgid " bzr info -v"
919
953
msgstr ""
920
954
921
#: bzrlib/builtins.py:1661
955
#: bzrlib/builtins.py:1714
922
956
msgid " Display the above together with number of committers to the branch:"
923
957
msgstr ""
924
958
925
#: bzrlib/builtins.py:1663
959
#: bzrlib/builtins.py:1716
926
960
msgid " bzr info -vv"
927
961
msgstr ""
928
962
929
#: bzrlib/builtins.py:1682
963
#: bzrlib/builtins.py:1735
930
964
msgid "Remove files or directories."
931
965
msgstr ""
932
966
933
#: bzrlib/builtins.py:1684
967
#: bzrlib/builtins.py:1737
934
968
msgid ""
935
969
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
936
970
"delete them if they can easily be recovered using revert otherwise they\n"
940
974
msgstr ""
941
975
942
976
# help of 'new' option of 'remove' command
943
#: bzrlib/builtins.py:1692
977
#: bzrlib/builtins.py:1745
944
978
msgid "Only remove files that have never been committed."
945
979
msgstr ""
946
980
947
981
# help of 'file-deletion-strategy' option of 'remove' command
948
#: bzrlib/builtins.py:1694
982
#: bzrlib/builtins.py:1747
949
983
msgid "The file deletion mode to be used."
950
984
msgstr ""
951
985
952
986
# title of 'file-deletion-strategy' option of 'remove' command
953
#: bzrlib/builtins.py:1695
987
#: bzrlib/builtins.py:1748
954
988
msgid "Deletion Strategy"
955
989
msgstr ""
956
990
957
991
# help of 'file-deletion-strategy=safe' option of 'remove' command
958
#: bzrlib/builtins.py:1696
992
#: bzrlib/builtins.py:1749
959
993
msgid "Backup changed files (default)."
960
994
msgstr ""
961
995
962
996
# help of 'file-deletion-strategy=keep' option of 'remove' command
963
#: bzrlib/builtins.py:1697
997
#: bzrlib/builtins.py:1750
964
998
msgid "Delete from bzr but leave the working copy."
965
999
msgstr ""
966
1000
967
1001
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
968
#: bzrlib/builtins.py:1698
1002
#: bzrlib/builtins.py:1751
969
1003
msgid "Don't backup changed files."
970
1004
msgstr ""
971
1005
972
1006
# help of 'file-deletion-strategy=force' option of 'remove' command
973
#: bzrlib/builtins.py:1699
1007
#: bzrlib/builtins.py:1752
974
1008
msgid ""
975
1009
"Delete all the specified files, even if they can not be recovered and even "
976
1010
"if they are non-empty directories. (deprecated, use no-backup)"
977
1011
msgstr ""
978
1012
979
#: bzrlib/builtins.py:1708
1013
#: bzrlib/builtins.py:1761
980
1014
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
981
1015
msgstr ""
982
1016
983
#: bzrlib/builtins.py:1725
1017
#: bzrlib/builtins.py:1778
984
1018
msgid "No matching files."
985
1019
msgstr ""
986
1020
987
#: bzrlib/builtins.py:1786
1021
#: bzrlib/builtins.py:1839
988
1022
msgid "Reconcile bzr metadata in a branch."
989
1023
msgstr ""
990
1024
991
#: bzrlib/builtins.py:1788
1025
#: bzrlib/builtins.py:1841
992
1026
msgid ""
993
1027
"This can correct data mismatches that may have been caused by\n"
994
1028
"previous ghost operations or bzr upgrades. You should only\n"
996
1030
"advises you to run it."
997
1031
msgstr ""
998
1032
999
#: bzrlib/builtins.py:1793
1033
#: bzrlib/builtins.py:1846
1000
1034
msgid ""
1001
1035
"If a second branch is provided, cross-branch reconciliation is\n"
1002
1036
"also attempted, which will check that data like the tree root\n"
1004
1038
"correctly in both branches."
1005
1039
msgstr ""
1006
1040
1007
#: bzrlib/builtins.py:1798
1041
#: bzrlib/builtins.py:1851
1008
1042
msgid ""
1009
1043
"At the same time it is run it may recompress data resulting in\n"
1010
1044
"a potential saving in disk space or performance gain."
1011
1045
msgstr ""
1012
1046
1013
#: bzrlib/builtins.py:1801
1047
#: bzrlib/builtins.py:1854
1014
1048
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1015
1049
msgstr ""
1016
1050
1017
1051
# help of 'format=2a' option of 'init' command
1018
#: bzrlib/builtins.py:1868
1052
# help of 'format=default' option of 'init' command
1053
# help of 'format=2a' option of 'init-repository' command
1054
# help of 'format=default' option of 'init-repository' command
1055
# help of 'format=2a' option of 'upgrade' command
1056
# help of 'format=default' option of 'upgrade' command
1057
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1019
1058
msgid ""
1020
1059
"Format for the bzr 2.0 series.\n"
1021
1060
"Uses group-compress storage.\n"
1023
1062
msgstr ""
1024
1063
1025
1064
# help of 'format=pack-0.92' option of 'init' command
1026
#: bzrlib/builtins.py:1868
1065
# help of 'format=pack-0.92' option of 'init-repository' command
1066
# help of 'format=pack-0.92' option of 'upgrade' command
1067
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1027
1068
msgid ""
1028
1069
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1029
1070
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1030
1071
msgstr ""
1031
1072
1032
1073
# help of 'format=development-colo' option of 'init' command
1033
#: bzrlib/builtins.py:1868
1074
# help of 'format=development-colo' option of 'init-repository' command
1075
# help of 'format=development-colo' option of 'upgrade' command
1076
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1034
1077
msgid "The 2a format with experimental support for colocated branches.\n"
1035
1078
msgstr ""
1036
1079
1037
#: bzrlib/builtins.py:1869
1080
#: bzrlib/builtins.py:1922
1038
1081
msgid "Make a directory into a versioned branch."
1039
1082
msgstr ""
1040
1083
1041
#: bzrlib/builtins.py:1871
1084
#: bzrlib/builtins.py:1924
1042
1085
msgid ""
1043
1086
"Use this to create an empty branch, or before importing an\n"
1044
1087
"existing project."
1045
1088
msgstr ""
1046
1089
1047
#: bzrlib/builtins.py:1874
1090
#: bzrlib/builtins.py:1927
1048
1091
msgid ""
1049
1092
"If there is a repository in a parent directory of the location, then\n"
1050
1093
"the history of the branch will be stored in the repository. Otherwise\n"
1052
1095
"in the .bzr directory."
1053
1096
msgstr ""
1054
1097
1055
#: bzrlib/builtins.py:1879
1098
#: bzrlib/builtins.py:1932
1056
1099
msgid ""
1057
1100
"If there is already a branch at the location but it has no working tree,\n"
1058
1101
"the tree can be populated with 'bzr checkout'."
1059
1102
msgstr ""
1060
1103
1061
#: bzrlib/builtins.py:1882
1104
#: bzrlib/builtins.py:1935
1062
1105
msgid "Recipe for importing a tree of files::"
1063
1106
msgstr ""
1064
1107
1065
#: bzrlib/builtins.py:1884
1108
#: bzrlib/builtins.py:1937
1066
1109
msgid ""
1067
1110
" cd ~/project\n"
1068
1111
" bzr init\n"
1072
1115
msgstr ""
1073
1116
1074
1117
# help of 'create-prefix' option of 'init' command
1075
#: bzrlib/builtins.py:1895
1118
# help of 'create-prefix' option of 'push' command
1119
#: bzrlib/builtins.py:1948
1076
1120
msgid "Create the path leading up to the branch if it does not already exist."
1077
1121
msgstr ""
1078
1122
1079
1123
# help of 'format' option of 'init' command
1080
#: bzrlib/builtins.py:1898
1124
#: bzrlib/builtins.py:1951
1081
1125
msgid "Specify a format for this branch. See \"help formats\"."
1082
1126
msgstr ""
1083
1127
1084
1128
# help of 'append-revisions-only' option of 'init' command
1085
#: bzrlib/builtins.py:1906
1129
#: bzrlib/builtins.py:1959
1086
1130
msgid "Never change revnos or the existing log. Append revisions to it only."
1087
1131
msgstr ""
1088
1132
1089
1133
# help of 'no-tree' option of 'init' command
1090
#: bzrlib/builtins.py:1909
1134
#: bzrlib/builtins.py:1962
1091
1135
msgid "Create a branch without a working tree."
1092
1136
msgstr ""
1093
1137
1094
#: bzrlib/builtins.py:1929 bzrlib/push.py:108
1138
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1095
1139
#, python-format
1096
1140
msgid ""
1097
1141
"Parent directory of %s does not exist.\n"
1098
1142
"You may supply --create-prefix to create all leading parent directories."
1099
1143
msgstr ""
1100
1144
1101
#: bzrlib/builtins.py:1963
1145
#: bzrlib/builtins.py:2016
1102
1146
msgid ""
1103
1147
"This branch format cannot be set to append-revisions-only. Try --default."
1104
1148
msgstr ""
1105
1149
1106
#: bzrlib/builtins.py:1974
1150
#: bzrlib/builtins.py:2027
1107
1151
msgid "Created a {0} (format: {1})\n"
1108
1152
msgstr ""
1109
1153
1110
#: bzrlib/builtins.py:1983
1154
#: bzrlib/builtins.py:2036
1111
1155
#, python-format
1112
1156
msgid "Using shared repository: %s\n"
1113
1157
msgstr ""
1114
1158
1115
#: bzrlib/builtins.py:1987
1159
#: bzrlib/builtins.py:2040
1116
1160
msgid "Create a shared repository for branches to share storage space."
1117
1161
msgstr ""
1118
1162
1119
#: bzrlib/builtins.py:1989
1163
#: bzrlib/builtins.py:2042
1120
1164
msgid ""
1121
1165
"New branches created under the repository directory will store their\n"
1122
1166
"revisions in the repository, not in the branch directory. For branches\n"
1124
1168
"speeds up the creation of new branches."
1125
1169
msgstr ""
1126
1170
1127
#: bzrlib/builtins.py:1994
1171
#: bzrlib/builtins.py:2047
1128
1172
msgid ""
1129
1173
"If the --no-trees option is given then the branches in the repository\n"
1130
1174
"will not have working trees by default. They will still exist as \n"
1134
1178
"branches, such as on a server."
1135
1179
msgstr ""
1136
1180
1137
#: bzrlib/builtins.py:2001
1181
#: bzrlib/builtins.py:2054
1138
1182
msgid ""
1139
1183
":Examples:\n"
1140
1184
" Create a shared repository holding just branches::"
1141
1185
msgstr ""
1142
1186
1143
#: bzrlib/builtins.py:2004
1187
#: bzrlib/builtins.py:2057
1144
1188
msgid ""
1145
1189
" bzr init-repo --no-trees repo\n"
1146
1190
" bzr init repo/trunk"
1147
1191
msgstr ""
1148
1192
1149
#: bzrlib/builtins.py:2007
1193
#: bzrlib/builtins.py:2060
1150
1194
msgid " Make a lightweight checkout elsewhere::"
1151
1195
msgstr ""
1152
1196
1153
#: bzrlib/builtins.py:2009
1197
#: bzrlib/builtins.py:2062
1154
1198
msgid ""
1155
1199
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1156
1200
" cd trunk-checkout\n"
1158
1202
msgstr ""
1159
1203
1160
1204
# help of 'format' option of 'init-repository' command
1161
#: bzrlib/builtins.py:2017
1205
#: bzrlib/builtins.py:2070
1162
1206
msgid ""
1163
1207
"Specify a format for this repository. See \"bzr help formats\" for details."
1164
1208
msgstr ""
1165
1209
1166
1210
# title of 'format' option of 'init-repository' command
1167
#: bzrlib/builtins.py:2021
1211
#: bzrlib/builtins.py:2074
1168
1212
msgid "Repository format"
1169
1213
msgstr ""
1170
1214
1171
1215
# help of 'no-trees' option of 'init-repository' command
1172
#: bzrlib/builtins.py:2023
1216
#: bzrlib/builtins.py:2076
1173
1217
msgid "Branches in the repository will default to not having a working tree."
1174
1218
msgstr ""
1175
1219
1176
#: bzrlib/builtins.py:2047
1220
#: bzrlib/builtins.py:2102
1177
1221
msgid "Show differences in the working tree, between revisions or branches."
1178
1222
msgstr ""
1179
1223
1180
#: bzrlib/builtins.py:2049
1224
#: bzrlib/builtins.py:2104
1181
1225
msgid ""
1182
1226
"If no arguments are given, all changes for the current tree are listed.\n"
1183
1227
"If files are given, only the changes in those files are listed.\n"
1187
1231
"given."
1188
1232
msgstr ""
1189
1233
1190
#: bzrlib/builtins.py:2056
1234
#: bzrlib/builtins.py:2111
1191
1235
msgid ""
1192
1236
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1193
1237
"produces patches suitable for \"patch -p1\"."
1194
1238
msgstr ""
1195
1239
1196
#: bzrlib/builtins.py:2059
1240
#: bzrlib/builtins.py:2114
1197
1241
msgid ""
1198
1242
"Note that when using the -r argument with a range of revisions, the\n"
1199
1243
"differences are computed between the two specified revisions. That\n"
1203
1247
"in the range."
1204
1248
msgstr ""
1205
1249
1206
#: bzrlib/builtins.py:2066
1250
#: bzrlib/builtins.py:2121
1207
1251
msgid ""
1208
1252
":Exit values:\n"
1209
1253
" 1 - changed\n"
1212
1256
" 0 - no change"
1213
1257
msgstr ""
1214
1258
1215
#: bzrlib/builtins.py:2072
1259
#: bzrlib/builtins.py:2127
1216
1260
msgid ""
1217
1261
":Examples:\n"
1218
1262
" Shows the difference in the working tree versus the last commit::"
1219
1263
msgstr ""
1220
1264
1221
#: bzrlib/builtins.py:2075
1265
#: bzrlib/builtins.py:2130
1222
1266
msgid " bzr diff"
1223
1267
msgstr ""
1224
1268
1225
#: bzrlib/builtins.py:2077
1269
#: bzrlib/builtins.py:2132
1226
1270
msgid " Difference between the working tree and revision 1::"
1227
1271
msgstr ""
1228
1272
1229
#: bzrlib/builtins.py:2079
1273
#: bzrlib/builtins.py:2134
1230
1274
msgid " bzr diff -r1"
1231
1275
msgstr ""
1232
1276
1233
#: bzrlib/builtins.py:2081
1277
#: bzrlib/builtins.py:2136
1234
1278
msgid " Difference between revision 3 and revision 1::"
1235
1279
msgstr ""
1236
1280
1237
#: bzrlib/builtins.py:2083
1281
#: bzrlib/builtins.py:2138
1238
1282
msgid " bzr diff -r1..3"
1239
1283
msgstr ""
1240
1284
1241
#: bzrlib/builtins.py:2085
1285
#: bzrlib/builtins.py:2140
1242
1286
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1243
1287
msgstr ""
1244
1288
1245
#: bzrlib/builtins.py:2087
1289
#: bzrlib/builtins.py:2142
1246
1290
msgid " bzr diff -r1..3 xxx"
1247
1291
msgstr ""
1248
1292
1249
#: bzrlib/builtins.py:2089
1293
#: bzrlib/builtins.py:2144
1250
1294
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1251
1295
msgstr ""
1252
1296
1253
#: bzrlib/builtins.py:2091
1297
#: bzrlib/builtins.py:2146
1254
1298
msgid " bzr diff -c2"
1255
1299
msgstr ""
1256
1300
1257
#: bzrlib/builtins.py:2093
1301
#: bzrlib/builtins.py:2148
1258
1302
msgid ""
1259
1303
" To see the changes introduced by revision X::\n"
1260
1304
" \n"
1261
1305
" bzr diff -cX"
1262
1306
msgstr ""
1263
1307
1264
#: bzrlib/builtins.py:2097
1308
#: bzrlib/builtins.py:2152
1265
1309
msgid ""
1266
1310
" Note that in the case of a merge, the -c option shows the changes\n"
1267
1311
" compared to the left hand parent. To see the changes against\n"
1268
1312
" another parent, use::"
1269
1313
msgstr ""
1270
1314
1271
#: bzrlib/builtins.py:2101
1315
#: bzrlib/builtins.py:2156
1272
1316
msgid " bzr diff -r<chosen_parent>..X"
1273
1317
msgstr ""
1274
1318
1275
#: bzrlib/builtins.py:2103
1319
#: bzrlib/builtins.py:2158
1276
1320
msgid ""
1277
1321
" The changes between the current revision and the previous revision\n"
1278
1322
" (equivalent to -c-1 and -r-2..-1)"
1279
1323
msgstr ""
1280
1324
1281
#: bzrlib/builtins.py:2106
1325
#: bzrlib/builtins.py:2161
1282
1326
msgid " bzr diff -r-2.."
1283
1327
msgstr ""
1284
1328
1285
#: bzrlib/builtins.py:2108
1329
#: bzrlib/builtins.py:2163
1286
1330
msgid " Show just the differences for file NEWS::"
1287
1331
msgstr ""
1288
1332
1289
#: bzrlib/builtins.py:2110
1333
#: bzrlib/builtins.py:2165
1290
1334
msgid " bzr diff NEWS"
1291
1335
msgstr ""
1292
1336
1293
#: bzrlib/builtins.py:2112
1337
#: bzrlib/builtins.py:2167
1294
1338
msgid " Show the differences in working tree xxx for file NEWS::"
1295
1339
msgstr ""
1296
1340
1297
#: bzrlib/builtins.py:2114
1341
#: bzrlib/builtins.py:2169
1298
1342
msgid " bzr diff xxx/NEWS"
1299
1343
msgstr ""
1300
1344
1301
#: bzrlib/builtins.py:2116
1345
#: bzrlib/builtins.py:2171
1302
1346
msgid " Show the differences from branch xxx to this working tree:"
1303
1347
msgstr ""
1304
1348
1305
#: bzrlib/builtins.py:2118
1349
#: bzrlib/builtins.py:2173
1306
1350
msgid " bzr diff --old xxx"
1307
1351
msgstr ""
1308
1352
1309
#: bzrlib/builtins.py:2120
1353
#: bzrlib/builtins.py:2175
1310
1354
msgid " Show the differences between two branches for file NEWS::"
1311
1355
msgstr ""
1312
1356
1313
#: bzrlib/builtins.py:2122
1357
#: bzrlib/builtins.py:2177
1314
1358
msgid " bzr diff --old xxx --new yyy NEWS"
1315
1359
msgstr ""
1316
1360
1317
#: bzrlib/builtins.py:2124
1361
#: bzrlib/builtins.py:2179
1318
1362
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1319
1363
msgstr ""
1320
1364
1321
#: bzrlib/builtins.py:2126
1365
#: bzrlib/builtins.py:2181
1322
1366
msgid ""
1323
1367
" bzr diff --prefix old/:new/\n"
1324
1368
" \n"
1328
1372
msgstr ""
1329
1373
1330
1374
# help of 'diff-options' option of 'diff' command
1331
#: bzrlib/builtins.py:2136
1375
#: bzrlib/builtins.py:2191
1332
1376
msgid "Pass these options to the external diff program."
1333
1377
msgstr ""
1334
1378
1335
1379
# help of 'prefix' option of 'diff' command
1336
#: bzrlib/builtins.py:2139
1380
#: bzrlib/builtins.py:2194
1337
1381
msgid ""
1338
1382
"Set prefixes added to old and new filenames, as two values separated by a "
1339
1383
"colon. (eg \"old/:new/\")."
1340
1384
msgstr ""
1341
1385
1342
1386
# help of 'old' option of 'diff' command
1343
#: bzrlib/builtins.py:2142
1387
#: bzrlib/builtins.py:2197
1344
1388
msgid "Branch/tree to compare from."
1345
1389
msgstr ""
1346
1390
1347
1391
# help of 'new' option of 'diff' command
1348
#: bzrlib/builtins.py:2146
1392
#: bzrlib/builtins.py:2201
1349
1393
msgid "Branch/tree to compare to."
1350
1394
msgstr ""
1351
1395
1352
1396
# help of 'using' option of 'diff' command
1353
#: bzrlib/builtins.py:2152
1397
#: bzrlib/builtins.py:2207
1354
1398
msgid "Use this command to compare files."
1355
1399
msgstr ""
1356
1400
1357
1401
# help of 'format' option of 'diff' command
1358
#: bzrlib/builtins.py:2157
1402
#: bzrlib/builtins.py:2212
1359
1403
msgid "Diff format to use."
1360
1404
msgstr ""
1361
1405
1362
1406
# title of 'format' option of 'diff' command
1363
#: bzrlib/builtins.py:2159
1407
#: bzrlib/builtins.py:2214
1364
1408
msgid "Diff format"
1365
1409
msgstr ""
1366
1410
1367
#: bzrlib/builtins.py:2181
1411
#: bzrlib/builtins.py:2236
1368
1412
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1369
1413
msgstr ""
1370
1414
1371
#: bzrlib/builtins.py:2185
1415
#: bzrlib/builtins.py:2240
1372
1416
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1373
1417
msgstr ""
1374
1418
1375
#: bzrlib/builtins.py:2190 bzrlib/builtins.py:2588 bzrlib/builtins.py:2601
1376
#: bzrlib/builtins.py:2609 bzrlib/builtins.py:4760
1419
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1420
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1377
1421
msgid "{0} and {1} are mutually exclusive"
1378
1422
msgstr ""
1379
1423
1380
#: bzrlib/builtins.py:2210
1424
#: bzrlib/builtins.py:2265
1381
1425
msgid ""
1382
1426
"List files deleted in the working tree.\n"
1383
1427
" "
1384
1428
msgstr ""
1385
1429
1386
#: bzrlib/builtins.py:2288
1430
#: bzrlib/builtins.py:2343
1387
1431
msgid "Show the tree root directory."
1388
1432
msgstr ""
1389
1433
1390
#: bzrlib/builtins.py:2290
1434
#: bzrlib/builtins.py:2345
1391
1435
msgid ""
1392
1436
"The root is the nearest enclosing directory with a .bzr control\n"
1393
1437
"directory."
1394
1438
msgstr ""
1395
1439
1396
#: bzrlib/builtins.py:2305
1440
#: bzrlib/builtins.py:2360
1397
1441
msgid "The limit argument must be an integer."
1398
1442
msgstr ""
1399
1443
1400
#: bzrlib/builtins.py:2313
1444
#: bzrlib/builtins.py:2368
1401
1445
msgid "The levels argument must be an integer."
1402
1446
msgstr ""
1403
1447
1404
#: bzrlib/builtins.py:2318
1448
#: bzrlib/builtins.py:2373
1405
1449
msgid "Show historical log for a branch or subset of a branch."
1406
1450
msgstr ""
1407
1451
1408
#: bzrlib/builtins.py:2320
1452
#: bzrlib/builtins.py:2375
1409
1453
msgid ""
1410
1454
"log is bzr's default tool for exploring the history of a branch.\n"
1411
1455
"The branch to use is taken from the first parameter. If no parameters\n"
1413
1457
"Here are some simple examples::"
1414
1458
msgstr ""
1415
1459
1416
#: bzrlib/builtins.py:2325
1460
#: bzrlib/builtins.py:2380
1417
1461
msgid ""
1418
1462
" bzr log log the current branch\n"
1419
1463
" bzr log foo.py log a file in its branch\n"
1420
1464
" bzr log http://server/branch log a branch on a server"
1421
1465
msgstr ""
1422
1466
1423
#: bzrlib/builtins.py:2329
1467
#: bzrlib/builtins.py:2384
1424
1468
msgid ""
1425
1469
"The filtering, ordering and information shown for each revision can\n"
1426
1470
"be controlled as explained below. By default, all revisions are\n"
1430
1474
"were merged."
1431
1475
msgstr ""
1432
1476
1433
#: bzrlib/builtins.py:2336
1477
#: bzrlib/builtins.py:2391
1434
1478
msgid ":Output control:"
1435
1479
msgstr ""
1436
1480
1437
#: bzrlib/builtins.py:2338
1481
#: bzrlib/builtins.py:2393
1438
1482
msgid ""
1439
1483
" The log format controls how information about each revision is\n"
1440
1484
" displayed. The standard log formats are called ``long``, ``short``\n"
1442
1486
" for more details on log formats."
1443
1487
msgstr ""
1444
1488
1445
#: bzrlib/builtins.py:2343
1489
#: bzrlib/builtins.py:2398
1446
1490
msgid ""
1447
1491
" The following options can be used to control what information is\n"
1448
1492
" displayed::"
1449
1493
msgstr ""
1450
1494
1451
#: bzrlib/builtins.py:2346
1495
#: bzrlib/builtins.py:2401
1452
1496
msgid ""
1453
1497
" -l N display a maximum of N revisions\n"
1454
1498
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1457
1501
" --show-ids display revision-ids (and file-ids), not just revnos"
1458
1502
msgstr ""
1459
1503
1460
#: bzrlib/builtins.py:2352
1504
#: bzrlib/builtins.py:2407
1461
1505
msgid ""
1462
1506
" Note that the default number of levels to display is a function of the\n"
1463
1507
" log format. If the -n option is not used, the standard log formats show\n"
1464
1508
" just the top level (mainline)."
1465
1509
msgstr ""
1466
1510
1467
#: bzrlib/builtins.py:2356
1511
#: bzrlib/builtins.py:2411
1468
1512
msgid ""
1469
1513
" Status summaries are shown using status flags like A, M, etc. To see\n"
1470
1514
" the changes explained using words like ``added`` and ``modified``\n"
1471
1515
" instead, use the -vv option."
1472
1516
msgstr ""
1473
1517
1474
#: bzrlib/builtins.py:2360
1518
#: bzrlib/builtins.py:2415
1475
1519
msgid ":Ordering control:"
1476
1520
msgstr ""
1477
1521
1478
#: bzrlib/builtins.py:2362
1522
#: bzrlib/builtins.py:2417
1479
1523
msgid ""
1480
1524
" To display revisions from oldest to newest, use the --forward option.\n"
1481
1525
" In most cases, using this option will have little impact on the total\n"
1483
1527
" display revisions like --reverse does when it can."
1484
1528
msgstr ""
1485
1529
1486
#: bzrlib/builtins.py:2367
1530
#: bzrlib/builtins.py:2422
1487
1531
msgid ":Revision filtering:"
1488
1532
msgstr ""
1489
1533
1490
#: bzrlib/builtins.py:2369
1534
#: bzrlib/builtins.py:2424
1491
1535
msgid ""
1492
1536
" The -r option can be used to specify what revision or range of revisions\n"
1493
1537
" to filter against. The various forms are shown below::"
1494
1538
msgstr ""
1495
1539
1496
#: bzrlib/builtins.py:2372
1540
#: bzrlib/builtins.py:2427
1497
1541
msgid ""
1498
1542
" -rX display revision X\n"
1499
1543
" -rX.. display revision X and later\n"
1501
1545
" -rX..Y display from X to Y inclusive"
1502
1546
msgstr ""
1503
1547
1504
#: bzrlib/builtins.py:2377
1548
#: bzrlib/builtins.py:2432
1505
1549
msgid ""
1506
1550
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1507
1551
" Some common examples are given below::"
1508
1552
msgstr ""
1509
1553
1510
#: bzrlib/builtins.py:2380
1554
#: bzrlib/builtins.py:2435
1511
1555
msgid ""
1512
1556
" -r-1 show just the tip\n"
1513
1557
" -r-10.. show the last 10 mainline revisions\n"
1517
1561
" -rdate:yesterday.. show changes since yesterday"
1518
1562
msgstr ""
1519
1563
1520
#: bzrlib/builtins.py:2387
1564
#: bzrlib/builtins.py:2442
1521
1565
msgid ""
1522
1566
" When logging a range of revisions using -rX..Y, log starts at\n"
1523
1567
" revision Y and searches back in history through the primary\n"
1527
1571
" a nested merge revision and the log will be truncated accordingly."
1528
1572
msgstr ""
1529
1573
1530
#: bzrlib/builtins.py:2394
1574
#: bzrlib/builtins.py:2449
1531
1575
msgid ":Path filtering:"
1532
1576
msgstr ""
1533
1577
1534
#: bzrlib/builtins.py:2396
1578
#: bzrlib/builtins.py:2451
1535
1579
msgid ""
1536
1580
" If parameters are given and the first one is not a branch, the log\n"
1537
1581
" will be filtered to show only those revisions that changed the\n"
1538
1582
" nominated files or directories."
1539
1583
msgstr ""
1540
1584
1541
#: bzrlib/builtins.py:2400
1585
#: bzrlib/builtins.py:2455
1542
1586
msgid ""
1543
1587
" Filenames are interpreted within their historical context. To log a\n"
1544
1588
" deleted file, specify a revision range so that the file existed at\n"
1545
1589
" the end or start of the range."
1546
1590
msgstr ""
1547
1591
1548
#: bzrlib/builtins.py:2404
1592
#: bzrlib/builtins.py:2459
1549
1593
msgid ""
1550
1594
" Historical context is also important when interpreting pathnames of\n"
1551
1595
" renamed files/directories. Consider the following example:"
1552
1596
msgstr ""
1553
1597
1554
#: bzrlib/builtins.py:2407
1598
#: bzrlib/builtins.py:2462
1555
1599
msgid ""
1556
1600
" * revision 1: add tutorial.txt\n"
1557
1601
" * revision 2: modify tutorial.txt\n"
1558
1602
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1559
1603
msgstr ""
1560
1604
1561
#: bzrlib/builtins.py:2411
1605
#: bzrlib/builtins.py:2466
1562
1606
msgid " In this case:"
1563
1607
msgstr ""
1564
1608
1565
#: bzrlib/builtins.py:2413
1609
#: bzrlib/builtins.py:2468
1566
1610
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1567
1611
msgstr ""
1568
1612
1569
#: bzrlib/builtins.py:2415
1613
#: bzrlib/builtins.py:2470
1570
1614
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1571
1615
msgstr ""
1572
1616
1573
#: bzrlib/builtins.py:2417
1617
#: bzrlib/builtins.py:2472
1574
1618
msgid ""
1575
1619
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1576
1620
" the original file in revision 2."
1577
1621
msgstr ""
1578
1622
1579
#: bzrlib/builtins.py:2420
1623
#: bzrlib/builtins.py:2475
1580
1624
msgid ""
1581
1625
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1582
1626
" was no file called guide.txt in revision 2."
1583
1627
msgstr ""
1584
1628
1585
#: bzrlib/builtins.py:2423
1629
#: bzrlib/builtins.py:2478
1586
1630
msgid ""
1587
1631
" Renames are always followed by log. By design, there is no need to\n"
1588
1632
" explicitly ask for this (and no way to stop logging a file back\n"
1589
1633
" until it was last renamed)."
1590
1634
msgstr ""
1591
1635
1592
#: bzrlib/builtins.py:2427
1636
#: bzrlib/builtins.py:2482
1593
1637
msgid ":Other filtering:"
1594
1638
msgstr ""
1595
1639
1596
#: bzrlib/builtins.py:2429
1640
#: bzrlib/builtins.py:2484
1597
1641
msgid ""
1598
1642
" The --match option can be used for finding revisions that match a\n"
1599
1643
" regular expression in a commit message, committer, author or bug.\n"
1602
1646
" --match-message can be used to only match a specific field."
1603
1647
msgstr ""
1604
1648
1605
#: bzrlib/builtins.py:2435
1649
#: bzrlib/builtins.py:2490
1606
1650
msgid ":Tips & tricks:"
1607
1651
msgstr ""
1608
1652
1609
#: bzrlib/builtins.py:2437
1653
#: bzrlib/builtins.py:2492
1610
1654
msgid ""
1611
1655
" GUI tools and IDEs are often better at exploring history than command\n"
1612
1656
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1615
1659
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1616
1660
msgstr ""
1617
1661
1618
#: bzrlib/builtins.py:2443
1662
#: bzrlib/builtins.py:2498
1619
1663
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1620
1664
msgstr ""
1621
1665
1622
#: bzrlib/builtins.py:2445
1666
#: bzrlib/builtins.py:2500
1623
1667
msgid ""
1624
1668
" [ALIASES]\n"
1625
1669
" tip = log -r-1\n"
1627
1671
" show = log -v -p"
1628
1672
msgstr ""
1629
1673
1630
#: bzrlib/builtins.py:2450
1674
#: bzrlib/builtins.py:2505
1631
1675
msgid ""
1632
1676
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1633
1677
" will show the last 10 mainline revisions. To see the details of a\n"
1634
1678
" particular revision X, ``bzr show -rX``."
1635
1679
msgstr ""
1636
1680
1637
#: bzrlib/builtins.py:2454
1681
#: bzrlib/builtins.py:2509
1638
1682
msgid ""
1639
1683
" If you are interested in looking deeper into a particular merge X,\n"
1640
1684
" use ``bzr log -n0 -rX``."
1641
1685
msgstr ""
1642
1686
1643
#: bzrlib/builtins.py:2457
1687
#: bzrlib/builtins.py:2512
1644
1688
msgid ""
1645
1689
" ``bzr log -v`` on a branch with lots of history is currently\n"
1646
1690
" very slow. A fix for this issue is currently under development.\n"
1648
1692
" be given when using the -v option."
1649
1693
msgstr ""
1650
1694
1651
#: bzrlib/builtins.py:2462
1695
#: bzrlib/builtins.py:2517
1652
1696
msgid ""
1653
1697
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1654
1698
" used to find revisions matching user names, commit messages, etc.\n"
1656
1700
" a list of words but not others."
1657
1701
msgstr ""
1658
1702
1659
#: bzrlib/builtins.py:2467
1703
#: bzrlib/builtins.py:2522
1660
1704
msgid ""
1661
1705
" When exploring non-mainline history on large projects with deep\n"
1662
1706
" history, the performance of log can be greatly improved by installing\n"
1665
1709
msgstr ""
1666
1710
1667
1711
# help of 'forward' option of 'log' command
1668
#: bzrlib/builtins.py:2476
1712
#: bzrlib/builtins.py:2531
1669
1713
msgid "Show from oldest to newest."
1670
1714
msgstr ""
1671
1715
1672
1716
# help of 'verbose' option of 'log' command
1673
#: bzrlib/builtins.py:2479
1717
#: bzrlib/builtins.py:2534
1674
1718
msgid "Show files changed in each revision."
1675
1719
msgstr ""
1676
1720
1677
1721
# help of 'change' option of 'log' command
1678
#: bzrlib/builtins.py:2485
1722
#: bzrlib/builtins.py:2540
1679
1723
msgid "Show just the specified revision. See also \"help revisionspec\"."
1680
1724
msgstr ""
1681
1725
1682
1726
# help of 'authors' option of 'log' command
1683
#: bzrlib/builtins.py:2489
1727
#: bzrlib/builtins.py:2544
1684
1728
msgid "What names to list as authors - first, all or committer."
1685
1729
msgstr ""
1686
1730
1687
1731
# title of 'authors' option of 'log' command
1688
#: bzrlib/builtins.py:2490
1732
#: bzrlib/builtins.py:2545
1689
1733
msgid "Authors"
1690
1734
msgstr ""
1691
1735
1692
1736
# help of 'levels' option of 'log' command
1693
#: bzrlib/builtins.py:2495
1737
#: bzrlib/builtins.py:2550
1694
1738
msgid "Number of levels to display - 0 for all, 1 for flat."
1695
1739
msgstr ""
1696
1740
1697
1741
# help of 'limit' option of 'log' command
1698
#: bzrlib/builtins.py:2505
1742
#: bzrlib/builtins.py:2560
1699
1743
msgid "Limit the output to the first N revisions."
1700
1744
msgstr ""
1701
1745
1702
1746
# help of 'show-diff' option of 'log' command
1703
#: bzrlib/builtins.py:2510
1747
#: bzrlib/builtins.py:2565
1704
1748
msgid "Show changes made in each revision as a patch."
1705
1749
msgstr ""
1706
1750
1707
1751
# help of 'include-merged' option of 'log' command
1708
#: bzrlib/builtins.py:2512
1752
#: bzrlib/builtins.py:2567
1709
1753
msgid "Show merged revisions like --levels 0 does."
1710
1754
msgstr ""
1711
1755
1712
1756
# help of 'omit-merges' option of 'log' command
1713
#: bzrlib/builtins.py:2516
1757
#: bzrlib/builtins.py:2571
1714
1758
msgid "Do not report commits with more than one parent."
1715
1759
msgstr ""
1716
1760
1717
1761
# help of 'exclude-common-ancestry' option of 'log' command
1718
#: bzrlib/builtins.py:2518
1762
#: bzrlib/builtins.py:2573
1719
1763
msgid ""
1720
1764
"Display only the revisions that are not part of both ancestries (require -"
1721
1765
"rX..Y)."
1722
1766
msgstr ""
1723
1767
1724
1768
# help of 'signatures' option of 'log' command
1725
#: bzrlib/builtins.py:2522
1769
#: bzrlib/builtins.py:2577
1726
1770
msgid "Show digital signature validity."
1727
1771
msgstr ""
1728
1772
1729
1773
# help of 'match' option of 'log' command
1730
#: bzrlib/builtins.py:2525
1774
#: bzrlib/builtins.py:2580
1731
1775
msgid "Show revisions whose properties match this expression."
1732
1776
msgstr ""
1733
1777
1734
1778
# help of 'match-message' option of 'log' command
1735
#: bzrlib/builtins.py:2529
1779
#: bzrlib/builtins.py:2584
1736
1780
msgid "Show revisions whose message matches this expression."
1737
1781
msgstr ""
1738
1782
1739
1783
# help of 'match-committer' option of 'log' command
1740
#: bzrlib/builtins.py:2533
1784
#: bzrlib/builtins.py:2588
1741
1785
msgid "Show revisions whose committer matches this expression."
1742
1786
msgstr ""
1743
1787
1744
1788
# help of 'match-author' option of 'log' command
1745
#: bzrlib/builtins.py:2537
1789
#: bzrlib/builtins.py:2592
1746
1790
msgid "Show revisions whose authors match this expression."
1747
1791
msgstr ""
1748
1792
1749
1793
# help of 'match-bugs' option of 'log' command
1750
#: bzrlib/builtins.py:2541
1794
#: bzrlib/builtins.py:2596
1751
1795
msgid "Show revisions whose bugs match this expression."
1752
1796
msgstr ""
1753
1797
1754
#: bzrlib/builtins.py:2595
1798
#: bzrlib/builtins.py:2650
1755
1799
msgid "--exclude-common-ancestry requires -r with two revisions"
1756
1800
msgstr ""
1757
1801
1758
#: bzrlib/builtins.py:2623
1802
#: bzrlib/builtins.py:2678
1759
1803
#, python-format
1760
1804
msgid "Path unknown at end or start of revision range: %s"
1761
1805
msgstr ""
1762
1806
1763
#: bzrlib/builtins.py:2740
1807
#: bzrlib/builtins.py:2795
1764
1808
#, python-format
1765
1809
msgid "bzr %s doesn't accept two revisions in different branches."
1766
1810
msgstr ""
1767
1811
1768
#: bzrlib/builtins.py:2756
1812
#: bzrlib/builtins.py:2811
1769
1813
#, python-format
1770
1814
msgid "bzr %s --revision takes one or two values."
1771
1815
msgstr ""
1772
1816
1773
#: bzrlib/builtins.py:2801
1817
#: bzrlib/builtins.py:2856
1774
1818
msgid ""
1775
1819
"List files in a tree.\n"
1776
1820
" "
1777
1821
msgstr ""
1778
1822
1779
1823
# help of 'recursive' option of 'ls' command
1780
#: bzrlib/builtins.py:2810
1824
#: bzrlib/builtins.py:2865
1781
1825
msgid "Recurse into subdirectories."
1782
1826
msgstr ""
1783
1827
1784
1828
# help of 'from-root' option of 'ls' command
1785
#: bzrlib/builtins.py:2812
1829
#: bzrlib/builtins.py:2867
1786
1830
msgid "Print paths relative to the root of the branch."
1787
1831
msgstr ""
1788
1832
1789
1833
# help of 'unknown' option of 'ls' command
1790
#: bzrlib/builtins.py:2814
1834
#: bzrlib/builtins.py:2869
1791
1835
msgid "Print unknown files."
1792
1836
msgstr ""
1793
1837
1794
1838
# help of 'versioned' option of 'ls' command
1795
#: bzrlib/builtins.py:2815
1839
#: bzrlib/builtins.py:2870
1796
1840
msgid "Print versioned files."
1797
1841
msgstr ""
1798
1842
1799
1843
# help of 'ignored' option of 'ls' command
1800
#: bzrlib/builtins.py:2818
1844
#: bzrlib/builtins.py:2873
1801
1845
msgid "Print ignored files."
1802
1846
msgstr ""
1803
1847
1804
1848
# help of 'kind' option of 'ls' command
1805
#: bzrlib/builtins.py:2820
1849
#: bzrlib/builtins.py:2875
1806
1850
msgid "List entries of a particular kind: file, directory, symlink."
1807
1851
msgstr ""
1808
1852
1809
#: bzrlib/builtins.py:2833
1853
#: bzrlib/builtins.py:2888
1810
1854
msgid "invalid kind specified"
1811
1855
msgstr ""
1812
1856
1813
#: bzrlib/builtins.py:2836
1857
#: bzrlib/builtins.py:2891
1814
1858
msgid "Cannot set both --verbose and --null"
1815
1859
msgstr ""
1816
1860
1817
#: bzrlib/builtins.py:2845
1861
#: bzrlib/builtins.py:2900
1818
1862
msgid "cannot specify both --from-root and PATH"
1819
1863
msgstr ""
1820
1864
1821
#: bzrlib/builtins.py:2932
1865
#: bzrlib/builtins.py:2987
1822
1866
msgid "Ignore specified files or patterns."
1823
1867
msgstr ""
1824
1868
1825
#: bzrlib/builtins.py:2934
1869
#: bzrlib/builtins.py:2989
1826
1870
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1827
1871
msgstr ""
1828
1872
1829
#: bzrlib/builtins.py:2936
1873
#: bzrlib/builtins.py:2991
1830
1874
msgid ""
1831
1875
"If a .bzrignore file does not exist, the ignore command\n"
1832
1876
"will create one and add the specified files or patterns to the newly\n"
1835
1879
"the use of the ignore command will require an explicit add command."
1836
1880
msgstr ""
1837
1881
1838
#: bzrlib/builtins.py:2942
1882
#: bzrlib/builtins.py:2997
1839
1883
msgid ""
1840
1884
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1841
1885
"After adding, editing or deleting that file either indirectly by\n"
1843
1887
"it."
1844
1888
msgstr ""
1845
1889
1846
#: bzrlib/builtins.py:2947
1890
#: bzrlib/builtins.py:3002
1847
1891
msgid ""
1848
1892
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1849
1893
"the global ignore file can be found in the application data directory as\n"
1852
1896
"can be edited directly using an editor."
1853
1897
msgstr ""
1854
1898
1855
#: bzrlib/builtins.py:2953
1899
#: bzrlib/builtins.py:3008
1856
1900
msgid ""
1857
1901
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1858
1902
"precedence over regular ignores. Such exceptions are used to specify\n"
1859
1903
"files that should be versioned which would otherwise be ignored."
1860
1904
msgstr ""
1861
1905
1862
#: bzrlib/builtins.py:2957
1906
#: bzrlib/builtins.py:3012
1863
1907
msgid ""
1864
1908
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1865
1909
"precedence over the '!' exception patterns."
1866
1910
msgstr ""
1867
1911
1868
#: bzrlib/builtins.py:2960
1912
#: bzrlib/builtins.py:3015
1869
1913
msgid ""
1870
1914
":Notes: \n"
1871
1915
" \n"
1873
1917
" the shell on Unix."
1874
1918
msgstr ""
1875
1919
1876
#: bzrlib/builtins.py:2965
1920
#: bzrlib/builtins.py:3020
1877
1921
msgid ""
1878
1922
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1879
1923
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1880
1924
msgstr ""
1881
1925
1882
#: bzrlib/builtins.py:2968
1926
#: bzrlib/builtins.py:3023
1883
1927
msgid ""
1884
1928
":Examples:\n"
1885
1929
" Ignore the top level Makefile::"
1886
1930
msgstr ""
1887
1931
1888
#: bzrlib/builtins.py:2971
1932
#: bzrlib/builtins.py:3026
1889
1933
msgid " bzr ignore ./Makefile"
1890
1934
msgstr ""
1891
1935
1892
#: bzrlib/builtins.py:2973
1936
#: bzrlib/builtins.py:3028
1893
1937
msgid " Ignore .class files in all directories...::"
1894
1938
msgstr ""
1895
1939
1896
#: bzrlib/builtins.py:2975
1940
#: bzrlib/builtins.py:3030
1897
1941
msgid " bzr ignore \"*.class\""
1898
1942
msgstr ""
1899
1943
1900
#: bzrlib/builtins.py:2977
1944
#: bzrlib/builtins.py:3032
1901
1945
msgid " ...but do not ignore \"special.class\"::"
1902
1946
msgstr ""
1903
1947
1904
#: bzrlib/builtins.py:2979
1948
#: bzrlib/builtins.py:3034
1905
1949
msgid " bzr ignore \"!special.class\""
1906
1950
msgstr ""
1907
1951
1908
#: bzrlib/builtins.py:2981
1952
#: bzrlib/builtins.py:3036
1909
1953
msgid " Ignore files whose name begins with the \"#\" character::"
1910
1954
msgstr ""
1911
1955
1912
#: bzrlib/builtins.py:2983
1956
#: bzrlib/builtins.py:3038
1913
1957
msgid " bzr ignore \"RE:^#\""
1914
1958
msgstr ""
1915
1959
1916
#: bzrlib/builtins.py:2985
1960
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1917
1961
msgid " Ignore .o files under the lib directory::"
1918
1962
msgstr ""
1919
1963
1920
#: bzrlib/builtins.py:2987
1964
#: bzrlib/builtins.py:3042
1921
1965
msgid " bzr ignore \"lib/**/*.o\""
1922
1966
msgstr ""
1923
1967
1924
#: bzrlib/builtins.py:2991
1968
#: bzrlib/builtins.py:3046
1925
1969
msgid " bzr ignore \"RE:lib/.*\\.o\""
1926
1970
msgstr ""
1927
1971
1928
#: bzrlib/builtins.py:2993
1972
#: bzrlib/builtins.py:3048
1929
1973
msgid " Ignore everything but the \"debian\" toplevel directory::"
1930
1974
msgstr ""
1931
1975
1932
#: bzrlib/builtins.py:2995
1976
#: bzrlib/builtins.py:3050
1933
1977
msgid ""
1934
1978
" bzr ignore \"RE:(?!debian/).*\"\n"
1935
1979
" \n"
1942
1986
msgstr ""
1943
1987
1944
1988
# help of 'default-rules' option of 'ignore' command
1945
#: bzrlib/builtins.py:3009
1989
#: bzrlib/builtins.py:3064
1946
1990
msgid "Display the default ignore rules that bzr uses."
1947
1991
msgstr ""
1948
1992
1949
#: bzrlib/builtins.py:3021
1993
#: bzrlib/builtins.py:3076
1950
1994
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1951
1995
msgstr ""
1952
1996
1953
#: bzrlib/builtins.py:3032
1997
#: bzrlib/builtins.py:3087
1954
1998
#, python-format
1955
1999
msgid "Invalid ignore pattern found. %s"
1956
2000
msgid_plural "Invalid ignore patterns found. %s"
1957
2001
msgstr[0] ""
1958
2002
msgstr[1] ""
1959
2003
1960
#: bzrlib/builtins.py:3041
2004
#: bzrlib/builtins.py:3096
1961
2005
msgid "NAME_PATTERN should not be an absolute path"
1962
2006
msgstr ""
1963
2007
1964
#: bzrlib/builtins.py:3054
2008
#: bzrlib/builtins.py:3109
1965
2009
#, python-format
1966
2010
msgid ""
1967
2011
"Warning: the following files are version controlled and match your ignore "
1971
2015
"them.\n"
1972
2016
msgstr ""
1973
2017
1974
#: bzrlib/builtins.py:3061
2018
#: bzrlib/builtins.py:3116
1975
2019
msgid "List ignored files and the patterns that matched them."
1976
2020
msgstr ""
1977
2021
1978
#: bzrlib/builtins.py:3063
2022
#: bzrlib/builtins.py:3118
1979
2023
msgid ""
1980
2024
"List all the ignored files and the ignore pattern that caused the file to\n"
1981
2025
"be ignored."
1982
2026
msgstr ""
1983
2027
1984
#: bzrlib/builtins.py:3066
2028
#: bzrlib/builtins.py:3121
1985
2029
msgid "Alternatively, to list just the files::"
1986
2030
msgstr ""
1987
2031
1988
#: bzrlib/builtins.py:3068
2032
#: bzrlib/builtins.py:3123
1989
2033
msgid " bzr ls --ignored"
1990
2034
msgstr ""
1991
2035
1992
#: bzrlib/builtins.py:3102
2036
#: bzrlib/builtins.py:3157
1993
2037
#, python-format
1994
2038
msgid "not a valid revision-number: %r"
1995
2039
msgstr ""
1996
2040
1997
#: bzrlib/builtins.py:3109
2041
#: bzrlib/builtins.py:3164
1998
2042
msgid "Export current or past revision to a destination directory or archive."
1999
2043
msgstr ""
2000
2044
2001
#: bzrlib/builtins.py:3111
2045
#: bzrlib/builtins.py:3166
2002
2046
msgid "If no revision is specified this exports the last committed revision."
2003
2047
msgstr ""
2004
2048
2005
#: bzrlib/builtins.py:3113
2049
#: bzrlib/builtins.py:3168
2006
2050
msgid ""
2007
2051
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2008
2052
"given, try to find the format with the extension. If no extension\n"
2009
2053
"is found exports to a directory (equivalent to --format=dir)."
2010
2054
msgstr ""
2011
2055
2012
#: bzrlib/builtins.py:3117
2056
#: bzrlib/builtins.py:3172
2013
2057
msgid ""
2014
2058
"If root is supplied, it will be used as the root directory inside\n"
2015
2059
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2016
2060
"to the exported filename. The root option has no effect for 'dir' format."
2017
2061
msgstr ""
2018
2062
2019
#: bzrlib/builtins.py:3121
2063
#: bzrlib/builtins.py:3176
2020
2064
msgid ""
2021
2065
"If branch is omitted then the branch containing the current working\n"
2022
2066
"directory will be used."
2023
2067
msgstr ""
2024
2068
2025
#: bzrlib/builtins.py:3124
2069
#: bzrlib/builtins.py:3179
2026
2070
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2027
2071
msgstr ""
2028
2072
2029
#: bzrlib/builtins.py:3126
2073
#: bzrlib/builtins.py:3181
2030
2074
msgid ""
2031
2075
" ================= =========================\n"
2032
2076
" Supported formats Autodetected by extension\n"
2040
2084
msgstr ""
2041
2085
2042
2086
# help of 'format' option of 'export' command
2043
#: bzrlib/builtins.py:3140
2087
#: bzrlib/builtins.py:3195
2044
2088
msgid "Type of file to export to."
2045
2089
msgstr ""
2046
2090
2047
2091
# help of 'filters' option of 'export' command
2048
#: bzrlib/builtins.py:3143
2092
#: bzrlib/builtins.py:3198
2049
2093
msgid "Apply content filters to export the convenient form."
2050
2094
msgstr ""
2051
2095
2052
2096
# help of 'root' option of 'export' command
2053
#: bzrlib/builtins.py:3147
2097
#: bzrlib/builtins.py:3202
2054
2098
msgid "Name of the root directory inside the exported file."
2055
2099
msgstr ""
2056
2100
2057
2101
# help of 'per-file-timestamps' option of 'export' command
2058
#: bzrlib/builtins.py:3149
2102
#: bzrlib/builtins.py:3204
2059
2103
msgid ""
2060
2104
"Set modification time of files to that of the last revision in which it was "
2061
2105
"changed."
2062
2106
msgstr ""
2063
2107
2064
2108
# help of 'uncommitted' option of 'export' command
2065
#: bzrlib/builtins.py:3152
2109
#: bzrlib/builtins.py:3207
2066
2110
msgid "Export the working tree contents rather than that of the last revision."
2067
2111
msgstr ""
2068
2112
2069
#: bzrlib/builtins.py:3171
2113
#: bzrlib/builtins.py:3226
2070
2114
msgid "--uncommitted requires a working tree"
2071
2115
msgstr ""
2072
2116
2073
#: bzrlib/builtins.py:3180
2117
#: bzrlib/builtins.py:3235
2074
2118
#, python-format
2075
2119
msgid "Unsupported export format: %s"
2076
2120
msgstr ""
2077
2121
2078
#: bzrlib/builtins.py:3184
2122
#: bzrlib/builtins.py:3239
2079
2123
msgid "Write the contents of a file as of a given revision to standard output."
2080
2124
msgstr ""
2081
2125
2082
#: bzrlib/builtins.py:3186
2126
#: bzrlib/builtins.py:3241
2083
2127
msgid "If no revision is nominated, the last revision is used."
2084
2128
msgstr ""
2085
2129
2086
#: bzrlib/builtins.py:3188
2130
#: bzrlib/builtins.py:3243
2087
2131
msgid ""
2088
2132
"Note: Take care to redirect standard output when using this command on a\n"
2089
2133
"binary file."
2090
2134
msgstr ""
2091
2135
2092
2136
# help of 'name-from-revision' option of 'cat' command
2093
#: bzrlib/builtins.py:3194
2137
#: bzrlib/builtins.py:3249
2094
2138
msgid "The path name in the old tree."
2095
2139
msgstr ""
2096
2140
2097
2141
# help of 'filters' option of 'cat' command
2098
#: bzrlib/builtins.py:3195
2142
#: bzrlib/builtins.py:3250
2099
2143
msgid "Apply content filters to display the convenience form."
2100
2144
msgstr ""
2101
2145
2102
#: bzrlib/builtins.py:3206
2146
#: bzrlib/builtins.py:3261
2103
2147
msgid "bzr cat --revision takes exactly one revision specifier"
2104
2148
msgstr ""
2105
2149
2106
#: bzrlib/builtins.py:3231 bzrlib/builtins.py:3243
2150
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2107
2151
msgid "{0!r} is not present in revision {1}"
2108
2152
msgstr ""
2109
2153
2110
#: bzrlib/builtins.py:3266
2154
#: bzrlib/builtins.py:3321
2111
2155
msgid "Commit changes into a new revision."
2112
2156
msgstr ""
2113
2157
2114
#: bzrlib/builtins.py:3268
2158
#: bzrlib/builtins.py:3323
2115
2159
msgid ""
2116
2160
"An explanatory message needs to be given for each commit. This is\n"
2117
2161
"often done by using the --message option (getting the message from the\n"
2121
2165
"boilerplate text loaded into the editor, use the --show-diff option."
2122
2166
msgstr ""
2123
2167
2124
#: bzrlib/builtins.py:3275
2168
#: bzrlib/builtins.py:3330
2125
2169
msgid ""
2126
2170
"By default, the entire tree is committed and the person doing the\n"
2127
2171
"commit is assumed to be the author. These defaults can be overridden\n"
2128
2172
"as explained below."
2129
2173
msgstr ""
2130
2174
2131
#: bzrlib/builtins.py:3279
2175
#: bzrlib/builtins.py:3334
2132
2176
msgid ":Selective commits:"
2133
2177
msgstr ""
2134
2178
2135
#: bzrlib/builtins.py:3281
2179
#: bzrlib/builtins.py:3336
2136
2180
msgid ""
2137
2181
" If selected files are specified, only changes to those files are\n"
2138
2182
" committed. If a directory is specified then the directory and\n"
2139
2183
" everything within it is committed."
2140
2184
msgstr ""
2141
2185
2142
#: bzrlib/builtins.py:3285
2186
#: bzrlib/builtins.py:3340
2143
2187
msgid ""
2144
2188
" When excludes are given, they take precedence over selected files.\n"
2145
2189
" For example, to commit only changes within foo, but not changes\n"
2146
2190
" within foo/bar::"
2147
2191
msgstr ""
2148
2192
2149
#: bzrlib/builtins.py:3289
2193
#: bzrlib/builtins.py:3344
2150
2194
msgid " bzr commit foo -x foo/bar"
2151
2195
msgstr ""
2152
2196
2153
#: bzrlib/builtins.py:3291
2197
#: bzrlib/builtins.py:3346
2154
2198
msgid " A selective commit after a merge is not yet supported."
2155
2199
msgstr ""
2156
2200
2157
#: bzrlib/builtins.py:3293
2201
#: bzrlib/builtins.py:3348
2158
2202
msgid ":Custom authors:"
2159
2203
msgstr ""
2160
2204
2161
#: bzrlib/builtins.py:3295
2205
#: bzrlib/builtins.py:3350
2162
2206
msgid ""
2163
2207
" If the author of the change is not the same person as the committer,\n"
2164
2208
" you can specify the author's name using the --author option. The\n"
2168
2212
" author."
2169
2213
msgstr ""
2170
2214
2171
#: bzrlib/builtins.py:3302
2215
#: bzrlib/builtins.py:3357
2172
2216
msgid ":Checks:"
2173
2217
msgstr ""
2174
2218
2175
#: bzrlib/builtins.py:3304
2219
#: bzrlib/builtins.py:3359
2176
2220
msgid ""
2177
2221
" A common mistake is to forget to add a new file or directory before\n"
2178
2222
" running the commit command. The --strict option checks for unknown\n"
2181
2225
" for details."
2182
2226
msgstr ""
2183
2227
2184
#: bzrlib/builtins.py:3310
2228
#: bzrlib/builtins.py:3365
2185
2229
msgid ":Things to note:"
2186
2230
msgstr ""
2187
2231
2188
#: bzrlib/builtins.py:3312
2232
#: bzrlib/builtins.py:3367
2189
2233
msgid ""
2190
2234
" If you accidentially commit the wrong changes or make a spelling\n"
2191
2235
" mistake in the commit message say, you can use the uncommit command\n"
2192
2236
" to undo it. See ``bzr help uncommit`` for details."
2193
2237
msgstr ""
2194
2238
2195
#: bzrlib/builtins.py:3316
2239
#: bzrlib/builtins.py:3371
2196
2240
msgid ""
2197
2241
" Hooks can also be configured to run after a commit. This allows you\n"
2198
2242
" to trigger updates to external systems like bug trackers. The --fixes\n"
2201
2245
msgstr ""
2202
2246
2203
2247
# help of 'exclude' option of 'commit' command
2204
#: bzrlib/builtins.py:3326
2248
#: bzrlib/builtins.py:3381
2205
2249
msgid "Do not consider changes made to a given path."
2206
2250
msgstr ""
2207
2251
2208
2252
# help of 'message' option of 'commit' command
2209
#: bzrlib/builtins.py:3329
2253
#: bzrlib/builtins.py:3384
2210
2254
msgid "Description of the new revision."
2211
2255
msgstr ""
2212
2256
2213
2257
# help of 'unchanged' option of 'commit' command
2214
#: bzrlib/builtins.py:3332
2258
#: bzrlib/builtins.py:3387
2215
2259
msgid "Commit even if nothing has changed."
2216
2260
msgstr ""
2217
2261
2218
2262
# help of 'file' option of 'commit' command
2219
#: bzrlib/builtins.py:3336
2263
#: bzrlib/builtins.py:3391
2220
2264
msgid "Take commit message from this file."
2221
2265
msgstr ""
2222
2266
2223
2267
# help of 'strict' option of 'commit' command
2224
#: bzrlib/builtins.py:3338
2268
#: bzrlib/builtins.py:3393
2225
2269
msgid "Refuse to commit if there are unknown files in the working tree."
2226
2270
msgstr ""
2227
2271
2228
2272
# help of 'commit-time' option of 'commit' command
2229
#: bzrlib/builtins.py:3341
2273
#: bzrlib/builtins.py:3396
2230
2274
msgid ""
2231
2275
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2232
2276
"08:00:00 +0100'."
2233
2277
msgstr ""
2234
2278
2235
2279
# help of 'fixes' option of 'commit' command
2236
#: bzrlib/builtins.py:3344
2280
#: bzrlib/builtins.py:3399
2237
2281
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2238
2282
msgstr ""
2239
2283
2240
2284
# help of 'author' option of 'commit' command
2241
#: bzrlib/builtins.py:3347
2285
#: bzrlib/builtins.py:3402
2242
2286
msgid "Set the author's name, if it's different from the committer."
2243
2287
msgstr ""
2244
2288
2245
2289
# help of 'local' option of 'commit' command
2246
#: bzrlib/builtins.py:3350
2290
#: bzrlib/builtins.py:3405
2247
2291
msgid ""
2248
2292
"Perform a local commit in a bound branch. Local commits are not pushed to "
2249
2293
"the master branch until a normal commit is performed."
2250
2294
msgstr ""
2251
2295
2252
2296
# help of 'show-diff' option of 'commit' command
2253
#: bzrlib/builtins.py:3356
2297
#: bzrlib/builtins.py:3411
2254
2298
msgid ""
2255
2299
"When no message is supplied, show the diff along with the status summary in "
2256
2300
"the message editor."
2257
2301
msgstr ""
2258
2302
2259
2303
# help of 'lossy' option of 'commit' command
2260
#: bzrlib/builtins.py:3359
2304
#: bzrlib/builtins.py:3414
2261
2305
msgid ""
2262
2306
"When committing to a foreign version control system do not push data that "
2263
2307
"can not be natively represented."
2264
2308
msgstr ""
2265
2309
2266
#: bzrlib/builtins.py:3377
2310
#: bzrlib/builtins.py:3432
2267
2311
#, python-format
2268
2312
msgid ""
2269
2313
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2271
2315
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2272
2316
msgstr ""
2273
2317
2274
#: bzrlib/builtins.py:3386
2318
#: bzrlib/builtins.py:3441
2275
2319
#, python-format
2276
2320
msgid ""
2277
2321
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2279
2323
"Commit refused."
2280
2324
msgstr ""
2281
2325
2282
#: bzrlib/builtins.py:3395
2326
#: bzrlib/builtins.py:3450
2283
2327
#, python-format
2284
2328
msgid "Unrecognized bug %s. Commit refused."
2285
2329
msgstr ""
2286
2330
2287
#: bzrlib/builtins.py:3398
2331
#: bzrlib/builtins.py:3453
2288
2332
#, python-format
2289
2333
msgid ""
2290
2334
"%s\n"
2291
2335
"Commit refused."
2292
2336
msgstr ""
2293
2337
2294
#: bzrlib/builtins.py:3422
2338
#: bzrlib/builtins.py:3477
2295
2339
msgid "Could not parse --commit-time: "
2296
2340
msgstr ""
2297
2341
2298
#: bzrlib/builtins.py:3462
2342
#: bzrlib/builtins.py:3517
2299
2343
msgid "please specify either --message or --file"
2300
2344
msgstr ""
2301
2345
2302
#: bzrlib/builtins.py:3491
2346
#: bzrlib/builtins.py:3546
2303
2347
msgid "please specify a commit message with either --message or --file"
2304
2348
msgstr ""
2305
2349
2306
#: bzrlib/builtins.py:3494
2350
#: bzrlib/builtins.py:3549
2307
2351
msgid ""
2308
2352
"Empty commit message specified. Please specify a commit message with either "
2309
2353
"--message or --file or leave a blank message with --message \"\"."
2310
2354
msgstr ""
2311
2355
2312
#: bzrlib/builtins.py:3514
2356
#: bzrlib/builtins.py:3569
2313
2357
msgid ""
2314
2358
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2315
2359
"--unchanged to force an empty commit."
2316
2360
msgstr ""
2317
2361
2318
#: bzrlib/builtins.py:3518
2362
#: bzrlib/builtins.py:3573
2319
2363
msgid ""
2320
2364
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2321
2365
"resolve FILE\" to resolve."
2322
2366
msgstr ""
2323
2367
2324
#: bzrlib/builtins.py:3522
2368
#: bzrlib/builtins.py:3577
2325
2369
msgid "Commit refused because there are unknown files in the working tree."
2326
2370
msgstr ""
2327
2371
2328
#: bzrlib/builtins.py:3525
2372
#: bzrlib/builtins.py:3580
2329
2373
msgid ""
2330
2374
"\n"
2331
2375
"To commit to master branch, run update and then commit.\n"
2332
2376
"You can also pass --local to commit to continue working disconnected."
2333
2377
msgstr ""
2334
2378
2335
#: bzrlib/builtins.py:3533
2379
#: bzrlib/builtins.py:3588
2336
2380
msgid ""
2337
2381
"Validate working tree structure, branch consistency and repository history."
2338
2382
msgstr ""
2339
2383
2340
#: bzrlib/builtins.py:3535
2384
#: bzrlib/builtins.py:3590
2341
2385
msgid ""
2342
2386
"This command checks various invariants about branch and repository storage\n"
2343
2387
"to detect data corruption or bzr bugs."
2344
2388
msgstr ""
2345
2389
2346
#: bzrlib/builtins.py:3538
2390
#: bzrlib/builtins.py:3593
2347
2391
msgid ""
2348
2392
"The working tree and branch checks will only give output if a problem is\n"
2349
2393
"detected. The output fields of the repository check are:"
2350
2394
msgstr ""
2351
2395
2352
#: bzrlib/builtins.py:3541
2396
#: bzrlib/builtins.py:3596
2353
2397
msgid ""
2354
2398
"revisions\n"
2355
2399
" This is just the number of revisions checked. It doesn't\n"
2356
2400
" indicate a problem."
2357
2401
msgstr ""
2358
2402
2359
#: bzrlib/builtins.py:3545
2403
#: bzrlib/builtins.py:3600
2360
2404
msgid ""
2361
2405
"versionedfiles\n"
2362
2406
" This is just the number of versionedfiles checked. It\n"
2363
2407
" doesn't indicate a problem."
2364
2408
msgstr ""
2365
2409
2366
#: bzrlib/builtins.py:3549
2410
#: bzrlib/builtins.py:3604
2367
2411
msgid ""
2368
2412
"unreferenced ancestors\n"
2369
2413
" Texts that are ancestors of other texts, but\n"
2371
2415
" subtle problem that Bazaar can work around."
2372
2416
msgstr ""
2373
2417
2374
#: bzrlib/builtins.py:3554
2418
#: bzrlib/builtins.py:3609
2375
2419
msgid ""
2376
2420
"unique file texts\n"
2377
2421
" This is the total number of unique file contents\n"
2378
2422
" seen in the checked revisions. It does not indicate a problem."
2379
2423
msgstr ""
2380
2424
2381
#: bzrlib/builtins.py:3558
2425
#: bzrlib/builtins.py:3613
2382
2426
msgid ""
2383
2427
"repeated file texts\n"
2384
2428
" This is the total number of repeated texts seen\n"
2387
2431
" indicate a problem."
2388
2432
msgstr ""
2389
2433
2390
#: bzrlib/builtins.py:3564
2434
#: bzrlib/builtins.py:3619
2391
2435
msgid ""
2392
2436
"If no restrictions are specified, all Bazaar data that is found at the "
2393
2437
"given\n"
2394
2438
"location will be checked."
2395
2439
msgstr ""
2396
2440
2397
#: bzrlib/builtins.py:3567
2398
msgid ":Examples:"
2399
msgstr ""
2400
2401
#: bzrlib/builtins.py:3569
2441
#: bzrlib/builtins.py:3624
2402
2442
msgid " Check the tree and branch at 'foo'::"
2403
2443
msgstr ""
2404
2444
2405
#: bzrlib/builtins.py:3571
2445
#: bzrlib/builtins.py:3626
2406
2446
msgid " bzr check --tree --branch foo"
2407
2447
msgstr ""
2408
2448
2409
#: bzrlib/builtins.py:3573
2449
#: bzrlib/builtins.py:3628
2410
2450
msgid " Check only the repository at 'bar'::"
2411
2451
msgstr ""
2412
2452
2413
#: bzrlib/builtins.py:3575
2453
#: bzrlib/builtins.py:3630
2414
2454
msgid " bzr check --repo bar"
2415
2455
msgstr ""
2416
2456
2417
#: bzrlib/builtins.py:3577
2457
#: bzrlib/builtins.py:3632
2418
2458
msgid " Check everything at 'baz'::"
2419
2459
msgstr ""
2420
2460
2421
#: bzrlib/builtins.py:3579
2461
#: bzrlib/builtins.py:3634
2422
2462
msgid " bzr check baz"
2423
2463
msgstr ""
2424
2464
2425
2465
# help of 'branch' option of 'check' command
2426
#: bzrlib/builtins.py:3585
2466
#: bzrlib/builtins.py:3640
2427
2467
msgid "Check the branch related to the current directory."
2428
2468
msgstr ""
2429
2469
2430
2470
# help of 'repo' option of 'check' command
2431
#: bzrlib/builtins.py:3587
2471
#: bzrlib/builtins.py:3642
2432
2472
msgid "Check the repository related to the current directory."
2433
2473
msgstr ""
2434
2474
2435
2475
# help of 'tree' option of 'check' command
2436
#: bzrlib/builtins.py:3589
2476
#: bzrlib/builtins.py:3644
2437
2477
msgid "Check the working tree related to the current directory."
2438
2478
msgstr ""
2439
2479
2440
#: bzrlib/builtins.py:3603
2480
#: bzrlib/builtins.py:3658
2441
2481
msgid "Upgrade a repository, branch or working tree to a newer format."
2442
2482
msgstr ""
2443
2483
2444
#: bzrlib/builtins.py:3605
2484
#: bzrlib/builtins.py:3660
2445
2485
msgid ""
2446
2486
"When the default format has changed after a major new release of\n"
2447
2487
"Bazaar, you may be informed during certain operations that you\n"
2450
2490
"with older repositories or with older versions of Bazaar."
2451
2491
msgstr ""
2452
2492
2453
#: bzrlib/builtins.py:3611
2493
#: bzrlib/builtins.py:3666
2454
2494
msgid ""
2455
2495
"If you wish to upgrade to a particular format rather than the\n"
2456
2496
"current default, that can be specified using the --format option.\n"
2460
2500
"2.x default) so downgrading is not always possible."
2461
2501
msgstr ""
2462
2502
2463
#: bzrlib/builtins.py:3618
2503
#: bzrlib/builtins.py:3673
2464
2504
msgid ""
2465
2505
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2466
2506
"process (where # is a number). By default, this is left there on\n"
2471
2511
"afterwards."
2472
2512
msgstr ""
2473
2513
2474
#: bzrlib/builtins.py:3626
2514
#: bzrlib/builtins.py:3681
2475
2515
msgid ""
2476
2516
"If the location given is a shared repository, dependent branches\n"
2477
2517
"are also converted provided the repository converts successfully.\n"
2479
2519
"tried."
2480
2520
msgstr ""
2481
2521
2482
#: bzrlib/builtins.py:3631
2522
#: bzrlib/builtins.py:3686
2483
2523
msgid ""
2484
2524
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2485
2525
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2486
2526
msgstr ""
2487
2527
2488
2528
# help of 'format' option of 'upgrade' command
2489
#: bzrlib/builtins.py:3639
2529
#: bzrlib/builtins.py:3694
2490
2530
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2491
2531
msgstr ""
2492
2532
2493
2533
# title of 'format' option of 'init' command
2494
#: bzrlib/builtins.py:3643
2534
# title of 'format' option of 'upgrade' command
2535
#: bzrlib/builtins.py:3698
2495
2536
msgid "Branch format"
2496
2537
msgstr ""
2497
2538
2498
2539
# help of 'clean' option of 'upgrade' command
2499
#: bzrlib/builtins.py:3645
2540
#: bzrlib/builtins.py:3700
2500
2541
msgid "Remove the backup.bzr directory if successful."
2501
2542
msgstr ""
2502
2543
2503
2544
# help of 'dry-run' option of 'add' command
2504
#: bzrlib/builtins.py:3647
2545
# help of 'dry-run' option of 'upgrade' command
2546
#: bzrlib/builtins.py:3702
2505
2547
msgid "Show what would be done, but don't actually do anything."
2506
2548
msgstr ""
2507
2549
2508
#: bzrlib/builtins.py:3662
2550
#: bzrlib/builtins.py:3717
2509
2551
msgid "Show or set bzr user id."
2510
2552
msgstr ""
2511
2553
2512
#: bzrlib/builtins.py:3664
2554
#: bzrlib/builtins.py:3719
2513
2555
msgid ""
2514
2556
":Examples:\n"
2515
2557
" Show the email of the current user::"
2516
2558
msgstr ""
2517
2559
2518
#: bzrlib/builtins.py:3667
2560
#: bzrlib/builtins.py:3722
2519
2561
msgid " bzr whoami --email"
2520
2562
msgstr ""
2521
2563
2522
#: bzrlib/builtins.py:3669
2564
#: bzrlib/builtins.py:3724
2523
2565
msgid " Set the current user::"
2524
2566
msgstr ""
2525
2567
2526
#: bzrlib/builtins.py:3671
2568
#: bzrlib/builtins.py:3726
2527
2569
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2528
2570
msgstr ""
2529
2571
2530
2572
# help of 'email' option of 'whoami' command
2531
#: bzrlib/builtins.py:3675
2573
#: bzrlib/builtins.py:3730
2532
2574
msgid "Display email address only."
2533
2575
msgstr ""
2534
2576
2535
2577
# help of 'branch' option of 'whoami' command
2536
#: bzrlib/builtins.py:3677
2578
#: bzrlib/builtins.py:3732
2537
2579
msgid "Set identity for the current branch instead of globally."
2538
2580
msgstr ""
2539
2581
2540
#: bzrlib/builtins.py:3701
2582
#: bzrlib/builtins.py:3758
2541
2583
msgid "--email can only be used to display existing identity"
2542
2584
msgstr ""
2543
2585
2544
#: bzrlib/builtins.py:3723
2586
#: bzrlib/builtins.py:3780
2545
2587
msgid "Print or set the branch nickname."
2546
2588
msgstr ""
2547
2589
2548
#: bzrlib/builtins.py:3725
2590
#: bzrlib/builtins.py:3782
2549
2591
msgid ""
2550
2592
"If unset, the tree root directory name is used as the nickname.\n"
2551
2593
"To print the current nickname, execute with no argument."
2552
2594
msgstr ""
2553
2595
2554
#: bzrlib/builtins.py:3728
2596
#: bzrlib/builtins.py:3785
2555
2597
msgid ""
2556
2598
"Bound branches use the nickname of its master branch unless it is set\n"
2557
2599
"locally."
2558
2600
msgstr ""
2559
2601
2560
#: bzrlib/builtins.py:3748
2602
#: bzrlib/builtins.py:3805
2561
2603
msgid "Set/unset and display aliases."
2562
2604
msgstr ""
2563
2605
2564
#: bzrlib/builtins.py:3750
2606
#: bzrlib/builtins.py:3807
2565
2607
msgid ""
2566
2608
":Examples:\n"
2567
2609
" Show the current aliases::"
2568
2610
msgstr ""
2569
2611
2570
#: bzrlib/builtins.py:3753
2612
#: bzrlib/builtins.py:3810
2571
2613
msgid " bzr alias"
2572
2614
msgstr ""
2573
2615
2574
#: bzrlib/builtins.py:3755
2616
#: bzrlib/builtins.py:3812
2575
2617
msgid " Show the alias specified for 'll'::"
2576
2618
msgstr ""
2577
2619
2578
#: bzrlib/builtins.py:3757
2620
#: bzrlib/builtins.py:3814
2579
2621
msgid " bzr alias ll"
2580
2622
msgstr ""
2581
2623
2582
#: bzrlib/builtins.py:3759
2624
#: bzrlib/builtins.py:3816
2583
2625
msgid " Set an alias for 'll'::"
2584
2626
msgstr ""
2585
2627
2586
#: bzrlib/builtins.py:3761
2628
#: bzrlib/builtins.py:3818
2587
2629
msgid " bzr alias ll=\"log --line -r-10..-1\""
2588
2630
msgstr ""
2589
2631
2590
#: bzrlib/builtins.py:3763
2632
#: bzrlib/builtins.py:3820
2591
2633
msgid " To remove an alias for 'll'::"
2592
2634
msgstr ""
2593
2635
2594
#: bzrlib/builtins.py:3765
2636
#: bzrlib/builtins.py:3822
2595
2637
msgid " bzr alias --remove ll"
2596
2638
msgstr ""
2597
2639
2598
2640
# help of 'remove' option of 'alias' command
2599
#: bzrlib/builtins.py:3770
2641
#: bzrlib/builtins.py:3827
2600
2642
msgid "Remove the alias."
2601
2643
msgstr ""
2602
2644
2603
#: bzrlib/builtins.py:3788
2645
#: bzrlib/builtins.py:3845
2604
2646
msgid "bzr alias --remove expects an alias to remove."
2605
2647
msgstr ""
2606
2648
2607
#: bzrlib/builtins.py:3960
2649
#: bzrlib/builtins.py:4026
2608
2650
msgid "subunit not available. subunit needs to be installed to use --subunit."
2609
2651
msgstr ""
2610
2652
2611
#: bzrlib/builtins.py:3977
2653
#: bzrlib/builtins.py:4043
2612
2654
msgid ""
2613
2655
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2614
2656
msgstr ""
2615
2657
2616
#: bzrlib/builtins.py:4024
2658
#: bzrlib/builtins.py:4090
2617
2659
msgid "Show version of bzr."
2618
2660
msgstr ""
2619
2661
2620
2662
# help of 'short' option of 'version' command
2621
#: bzrlib/builtins.py:4028
2663
#: bzrlib/builtins.py:4094
2622
2664
msgid "Print just the version number."
2623
2665
msgstr ""
2624
2666
2625
#: bzrlib/builtins.py:4047
2667
#: bzrlib/builtins.py:4113
2626
2668
msgid "It sure does!\n"
2627
2669
msgstr ""
2628
2670
2629
#: bzrlib/builtins.py:4071
2671
#: bzrlib/builtins.py:4137
2630
2672
#, python-format
2631
2673
msgid "merge base is revision %s\n"
2632
2674
msgstr ""
2633
2675
2634
#: bzrlib/builtins.py:4075
2676
#: bzrlib/builtins.py:4141
2635
2677
msgid "Perform a three-way merge."
2636
2678
msgstr ""
2637
2679
2638
#: bzrlib/builtins.py:4077
2680
#: bzrlib/builtins.py:4143
2639
2681
msgid ""
2640
2682
"The source of the merge can be specified either in the form of a branch,\n"
2641
2683
"or in the form of a path to a file containing a merge directive generated\n"
2646
2688
"the current working tree."
2647
2689
msgstr ""
2648
2690
2649
#: bzrlib/builtins.py:4085
2691
#: bzrlib/builtins.py:4151
2650
2692
msgid ""
2651
2693
"When merging from a branch, by default bzr will try to merge in all new\n"
2652
2694
"work from the other branch, automatically determining an appropriate base\n"
2653
2695
"revision. If this fails, you may need to give an explicit base."
2654
2696
msgstr ""
2655
2697
2656
#: bzrlib/builtins.py:4089
2698
#: bzrlib/builtins.py:4155
2657
2699
msgid ""
2658
2700
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2659
2701
"try to merge in all new work up to and including revision OTHER."
2660
2702
msgstr ""
2661
2703
2662
#: bzrlib/builtins.py:4092
2704
#: bzrlib/builtins.py:4158
2663
2705
msgid ""
2664
2706
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2665
2707
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2670
2712
"changes from the other branch is not stored in the commit."
2671
2713
msgstr ""
2672
2714
2673
#: bzrlib/builtins.py:4100
2715
#: bzrlib/builtins.py:4166
2674
2716
msgid "Revision numbers are always relative to the source branch."
2675
2717
msgstr ""
2676
2718
2677
#: bzrlib/builtins.py:4107
2719
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2720
msgid ""
2721
"Merge will do its best to combine the changes in two branches, but there\n"
2722
"are some kinds of problems only a human can fix. When it encounters those,\n"
2723
"it will mark a conflict. A conflict means that you need to fix something,\n"
2724
"before you should commit."
2725
msgstr ""
2726
2727
#: bzrlib/builtins.py:4173
2678
2728
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2679
2729
msgstr ""
2680
2730
2681
#: bzrlib/builtins.py:4109
2731
#: bzrlib/builtins.py:4175
2682
2732
msgid ""
2683
2733
"If there is no default branch set, the first merge will set it (use\n"
2684
2734
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2686
2736
"only be saved if the remote location can be accessed."
2687
2737
msgstr ""
2688
2738
2689
#: bzrlib/builtins.py:4114
2739
#: bzrlib/builtins.py:4180
2690
2740
msgid ""
2691
2741
"The results of the merge are placed into the destination working\n"
2692
2742
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2693
2743
"committed to record the result of the merge."
2694
2744
msgstr ""
2695
2745
2696
#: bzrlib/builtins.py:4118
2746
#: bzrlib/builtins.py:4184
2697
2747
msgid ""
2698
2748
"merge refuses to run if there are any uncommitted changes, unless\n"
2699
2749
"--force is given. If --force is given, then the changes from the source \n"
2702
2752
"merge revision which has more than two parents."
2703
2753
msgstr ""
2704
2754
2705
#: bzrlib/builtins.py:4124
2755
#: bzrlib/builtins.py:4190
2706
2756
msgid ""
2707
2757
"If one would like to merge changes from the working tree of the other\n"
2708
2758
"branch without merging any committed revisions, the --uncommitted option\n"
2709
2759
"can be given."
2710
2760
msgstr ""
2711
2761
2712
#: bzrlib/builtins.py:4128
2762
#: bzrlib/builtins.py:4194
2713
2763
msgid ""
2714
2764
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2715
2765
"you to apply each diff hunk and file change, similar to \"shelve\"."
2716
2766
msgstr ""
2717
2767
2718
#: bzrlib/builtins.py:4131
2768
#: bzrlib/builtins.py:4197
2719
2769
msgid ""
2720
2770
":Examples:\n"
2721
2771
" To merge all new revisions from bzr.dev::"
2722
2772
msgstr ""
2723
2773
2724
#: bzrlib/builtins.py:4134
2774
#: bzrlib/builtins.py:4200
2725
2775
msgid " bzr merge ../bzr.dev"
2726
2776
msgstr ""
2727
2777
2728
#: bzrlib/builtins.py:4136
2778
#: bzrlib/builtins.py:4202
2729
2779
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2730
2780
msgstr ""
2731
2781
2732
#: bzrlib/builtins.py:4138
2782
#: bzrlib/builtins.py:4204
2733
2783
msgid " bzr merge -r 82 ../bzr.dev"
2734
2784
msgstr ""
2735
2785
2736
#: bzrlib/builtins.py:4140
2786
#: bzrlib/builtins.py:4206
2737
2787
msgid " To merge the changes introduced by 82, without previous changes::"
2738
2788
msgstr ""
2739
2789
2740
#: bzrlib/builtins.py:4142
2790
#: bzrlib/builtins.py:4208
2741
2791
msgid " bzr merge -r 81..82 ../bzr.dev"
2742
2792
msgstr ""
2743
2793
2744
#: bzrlib/builtins.py:4144
2794
#: bzrlib/builtins.py:4210
2745
2795
msgid " To apply a merge directive contained in /tmp/merge::"
2746
2796
msgstr ""
2747
2797
2748
#: bzrlib/builtins.py:4146
2798
#: bzrlib/builtins.py:4212
2749
2799
msgid " bzr merge /tmp/merge"
2750
2800
msgstr ""
2751
2801
2752
#: bzrlib/builtins.py:4148
2802
#: bzrlib/builtins.py:4214
2753
2803
msgid ""
2754
2804
" To create a merge revision with three parents from two branches\n"
2755
2805
" feature1a and feature1b:"
2756
2806
msgstr ""
2757
2807
2758
#: bzrlib/builtins.py:4151
2808
#: bzrlib/builtins.py:4217
2759
2809
msgid ""
2760
2810
" bzr merge ../feature1a\n"
2761
2811
" bzr merge ../feature1b --force\n"
2763
2813
msgstr ""
2764
2814
2765
2815
# help of 'force' option of 'merge' command
2766
#: bzrlib/builtins.py:4163
2816
#: bzrlib/builtins.py:4229
2767
2817
msgid "Merge even if the destination tree has uncommitted changes."
2768
2818
msgstr ""
2769
2819
2770
2820
# help of 'uncommitted' option of 'merge' command
2771
#: bzrlib/builtins.py:4169
2821
#: bzrlib/builtins.py:4235
2772
2822
msgid ""
2773
2823
"Apply uncommitted changes from a working copy, instead of branch changes."
2774
2824
msgstr ""
2775
2825
2776
2826
# help of 'pull' option of 'merge' command
2777
#: bzrlib/builtins.py:4171
2827
#: bzrlib/builtins.py:4237
2778
2828
msgid ""
2779
2829
"If the destination is already completely merged into the source, pull from "
2780
2830
"the source rather than merging. When this happens, you do not need to "
2782
2832
msgstr ""
2783
2833
2784
2834
# help of 'directory' option of 'merge' command
2785
#: bzrlib/builtins.py:4176
2835
#: bzrlib/builtins.py:4242
2786
2836
msgid ""
2787
2837
"Branch to merge into, rather than the one containing the working directory."
2788
2838
msgstr ""
2789
2839
2790
2840
# help of 'preview' option of 'merge' command
2791
#: bzrlib/builtins.py:4178
2841
#: bzrlib/builtins.py:4244
2792
2842
msgid "Instead of merging, show a diff of the merge."
2793
2843
msgstr ""
2794
2844
2795
2845
# help of 'interactive' option of 'merge' command
2796
#: bzrlib/builtins.py:4180
2846
#: bzrlib/builtins.py:4246
2797
2847
msgid "Select changes interactively."
2798
2848
msgstr ""
2799
2849
2800
#: bzrlib/builtins.py:4202
2850
#: bzrlib/builtins.py:4268
2801
2851
msgid ""
2802
2852
"Merging into empty branches not currently supported, https://bugs.launchpad."
2803
2853
"net/bzr/+bug/308562"
2804
2854
msgstr ""
2805
2855
2806
#: bzrlib/builtins.py:4229
2856
#: bzrlib/builtins.py:4295
2807
2857
msgid "Cannot use --uncommitted with bundles or merge directives."
2808
2858
msgstr ""
2809
2859
2810
#: bzrlib/builtins.py:4240
2860
#: bzrlib/builtins.py:4306
2811
2861
msgid "Cannot use --uncommitted and --revision at the same time."
2812
2862
msgstr ""
2813
2863
2814
#: bzrlib/builtins.py:4260
2864
#: bzrlib/builtins.py:4326
2815
2865
msgid "merger: "
2816
2866
msgstr ""
2817
2867
2818
#: bzrlib/builtins.py:4262 bzrlib/bundle/apply_bundle.py:68
2868
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2819
2869
msgid "Nothing to do."
2820
2870
msgstr ""
2821
2871
2822
#: bzrlib/builtins.py:4266
2872
#: bzrlib/builtins.py:4332
2823
2873
msgid "Cannot pull individual files"
2824
2874
msgstr ""
2825
2875
2826
#: bzrlib/builtins.py:4274
2876
#: bzrlib/builtins.py:4340
2827
2877
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2828
2878
msgstr ""
2829
2879
2830
#: bzrlib/builtins.py:4332
2880
#: bzrlib/builtins.py:4398
2831
2881
#, python-format
2832
2882
msgid "Show-base is not supported for this merge type. %s"
2833
2883
msgstr ""
2834
2884
2835
#: bzrlib/builtins.py:4341
2885
#: bzrlib/builtins.py:4407
2836
2886
#, python-format
2837
2887
msgid "Conflict reduction is not supported for merge type %s."
2838
2888
msgstr ""
2839
2889
2840
#: bzrlib/builtins.py:4345
2890
#: bzrlib/builtins.py:4411
2841
2891
msgid "Cannot do conflict reduction and show base."
2842
2892
msgstr ""
2843
2893
2844
#: bzrlib/builtins.py:4456
2894
#: bzrlib/builtins.py:4522
2845
2895
msgid "No location specified or remembered"
2846
2896
msgstr ""
2847
2897
2848
#: bzrlib/builtins.py:4458
2898
#: bzrlib/builtins.py:4524
2849
2899
msgid "{0} remembered {1} location {2}"
2850
2900
msgstr ""
2851
2901
2852
#: bzrlib/builtins.py:4464
2902
#: bzrlib/builtins.py:4530
2853
2903
msgid "Redo a merge."
2854
2904
msgstr ""
2855
2905
2856
#: bzrlib/builtins.py:4466
2906
#: bzrlib/builtins.py:4532
2857
2907
msgid ""
2858
2908
"Use this if you want to try a different merge technique while resolving\n"
2859
2909
"conflicts. Some merge techniques are better than others, and remerge\n"
2860
2910
"lets you try different ones on different files."
2861
2911
msgstr ""
2862
2912
2863
#: bzrlib/builtins.py:4470
2913
#: bzrlib/builtins.py:4536
2864
2914
msgid ""
2865
2915
"The options for remerge have the same meaning and defaults as the ones for\n"
2866
2916
"merge. The difference is that remerge can (only) be run when there is a\n"
2867
2917
"pending merge, and it lets you specify particular files."
2868
2918
msgstr ""
2869
2919
2870
#: bzrlib/builtins.py:4474
2920
#: bzrlib/builtins.py:4540
2871
2921
msgid ""
2872
2922
":Examples:\n"
2873
2923
" Re-do the merge of all conflicted files, and show the base text in\n"
2874
2924
" conflict regions, in addition to the usual THIS and OTHER texts::"
2875
2925
msgstr ""
2876
2926
2877
#: bzrlib/builtins.py:4478
2927
#: bzrlib/builtins.py:4544
2878
2928
msgid " bzr remerge --show-base"
2879
2929
msgstr ""
2880
2930
2881
#: bzrlib/builtins.py:4480
2931
#: bzrlib/builtins.py:4546
2882
2932
msgid ""
2883
2933
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2884
2934
" additional processing to reduce the size of conflict regions::"
2885
2935
msgstr ""
2886
2936
2887
#: bzrlib/builtins.py:4483
2937
#: bzrlib/builtins.py:4549
2888
2938
msgid " bzr remerge --merge-type weave --reprocess foobar"
2889
2939
msgstr ""
2890
2940
2891
2941
# help of 'show-base' option of 'merge' command
2892
#: bzrlib/builtins.py:4490
2942
# help of 'show-base' option of 'pull' command
2943
# help of 'show-base' option of 'remerge' command
2944
# help of 'show-base' option of 'update' command
2945
#: bzrlib/builtins.py:4556
2893
2946
msgid "Show base revision text in conflicts."
2894
2947
msgstr ""
2895
2948
2896
#: bzrlib/builtins.py:4502
2949
#: bzrlib/builtins.py:4568
2897
2950
msgid ""
2898
2951
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2899
2952
"merges."
2900
2953
msgstr ""
2901
2954
2902
#: bzrlib/builtins.py:4558
2955
#: bzrlib/builtins.py:4624
2903
2956
msgid "Revert files to a previous revision."
2904
2957
msgstr ""
2905
2958
2906
#: bzrlib/builtins.py:4560
2959
#: bzrlib/builtins.py:4626
2907
2960
msgid ""
2908
2961
"Giving a list of files will revert only those files. Otherwise, all files\n"
2909
2962
"will be reverted. If the revision is not specified with '--revision', the\n"
2910
2963
"last committed revision is used."
2911
2964
msgstr ""
2912
2965
2913
#: bzrlib/builtins.py:4564
2966
#: bzrlib/builtins.py:4630
2914
2967
msgid ""
2915
2968
"To remove only some changes, without reverting to a prior version, use\n"
2916
2969
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2919
2972
"certain changes on a hunk-by-hunk basis, see the shelve command."
2920
2973
msgstr ""
2921
2974
2922
#: bzrlib/builtins.py:4570
2975
#: bzrlib/builtins.py:4636
2923
2976
msgid ""
2924
2977
"By default, any files that have been manually changed will be backed up\n"
2925
2978
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2926
2979
"'.~#~' appended to their name, where # is a number."
2927
2980
msgstr ""
2928
2981
2929
#: bzrlib/builtins.py:4574
2982
#: bzrlib/builtins.py:4640
2930
2983
msgid ""
2931
2984
"When you provide files, you can use their current pathname or the pathname\n"
2932
2985
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2934
2987
"reverted."
2935
2988
msgstr ""
2936
2989
2937
#: bzrlib/builtins.py:4579
2990
#: bzrlib/builtins.py:4645
2938
2991
msgid ""
2939
2992
"If you have newly added files since the target revision, they will be\n"
2940
2993
"removed. If the files to be removed have been changed, backups will be\n"
2942
2995
"deleted."
2943
2996
msgstr ""
2944
2997
2945
#: bzrlib/builtins.py:4584
2998
#: bzrlib/builtins.py:4650
2946
2999
msgid ""
2947
3000
"The working tree contains a list of revisions that have been merged but\n"
2948
3001
"not yet committed. These revisions will be included as additional parents\n"
2954
3007
"reverting any files."
2955
3008
msgstr ""
2956
3009
2957
#: bzrlib/builtins.py:4593
3010
#: bzrlib/builtins.py:4659
2958
3011
msgid ""
2959
3012
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2960
3013
"changes from a branch in a single revision. To do this, perform the merge\n"
2969
3022
msgstr ""
2970
3023
2971
3024
# help of 'no-backup' option of 'revert' command
2972
#: bzrlib/builtins.py:4607
3025
#: bzrlib/builtins.py:4673
2973
3026
msgid "Do not save backups of reverted files."
2974
3027
msgstr ""
2975
3028
2976
3029
# help of 'forget-merges' option of 'revert' command
2977
#: bzrlib/builtins.py:4609
3030
#: bzrlib/builtins.py:4675
2978
3031
msgid "Remove pending merge marker, without changing any files."
2979
3032
msgstr ""
2980
3033
2981
#: bzrlib/builtins.py:4640
3034
#: bzrlib/builtins.py:4706
2982
3035
msgid ""
2983
3036
"Show help on a command or other topic.\n"
2984
3037
" "
2985
3038
msgstr ""
2986
3039
2987
3040
# help of 'long' option of 'help' command
2988
#: bzrlib/builtins.py:4645
3041
#: bzrlib/builtins.py:4711
2989
3042
msgid "Show help on all commands."
2990
3043
msgstr ""
2991
3044
2992
#: bzrlib/builtins.py:4674
3045
#: bzrlib/builtins.py:4740
2993
3046
msgid "Show unmerged/unpulled revisions between two branches."
2994
3047
msgstr ""
2995
3048
2996
#: bzrlib/builtins.py:4676
3049
#: bzrlib/builtins.py:4742
2997
3050
msgid "OTHER_BRANCH may be local or remote."
2998
3051
msgstr ""
2999
3052
3000
#: bzrlib/builtins.py:4678
3053
#: bzrlib/builtins.py:4744
3001
3054
msgid ""
3002
3055
"To filter on a range of revisions, you can use the command -r begin..end\n"
3003
3056
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3008
3061
" 0 - no missing revisions"
3009
3062
msgstr ""
3010
3063
3011
#: bzrlib/builtins.py:4688
3064
#: bzrlib/builtins.py:4754
3012
3065
msgid ""
3013
3066
" Determine the missing revisions between this and the branch at the\n"
3014
3067
" remembered pull location::"
3015
3068
msgstr ""
3016
3069
3017
#: bzrlib/builtins.py:4691
3070
#: bzrlib/builtins.py:4757
3018
3071
msgid " bzr missing"
3019
3072
msgstr ""
3020
3073
3021
#: bzrlib/builtins.py:4693
3074
#: bzrlib/builtins.py:4759
3022
3075
msgid " Determine the missing revisions between this and another branch::"
3023
3076
msgstr ""
3024
3077
3025
#: bzrlib/builtins.py:4695
3078
#: bzrlib/builtins.py:4761
3026
3079
msgid " bzr missing http://server/branch"
3027
3080
msgstr ""
3028
3081
3029
#: bzrlib/builtins.py:4697
3082
#: bzrlib/builtins.py:4763
3030
3083
msgid ""
3031
3084
" Determine the missing revisions up to a specific revision on the other\n"
3032
3085
" branch::"
3033
3086
msgstr ""
3034
3087
3035
#: bzrlib/builtins.py:4700
3088
#: bzrlib/builtins.py:4766
3036
3089
msgid " bzr missing -r ..-10"
3037
3090
msgstr ""
3038
3091
3039
#: bzrlib/builtins.py:4702
3092
#: bzrlib/builtins.py:4768
3040
3093
msgid ""
3041
3094
" Determine the missing revisions up to a specific revision on this\n"
3042
3095
" branch::"
3043
3096
msgstr ""
3044
3097
3045
#: bzrlib/builtins.py:4705
3098
#: bzrlib/builtins.py:4771
3046
3099
msgid " bzr missing --my-revision ..-10"
3047
3100
msgstr ""
3048
3101
3049
3102
# help of 'reverse' option of 'missing' command
3050
#: bzrlib/builtins.py:4712
3103
#: bzrlib/builtins.py:4778
3051
3104
msgid "Reverse the order of revisions."
3052
3105
msgstr ""
3053
3106
3054
3107
# help of 'mine-only' option of 'missing' command
3055
#: bzrlib/builtins.py:4714
3108
#: bzrlib/builtins.py:4780
3056
3109
msgid "Display changes in the local branch only."
3057
3110
msgstr ""
3058
3111
3059
3112
# help of 'this' option of 'missing' command
3060
#: bzrlib/builtins.py:4715
3113
#: bzrlib/builtins.py:4781
3061
3114
msgid "Same as --mine-only."
3062
3115
msgstr ""
3063
3116
3064
3117
# help of 'theirs-only' option of 'missing' command
3065
#: bzrlib/builtins.py:4717
3118
#: bzrlib/builtins.py:4783
3066
3119
msgid "Display changes in the remote branch only."
3067
3120
msgstr ""
3068
3121
3069
3122
# help of 'other' option of 'missing' command
3070
#: bzrlib/builtins.py:4718
3123
#: bzrlib/builtins.py:4784
3071
3124
msgid "Same as --theirs-only."
3072
3125
msgstr ""
3073
3126
3074
3127
# help of 'revision' option of 'missing' command
3075
#: bzrlib/builtins.py:4723
3128
#: bzrlib/builtins.py:4789
3076
3129
msgid ""
3077
3130
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3078
3131
"details."
3079
3132
msgstr ""
3080
3133
3081
3134
# help of 'my-revision' option of 'missing' command
3082
#: bzrlib/builtins.py:4727
3135
#: bzrlib/builtins.py:4793
3083
3136
msgid ""
3084
3137
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3085
3138
"details."
3086
3139
msgstr ""
3087
3140
3088
3141
# help of 'include-merged' option of 'missing' command
3089
#: bzrlib/builtins.py:4730
3142
#: bzrlib/builtins.py:4796
3090
3143
msgid "Show all revisions in addition to the mainline ones."
3091
3144
msgstr ""
3092
3145
3093
#: bzrlib/builtins.py:4784
3146
#: bzrlib/builtins.py:4850
3094
3147
msgid "No peer location known or specified."
3095
3148
msgstr ""
3096
3149
3097
#: bzrlib/builtins.py:4788
3150
#: bzrlib/builtins.py:4854
3098
3151
msgid "Using saved parent location: {0}\n"
3099
3152
msgstr ""
3100
3153
3101
#: bzrlib/builtins.py:4821
3154
#: bzrlib/builtins.py:4887
3102
3155
#, python-format
3103
3156
msgid "You have %d extra revision:\n"
3104
3157
msgid_plural "You have %d extra revisions:\n"
3105
3158
msgstr[0] ""
3106
3159
msgstr[1] ""
3107
3160
3108
#: bzrlib/builtins.py:4837
3161
#: bzrlib/builtins.py:4903
3109
3162
#, python-format
3110
3163
msgid "You are missing %d revision:\n"
3111
3164
msgid_plural "You are missing %d revisions:\n"
3112
3165
msgstr[0] ""
3113
3166
msgstr[1] ""
3114
3167
3115
#: bzrlib/builtins.py:4849
3168
#: bzrlib/builtins.py:4915
3116
3169
msgid "This branch has no new revisions.\n"
3117
3170
msgstr ""
3118
3171
3119
#: bzrlib/builtins.py:4852
3172
#: bzrlib/builtins.py:4918
3120
3173
msgid "Other branch has no new revisions.\n"
3121
3174
msgstr ""
3122
3175
3123
#: bzrlib/builtins.py:4857
3176
#: bzrlib/builtins.py:4923
3124
3177
msgid "Branches are up to date.\n"
3125
3178
msgstr ""
3126
3179
3127
#: bzrlib/builtins.py:4868
3180
#: bzrlib/builtins.py:4934
3128
3181
msgid "Compress the data within a repository."
3129
3182
msgstr ""
3130
3183
3131
#: bzrlib/builtins.py:4870
3184
#: bzrlib/builtins.py:4936
3132
3185
msgid ""
3133
3186
"This operation compresses the data within a bazaar repository. As\n"
3134
3187
"bazaar supports automatic packing of repository, this operation is\n"
3135
3188
"normally not required to be done manually."
3136
3189
msgstr ""
3137
3190
3138
#: bzrlib/builtins.py:4874
3191
#: bzrlib/builtins.py:4940
3139
3192
msgid ""
3140
3193
"During the pack operation, bazaar takes a backup of existing repository\n"
3141
3194
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3144
3197
"used."
3145
3198
msgstr ""
3146
3199
3147
#: bzrlib/builtins.py:4880
3200
#: bzrlib/builtins.py:4946
3148
3201
msgid ""
3149
3202
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3150
3203
"during or immediately after repacking, you may be left with a state\n"
3153
3206
msgstr ""
3154
3207
3155
3208
# help of 'clean-obsolete-packs' option of 'pack' command
3156
#: bzrlib/builtins.py:4889
3209
#: bzrlib/builtins.py:4955
3157
3210
msgid "Delete obsolete packs to save disk space."
3158
3211
msgstr ""
3159
3212
3160
#: bzrlib/builtins.py:4903
3213
#: bzrlib/builtins.py:4969
3161
3214
msgid "List the installed plugins."
3162
3215
msgstr ""
3163
3216
3164
#: bzrlib/builtins.py:4905
3217
#: bzrlib/builtins.py:4971
3165
3218
msgid ""
3166
3219
"This command displays the list of installed plugins including\n"
3167
3220
"version of plugin and a short description of each."
3168
3221
msgstr ""
3169
3222
3170
#: bzrlib/builtins.py:4908
3223
#: bzrlib/builtins.py:4974
3171
3224
msgid "--verbose shows the path where each plugin is located."
3172
3225
msgstr ""
3173
3226
3174
#: bzrlib/builtins.py:4910
3227
#: bzrlib/builtins.py:4976
3175
3228
msgid ""
3176
3229
"A plugin is an external component for Bazaar that extends the\n"
3177
3230
"revision control system, by adding or replacing code in Bazaar.\n"
3180
3233
"customizing log output."
3181
3234
msgstr ""
3182
3235
3183
#: bzrlib/builtins.py:4916
3236
#: bzrlib/builtins.py:4982
3184
3237
msgid ""
3185
3238
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3186
3239
"for further information on plugins including where to find them and how to\n"
3188
3241
"plugins using the Python programming language."
3189
3242
msgstr ""
3190
3243
3191
#: bzrlib/builtins.py:4932
3244
#: bzrlib/builtins.py:4998
3192
3245
msgid "Show testament (signing-form) of a revision."
3193
3246
msgstr ""
3194
3247
3195
3248
# help of 'long' option of 'testament' command
3196
#: bzrlib/builtins.py:4935
3249
#: bzrlib/builtins.py:5001
3197
3250
msgid "Produce long-format testament."
3198
3251
msgstr ""
3199
3252
3200
3253
# help of 'strict' option of 'testament' command
3201
#: bzrlib/builtins.py:4937
3254
#: bzrlib/builtins.py:5003
3202
3255
msgid "Produce a strict-format testament."
3203
3256
msgstr ""
3204
3257
3205
#: bzrlib/builtins.py:4963
3258
#: bzrlib/builtins.py:5029
3206
3259
msgid "Show the origin of each line in a file."
3207
3260
msgstr ""
3208
3261
3209
#: bzrlib/builtins.py:4965
3262
#: bzrlib/builtins.py:5031
3210
3263
msgid ""
3211
3264
"This prints out the given file with an annotation on the left side\n"
3212
3265
"indicating which revision, author and date introduced the change."
3213
3266
msgstr ""
3214
3267
3215
#: bzrlib/builtins.py:4968
3268
#: bzrlib/builtins.py:5034
3216
3269
msgid ""
3217
3270
"If the origin is the same for a run of consecutive lines, it is\n"
3218
3271
"shown only at the top, unless the --all option is given."
3219
3272
msgstr ""
3220
3273
3221
3274
# help of 'all' option of 'annotate' command
3222
#: bzrlib/builtins.py:4976
3275
#: bzrlib/builtins.py:5042
3223
3276
msgid "Show annotations on all lines."
3224
3277
msgstr ""
3225
3278
3226
3279
# help of 'long' option of 'annotate' command
3227
#: bzrlib/builtins.py:4977
3280
#: bzrlib/builtins.py:5043
3228
3281
msgid "Show commit date in annotations."
3229
3282
msgstr ""
3230
3283
3231
#: bzrlib/builtins.py:5064
3284
#: bzrlib/builtins.py:5130
3232
3285
msgid "Cannot sign a range of non-revision-history revisions"
3233
3286
msgstr ""
3234
3287
3235
#: bzrlib/builtins.py:5076
3288
#: bzrlib/builtins.py:5142
3236
3289
msgid "Please supply either one revision, or a range."
3237
3290
msgstr ""
3238
3291
3239
#: bzrlib/builtins.py:5080
3292
#: bzrlib/builtins.py:5146
3240
3293
msgid ""
3241
3294
"Convert the current branch into a checkout of the supplied branch.\n"
3242
3295
"If no branch is supplied, rebind to the last bound location."
3243
3296
msgstr ""
3244
3297
3245
#: bzrlib/builtins.py:5083
3298
#: bzrlib/builtins.py:5149
3246
3299
msgid ""
3247
3300
"Once converted into a checkout, commits must succeed on the master branch\n"
3248
3301
"before they will be applied to the local branch."
3249
3302
msgstr ""
3250
3303
3251
#: bzrlib/builtins.py:5086
3304
#: bzrlib/builtins.py:5152
3252
3305
msgid ""
3253
3306
"Bound branches use the nickname of its master branch unless it is set\n"
3254
3307
"locally, in which case binding will update the local nickname to be\n"
3255
3308
"that of the master."
3256
3309
msgstr ""
3257
3310
3258
#: bzrlib/builtins.py:5101
3311
#: bzrlib/builtins.py:5167
3259
3312
msgid "No location supplied. This format does not remember old locations."
3260
3313
msgstr ""
3261
3314
3262
#: bzrlib/builtins.py:5106
3315
#: bzrlib/builtins.py:5172
3263
3316
msgid "Branch is already bound"
3264
3317
msgstr ""
3265
3318
3266
#: bzrlib/builtins.py:5108
3319
#: bzrlib/builtins.py:5174
3267
3320
msgid "No location supplied and no previous location known"
3268
3321
msgstr ""
3269
3322
3270
#: bzrlib/builtins.py:5114
3323
#: bzrlib/builtins.py:5180
3271
3324
msgid "These branches have diverged. Try merging, and then bind again."
3272
3325
msgstr ""
3273
3326
3274
#: bzrlib/builtins.py:5121
3327
#: bzrlib/builtins.py:5187
3275
3328
msgid "Convert the current checkout into a regular branch."
3276
3329
msgstr ""
3277
3330
3278
#: bzrlib/builtins.py:5123
3331
#: bzrlib/builtins.py:5189
3279
3332
msgid ""
3280
3333
"After unbinding, the local branch is considered independent and subsequent\n"
3281
3334
"commits will be local only."
3282
3335
msgstr ""
3283
3336
3284
#: bzrlib/builtins.py:5134
3337
#: bzrlib/builtins.py:5200
3285
3338
msgid "Local branch is not bound"
3286
3339
msgstr ""
3287
3340
3288
#: bzrlib/builtins.py:5138
3341
#: bzrlib/builtins.py:5204
3289
3342
msgid "Remove the last committed revision."
3290
3343
msgstr ""
3291
3344
3292
#: bzrlib/builtins.py:5140
3345
#: bzrlib/builtins.py:5206
3293
3346
msgid ""
3294
3347
"--verbose will print out what is being removed.\n"
3295
3348
"--dry-run will go through all the motions, but not actually\n"
3296
3349
"remove anything."
3297
3350
msgstr ""
3298
3351
3299
#: bzrlib/builtins.py:5144
3352
#: bzrlib/builtins.py:5210
3300
3353
msgid ""
3301
3354
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3302
3355
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3303
3356
"branch at revision 15."
3304
3357
msgstr ""
3305
3358
3306
#: bzrlib/builtins.py:5148
3359
#: bzrlib/builtins.py:5214
3307
3360
msgid ""
3308
3361
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3309
3362
"it may make is to restore any pending merges that were present before\n"
3311
3364
msgstr ""
3312
3365
3313
3366
# help of 'dry-run' option of 'uncommit' command
3314
#: bzrlib/builtins.py:5159
3367
#: bzrlib/builtins.py:5225
3315
3368
msgid "Don't actually make changes."
3316
3369
msgstr ""
3317
3370
3318
3371
# help of 'force' option of 'uncommit' command
3319
#: bzrlib/builtins.py:5160
3372
#: bzrlib/builtins.py:5226
3320
3373
msgid "Say yes to all questions."
3321
3374
msgstr ""
3322
3375
3323
3376
# help of 'keep-tags' option of 'uncommit' command
3324
#: bzrlib/builtins.py:5162
3377
#: bzrlib/builtins.py:5228
3325
3378
msgid "Keep tags that point to removed revisions."
3326
3379
msgstr ""
3327
3380
3328
3381
# help of 'local' option of 'uncommit' command
3329
#: bzrlib/builtins.py:5164
3382
#: bzrlib/builtins.py:5230
3330
3383
msgid "Only remove the commits from the local branch when in a checkout."
3331
3384
msgstr ""
3332
3385
3333
#: bzrlib/builtins.py:5213
3386
#: bzrlib/builtins.py:5279
3334
3387
msgid "No revisions to uncommit.\n"
3335
3388
msgstr ""
3336
3389
3337
#: bzrlib/builtins.py:5228
3390
#: bzrlib/builtins.py:5294
3338
3391
msgid "Dry-run, pretending to remove the above revisions.\n"
3339
3392
msgstr ""
3340
3393
3341
#: bzrlib/builtins.py:5231
3394
#: bzrlib/builtins.py:5297
3342
3395
msgid "The above revision(s) will be removed.\n"
3343
3396
msgstr ""
3344
3397
3345
#: bzrlib/builtins.py:5235
3398
#: bzrlib/builtins.py:5301
3346
3399
msgid "Uncommit these revisions"
3347
3400
msgstr ""
3348
3401
3349
#: bzrlib/builtins.py:5238
3402
#: bzrlib/builtins.py:5304
3350
3403
msgid "Canceled\n"
3351
3404
msgstr ""
3352
3405
3353
#: bzrlib/builtins.py:5245
3406
#: bzrlib/builtins.py:5311
3354
3407
#, python-format
3355
3408
msgid ""
3356
3409
"You can restore the old tip by running:\n"
3357
3410
" bzr pull . -r revid:%s\n"
3358
3411
msgstr ""
3359
3412
3360
#: bzrlib/builtins.py:5250
3413
#: bzrlib/builtins.py:5316
3361
3414
msgid "Break a dead lock."
3362
3415
msgstr ""
3363
3416
3364
#: bzrlib/builtins.py:5252
3417
#: bzrlib/builtins.py:5318
3365
3418
msgid ""
3366
3419
"This command breaks a lock on a repository, branch, working directory or\n"
3367
3420
"config file."
3368
3421
msgstr ""
3369
3422
3370
#: bzrlib/builtins.py:5255
3423
#: bzrlib/builtins.py:5321
3371
3424
msgid ""
3372
3425
"CAUTION: Locks should only be broken when you are sure that the process\n"
3373
3426
"holding the lock has been stopped."
3374
3427
msgstr ""
3375
3428
3376
#: bzrlib/builtins.py:5258
3429
#: bzrlib/builtins.py:5324
3377
3430
msgid ""
3378
3431
"You can get information on what locks are open via the 'bzr info\n"
3379
3432
"[location]' command."
3380
3433
msgstr ""
3381
3434
3382
#: bzrlib/builtins.py:5261
3435
#: bzrlib/builtins.py:5327
3383
3436
msgid ""
3384
3437
":Examples:\n"
3385
3438
" bzr break-lock\n"
3388
3441
msgstr ""
3389
3442
3390
3443
# help of 'config' option of 'break-lock' command
3391
#: bzrlib/builtins.py:5270
3444
#: bzrlib/builtins.py:5336
3392
3445
msgid "LOCATION is the directory where the config lock is."
3393
3446
msgstr ""
3394
3447
3395
3448
# help of 'force' option of 'break-lock' command
3396
#: bzrlib/builtins.py:5272
3449
#: bzrlib/builtins.py:5338
3397
3450
msgid "Do not ask for confirmation before breaking the lock."
3398
3451
msgstr ""
3399
3452
3400
3453
# help of 'protocol=bzr' option of 'serve' command
3401
#: bzrlib/builtins.py:5307
3454
#: bzrlib/builtins.py:5373
3402
3455
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3403
3456
msgstr ""
3404
3457
3405
#: bzrlib/builtins.py:5308
3458
#: bzrlib/builtins.py:5374
3406
3459
msgid "Run the bzr server."
3407
3460
msgstr ""
3408
3461
3409
3462
# help of 'inet' option of 'serve' command
3410
#: bzrlib/builtins.py:5314
3463
#: bzrlib/builtins.py:5380
3411
3464
msgid "Serve on stdin/out for use from inetd or sshd."
3412
3465
msgstr ""
3413
3466
3414
3467
# title of 'protocol' option of 'serve' command
3415
#: bzrlib/builtins.py:5315
3468
#: bzrlib/builtins.py:5381
3416
3469
msgid "protocol"
3417
3470
msgstr ""
3418
3471
3419
3472
# help of 'protocol' option of 'serve' command
3420
#: bzrlib/builtins.py:5316
3473
#: bzrlib/builtins.py:5382
3421
3474
msgid "Protocol to serve."
3422
3475
msgstr ""
3423
3476
3424
3477
# help of 'port' option of 'serve' command
3425
#: bzrlib/builtins.py:5320
3478
#: bzrlib/builtins.py:5386
3426
3479
msgid ""
3427
3480
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3428
3481
"Passing 0 as the port number will result in a dynamically allocated port. "
3430
3483
msgstr ""
3431
3484
3432
3485
# help of 'directory' option of 'serve' command
3433
#: bzrlib/builtins.py:5326
3486
#: bzrlib/builtins.py:5392
3434
3487
msgid "Serve contents of this directory."
3435
3488
msgstr ""
3436
3489
3437
3490
# help of 'allow-writes' option of 'serve' command
3438
#: bzrlib/builtins.py:5328
3491
#: bzrlib/builtins.py:5394
3439
3492
msgid ""
3440
3493
"By default the server is a readonly server. Supplying --allow-writes "
3441
3494
"enables write access to the contents of the served directory and below. "
3445
3498
msgstr ""
3446
3499
3447
3500
# help of 'client-timeout' option of 'serve' command
3448
#: bzrlib/builtins.py:5337
3501
#: bzrlib/builtins.py:5403
3449
3502
msgid "Override the default idle client timeout (5min)."
3450
3503
msgstr ""
3451
3504
3452
#: bzrlib/builtins.py:5387
3505
#: bzrlib/builtins.py:5453
3453
3506
msgid "Combine a tree into its containing tree."
3454
3507
msgstr ""
3455
3508
3456
#: bzrlib/builtins.py:5389
3509
#: bzrlib/builtins.py:5455
3457
3510
msgid "This command requires the target tree to be in a rich-root format."
3458
3511
msgstr ""
3459
3512
3460
#: bzrlib/builtins.py:5391
3513
#: bzrlib/builtins.py:5457
3461
3514
msgid ""
3462
3515
"The TREE argument should be an independent tree, inside another tree, but\n"
3463
3516
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3464
3517
"running \"bzr branch\" with the target inside a tree.)"
3465
3518
msgstr ""
3466
3519
3467
#: bzrlib/builtins.py:5395
3520
#: bzrlib/builtins.py:5461
3468
3521
msgid ""
3469
3522
"The result is a combined tree, with the subtree no longer an independent\n"
3470
3523
"part. This is marked as a merge of the subtree into the containing tree,\n"
3471
3524
"and all history is preserved."
3472
3525
msgstr ""
3473
3526
3474
#: bzrlib/builtins.py:5413
3527
#: bzrlib/builtins.py:5479
3475
3528
#, python-format
3476
3529
msgid ""
3477
3530
"Can't join trees because %s doesn't support rich root data.\n"
3478
3531
"You can use bzr upgrade on the repository."
3479
3532
msgstr ""
3480
3533
3481
#: bzrlib/builtins.py:5423 bzrlib/builtins.py:5429
3534
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3482
3535
msgid "Cannot join {0}. {1}"
3483
3536
msgstr ""
3484
3537
3485
#: bzrlib/builtins.py:5433
3538
#: bzrlib/builtins.py:5499
3486
3539
msgid "Split a subdirectory of a tree into a separate tree."
3487
3540
msgstr ""
3488
3541
3489
#: bzrlib/builtins.py:5435
3542
#: bzrlib/builtins.py:5501
3490
3543
msgid ""
3491
3544
"This command will produce a target tree in a format that supports\n"
3492
3545
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3493
3546
"converted into earlier formats like 'dirstate-tags'."
3494
3547
msgstr ""
3495
3548
3496
#: bzrlib/builtins.py:5439
3549
#: bzrlib/builtins.py:5505
3497
3550
msgid ""
3498
3551
"The TREE argument should be a subdirectory of a working tree. That\n"
3499
3552
"subdirectory will be converted into an independent tree, with its own\n"
3500
3553
"branch. Commits in the top-level tree will not apply to the new subtree."
3501
3554
msgstr ""
3502
3555
3503
#: bzrlib/builtins.py:5519
3556
#: bzrlib/builtins.py:5585
3504
3557
msgid "No submit branch specified or known"
3505
3558
msgstr ""
3506
3559
3507
#: bzrlib/builtins.py:5527 bzrlib/send.py:106
3560
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3508
3561
msgid "No public branch specified or known"
3509
3562
msgstr ""
3510
3563
3511
#: bzrlib/builtins.py:5532
3564
#: bzrlib/builtins.py:5598
3512
3565
msgid "bzr merge-directive takes at most two one revision identifiers"
3513
3566
msgstr ""
3514
3567
3515
#: bzrlib/builtins.py:5541
3568
#: bzrlib/builtins.py:5607
3516
3569
msgid "No revisions to bundle."
3517
3570
msgstr ""
3518
3571
3519
#: bzrlib/builtins.py:5560
3572
#: bzrlib/builtins.py:5626
3520
3573
msgid "Mail or create a merge-directive for submitting changes."
3521
3574
msgstr ""
3522
3575
3523
#: bzrlib/builtins.py:5562
3576
#: bzrlib/builtins.py:5628
3524
3577
msgid "A merge directive provides many things needed for requesting merges:"
3525
3578
msgstr ""
3526
3579
3527
#: bzrlib/builtins.py:5564
3580
#: bzrlib/builtins.py:5630
3528
3581
msgid "* A machine-readable description of the merge to perform"
3529
3582
msgstr ""
3530
3583
3531
#: bzrlib/builtins.py:5566
3584
#: bzrlib/builtins.py:5632
3532
3585
msgid "* An optional patch that is a preview of the changes requested"
3533
3586
msgstr ""
3534
3587
3535
#: bzrlib/builtins.py:5568
3588
#: bzrlib/builtins.py:5634
3536
3589
msgid ""
3537
3590
"* An optional bundle of revision data, so that the changes can be applied\n"
3538
3591
" directly from the merge directive, without retrieving data from a\n"
3539
3592
" branch."
3540
3593
msgstr ""
3541
3594
3542
#: bzrlib/builtins.py:5572
3595
#: bzrlib/builtins.py:5638
3543
3596
msgid ""
3544
3597
"`bzr send` creates a compact data set that, when applied using bzr\n"
3545
3598
"merge, has the same effect as merging from the source branch. "
3546
3599
msgstr ""
3547
3600
3548
#: bzrlib/builtins.py:5575
3601
#: bzrlib/builtins.py:5641
3549
3602
msgid ""
3550
3603
"By default the merge directive is self-contained and can be applied to any\n"
3551
3604
"branch containing submit_branch in its ancestory without needing access to\n"
3552
3605
"the source branch."
3553
3606
msgstr ""
3554
3607
3555
#: bzrlib/builtins.py:5579
3608
#: bzrlib/builtins.py:5645
3556
3609
msgid ""
3557
3610
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3558
3611
"revisions, but only a structured request to merge from the\n"
3561
3614
"included if known, so that people can check it later."
3562
3615
msgstr ""
3563
3616
3564
#: bzrlib/builtins.py:5585
3617
#: bzrlib/builtins.py:5651
3565
3618
msgid ""
3566
3619
"The submit branch defaults to the parent of the source branch, but can be\n"
3567
3620
"overridden. Both submit branch and public branch will be remembered in\n"
3570
3623
"be changed using --from."
3571
3624
msgstr ""
3572
3625
3573
#: bzrlib/builtins.py:5591
3626
#: bzrlib/builtins.py:5657
3574
3627
msgid ""
3575
3628
"Both the submit branch and the public branch follow the usual behavior with\n"
3576
3629
"respect to --remember: If there is no default location set, the first send\n"
3579
3632
"--remember. The value will only be saved if the location can be accessed."
3580
3633
msgstr ""
3581
3634
3582
#: bzrlib/builtins.py:5597
3635
#: bzrlib/builtins.py:5663
3583
3636
msgid ""
3584
3637
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3585
3638
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3587
3640
"in the merge directive."
3588
3641
msgstr ""
3589
3642
3590
#: bzrlib/builtins.py:5602
3643
#: bzrlib/builtins.py:5668
3591
3644
msgid ""
3592
3645
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3593
3646
"given, in which case it is sent to a file."
3594
3647
msgstr ""
3595
3648
3596
#: bzrlib/builtins.py:5605
3649
#: bzrlib/builtins.py:5671
3597
3650
msgid ""
3598
3651
"Mail is sent using your preferred mail program. This should be transparent\n"
3599
3652
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3600
3653
"If the preferred client can't be found (or used), your editor will be used."
3601
3654
msgstr ""
3602
3655
3603
#: bzrlib/builtins.py:5609
3656
#: bzrlib/builtins.py:5675
3604
3657
msgid ""
3605
3658
"To use a specific mail program, set the mail_client configuration option.\n"
3606
3659
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3612
3665
"supported clients."
3613
3666
msgstr ""
3614
3667
3615
#: bzrlib/builtins.py:5616
3668
#: bzrlib/builtins.py:5682
3616
3669
msgid ""
3617
3670
"If mail is being sent, a to address is required. This can be supplied\n"
3618
3671
"either on the commandline, by setting the submit_to configuration\n"
3620
3673
"in the submit branch."
3621
3674
msgstr ""
3622
3675
3623
#: bzrlib/builtins.py:5621
3676
#: bzrlib/builtins.py:5687
3624
3677
msgid ""
3625
3678
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3626
3679
"and\n"
3630
3683
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3631
3684
msgstr ""
3632
3685
3633
#: bzrlib/builtins.py:5627
3686
#: bzrlib/builtins.py:5693
3634
3687
msgid ""
3635
3688
"The merge directives created by bzr send may be applied using bzr merge or\n"
3636
3689
"bzr pull by specifying a file containing a merge directive as the location."
3637
3690
msgstr ""
3638
3691
3639
#: bzrlib/builtins.py:5630
3692
#: bzrlib/builtins.py:5696
3640
3693
msgid ""
3641
3694
"bzr send makes extensive use of public locations to map local locations "
3642
3695
"into\n"
3645
3698
msgstr ""
3646
3699
3647
3700
# help of 'output' option of 'send' command
3648
#: bzrlib/builtins.py:5654
3701
#: bzrlib/builtins.py:5720
3649
3702
msgid "Write merge directive to this file or directory; use - for stdout."
3650
3703
msgstr ""
3651
3704
3652
3705
# help of 'strict' option of 'send' command
3653
#: bzrlib/builtins.py:5658
3706
#: bzrlib/builtins.py:5724
3654
3707
msgid ""
3655
3708
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3656
3709
"strict disables the check."
3657
3710
msgstr ""
3658
3711
3659
3712
# help of 'mail-to' option of 'send' command
3660
#: bzrlib/builtins.py:5660
3713
#: bzrlib/builtins.py:5726
3661
3714
msgid "Mail the request to this address."
3662
3715
msgstr ""
3663
3716
3664
3717
# help of 'body' option of 'send' command
3665
#: bzrlib/builtins.py:5664
3718
#: bzrlib/builtins.py:5730
3666
3719
msgid "Body for the email."
3667
3720
msgstr ""
3668
3721
3669
3722
# help of 'no-bundle' option of 'send' command
3670
#: bzrlib/builtins.py:5717
3723
#: bzrlib/builtins.py:5783
3671
3724
msgid "Do not include a bundle in the merge directive."
3672
3725
msgstr ""
3673
3726
3674
3727
# help of 'no-patch' option of 'send' command
3675
#: bzrlib/builtins.py:5718
3728
#: bzrlib/builtins.py:5784
3676
3729
msgid "Do not include a preview patch in the merge directive."
3677
3730
msgstr ""
3678
3731
3679
3732
# help of 'remember' option of 'send' command
3680
#: bzrlib/builtins.py:5721
3733
#: bzrlib/builtins.py:5787
3681
3734
msgid "Remember submit and public branch."
3682
3735
msgstr ""
3683
3736
3684
3737
# help of 'from' option of 'send' command
3685
#: bzrlib/builtins.py:5723
3738
#: bzrlib/builtins.py:5789
3686
3739
msgid ""
3687
3740
"Branch to generate the submission from, rather than the one containing the "
3688
3741
"working directory."
3689
3742
msgstr ""
3690
3743
3691
3744
# title of 'format' option of 'send' command
3692
#: bzrlib/builtins.py:5733
3745
# title of 'format' option of 'version-info' command
3746
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3693
3747
msgid "format"
3694
3748
msgstr ""
3695
3749
3696
3750
# help of 'format' option of 'send' command
3697
#: bzrlib/builtins.py:5734
3751
#: bzrlib/builtins.py:5800
3698
3752
msgid "Use the specified output format."
3699
3753
msgstr ""
3700
3754
3701
#: bzrlib/builtins.py:5756
3755
#: bzrlib/builtins.py:5822
3702
3756
msgid "Create, remove or modify a tag naming a revision."
3703
3757
msgstr ""
3704
3758
3705
#: bzrlib/builtins.py:5758
3759
#: bzrlib/builtins.py:5824
3706
3760
msgid ""
3707
3761
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3708
3762
"(--revision) option can be given -rtag:X, where X is any previously\n"
3709
3763
"created tag."
3710
3764
msgstr ""
3711
3765
3712
#: bzrlib/builtins.py:5762
3766
#: bzrlib/builtins.py:5828
3713
3767
msgid ""
3714
3768
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3715
3769
"along when you branch, push, pull or merge."
3716
3770
msgstr ""
3717
3771
3718
#: bzrlib/builtins.py:5765
3772
#: bzrlib/builtins.py:5831
3719
3773
msgid ""
3720
3774
"It is an error to give a tag name that already exists unless you pass\n"
3721
3775
"--force, in which case the tag is moved to point to the new revision."
3722
3776
msgstr ""
3723
3777
3724
#: bzrlib/builtins.py:5768
3778
#: bzrlib/builtins.py:5834
3725
3779
msgid ""
3726
3780
"To rename a tag (change the name but keep it on the same revsion), run "
3727
3781
"``bzr\n"
3728
3782
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3729
3783
msgstr ""
3730
3784
3731
#: bzrlib/builtins.py:5771
3785
#: bzrlib/builtins.py:5837
3732
3786
msgid ""
3733
3787
"If no tag name is specified it will be determined through the \n"
3734
3788
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3737
3791
msgstr ""
3738
3792
3739
3793
# help of 'delete' option of 'tag' command
3740
#: bzrlib/builtins.py:5781
3794
#: bzrlib/builtins.py:5847
3741
3795
msgid "Delete this tag rather than placing it."
3742
3796
msgstr ""
3743
3797
3744
3798
# help of 'directory' option of 'tag' command
3745
#: bzrlib/builtins.py:5784
3799
#: bzrlib/builtins.py:5850
3746
3800
msgid "Branch in which to place the tag."
3747
3801
msgstr ""
3748
3802
3749
3803
# help of 'force' option of 'tag' command
3750
#: bzrlib/builtins.py:5786
3804
#: bzrlib/builtins.py:5852
3751
3805
msgid "Replace existing tags."
3752
3806
msgstr ""
3753
3807
3754
#: bzrlib/builtins.py:5801
3808
#: bzrlib/builtins.py:5867
3755
3809
msgid "No tag specified to delete."
3756
3810
msgstr ""
3757
3811
3758
#: bzrlib/builtins.py:5803
3812
#: bzrlib/builtins.py:5869
3759
3813
#, python-format
3760
3814
msgid "Deleted tag %s."
3761
3815
msgstr ""
3762
3816
3763
#: bzrlib/builtins.py:5817
3817
#: bzrlib/builtins.py:5883
3764
3818
msgid "Please specify a tag name."
3765
3819
msgstr ""
3766
3820
3767
#: bzrlib/builtins.py:5825
3821
#: bzrlib/builtins.py:5891
3768
3822
#, python-format
3769
3823
msgid "Tag %s already exists for that revision."
3770
3824
msgstr ""
3771
3825
3772
#: bzrlib/builtins.py:5829
3826
#: bzrlib/builtins.py:5895
3773
3827
#, python-format
3774
3828
msgid "Created tag %s."
3775
3829
msgstr ""
3776
3830
3777
#: bzrlib/builtins.py:5831
3831
#: bzrlib/builtins.py:5897
3778
3832
#, python-format
3779
3833
msgid "Updated tag %s."
3780
3834
msgstr ""
3781
3835
3782
#: bzrlib/builtins.py:5835
3836
#: bzrlib/builtins.py:5901
3783
3837
msgid "List tags."
3784
3838
msgstr ""
3785
3839
3786
#: bzrlib/builtins.py:5837
3840
#: bzrlib/builtins.py:5903
3787
3841
msgid ""
3788
3842
"This command shows a table of tag names and the revisions they reference."
3789
3843
msgstr ""
3790
3844
3791
3845
# help of 'directory' option of 'tags' command
3792
#: bzrlib/builtins.py:5843
3846
#: bzrlib/builtins.py:5909
3793
3847
msgid "Branch whose tags should be displayed."
3794
3848
msgstr ""
3795
3849
3796
3850
# help of 'sort' option of 'tags' command
3797
#: bzrlib/builtins.py:5845
3851
#: bzrlib/builtins.py:5911
3798
3852
msgid "Sort tags by different criteria."
3799
3853
msgstr ""
3800
3854
3801
3855
# title of 'sort' option of 'tags' command
3802
#: bzrlib/builtins.py:5845
3856
#: bzrlib/builtins.py:5911
3803
3857
msgid "Sorting"
3804
3858
msgstr ""
3805
3859
3806
#: bzrlib/builtins.py:5914
3860
#: bzrlib/builtins.py:5980
3807
3861
msgid "Reconfigure the type of a bzr directory."
3808
3862
msgstr ""
3809
3863
3810
#: bzrlib/builtins.py:5916
3864
#: bzrlib/builtins.py:5982
3811
3865
msgid "A target configuration must be specified."
3812
3866
msgstr ""
3813
3867
3814
#: bzrlib/builtins.py:5918
3868
#: bzrlib/builtins.py:5984
3815
3869
msgid ""
3816
3870
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3817
3871
"The order of preference is\n"
3823
3877
msgstr ""
3824
3878
3825
3879
# title of 'tree_type' option of 'reconfigure' command
3826
#: bzrlib/builtins.py:5932
3880
#: bzrlib/builtins.py:5998
3827
3881
msgid "Tree type"
3828
3882
msgstr ""
3829
3883
3830
3884
# help of 'tree_type' option of 'reconfigure' command
3831
#: bzrlib/builtins.py:5933
3885
#: bzrlib/builtins.py:5999
3832
3886
msgid "The relation between branch and tree."
3833
3887
msgstr ""
3834
3888
3835
3889
# help of 'tree_type=branch' option of 'reconfigure' command
3836
#: bzrlib/builtins.py:5935
3890
#: bzrlib/builtins.py:6001
3837
3891
msgid "Reconfigure to be an unbound branch with no working tree."
3838
3892
msgstr ""
3839
3893
3840
3894
# help of 'tree_type=tree' option of 'reconfigure' command
3841
#: bzrlib/builtins.py:5936
3895
#: bzrlib/builtins.py:6002
3842
3896
msgid "Reconfigure to be an unbound branch with a working tree."
3843
3897
msgstr ""
3844
3898
3845
3899
# help of 'tree_type=checkout' option of 'reconfigure' command
3846
#: bzrlib/builtins.py:5937
3900
#: bzrlib/builtins.py:6003
3847
3901
msgid "Reconfigure to be a bound branch with a working tree."
3848
3902
msgstr ""
3849
3903
3850
3904
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3851
#: bzrlib/builtins.py:5938
3905
#: bzrlib/builtins.py:6004
3852
3906
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3853
3907
msgstr ""
3854
3908
3855
3909
# title of 'repository_type' option of 'reconfigure' command
3856
#: bzrlib/builtins.py:5943
3910
#: bzrlib/builtins.py:6009
3857
3911
msgid "Repository type"
3858
3912
msgstr ""
3859
3913
3860
3914
# help of 'repository_type' option of 'reconfigure' command
3861
#: bzrlib/builtins.py:5944
3915
#: bzrlib/builtins.py:6010
3862
3916
msgid "Location fo the repository."
3863
3917
msgstr ""
3864
3918
3865
3919
# help of 'repository_type=standalone' option of 'reconfigure' command
3866
#: bzrlib/builtins.py:5946
3920
#: bzrlib/builtins.py:6012
3867
3921
msgid ""
3868
3922
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3869
3923
msgstr ""
3870
3924
3871
3925
# help of 'repository_type=use-shared' option of 'reconfigure' command
3872
#: bzrlib/builtins.py:5948
3926
#: bzrlib/builtins.py:6014
3873
3927
msgid "Reconfigure to use a shared repository."
3874
3928
msgstr ""
3875
3929
3876
3930
# title of 'repository_trees' option of 'reconfigure' command
3877
#: bzrlib/builtins.py:5952
3931
#: bzrlib/builtins.py:6018
3878
3932
msgid "Trees in Repository"
3879
3933
msgstr ""
3880
3934
3881
3935
# help of 'repository_trees' option of 'reconfigure' command
3882
#: bzrlib/builtins.py:5953
3936
#: bzrlib/builtins.py:6019
3883
3937
msgid "Whether new branches in the repository have trees."
3884
3938
msgstr ""
3885
3939
3886
3940
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3887
#: bzrlib/builtins.py:5955
3941
#: bzrlib/builtins.py:6021
3888
3942
msgid "Reconfigure repository to create working trees on branches by default."
3889
3943
msgstr ""
3890
3944
3891
3945
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3892
#: bzrlib/builtins.py:5957
3946
#: bzrlib/builtins.py:6023
3893
3947
msgid ""
3894
3948
"Reconfigure repository to not create working trees on branches by default."
3895
3949
msgstr ""
3896
3950
3897
3951
# help of 'bind-to' option of 'reconfigure' command
3898
#: bzrlib/builtins.py:5960
3952
#: bzrlib/builtins.py:6026
3899
3953
msgid "Branch to bind checkout to."
3900
3954
msgstr ""
3901
3955
3902
3956
# help of 'force' option of 'reconfigure' command
3903
#: bzrlib/builtins.py:5962
3957
#: bzrlib/builtins.py:6028
3904
3958
msgid "Perform reconfiguration even if local changes will be lost."
3905
3959
msgstr ""
3906
3960
3907
3961
# help of 'stacked-on' option of 'reconfigure' command
3908
#: bzrlib/builtins.py:5965
3962
#: bzrlib/builtins.py:6031
3909
3963
msgid "Reconfigure a branch to be stacked on another branch."
3910
3964
msgstr ""
3911
3965
3912
3966
# help of 'unstacked' option of 'reconfigure' command
3913
#: bzrlib/builtins.py:5969
3967
#: bzrlib/builtins.py:6035
3914
3968
msgid ""
3915
3969
"Reconfigure a branch to be unstacked. This may require copying substantial "
3916
3970
"data into it."
3917
3971
msgstr ""
3918
3972
3919
#: bzrlib/builtins.py:5979
3973
#: bzrlib/builtins.py:6045
3920
3974
msgid "Can't use both --stacked-on and --unstacked"
3921
3975
msgstr ""
3922
3976
3923
#: bzrlib/builtins.py:5993
3977
#: bzrlib/builtins.py:6059
3924
3978
msgid "No target configuration specified"
3925
3979
msgstr ""
3926
3980
3927
#: bzrlib/builtins.py:6028
3981
#: bzrlib/builtins.py:6094
3928
3982
msgid "Set the branch of a checkout and update."
3929
3983
msgstr ""
3930
3984
3931
#: bzrlib/builtins.py:6030
3985
#: bzrlib/builtins.py:6096
3932
3986
msgid ""
3933
3987
"For lightweight checkouts, this changes the branch being referenced.\n"
3934
3988
"For heavyweight checkouts, this checks that there are no local commits\n"
3936
3990
"of the new location and binds to it."
3937
3991
msgstr ""
3938
3992
3939
#: bzrlib/builtins.py:6035
3993
#: bzrlib/builtins.py:6101
3940
3994
msgid ""
3941
3995
"In both cases, the working tree is updated and uncommitted changes\n"
3942
3996
"are merged. The user can commit or revert these as they desire."
3943
3997
msgstr ""
3944
3998
3945
#: bzrlib/builtins.py:6038
3999
#: bzrlib/builtins.py:6104
3946
4000
msgid "Pending merges need to be committed or reverted before using switch."
3947
4001
msgstr ""
3948
4002
3949
#: bzrlib/builtins.py:6040
4003
#: bzrlib/builtins.py:6106
3950
4004
msgid ""
3951
4005
"The path to the branch to switch to can be specified relative to the parent\n"
3952
4006
"directory of the current branch. For example, if you are currently in a\n"
3954
4008
"/path/to/newbranch."
3955
4009
msgstr ""
3956
4010
3957
#: bzrlib/builtins.py:6045
4011
#: bzrlib/builtins.py:6111
3958
4012
msgid ""
3959
4013
"Bound branches use the nickname of its master branch unless it is set\n"
3960
4014
"locally, in which case switching will update the local nickname to be\n"
3962
4016
msgstr ""
3963
4017
3964
4018
# help of 'force' option of 'switch' command
3965
#: bzrlib/builtins.py:6053
4019
#: bzrlib/builtins.py:6119
3966
4020
msgid "Switch even if local commits will be lost."
3967
4021
msgstr ""
3968
4022
3969
4023
# help of 'create-branch' option of 'switch' command
3970
#: bzrlib/builtins.py:6056
4024
#: bzrlib/builtins.py:6122
3971
4025
msgid "Create the target branch from this one before switching to it."
3972
4026
msgstr ""
3973
4027
3974
#: bzrlib/builtins.py:6068
4028
#: bzrlib/builtins.py:6134
3975
4029
msgid "You must supply either a revision or a location"
3976
4030
msgstr ""
3977
4031
3978
#: bzrlib/builtins.py:6079
4032
#: bzrlib/builtins.py:6145
3979
4033
msgid "cannot create branch without source branch"
3980
4034
msgstr ""
3981
4035
3982
#: bzrlib/builtins.py:6143
4036
#: bzrlib/builtins.py:6209
3983
4037
msgid "Manage filtered views."
3984
4038
msgstr ""
3985
4039
3986
#: bzrlib/builtins.py:6145
4040
#: bzrlib/builtins.py:6211
3987
4041
msgid ""
3988
4042
"Views provide a mask over the tree so that users can focus on\n"
3989
4043
"a subset of a tree when doing their work. After creating a view,\n"
3993
4047
"must be within the current view."
3994
4048
msgstr ""
3995
4049
3996
#: bzrlib/builtins.py:6152
4050
#: bzrlib/builtins.py:6218
3997
4051
msgid ""
3998
4052
"In most cases, a view has a short life-span: it is created to make\n"
3999
4053
"a selected change and is deleted once that change is committed.\n"
4001
4055
"and switch between them."
4002
4056
msgstr ""
4003
4057
4004
#: bzrlib/builtins.py:6157
4058
#: bzrlib/builtins.py:6223
4005
4059
msgid ""
4006
4060
"To disable the current view without deleting it, you can switch to\n"
4007
4061
"the pseudo view called ``off``. This can be useful when you need\n"
4009
4063
"want to switch back to your view after that."
4010
4064
msgstr ""
4011
4065
4012
#: bzrlib/builtins.py:6162
4066
#: bzrlib/builtins.py:6228
4013
4067
msgid ""
4014
4068
":Examples:\n"
4015
4069
" To define the current view::"
4016
4070
msgstr ""
4017
4071
4018
#: bzrlib/builtins.py:6165
4072
#: bzrlib/builtins.py:6231
4019
4073
msgid " bzr view file1 dir1 ..."
4020
4074
msgstr ""
4021
4075
4022
#: bzrlib/builtins.py:6167
4076
#: bzrlib/builtins.py:6233
4023
4077
msgid " To list the current view::"
4024
4078
msgstr ""
4025
4079
4026
#: bzrlib/builtins.py:6169
4080
#: bzrlib/builtins.py:6235
4027
4081
msgid " bzr view"
4028
4082
msgstr ""
4029
4083
4030
#: bzrlib/builtins.py:6171
4084
#: bzrlib/builtins.py:6237
4031
4085
msgid " To delete the current view::"
4032
4086
msgstr ""
4033
4087
4034
#: bzrlib/builtins.py:6173
4088
#: bzrlib/builtins.py:6239
4035
4089
msgid " bzr view --delete"
4036
4090
msgstr ""
4037
4091
4038
#: bzrlib/builtins.py:6175
4092
#: bzrlib/builtins.py:6241
4039
4093
msgid " To disable the current view without deleting it::"
4040
4094
msgstr ""
4041
4095
4042
#: bzrlib/builtins.py:6177
4096
#: bzrlib/builtins.py:6243
4043
4097
msgid " bzr view --switch off"
4044
4098
msgstr ""
4045
4099
4046
#: bzrlib/builtins.py:6179
4100
#: bzrlib/builtins.py:6245
4047
4101
msgid " To define a named view and switch to it::"
4048
4102
msgstr ""
4049
4103
4050
#: bzrlib/builtins.py:6181
4104
#: bzrlib/builtins.py:6247
4051
4105
msgid " bzr view --name view-name file1 dir1 ..."
4052
4106
msgstr ""
4053
4107
4054
#: bzrlib/builtins.py:6183
4108
#: bzrlib/builtins.py:6249
4055
4109
msgid " To list a named view::"
4056
4110
msgstr ""
4057
4111
4058
#: bzrlib/builtins.py:6185
4112
#: bzrlib/builtins.py:6251
4059
4113
msgid " bzr view --name view-name"
4060
4114
msgstr ""
4061
4115
4062
#: bzrlib/builtins.py:6187
4116
#: bzrlib/builtins.py:6253
4063
4117
msgid " To delete a named view::"
4064
4118
msgstr ""
4065
4119
4066
#: bzrlib/builtins.py:6189
4120
#: bzrlib/builtins.py:6255
4067
4121
msgid " bzr view --name view-name --delete"
4068
4122
msgstr ""
4069
4123
4070
#: bzrlib/builtins.py:6191
4124
#: bzrlib/builtins.py:6257
4071
4125
msgid " To switch to a named view::"
4072
4126
msgstr ""
4073
4127
4074
#: bzrlib/builtins.py:6193
4128
#: bzrlib/builtins.py:6259
4075
4129
msgid " bzr view --switch view-name"
4076
4130
msgstr ""
4077
4131
4078
#: bzrlib/builtins.py:6195
4132
#: bzrlib/builtins.py:6261
4079
4133
msgid " To list all views defined::"
4080
4134
msgstr ""
4081
4135
4082
#: bzrlib/builtins.py:6197
4136
#: bzrlib/builtins.py:6263
4083
4137
msgid " bzr view --all"
4084
4138
msgstr ""
4085
4139
4086
#: bzrlib/builtins.py:6199
4140
#: bzrlib/builtins.py:6265
4087
4141
msgid " To delete all views::"
4088
4142
msgstr ""
4089
4143
4090
#: bzrlib/builtins.py:6201
4144
#: bzrlib/builtins.py:6267
4091
4145
msgid " bzr view --delete --all"
4092
4146
msgstr ""
4093
4147
4094
4148
# help of 'all' option of 'view' command
4095
#: bzrlib/builtins.py:6208
4149
#: bzrlib/builtins.py:6274
4096
4150
msgid "Apply list or delete action to all views."
4097
4151
msgstr ""
4098
4152
4099
4153
# help of 'delete' option of 'view' command
4100
#: bzrlib/builtins.py:6211
4154
#: bzrlib/builtins.py:6277
4101
4155
msgid "Delete the view."
4102
4156
msgstr ""
4103
4157
4104
4158
# help of 'name' option of 'view' command
4105
#: bzrlib/builtins.py:6214
4159
#: bzrlib/builtins.py:6280
4106
4160
msgid "Name of the view to define, list or delete."
4107
4161
msgstr ""
4108
4162
4109
4163
# help of 'switch' option of 'view' command
4110
#: bzrlib/builtins.py:6218
4164
#: bzrlib/builtins.py:6284
4111
4165
msgid "Name of the view to switch to."
4112
4166
msgstr ""
4113
4167
4114
#: bzrlib/builtins.py:6237
4168
#: bzrlib/builtins.py:6303
4115
4169
msgid "Both --delete and a file list specified"
4116
4170
msgstr ""
4117
4171
4118
#: bzrlib/builtins.py:6240
4172
#: bzrlib/builtins.py:6306
4119
4173
msgid "Both --delete and --switch specified"
4120
4174
msgstr ""
4121
4175
4122
#: bzrlib/builtins.py:6243
4176
#: bzrlib/builtins.py:6309
4123
4177
msgid "Deleted all views.\n"
4124
4178
msgstr ""
4125
4179
4126
#: bzrlib/builtins.py:6245
4180
#: bzrlib/builtins.py:6311
4127
4181
msgid "No current view to delete"
4128
4182
msgstr ""
4129
4183
4130
#: bzrlib/builtins.py:6248
4184
#: bzrlib/builtins.py:6314
4131
4185
#, python-format
4132
4186
msgid "Deleted '%s' view.\n"
4133
4187
msgstr ""
4134
4188
4135
#: bzrlib/builtins.py:6252
4189
#: bzrlib/builtins.py:6318
4136
4190
msgid "Both --switch and a file list specified"
4137
4191
msgstr ""
4138
4192
4139
#: bzrlib/builtins.py:6255
4193
#: bzrlib/builtins.py:6321
4140
4194
msgid "Both --switch and --all specified"
4141
4195
msgstr ""
4142
4196
4143
#: bzrlib/builtins.py:6258
4197
#: bzrlib/builtins.py:6324
4144
4198
msgid "No current view to disable"
4145
4199
msgstr ""
4146
4200
4147
#: bzrlib/builtins.py:6260
4201
#: bzrlib/builtins.py:6326
4148
4202
#, python-format
4149
4203
msgid "Disabled '%s' view.\n"
4150
4204
msgstr ""
4151
4205
4152
#: bzrlib/builtins.py:6264 bzrlib/builtins.py:6286
4206
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4153
4207
msgid "Using '{0}' view: {1}\n"
4154
4208
msgstr ""
4155
4209
4156
#: bzrlib/builtins.py:6267
4210
#: bzrlib/builtins.py:6333
4157
4211
msgid "Views defined:\n"
4158
4212
msgstr ""
4159
4213
4160
#: bzrlib/builtins.py:6276
4214
#: bzrlib/builtins.py:6342
4161
4215
msgid "No views defined.\n"
4162
4216
msgstr ""
4163
4217
4164
#: bzrlib/builtins.py:6283
4218
#: bzrlib/builtins.py:6349
4165
4219
msgid "Cannot change the 'off' pseudo view"
4166
4220
msgstr ""
4167
4221
4168
#: bzrlib/builtins.py:6291
4222
#: bzrlib/builtins.py:6357
4169
4223
msgid "No current view.\n"
4170
4224
msgstr ""
4171
4225
4172
#: bzrlib/builtins.py:6294
4226
#: bzrlib/builtins.py:6360
4173
4227
msgid "'{0}' view is: {1}\n"
4174
4228
msgstr ""
4175
4229
4176
#: bzrlib/builtins.py:6314
4230
#: bzrlib/builtins.py:6380
4177
4231
msgid " <no hooks installed>\n"
4178
4232
msgstr ""
4179
4233
4180
#: bzrlib/builtins.py:6318
4234
#: bzrlib/builtins.py:6384
4181
4235
msgid "Remove a branch."
4182
4236
msgstr ""
4183
4237
4184
#: bzrlib/builtins.py:6320
4238
#: bzrlib/builtins.py:6386
4185
4239
msgid ""
4186
4240
"This will remove the branch from the specified location but \n"
4187
4241
"will keep any working tree or repository in place."
4188
4242
msgstr ""
4189
4243
4190
#: bzrlib/builtins.py:6325
4244
#: bzrlib/builtins.py:6391
4191
4245
msgid " Remove the branch at repo/trunk::"
4192
4246
msgstr ""
4193
4247
4194
#: bzrlib/builtins.py:6327
4248
#: bzrlib/builtins.py:6393
4195
4249
msgid " bzr remove-branch repo/trunk"
4196
4250
msgstr ""
4197
4251
4198
4252
# help of 'writer=plain' option of 'shelve' command
4199
#: bzrlib/builtins.py:6342
4253
#: bzrlib/builtins.py:6408
4200
4254
msgid "Plaintext diff output."
4201
4255
msgstr ""
4202
4256
4203
#: bzrlib/builtins.py:6343
4257
#: bzrlib/builtins.py:6409
4204
4258
msgid "Temporarily set aside some changes from the current tree."
4205
4259
msgstr ""
4206
4260
4207
#: bzrlib/builtins.py:6345
4261
#: bzrlib/builtins.py:6411
4208
4262
msgid ""
4209
4263
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4210
4264
"ie. out of the way, until a later time when you can bring them back from\n"
4213
4267
"will they survive its deletion."
4214
4268
msgstr ""
4215
4269
4216
#: bzrlib/builtins.py:6351
4270
#: bzrlib/builtins.py:6417
4217
4271
msgid "If shelve --list is specified, previously-shelved changes are listed."
4218
4272
msgstr ""
4219
4273
4220
#: bzrlib/builtins.py:6353
4274
#: bzrlib/builtins.py:6419
4221
4275
msgid ""
4222
4276
"Shelve is intended to help separate several sets of changes that have\n"
4223
4277
"been inappropriately mingled. If you just want to get rid of all changes\n"
4225
4279
"shelve all text changes at once, use shelve --all."
4226
4280
msgstr ""
4227
4281
4228
#: bzrlib/builtins.py:6358
4282
#: bzrlib/builtins.py:6424
4229
4283
msgid ""
4230
4284
"If filenames are specified, only the changes to those files will be\n"
4231
4285
"shelved. Other files will be left untouched."
4232
4286
msgstr ""
4233
4287
4234
#: bzrlib/builtins.py:6361
4288
#: bzrlib/builtins.py:6427
4235
4289
msgid ""
4236
4290
"If a revision is specified, changes since that revision will be shelved."
4237
4291
msgstr ""
4238
4292
4239
#: bzrlib/builtins.py:6363
4293
#: bzrlib/builtins.py:6429
4240
4294
msgid ""
4241
4295
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4242
4296
"restore the most recently shelved changes."
4243
4297
msgstr ""
4244
4298
4245
#: bzrlib/builtins.py:6366
4299
#: bzrlib/builtins.py:6432
4246
4300
msgid ""
4247
4301
"For complicated changes, it is possible to edit the changes in a separate\n"
4248
4302
"editor program to decide what the file remaining in the working copy\n"
4249
4303
"should look like. To do this, add the configuration option"
4250
4304
msgstr ""
4251
4305
4252
#: bzrlib/builtins.py:6370
4306
#: bzrlib/builtins.py:6436
4253
4307
msgid " change_editor = PROGRAM @new_path @old_path"
4254
4308
msgstr ""
4255
4309
4256
#: bzrlib/builtins.py:6372
4310
#: bzrlib/builtins.py:6438
4257
4311
msgid ""
4258
4312
"where @new_path is replaced with the path of the new version of the \n"
4259
4313
"file and @old_path is replaced with the path of the old version of \n"
4263
4317
msgstr ""
4264
4318
4265
4319
# help of 'all' option of 'shelve' command
4266
#: bzrlib/builtins.py:6384
4320
#: bzrlib/builtins.py:6450
4267
4321
msgid "Shelve all changes."
4268
4322
msgstr ""
4269
4323
4270
4324
# help of 'writer' option of 'shelve' command
4271
#: bzrlib/builtins.py:6386
4325
#: bzrlib/builtins.py:6452
4272
4326
msgid "Method to use for writing diffs."
4273
4327
msgstr ""
4274
4328
4275
4329
# title of 'writer' option of 'shelve' command
4276
#: bzrlib/builtins.py:6386
4330
#: bzrlib/builtins.py:6452
4277
4331
msgid "writer"
4278
4332
msgstr ""
4279
4333
4280
4334
# help of 'list' option of 'shelve' command
4281
#: bzrlib/builtins.py:6390
4335
#: bzrlib/builtins.py:6456
4282
4336
msgid "List shelved changes."
4283
4337
msgstr ""
4284
4338
4285
4339
# help of 'destroy' option of 'shelve' command
4286
#: bzrlib/builtins.py:6392
4340
#: bzrlib/builtins.py:6458
4287
4341
msgid "Destroy removed changes instead of shelving them."
4288
4342
msgstr ""
4289
4343
4290
#: bzrlib/builtins.py:6421
4344
#: bzrlib/builtins.py:6487
4291
4345
msgid "No shelved changes."
4292
4346
msgstr ""
4293
4347
4294
#: bzrlib/builtins.py:6432
4348
#: bzrlib/builtins.py:6498
4295
4349
msgid "Restore shelved changes."
4296
4350
msgstr ""
4297
4351
4298
#: bzrlib/builtins.py:6434
4352
#: bzrlib/builtins.py:6500
4299
4353
msgid ""
4300
4354
"By default, the most recently shelved changes are restored. However if you\n"
4301
4355
"specify a shelf by id those changes will be restored instead. This works\n"
4303
4357
msgstr ""
4304
4358
4305
4359
# help of 'action' option of 'unshelve' command
4306
#: bzrlib/builtins.py:6443
4360
#: bzrlib/builtins.py:6509
4307
4361
msgid "The action to perform."
4308
4362
msgstr ""
4309
4363
4364
# title of 'action' option of 'resolve' command
4365
# title of 'action' option of 'unshelve' command
4366
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4367
msgid "action"
4368
msgstr ""
4369
4310
4370
# help of 'action=apply' option of 'unshelve' command
4311
#: bzrlib/builtins.py:6445
4371
#: bzrlib/builtins.py:6511
4312
4372
msgid "Apply changes and remove from the shelf."
4313
4373
msgstr ""
4314
4374
4315
4375
# help of 'action=dry-run' option of 'unshelve' command
4316
#: bzrlib/builtins.py:6446
4376
#: bzrlib/builtins.py:6512
4317
4377
msgid "Show changes, but do not apply or remove them."
4318
4378
msgstr ""
4319
4379
4320
4380
# help of 'action=preview' option of 'unshelve' command
4321
#: bzrlib/builtins.py:6447
4381
#: bzrlib/builtins.py:6513
4322
4382
msgid ""
4323
4383
"Instead of unshelving the changes, show the diff that would result from "
4324
4384
"unshelving."
4325
4385
msgstr ""
4326
4386
4327
4387
# help of 'action=delete-only' option of 'unshelve' command
4328
#: bzrlib/builtins.py:6449
4388
#: bzrlib/builtins.py:6515
4329
4389
msgid "Delete changes without applying them."
4330
4390
msgstr ""
4331
4391
4332
4392
# help of 'action=keep' option of 'unshelve' command
4333
#: bzrlib/builtins.py:6450
4393
#: bzrlib/builtins.py:6516
4334
4394
msgid "Apply changes but don't delete them."
4335
4395
msgstr ""
4336
4396
4337
#: bzrlib/builtins.py:6465
4397
#: bzrlib/builtins.py:6531
4338
4398
msgid "Remove unwanted files from working tree."
4339
4399
msgstr ""
4340
4400
4341
#: bzrlib/builtins.py:6467
4401
#: bzrlib/builtins.py:6533
4342
4402
msgid ""
4343
4403
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4344
4404
"files are never deleted."
4345
4405
msgstr ""
4346
4406
4347
#: bzrlib/builtins.py:6470
4407
#: bzrlib/builtins.py:6536
4348
4408
msgid ""
4349
4409
"Another class is 'detritus', which includes files emitted by bzr during\n"
4350
4410
"normal operations and selftests. (The value of these files decreases with\n"
4351
4411
"time.)"
4352
4412
msgstr ""
4353
4413
4354
#: bzrlib/builtins.py:6474
4414
#: bzrlib/builtins.py:6540
4355
4415
msgid ""
4356
4416
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4357
4417
"flags are respected, and may be combined."
4358
4418
msgstr ""
4359
4419
4360
#: bzrlib/builtins.py:6477
4420
#: bzrlib/builtins.py:6543
4361
4421
msgid "To check what clean-tree will do, use --dry-run."
4362
4422
msgstr ""
4363
4423
4364
4424
# help of 'ignored' option of 'clean-tree' command
4365
#: bzrlib/builtins.py:6480
4425
#: bzrlib/builtins.py:6546
4366
4426
msgid "Delete all ignored files."
4367
4427
msgstr ""
4368
4428
4369
4429
# help of 'detritus' option of 'clean-tree' command
4370
#: bzrlib/builtins.py:6481
4430
#: bzrlib/builtins.py:6547
4371
4431
msgid ""
4372
4432
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4373
4433
msgstr ""
4374
4434
4375
4435
# help of 'unknown' option of 'clean-tree' command
4376
#: bzrlib/builtins.py:6484
4436
#: bzrlib/builtins.py:6550
4377
4437
msgid "Delete files unknown to bzr (default)."
4378
4438
msgstr ""
4379
4439
4380
4440
# help of 'dry-run' option of 'clean-tree' command
4381
#: bzrlib/builtins.py:6485
4441
#: bzrlib/builtins.py:6551
4382
4442
msgid "Show files to delete instead of deleting them."
4383
4443
msgstr ""
4384
4444
4385
4445
# help of 'force' option of 'clean-tree' command
4386
#: bzrlib/builtins.py:6487
4446
#: bzrlib/builtins.py:6553
4387
4447
msgid "Do not prompt before deleting."
4388
4448
msgstr ""
4389
4449
4390
#: bzrlib/bundle/__init__.py:57
4450
#: bzrlib/bundle/__init__.py:59
4391
4451
msgid "A directory cannot be a bundle"
4392
4452
msgstr ""
4393
4453
4394
#: bzrlib/bundle/apply_bundle.py:37
4454
#: bzrlib/bundle/apply_bundle.py:40
4395
4455
msgid "Install revisions"
4396
4456
msgstr ""
4397
4457
4398
#: bzrlib/bundle/commands.py:61
4458
#: bzrlib/bundle/commands.py:64
4399
4459
msgid "--verbose requires a merge directive"
4400
4460
msgstr ""
4401
4461
4402
#: bzrlib/bundle/commands.py:64
4462
#: bzrlib/bundle/commands.py:67
4403
4463
msgid "Bundle format not supported"
4404
4464
msgstr ""
4405
4465
4406
#: bzrlib/bundle/commands.py:74
4466
#: bzrlib/bundle/commands.py:77
4407
4467
msgid "Records\n"
4408
4468
msgstr ""
4409
4469
4410
#: bzrlib/bundle/commands.py:78
4470
#: bzrlib/bundle/commands.py:81
4411
4471
msgid "{0}: {1} ({2} multiparent)\n"
4412
4472
msgstr ""
4413
4473
4414
#: bzrlib/bundle/commands.py:80
4474
#: bzrlib/bundle/commands.py:83
4415
4475
#, python-format
4416
4476
msgid "unique files: %d\n"
4417
4477
msgstr ""
4418
4478
4419
#: bzrlib/bundle/commands.py:89
4479
#: bzrlib/bundle/commands.py:92
4420
4480
msgid "Revisions\n"
4421
4481
msgstr ""
4422
4482
4423
#: bzrlib/bundle/commands.py:90
4483
#: bzrlib/bundle/commands.py:93
4424
4484
#, python-format
4425
4485
msgid "nicks: %s\n"
4426
4486
msgstr ""
4427
4487
4428
#: bzrlib/bundle/commands.py:92
4488
#: bzrlib/bundle/commands.py:95
4429
4489
#, python-format
4430
4490
msgid ""
4431
4491
"committers: \n"
4432
4492
"%s\n"
4433
4493
msgstr ""
4434
4494
4435
#: bzrlib/bundle/commands.py:100
4495
#: bzrlib/bundle/commands.py:103
4436
4496
msgid "Decoded contents\n"
4437
4497
msgstr ""
4438
4498
4439
#: bzrlib/bundle/serializer/v4.py:325
4499
#: bzrlib/bundle/serializer/v4.py:327
4440
4500
#, python-format
4441
4501
msgid "Bundling %d revision."
4442
4502
msgid_plural "Bundling %d revisions."
4443
4503
msgstr[0] ""
4444
4504
msgstr[1] ""
4445
4505
4446
#: bzrlib/bzrdir.py:487
4506
#: bzrlib/bzrdir.py:489
4447
4507
msgid ""
4448
4508
"making backup of {0}\n"
4449
4509
" to {1}"
4450
4510
msgstr ""
4451
4511
4452
#: bzrlib/bzrdir.py:510
4512
#: bzrlib/bzrdir.py:512
4453
4513
msgid "renamed {0} to {1}"
4454
4514
msgstr ""
4455
4515
4456
#: bzrlib/bzrdir.py:1512
4516
#: bzrlib/bzrdir.py:1663
4457
4517
#, python-format
4458
4518
msgid ""
4459
4519
"Source repository format does not support stacking, using format:\n"
4460
4520
" %s"
4461
4521
msgstr ""
4462
4522
4463
#: bzrlib/bzrdir.py:1532
4523
#: bzrlib/bzrdir.py:1683
4464
4524
#, python-format
4465
4525
msgid ""
4466
4526
"Source branch format does not support stacking, using format:\n"
4467
4527
" %s"
4468
4528
msgstr ""
4469
4529
4470
#: bzrlib/bzrdir.py:1677
4530
#: bzrlib/bzrdir.py:1829
4471
4531
msgid "starting repository conversion"
4472
4532
msgstr ""
4473
4533
4474
#: bzrlib/bzrdir.py:1906
4534
#: bzrlib/bzrdir.py:2058
4475
4535
msgid "Using default stacking branch {0} at {1}"
4476
4536
msgstr ""
4477
4537
4478
#: bzrlib/check.py:106
4538
#: bzrlib/check.py:108
4479
4539
msgid "check"
4480
4540
msgstr ""
4481
4541
4482
#: bzrlib/check.py:108
4542
#: bzrlib/check.py:110
4483
4543
msgid "checking revisions"
4484
4544
msgstr ""
4485
4545
4486
#: bzrlib/check.py:110
4546
#: bzrlib/check.py:112
4487
4547
msgid "checking commit contents"
4488
4548
msgstr ""
4489
4549
4490
#: bzrlib/check.py:112
4550
#: bzrlib/check.py:114
4491
4551
msgid "checking file graphs"
4492
4552
msgstr ""
4493
4553
4494
#: bzrlib/check.py:116
4554
#: bzrlib/check.py:118
4495
4555
msgid "checking branches and trees"
4496
4556
msgstr ""
4497
4557
4498
#: bzrlib/check.py:203
4558
#: bzrlib/check.py:205
4499
4559
msgid "checked repository {0} format {1}"
4500
4560
msgstr ""
4501
4561
4502
#: bzrlib/check.py:206
4562
#: bzrlib/check.py:208
4503
4563
#, python-format
4504
4564
msgid "%6d revisions"
4505
4565
msgstr ""
4506
4566
4507
#: bzrlib/check.py:207
4567
#: bzrlib/check.py:209
4508
4568
#, python-format
4509
4569
msgid "%6d file-ids"
4510
4570
msgstr ""
4511
4571
4512
#: bzrlib/check.py:209
4572
#: bzrlib/check.py:211
4513
4573
#, python-format
4514
4574
msgid "%6d unreferenced text versions"
4515
4575
msgstr ""
4516
4576
4517
#: bzrlib/check.py:213
4577
#: bzrlib/check.py:215
4518
4578
msgid "unreferenced version: {{{0}}} in {1}"
4519
4579
msgstr ""
4520
4580
4521
#: bzrlib/check.py:216
4581
#: bzrlib/check.py:218
4522
4582
#, python-format
4523
4583
msgid "%6d revisions are missing inventory_sha1"
4524
4584
msgstr ""
4525
4585
4526
#: bzrlib/check.py:219
4586
#: bzrlib/check.py:221
4527
4587
#, python-format
4528
4588
msgid "%6d revisions are mentioned but not present"
4529
4589
msgstr ""
4530
4590
4531
#: bzrlib/check.py:222
4591
#: bzrlib/check.py:224
4532
4592
#, python-format
4533
4593
msgid "%6d ghost revisions"
4534
4594
msgstr ""
4535
4595
4536
#: bzrlib/check.py:227
4596
#: bzrlib/check.py:229
4537
4597
#, python-format
4538
4598
msgid "%6d revisions missing parents in ancestry"
4539
4599
msgstr ""
4540
4600
4541
#: bzrlib/check.py:231
4601
#: bzrlib/check.py:233
4542
4602
#, python-format
4543
4603
msgid " %s should be in the ancestry for:"
4544
4604
msgstr ""
4545
4605
4546
#: bzrlib/check.py:235
4606
#: bzrlib/check.py:237
4547
4607
#, python-format
4548
4608
msgid "%6d inconsistent parents"
4549
4609
msgstr ""
4550
4610
4551
#: bzrlib/check.py:239
4611
#: bzrlib/check.py:241
4552
4612
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4553
4613
msgstr ""
4554
4614
4555
#: bzrlib/check.py:245
4615
#: bzrlib/check.py:247
4556
4616
#, python-format
4557
4617
msgid "%6d revisions have incorrect parents in the revision index"
4558
4618
msgstr ""
4559
4619
4560
#: bzrlib/check.py:251
4620
#: bzrlib/check.py:253
4561
4621
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4562
4622
msgstr ""
4563
4623
4564
#: bzrlib/check.py:265
4624
#: bzrlib/check.py:267
4565
4625
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4566
4626
msgstr ""
4567
4627
4568
#: bzrlib/check.py:294
4628
#: bzrlib/check.py:296
4569
4629
msgid ""
4570
4630
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4571
4631
"{{{4}}}"
4572
4632
msgstr ""
4573
4633
4574
#: bzrlib/check.py:352
4634
#: bzrlib/check.py:354
4575
4635
#, python-format
4576
4636
msgid "Checking branch at '%s'."
4577
4637
msgstr ""
4578
4638
4579
#: bzrlib/check.py:372
4639
#: bzrlib/check.py:374
4580
4640
#, python-format
4581
4641
msgid "Checking working tree at '%s'."
4582
4642
msgstr ""
4583
4643
4584
#: bzrlib/check.py:425 bzrlib/check.py:439
4644
#: bzrlib/check.py:427 bzrlib/check.py:441
4585
4645
msgid "No branch found at specified location."
4586
4646
msgstr ""
4587
4647
4588
#: bzrlib/check.py:427 bzrlib/check.py:437
4648
#: bzrlib/check.py:429 bzrlib/check.py:439
4589
4649
msgid "No working tree found at specified location."
4590
4650
msgstr ""
4591
4651
4592
#: bzrlib/check.py:430
4652
#: bzrlib/check.py:432
4593
4653
#, python-format
4594
4654
msgid "Checking repository at '%s'."
4595
4655
msgstr ""
4596
4656
4597
#: bzrlib/check.py:441
4657
#: bzrlib/check.py:443
4598
4658
msgid "No repository found at specified location."
4599
4659
msgstr ""
4600
4660
4601
#: bzrlib/clean_tree.py:62
4661
#: bzrlib/clean_tree.py:63
4602
4662
msgid "Nothing to delete."
4603
4663
msgstr ""
4604
4664
4605
#: bzrlib/clean_tree.py:67
4665
#: bzrlib/clean_tree.py:68
4606
4666
msgid "Are you sure you wish to delete these"
4607
4667
msgstr ""
4608
4668
4609
#: bzrlib/clean_tree.py:69
4669
#: bzrlib/clean_tree.py:70
4610
4670
msgid "Canceled"
4611
4671
msgstr ""
4612
4672
4613
#: bzrlib/clean_tree.py:106
4673
#: bzrlib/clean_tree.py:107
4614
4674
#, python-format
4615
4675
msgid "unable to remove %s"
4616
4676
msgstr ""
4617
4677
4618
#: bzrlib/clean_tree.py:110
4678
#: bzrlib/clean_tree.py:111
4619
4679
msgid "deleting paths:"
4620
4680
msgstr ""
4621
4681
4622
#: bzrlib/clean_tree.py:124
4682
#: bzrlib/clean_tree.py:125
4623
4683
msgid "unable to remove \"{0}\": {1}."
4624
4684
msgstr ""
4625
4685
4626
#: bzrlib/clean_tree.py:129
4686
#: bzrlib/clean_tree.py:130
4627
4687
msgid "No files deleted."
4628
4688
msgstr ""
4629
4689
4630
#: bzrlib/cmd_version_info.py:45
4690
#: bzrlib/cmd_version_info.py:47
4631
4691
msgid "No known version info format {0}. Supported types are: {1}"
4632
4692
msgstr ""
4633
4693
4634
4694
# help of 'format=custom' option of 'version-info' command
4635
#: bzrlib/cmd_version_info.py:50
4695
#: bzrlib/cmd_version_info.py:52
4636
4696
msgid "Version info in Custom template-based format."
4637
4697
msgstr ""
4638
4698
4639
4699
# help of 'format=python' option of 'version-info' command
4640
#: bzrlib/cmd_version_info.py:50
4700
#: bzrlib/cmd_version_info.py:52
4641
4701
msgid "Version info in Python format."
4642
4702
msgstr ""
4643
4703
4644
4704
# help of 'format=rio' option of 'version-info' command
4645
#: bzrlib/cmd_version_info.py:50
4705
#: bzrlib/cmd_version_info.py:52
4646
4706
msgid "Version info in RIO (simple text) format (default)."
4647
4707
msgstr ""
4648
4708
4649
#: bzrlib/cmd_version_info.py:51
4709
#: bzrlib/cmd_version_info.py:53
4650
4710
msgid "Show version information about this tree."
4651
4711
msgstr ""
4652
4712
4653
#: bzrlib/cmd_version_info.py:53
4713
#: bzrlib/cmd_version_info.py:55
4654
4714
msgid ""
4655
4715
"You can use this command to add information about version into\n"
4656
4716
"source code of an application. The output can be in one of the\n"
4657
4717
"supported formats or in a custom format based on a template."
4658
4718
msgstr ""
4659
4719
4660
#: bzrlib/cmd_version_info.py:57
4720
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4721
#: en/help_topics/configuration.txt:710
4661
4722
msgid "For example::"
4662
4723
msgstr ""
4663
4724
4664
#: bzrlib/cmd_version_info.py:59
4725
#: bzrlib/cmd_version_info.py:61
4665
4726
msgid ""
4666
4727
" bzr version-info --custom \\\n"
4667
4728
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4668
4729
msgstr ""
4669
4730
4670
#: bzrlib/cmd_version_info.py:62
4731
#: bzrlib/cmd_version_info.py:64
4671
4732
msgid ""
4672
4733
"will produce a C header file with formatted string containing the\n"
4673
4734
"current revision number. Other supported variables in templates are:"
4674
4735
msgstr ""
4675
4736
4676
#: bzrlib/cmd_version_info.py:65
4737
#: bzrlib/cmd_version_info.py:67
4677
4738
msgid ""
4678
4739
" * {date} - date of the last revision\n"
4679
4740
" * {build_date} - current date\n"
4685
4746
msgstr ""
4686
4747
4687
4748
# help of 'format' option of 'version-info' command
4688
#: bzrlib/cmd_version_info.py:75
4749
#: bzrlib/cmd_version_info.py:77
4689
4750
msgid "Select the output format."
4690
4751
msgstr ""
4691
4752
4692
4753
# help of 'all' option of 'version-info' command
4693
#: bzrlib/cmd_version_info.py:79
4754
#: bzrlib/cmd_version_info.py:81
4694
4755
msgid "Include all possible information."
4695
4756
msgstr ""
4696
4757
4697
4758
# help of 'check-clean' option of 'version-info' command
4698
#: bzrlib/cmd_version_info.py:80
4759
#: bzrlib/cmd_version_info.py:82
4699
4760
msgid "Check if tree is clean."
4700
4761
msgstr ""
4701
4762
4702
4763
# help of 'include-history' option of 'version-info' command
4703
#: bzrlib/cmd_version_info.py:82
4764
#: bzrlib/cmd_version_info.py:84
4704
4765
msgid "Include the revision-history."
4705
4766
msgstr ""
4706
4767
4707
4768
# help of 'include-file-revisions' option of 'version-info' command
4708
#: bzrlib/cmd_version_info.py:84
4769
#: bzrlib/cmd_version_info.py:86
4709
4770
msgid "Include the last revision for each file."
4710
4771
msgstr ""
4711
4772
4712
4773
# help of 'template' option of 'version-info' command
4713
#: bzrlib/cmd_version_info.py:85
4774
#: bzrlib/cmd_version_info.py:87
4714
4775
msgid "Template for the output."
4715
4776
msgstr ""
4716
4777
4717
#: bzrlib/cmd_version_info.py:99
4778
#: bzrlib/cmd_version_info.py:101
4718
4779
msgid "bzr version-info --revision takes exactly one revision specifier"
4719
4780
msgstr ""
4720
4781
4721
#: bzrlib/commands.py:232
4782
#: bzrlib/commands.py:228
4722
4783
#, python-format
4723
4784
msgid "unknown command \"%s\""
4724
4785
msgstr ""
4725
4786
4726
#: bzrlib/commands.py:479
4787
#: bzrlib/commands.py:475
4727
4788
msgid "No help for this command."
4728
4789
msgstr ""
4729
4790
4730
#: bzrlib/commands.py:492
4791
#: bzrlib/commands.py:488
4731
4792
#, python-format
4732
4793
msgid ":Purpose: %s\n"
4733
4794
msgstr ""
4734
4795
4735
#: bzrlib/commands.py:494
4796
#: bzrlib/commands.py:490
4736
4797
#, python-format
4737
4798
msgid ""
4738
4799
":Usage:\n"
4739
4800
"%s\n"
4740
4801
msgstr ""
4741
4802
4742
#: bzrlib/commands.py:496
4803
#: bzrlib/commands.py:492
4743
4804
#, python-format
4744
4805
msgid ":Usage: %s\n"
4745
4806
msgstr ""
4746
4807
4747
#: bzrlib/commands.py:515
4808
#: bzrlib/commands.py:511
4748
4809
#, python-format
4749
4810
msgid ":Options:%s"
4750
4811
msgstr ""
4751
4812
4752
#: bzrlib/commands.py:526
4813
#: bzrlib/commands.py:522
4753
4814
#, python-format
4754
4815
msgid ""
4755
4816
":Description:\n"
4757
4818
"\n"
4758
4819
msgstr ""
4759
4820
4760
#: bzrlib/commands.py:536
4821
#: bzrlib/commands.py:532
4761
4822
#, python-format
4762
4823
msgid ""
4763
4824
"See bzr help %s for more details and examples.\n"
4764
4825
"\n"
4765
4826
msgstr ""
4766
4827
4828
#: bzrlib/commands.py:537
4829
msgid ":Aliases: "
4830
msgstr ""
4831
4767
4832
#: bzrlib/commands.py:541
4768
msgid ":Aliases: "
4769
msgstr ""
4770
4771
#: bzrlib/commands.py:545
4772
4833
#, python-format
4773
4834
msgid ":From: plugin \"%s\"\n"
4774
4835
msgstr ""
4775
4836
4837
#: bzrlib/commands.py:553
4838
msgid ":doc:`{0} <{1}-help>`"
4839
msgstr ""
4840
4776
4841
#: bzrlib/commands.py:557
4777
msgid ":doc:`{0} <{1}-help>`"
4778
msgstr ""
4779
4780
#: bzrlib/commands.py:561
4781
4842
#, python-format
4782
4843
msgid ":See also: %s"
4783
4844
msgstr ""
4784
4845
4785
#: bzrlib/commands.py:819 bzrlib/gpg.py:317
4846
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4786
4847
msgid "Only ASCII permitted in option names"
4787
4848
msgstr ""
4788
4849
4789
#: bzrlib/commands.py:844 bzrlib/commands.py:852
4850
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4790
4851
msgid "command {0!r} needs one or more {1}"
4791
4852
msgstr ""
4792
4853
4793
#: bzrlib/commands.py:861
4854
#: bzrlib/commands.py:857
4794
4855
msgid "command {0!r} requires argument {1}"
4795
4856
msgstr ""
4796
4857
4797
#: bzrlib/commands.py:868
4858
#: bzrlib/commands.py:864
4798
4859
msgid "extra argument to command {0}: {1}"
4799
4860
msgstr ""
4800
4861
4801
#: bzrlib/commands.py:965
4862
#: bzrlib/commands.py:961
4802
4863
#, python-format
4803
4864
msgid "Profile data written to \"%s\"."
4804
4865
msgstr ""
4805
4866
4806
#: bzrlib/commit.py:116 bzrlib/commit.py:738
4867
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4807
4868
msgid "added"
4808
4869
msgstr ""
4809
4870
4810
#: bzrlib/commit.py:116 bzrlib/commit.py:746
4871
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4811
4872
msgid "modified"
4812
4873
msgstr ""
4813
4874
4814
#: bzrlib/commit.py:130
4875
#: bzrlib/commit.py:131
4815
4876
#, python-format
4816
4877
msgid "Committing%s"
4817
4878
msgstr ""
4818
4879
4819
#: bzrlib/commit.py:133
4880
#: bzrlib/commit.py:134
4820
4881
#, python-format
4821
4882
msgid "Committed revision %d."
4822
4883
msgstr ""
4823
4884
4824
#: bzrlib/commit.py:142
4885
#: bzrlib/commit.py:143
4825
4886
#, python-format
4826
4887
msgid "deleted %s"
4827
4888
msgstr ""
4828
4889
4829
#: bzrlib/commit.py:145
4890
#: bzrlib/commit.py:146
4830
4891
#, python-format
4831
4892
msgid "missing %s"
4832
4893
msgstr ""
4833
4894
4834
#: bzrlib/commit.py:510
4895
#: bzrlib/commit.py:511
4835
4896
msgid ""
4836
4897
"Conflicting tags in bound branch:\n"
4837
4898
"{0}"
4838
4899
msgstr ""
4839
4900
4840
#: bzrlib/commit.py:740
4901
#: bzrlib/commit.py:742
4841
4902
msgid "renamed"
4842
4903
msgstr ""
4843
4904
4844
#: bzrlib/commit.py:975
4905
#: bzrlib/commit.py:977
4845
4906
msgid "unchanged"
4846
4907
msgstr ""
4847
4908
4848
#: bzrlib/commit.py:997
4909
#: bzrlib/commit.py:999
4849
4910
msgid "{0} [{1}] - Stage"
4850
4911
msgstr ""
4851
4912
4852
#: bzrlib/commit.py:1000
4913
#: bzrlib/commit.py:1002
4853
4914
#, python-format
4854
4915
msgid "%s - Stage"
4855
4916
msgstr ""
4856
4917
4857
#: bzrlib/commit_signature_commands.py:34
4918
#: bzrlib/commit_signature_commands.py:36
4858
4919
msgid "Sign all commits by a given committer."
4859
4920
msgstr ""
4860
4921
4861
#: bzrlib/commit_signature_commands.py:36
4922
#: bzrlib/commit_signature_commands.py:38
4862
4923
msgid ""
4863
4924
"If location is not specified the local tree is used.\n"
4864
4925
"If committer is not specified the default committer is used."
4865
4926
msgstr ""
4866
4927
4867
#: bzrlib/commit_signature_commands.py:39
4928
#: bzrlib/commit_signature_commands.py:41
4868
4929
msgid "This does not sign commits that already have signatures."
4869
4930
msgstr ""
4870
4931
4871
4932
# help of 'dry-run' option of 'sign-my-commits' command
4872
#: bzrlib/commit_signature_commands.py:47
4933
#: bzrlib/commit_signature_commands.py:49
4873
4934
msgid ""
4874
4935
"Don't actually sign anything, just print the revisions that would be signed."
4875
4936
msgstr ""
4876
4937
4877
#: bzrlib/commit_signature_commands.py:101
4938
#: bzrlib/commit_signature_commands.py:103
4878
4939
msgid "Verify all commit signatures."
4879
4940
msgstr ""
4880
4941
4881
#: bzrlib/commit_signature_commands.py:103
4942
#: bzrlib/commit_signature_commands.py:105
4882
4943
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4883
4944
msgstr ""
4884
4945
4885
4946
# help of 'acceptable-keys' option of 'verify-signatures' command
4886
#: bzrlib/commit_signature_commands.py:108
4947
#: bzrlib/commit_signature_commands.py:110
4887
4948
msgid ""
4888
4949
"Comma separated list of GPG key patterns which are acceptable for "
4889
4950
"verification."
4890
4951
msgstr ""
4891
4952
4892
#: bzrlib/commit_signature_commands.py:145
4953
#: bzrlib/commit_signature_commands.py:147
4893
4954
msgid "Cannot verify a range of non-revision-history revisions"
4894
4955
msgstr ""
4895
4956
4896
#: bzrlib/commit_signature_commands.py:166
4957
#: bzrlib/commit_signature_commands.py:168
4897
4958
msgid "All commits signed with verifiable keys"
4898
4959
msgstr ""
4899
4960
4900
#: bzrlib/config.py:451
4961
#: bzrlib/config.py:475
4901
4962
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4902
4963
msgstr ""
4903
4964
4904
#: bzrlib/config.py:2762
4965
#: bzrlib/config.py:2499
4966
msgid "{0} is not an SI unit."
4967
msgstr ""
4968
4969
#: bzrlib/config.py:2956
4970
msgid ""
4971
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4972
"will be saved."
4973
msgstr ""
4974
4975
#: bzrlib/config.py:3100
4905
4976
#, python-format
4906
4977
msgid "Invalid '%s', should be of the form 'name=value'"
4907
4978
msgstr ""
4908
4979
4909
#: bzrlib/config.py:3469
4980
#: bzrlib/config.py:3969
4910
4981
msgid "Display, set or remove a configuration option."
4911
4982
msgstr ""
4912
4983
4913
#: bzrlib/config.py:3471
4984
#: bzrlib/config.py:3971
4914
4985
msgid "Display the active value for a given option."
4915
4986
msgstr ""
4916
4987
4917
#: bzrlib/config.py:3473
4988
#: bzrlib/config.py:3973
4918
4989
msgid ""
4919
4990
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4920
4991
"matching options are displayed mentioning their scope. The active value\n"
4921
4992
"that bzr will take into account is the first one displayed for each option."
4922
4993
msgstr ""
4923
4994
4924
#: bzrlib/config.py:3477
4995
#: bzrlib/config.py:3977
4925
4996
msgid "If no NAME is given, --all .* is implied."
4926
4997
msgstr ""
4927
4998
4928
#: bzrlib/config.py:3479
4999
#: bzrlib/config.py:3979
4929
5000
msgid ""
4930
5001
"Setting a value is achieved by using name=value without spaces. The value\n"
4931
5002
"is set in the most relevant scope and can be checked by displaying the\n"
4933
5004
msgstr ""
4934
5005
4935
5006
# help of 'scope' option of 'config' command
4936
#: bzrlib/config.py:3491
5007
#: bzrlib/config.py:3991
4937
5008
msgid "Reduce the scope to the specified configuration file."
4938
5009
msgstr ""
4939
5010
4940
5011
# help of 'all' option of 'config' command
4941
#: bzrlib/config.py:3495
5012
#: bzrlib/config.py:3995
4942
5013
msgid "Display all the defined values for the matching options."
4943
5014
msgstr ""
4944
5015
4945
5016
# help of 'remove' option of 'config' command
4946
#: bzrlib/config.py:3497
5017
#: bzrlib/config.py:3997
4947
5018
msgid "Remove the option from the configuration file."
4948
5019
msgstr ""
4949
5020
4950
#: bzrlib/conflicts.py:48
5021
#: bzrlib/conflicts.py:50
4951
5022
msgid "List files with conflicts."
4952
5023
msgstr ""
4953
5024
4954
#: bzrlib/conflicts.py:50
4955
msgid ""
4956
"Merge will do its best to combine the changes in two branches, but there\n"
4957
"are some kinds of problems only a human can fix. When it encounters those,\n"
4958
"it will mark a conflict. A conflict means that you need to fix something,\n"
4959
"before you should commit."
4960
msgstr ""
4961
4962
#: bzrlib/conflicts.py:55
5025
#: bzrlib/conflicts.py:57
4963
5026
msgid ""
4964
5027
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4965
5028
"is supplied, the pathnames of files with text conflicts are listed,\n"
4966
5029
"instead. (This is useful for editing all files with text conflicts.)"
4967
5030
msgstr ""
4968
5031
4969
#: bzrlib/conflicts.py:59
5032
#: bzrlib/conflicts.py:61
4970
5033
msgid "Use bzr resolve when you have fixed a problem."
4971
5034
msgstr ""
4972
5035
4973
5036
# help of 'text' option of 'conflicts' command
4974
#: bzrlib/conflicts.py:64
5037
#: bzrlib/conflicts.py:66
4975
5038
msgid "List paths of files with text conflicts."
4976
5039
msgstr ""
4977
5040
4978
5041
# help of 'action=done' option of 'resolve' command
4979
#: bzrlib/conflicts.py:83
5042
#: bzrlib/conflicts.py:85
4980
5043
msgid "Marks the conflict as resolved."
4981
5044
msgstr ""
4982
5045
4983
5046
# help of 'action=take-this' option of 'resolve' command
4984
#: bzrlib/conflicts.py:86
5047
#: bzrlib/conflicts.py:88
4985
5048
msgid "Resolve the conflict preserving the version in the working tree."
4986
5049
msgstr ""
4987
5050
4988
5051
# help of 'action=take-other' option of 'resolve' command
4989
#: bzrlib/conflicts.py:89
5052
#: bzrlib/conflicts.py:91
4990
5053
msgid "Resolve the conflict taking the merged version into account."
4991
5054
msgstr ""
4992
5055
4993
5056
# help of 'action' option of 'resolve' command
4994
#: bzrlib/conflicts.py:96
5057
#: bzrlib/conflicts.py:98
4995
5058
msgid "How to resolve the conflict."
4996
5059
msgstr ""
4997
5060
4998
#: bzrlib/conflicts.py:102
5061
#: bzrlib/conflicts.py:104
4999
5062
msgid "Mark a conflict as resolved."
5000
5063
msgstr ""
5001
5064
5002
#: bzrlib/conflicts.py:109
5065
#: bzrlib/conflicts.py:111
5003
5066
msgid ""
5004
5067
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5005
5068
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5008
5071
msgstr ""
5009
5072
5010
5073
# help of 'all' option of 'resolve' command
5011
#: bzrlib/conflicts.py:117
5074
#: bzrlib/conflicts.py:119
5012
5075
msgid "Resolve all conflicts in this tree."
5013
5076
msgstr ""
5014
5077
5015
#: bzrlib/conflicts.py:124
5078
#: bzrlib/conflicts.py:126
5016
5079
msgid "If --all is specified, no FILE may be provided"
5017
5080
msgstr ""
5018
5081
5019
#: bzrlib/conflicts.py:149
5082
#: bzrlib/conflicts.py:151
5020
5083
#, python-format
5021
5084
msgid "%d conflict auto-resolved."
5022
5085
msgid_plural "%d conflicts auto-resolved."
5023
5086
msgstr[0] ""
5024
5087
msgstr[1] ""
5025
5088
5026
#: bzrlib/conflicts.py:152
5089
#: bzrlib/conflicts.py:154
5027
5090
msgid "Remaining conflicts:"
5028
5091
msgstr ""
5029
5092
5030
#: bzrlib/conflicts.py:157
5093
#: bzrlib/conflicts.py:159
5031
5094
msgid "All conflicts resolved."
5032
5095
msgstr ""
5033
5096
5034
#: bzrlib/conflicts.py:166
5097
#: bzrlib/conflicts.py:168
5035
5098
msgid "{0} conflict resolved, {1} remaining"
5036
5099
msgid_plural "{0} conflicts resolved, {1} remaining"
5037
5100
msgstr[0] ""
5038
5101
msgstr[1] ""
5039
5102
5040
# title of 'action' option of 'resolve' command
5041
#: bzrlib/conflicts.py:692
5042
msgid "action"
5043
msgstr ""
5044
5045
#: bzrlib/controldir.py:682
5103
#: bzrlib/controldir.py:698
5046
5104
msgid "{0} is{1} redirected to {2}"
5047
5105
msgstr ""
5048
5106
5049
#: bzrlib/diff.py:397
5107
#: bzrlib/diff.py:399
5050
5108
#, python-format
5051
5109
msgid "*** Ignoring files outside view. View is %s"
5052
5110
msgstr ""
5053
5111
5054
#: bzrlib/errors.py:155
5112
#: bzrlib/errors.py:157
5055
5113
msgid "The tree builder is already building a tree."
5056
5114
msgstr ""
5057
5115
5058
#: bzrlib/errors.py:176
5116
#: bzrlib/errors.py:178
5059
5117
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5060
5118
msgstr ""
5061
5119
5062
#: bzrlib/errors.py:195
5120
#: bzrlib/errors.py:197
5063
5121
msgid ""
5064
5122
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5065
5123
"versions \"%(minimum)s\" to \"%(current)s\"."
5066
5124
msgstr ""
5067
5125
5068
#: bzrlib/errors.py:207
5126
#: bzrlib/errors.py:209
5069
5127
msgid "The transport '%(transport)s' is only accessible within this process."
5070
5128
msgstr ""
5071
5129
5072
#: bzrlib/errors.py:225
5130
#: bzrlib/errors.py:227
5073
5131
msgid "Invalid revision number %(revno)s"
5074
5132
msgstr ""
5075
5133
5076
#: bzrlib/errors.py:234
5134
#: bzrlib/errors.py:236
5077
5135
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5078
5136
msgstr ""
5079
5137
5080
#: bzrlib/errors.py:245
5138
#: bzrlib/errors.py:247
5081
5139
msgid "Reserved revision-id {%(revision_id)s}"
5082
5140
msgstr ""
5083
5141
5084
#: bzrlib/errors.py:259
5142
#: bzrlib/errors.py:261
5085
5143
msgid "There is no public branch set for \"%(branch_url)s\"."
5086
5144
msgstr ""
5087
5145
5088
#: bzrlib/errors.py:269
5146
#: bzrlib/errors.py:271
5089
5147
msgid ""
5090
5148
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5091
5149
"obtain a list of topics."
5092
5150
msgstr ""
5093
5151
5094
#: bzrlib/errors.py:278
5152
#: bzrlib/errors.py:280
5095
5153
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5096
5154
msgstr ""
5097
5155
5098
#: bzrlib/errors.py:288
5156
#: bzrlib/errors.py:290
5099
5157
msgid ""
5100
5158
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5101
5159
msgstr ""
5102
5160
5103
#: bzrlib/errors.py:297
5161
#: bzrlib/errors.py:299
5104
5162
msgid "The branch '%(branch)s' is not stacked."
5105
5163
msgstr ""
5106
5164
5107
#: bzrlib/errors.py:311
5165
#: bzrlib/errors.py:313
5108
5166
msgid "No WorkingTree exists for \"%(base)s\"."
5109
5167
msgstr ""
5110
5168
5111
#: bzrlib/errors.py:320
5169
#: bzrlib/errors.py:322
5112
5170
msgid "Not currently building a tree."
5113
5171
msgstr ""
5114
5172
5115
#: bzrlib/errors.py:325
5173
#: bzrlib/errors.py:327
5116
5174
msgid "%(url)s is not a local path."
5117
5175
msgstr ""
5118
5176
5119
#: bzrlib/errors.py:353
5177
#: bzrlib/errors.py:355
5120
5178
msgid "%(not_locked)r is not write locked but needs to be."
5121
5179
msgstr ""
5122
5180
5123
#: bzrlib/errors.py:361
5181
#: bzrlib/errors.py:363
5124
5182
msgid "Error in command line options"
5125
5183
msgstr ""
5126
5184
5127
#: bzrlib/errors.py:366
5185
#: bzrlib/errors.py:368
5128
5186
msgid "%(value)s is not an index of type %(_type)s."
5129
5187
msgstr ""
5130
5188
5131
#: bzrlib/errors.py:376
5189
#: bzrlib/errors.py:378
5132
5190
msgid "Error in data for index %(value)s."
5133
5191
msgstr ""
5134
5192
5135
#: bzrlib/errors.py:385
5193
#: bzrlib/errors.py:387
5136
5194
msgid "The key '%(key)s' is already in index '%(index)s'."
5137
5195
msgstr ""
5138
5196
5139
#: bzrlib/errors.py:395
5197
#: bzrlib/errors.py:397
5140
5198
msgid "The key '%(key)s' is not a valid key."
5141
5199
msgstr ""
5142
5200
5143
#: bzrlib/errors.py:404
5201
#: bzrlib/errors.py:406
5144
5202
msgid "Could not parse options for index %(value)s."
5145
5203
msgstr ""
5146
5204
5147
#: bzrlib/errors.py:413
5205
#: bzrlib/errors.py:415
5148
5206
msgid "The value '%(value)s' is not a valid value."
5149
5207
msgstr ""
5150
5208
5151
#: bzrlib/errors.py:441
5209
#: bzrlib/errors.py:443
5152
5210
msgid "Generic path error: %(path)r%(extra)s)"
5153
5211
msgstr ""
5154
5212
5155
#: bzrlib/errors.py:454
5213
#: bzrlib/errors.py:456
5156
5214
msgid "No such file: %(path)r%(extra)s"
5157
5215
msgstr ""
5158
5216
5159
#: bzrlib/errors.py:459
5217
#: bzrlib/errors.py:461
5160
5218
msgid "File exists: %(path)r%(extra)s"
5161
5219
msgstr ""
5162
5220
5163
#: bzrlib/errors.py:465
5221
#: bzrlib/errors.py:467
5164
5222
msgid ""
5165
5223
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5166
5224
"after to tell bzr about a rename that has already happened)%(extra)s"
5167
5225
msgstr ""
5168
5226
5169
#: bzrlib/errors.py:481
5227
#: bzrlib/errors.py:483
5170
5228
msgid "\"%(path)s\" is not a directory %(extra)s"
5171
5229
msgstr ""
5172
5230
5173
#: bzrlib/errors.py:486
5231
#: bzrlib/errors.py:488
5174
5232
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5175
5233
msgstr ""
5176
5234
5177
#: bzrlib/errors.py:491
5235
#: bzrlib/errors.py:493
5178
5236
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5179
5237
msgstr ""
5180
5238
5181
#: bzrlib/errors.py:496
5239
#: bzrlib/errors.py:498
5182
5240
msgid "Hard-linking \"%(path)s\" is not supported"
5183
5241
msgstr ""
5184
5242
5185
#: bzrlib/errors.py:511
5243
#: bzrlib/errors.py:513
5186
5244
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5187
5245
msgstr ""
5188
5246
5189
#: bzrlib/errors.py:516
5247
#: bzrlib/errors.py:518
5190
5248
msgid "Permission denied: \"%(path)s\"%(extra)s"
5191
5249
msgstr ""
5192
5250
5193
#: bzrlib/errors.py:521
5251
#: bzrlib/errors.py:523
5194
5252
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5195
5253
msgstr ""
5196
5254
5197
#: bzrlib/errors.py:526
5255
#: bzrlib/errors.py:528
5198
5256
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5199
5257
msgstr ""
5200
5258
5201
#: bzrlib/errors.py:537
5259
#: bzrlib/errors.py:539
5202
5260
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5203
5261
msgstr ""
5204
5262
5205
#: bzrlib/errors.py:559
5263
#: bzrlib/errors.py:561
5206
5264
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5207
5265
msgstr ""
5208
5266
5209
#: bzrlib/errors.py:569
5267
#: bzrlib/errors.py:571
5210
5268
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5211
5269
msgstr ""
5212
5270
5213
#: bzrlib/errors.py:577
5271
#: bzrlib/errors.py:579
5214
5272
msgid ""
5215
5273
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5216
5274
"upgrade the branch to permit branch stacking."
5217
5275
msgstr ""
5218
5276
5219
#: bzrlib/errors.py:588
5277
#: bzrlib/errors.py:590
5220
5278
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5221
5279
msgstr ""
5222
5280
5223
#: bzrlib/errors.py:598
5281
#: bzrlib/errors.py:600
5224
5282
msgid ""
5225
5283
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5226
5284
"need to upgrade the repository to permit branch stacking."
5227
5285
msgstr ""
5228
5286
5229
#: bzrlib/errors.py:609
5287
#: bzrlib/errors.py:611
5230
5288
msgid "Error reading from %(path)r."
5231
5289
msgstr ""
5232
5290
5233
#: bzrlib/errors.py:628
5291
#: bzrlib/errors.py:630
5234
5292
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5235
5293
msgstr ""
5236
5294
5237
#: bzrlib/errors.py:644
5295
#: bzrlib/errors.py:646
5238
5296
msgid "Path \"%(path)s\" is not unicode normalized"
5239
5297
msgstr ""
5240
5298
5241
#: bzrlib/errors.py:652
5299
#: bzrlib/errors.py:654
5242
5300
msgid "Not a branch: \"%(path)s\"%(detail)s."
5243
5301
msgstr ""
5244
5302
5245
#: bzrlib/errors.py:694
5303
#: bzrlib/errors.py:696
5246
5304
msgid "No submit branch available for branch \"%(path)s\""
5247
5305
msgstr ""
5248
5306
5249
#: bzrlib/errors.py:703
5307
#: bzrlib/errors.py:705
5250
5308
msgid "Already a branch: \"%(path)s\"."
5251
5309
msgstr ""
5252
5310
5253
#: bzrlib/errors.py:709
5311
#: bzrlib/errors.py:711
5254
5312
msgid ""
5255
5313
"Directory contains a branch, but no working tree (use bzr checkout if you "
5256
5314
"wish to build a working tree): \"%(path)s\""
5257
5315
msgstr ""
5258
5316
5259
#: bzrlib/errors.py:714
5317
#: bzrlib/errors.py:716
5260
5318
msgid ""
5261
5319
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5262
5320
msgstr ""
5263
5321
5264
#: bzrlib/errors.py:724
5322
#: bzrlib/errors.py:726
5265
5323
msgid ""
5266
5324
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5267
5325
msgstr ""
5268
5326
5269
#: bzrlib/errors.py:734
5327
#: bzrlib/errors.py:736
5270
5328
msgid "No repository present: \"%(path)s\""
5271
5329
msgstr ""
5272
5330
5273
#: bzrlib/errors.py:741
5331
#: bzrlib/errors.py:743
5274
5332
msgid ""
5275
5333
"Unsupported branch format: %(format)s\n"
5276
5334
"Please run 'bzr upgrade'"
5277
5335
msgstr ""
5278
5336
5279
#: bzrlib/errors.py:747
5337
#: bzrlib/errors.py:749
5280
5338
msgid "Unknown %(kind)s format: %(format)r"
5281
5339
msgstr ""
5282
5340
5283
#: bzrlib/errors.py:756
5341
#: bzrlib/errors.py:758
5284
5342
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5285
5343
msgstr ""
5286
5344
5287
#: bzrlib/errors.py:769
5345
#: bzrlib/errors.py:768
5346
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:783
5288
5350
msgid ""
5289
5351
"%(target)s\n"
5290
5352
"is not compatible with\n"
5292
5354
"%(details)s"
5293
5355
msgstr ""
5294
5356
5295
#: bzrlib/errors.py:785
5357
#: bzrlib/errors.py:799
5296
5358
msgid "Revision is not compatible with %(repo_format)s"
5297
5359
msgstr ""
5298
5360
5299
#: bzrlib/errors.py:795
5361
#: bzrlib/errors.py:809
5300
5362
msgid "%(context_info)s%(path)s is already versioned."
5301
5363
msgstr ""
5302
5364
5303
#: bzrlib/errors.py:816
5365
#: bzrlib/errors.py:830
5304
5366
msgid "%(context_info)s%(path)s is not versioned."
5305
5367
msgstr ""
5306
5368
5307
#: bzrlib/errors.py:837
5369
#: bzrlib/errors.py:851
5308
5370
msgid "Path(s) are not versioned: %(paths_as_string)s"
5309
5371
msgstr ""
5310
5372
5311
#: bzrlib/errors.py:848
5373
#: bzrlib/errors.py:862
5312
5374
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5313
5375
msgstr ""
5314
5376
5315
#: bzrlib/errors.py:867
5377
#: bzrlib/errors.py:881
5316
5378
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5317
5379
msgstr ""
5318
5380
5319
#: bzrlib/errors.py:875
5381
#: bzrlib/errors.py:889
5320
5382
msgid ""
5321
5383
"Filename %(filename)r is not valid in your current filesystem encoding "
5322
5384
"%(fs_encoding)s"
5323
5385
msgstr ""
5324
5386
5325
#: bzrlib/errors.py:886
5387
#: bzrlib/errors.py:900
5326
5388
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5327
5389
msgstr ""
5328
5390
5329
#: bzrlib/errors.py:904
5391
#: bzrlib/errors.py:918
5330
5392
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5331
5393
msgstr ""
5332
5394
5333
#: bzrlib/errors.py:943
5395
#: bzrlib/errors.py:957
5334
5396
msgid "Cannot lock %(lock)s: %(why)s"
5335
5397
msgstr ""
5336
5398
5337
#: bzrlib/errors.py:953
5399
#: bzrlib/errors.py:967
5338
5400
msgid ""
5339
5401
"A transaction related operation was attempted after the transaction finished."
5340
5402
msgstr ""
5341
5403
5342
#: bzrlib/errors.py:980
5404
#: bzrlib/errors.py:994
5343
5405
msgid "Cannot lock: transport is read only: %(transport)s"
5344
5406
msgstr ""
5345
5407
5346
#: bzrlib/errors.py:988
5408
#: bzrlib/errors.py:1002
5347
5409
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5348
5410
msgstr ""
5349
5411
5350
#: bzrlib/errors.py:999
5412
#: bzrlib/errors.py:1013
5351
5413
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5352
5414
msgstr ""
5353
5415
5354
#: bzrlib/errors.py:1010
5416
#: bzrlib/errors.py:1024
5355
5417
msgid ""
5356
5418
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5357
5419
"%(holder)r, wanted to break %(target)r"
5358
5420
msgstr ""
5359
5421
5360
#: bzrlib/errors.py:1022
5422
#: bzrlib/errors.py:1036
5361
5423
msgid ""
5362
5424
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5363
5425
"Use 'bzr break-lock' to clear it"
5364
5426
msgstr ""
5365
5427
5366
#: bzrlib/errors.py:1035
5428
#: bzrlib/errors.py:1049
5367
5429
msgid "Lock not held: %(lock)s"
5368
5430
msgstr ""
5369
5431
5370
#: bzrlib/errors.py:1064
5432
#: bzrlib/errors.py:1078
5371
5433
msgid "No changes to commit"
5372
5434
msgstr ""
5373
5435
5374
#: bzrlib/errors.py:1069
5436
#: bzrlib/errors.py:1083
5375
5437
msgid ""
5376
5438
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5377
5439
msgstr ""
5378
5440
5379
#: bzrlib/errors.py:1079
5441
#: bzrlib/errors.py:1093
5380
5442
msgid ""
5381
5443
"Excluding paths during commit is not supported by repository at %(repository)"
5382
5444
"r."
5383
5445
msgstr ""
5384
5446
5385
#: bzrlib/errors.py:1088
5447
#: bzrlib/errors.py:1102
5386
5448
msgid ""
5387
5449
"The specified commit message contains characters unsupported by the current "
5388
5450
"encoding."
5389
5451
msgstr ""
5390
5452
5391
#: bzrlib/errors.py:1094
5453
#: bzrlib/errors.py:1108
5392
5454
msgid "Upgrade URL cannot work with readonly URLs."
5393
5455
msgstr ""
5394
5456
5395
#: bzrlib/errors.py:1099
5457
#: bzrlib/errors.py:1113
5396
5458
msgid "The branch format %(format)s is already at the most recent format."
5397
5459
msgstr ""
5398
5460
5399
#: bzrlib/errors.py:1122
5461
#: bzrlib/errors.py:1136
5400
5462
msgid "Option --change does not accept revision ranges"
5401
5463
msgstr ""
5402
5464
5403
#: bzrlib/errors.py:1127
5465
#: bzrlib/errors.py:1141
5404
5466
msgid "No namespace registered for string: %(spec)r"
5405
5467
msgstr ""
5406
5468
5407
#: bzrlib/errors.py:1146
5469
#: bzrlib/errors.py:1160
5408
5470
msgid ""
5409
5471
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5410
5472
"%(extra)s"
5411
5473
msgstr ""
5412
5474
5413
#: bzrlib/errors.py:1160
5475
#: bzrlib/errors.py:1174
5414
5476
msgid ""
5415
5477
"Operation denied because it would change the main history, which is not "
5416
5478
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5417
5479
msgstr ""
5418
5480
5419
#: bzrlib/errors.py:1171
5481
#: bzrlib/errors.py:1185
5420
5482
msgid ""
5421
5483
"These branches have diverged. Use the missing command to see how.\n"
5422
5484
"Use the merge command to reconcile them."
5423
5485
msgstr ""
5424
5486
5425
#: bzrlib/errors.py:1191
5487
#: bzrlib/errors.py:1205
5426
5488
msgid ""
5427
5489
"Branches have no common ancestor, and no merge base revision was specified."
5428
5490
msgstr ""
5429
5491
5430
#: bzrlib/errors.py:1197
5492
#: bzrlib/errors.py:1211
5431
5493
msgid ""
5432
5494
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5433
5495
msgstr ""
5434
5496
5435
#: bzrlib/errors.py:1203
5497
#: bzrlib/errors.py:1217
5436
5498
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5437
5499
msgstr ""
5438
5500
5439
#: bzrlib/errors.py:1212
5501
#: bzrlib/errors.py:1226
5440
5502
msgid ""
5441
5503
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5442
5504
msgstr ""
5443
5505
5444
#: bzrlib/errors.py:1221
5506
#: bzrlib/errors.py:1235
5445
5507
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5446
5508
msgstr ""
5447
5509
5448
#: bzrlib/errors.py:1230
5510
#: bzrlib/errors.py:1244
5449
5511
msgid "Branch %(branch)s has no commits."
5450
5512
msgstr ""
5451
5513
5452
#: bzrlib/errors.py:1248
5514
#: bzrlib/errors.py:1262
5453
5515
msgid ""
5454
5516
"Bound branch %(branch)s is out of date with master branch %(master)s."
5455
5517
"%(extra_help)s"
5456
5518
msgstr ""
5457
5519
5458
#: bzrlib/errors.py:1260
5520
#: bzrlib/errors.py:1274
5459
5521
msgid ""
5460
5522
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5461
5523
"bound to %(remote)s."
5462
5524
msgstr ""
5463
5525
5464
#: bzrlib/errors.py:1272
5526
#: bzrlib/errors.py:1286
5465
5527
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5466
5528
msgstr ""
5467
5529
5468
#: bzrlib/errors.py:1281
5530
#: bzrlib/errors.py:1295
5469
5531
msgid ""
5470
5532
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5471
5533
"%(error)s"
5472
5534
msgstr ""
5473
5535
5474
#: bzrlib/errors.py:1293
5536
#: bzrlib/errors.py:1307
5475
5537
msgid "Error in processing weave: %(msg)s"
5476
5538
msgstr ""
5477
5539
5478
#: bzrlib/errors.py:1302
5540
#: bzrlib/errors.py:1316
5479
5541
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5480
5542
msgstr ""
5481
5543
5482
#: bzrlib/errors.py:1313
5544
#: bzrlib/errors.py:1327
5483
5545
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5484
5546
msgstr ""
5485
5547
5486
#: bzrlib/errors.py:1323
5548
#: bzrlib/errors.py:1337
5487
5549
msgid "Weave invariant violated: %(what)s"
5488
5550
msgstr ""
5489
5551
5490
#: bzrlib/errors.py:1332
5552
#: bzrlib/errors.py:1346
5491
5553
msgid "Parents are mismatched between two revisions. %(msg)s"
5492
5554
msgstr ""
5493
5555
5494
#: bzrlib/errors.py:1354
5556
#: bzrlib/errors.py:1368
5495
5557
msgid ""
5496
5558
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5497
5559
"%(weave_b)s"
5498
5560
msgstr ""
5499
5561
5500
#: bzrlib/errors.py:1366
5562
#: bzrlib/errors.py:1380
5501
5563
msgid "Versioned file error"
5502
5564
msgstr ""
5503
5565
5504
#: bzrlib/errors.py:1371
5566
#: bzrlib/errors.py:1385
5505
5567
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5506
5568
msgstr ""
5507
5569
5508
#: bzrlib/errors.py:1381
5570
#: bzrlib/errors.py:1395
5509
5571
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5510
5572
msgstr ""
5511
5573
5512
#: bzrlib/errors.py:1391
5574
#: bzrlib/errors.py:1405
5513
5575
msgid "Text did not match its checksum: %(msg)s"
5514
5576
msgstr ""
5515
5577
5516
#: bzrlib/errors.py:1517
5578
#: bzrlib/errors.py:1531
5517
5579
msgid "Export format %(format)r not supported"
5518
5580
msgstr ""
5519
5581
5520
#: bzrlib/errors.py:1526
5582
#: bzrlib/errors.py:1540
5521
5583
msgid "Transport error: %(msg)s %(orig_error)s"
5522
5584
msgstr ""
5523
5585
5524
#: bzrlib/errors.py:1552
5586
#: bzrlib/errors.py:1566
5525
5587
msgid "Generic bzr smart protocol error: %(details)s"
5526
5588
msgstr ""
5527
5589
5528
#: bzrlib/errors.py:1560
5590
#: bzrlib/errors.py:1574
5529
5591
msgid "Received bad protocol version marker: %(marker)r"
5530
5592
msgstr ""
5531
5593
5532
#: bzrlib/errors.py:1592
5594
#: bzrlib/errors.py:1606
5533
5595
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5534
5596
msgstr ""
5535
5597
5536
#: bzrlib/errors.py:1597
5598
#: bzrlib/errors.py:1611
5537
5599
msgid "Connection error: %(msg)s %(orig_error)s"
5538
5600
msgstr ""
5539
5601
5540
#: bzrlib/errors.py:1602
5602
#: bzrlib/errors.py:1616
5541
5603
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5542
5604
msgstr ""
5543
5605
5544
#: bzrlib/errors.py:1623
5606
#: bzrlib/errors.py:1637
5545
5607
msgid "Connection closed: %(msg)s %(orig_error)s"
5546
5608
msgstr ""
5547
5609
5548
#: bzrlib/errors.py:1628
5610
#: bzrlib/errors.py:1642
5549
5611
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5550
5612
msgstr ""
5551
5613
5552
#: bzrlib/errors.py:1633
5614
#: bzrlib/errors.py:1647
5553
5615
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5554
5616
msgstr ""
5555
5617
5556
#: bzrlib/errors.py:1643
5618
#: bzrlib/errors.py:1657
5557
5619
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5558
5620
msgstr ""
5559
5621
5560
#: bzrlib/errors.py:1658
5622
#: bzrlib/errors.py:1672
5561
5623
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5562
5624
msgstr ""
5563
5625
5564
#: bzrlib/errors.py:1672
5626
#: bzrlib/errors.py:1686
5565
5627
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5566
5628
msgstr ""
5567
5629
5568
#: bzrlib/errors.py:1680
5630
#: bzrlib/errors.py:1694
5569
5631
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5570
5632
msgstr ""
5571
5633
5572
#: bzrlib/errors.py:1689
5634
#: bzrlib/errors.py:1703
5573
5635
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5574
5636
msgstr ""
5575
5637
5576
#: bzrlib/errors.py:1703
5638
#: bzrlib/errors.py:1717
5577
5639
msgid "Too many redirections"
5578
5640
msgstr ""
5579
5641
5580
#: bzrlib/errors.py:1708
5642
#: bzrlib/errors.py:1722
5581
5643
msgid "Working tree has conflicts."
5582
5644
msgstr ""
5583
5645
5584
#: bzrlib/errors.py:1712
5646
#: bzrlib/errors.py:1726
5585
5647
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5586
5648
msgstr ""
5587
5649
5588
#: bzrlib/errors.py:1721
5650
#: bzrlib/errors.py:1735
5589
5651
msgid ""
5590
5652
"Error(s) parsing config file %(filename)s:\n"
5591
5653
"%(errors)s"
5592
5654
msgstr ""
5593
5655
5594
#: bzrlib/errors.py:1732
5656
#: bzrlib/errors.py:1746
5595
5657
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5596
5658
msgstr ""
5597
5659
5598
#: bzrlib/errors.py:1740
5660
#: bzrlib/errors.py:1754
5599
5661
msgid "%(username)r does not seem to contain a reasonable email address"
5600
5662
msgstr ""
5601
5663
5602
#: bzrlib/errors.py:1749
5664
#: bzrlib/errors.py:1763
5603
5665
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5604
5666
msgstr ""
5605
5667
5606
#: bzrlib/errors.py:1757
5668
#: bzrlib/errors.py:1771
5607
5669
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5608
5670
msgstr ""
5609
5671
5610
#: bzrlib/errors.py:1765
5672
#: bzrlib/errors.py:1779
5611
5673
msgid "Unable to import library \"%(library)s\": %(error)s"
5612
5674
msgstr ""
5613
5675
5614
#: bzrlib/errors.py:1773
5676
#: bzrlib/errors.py:1787
5615
5677
msgid "python-gpgme is not installed, it is needed to verify signatures"
5616
5678
msgstr ""
5617
5679
5618
#: bzrlib/errors.py:1781
5680
#: bzrlib/errors.py:1795
5619
5681
msgid ""
5620
5682
"The working tree for %(basedir)s has changed since the last commit, but "
5621
5683
"weave merge requires that it be unchanged"
5622
5684
msgstr ""
5623
5685
5624
#: bzrlib/errors.py:1791
5686
#: bzrlib/errors.py:1805
5625
5687
msgid ""
5626
5688
"Can't reprocess and show base, because reprocessing obscures the "
5627
5689
"relationship of conflicting lines to the base"
5628
5690
msgstr ""
5629
5691
5630
#: bzrlib/errors.py:1797
5692
#: bzrlib/errors.py:1811
5631
5693
msgid "Cycle in graph %(graph)r"
5632
5694
msgstr ""
5633
5695
5634
#: bzrlib/errors.py:1825
5696
#: bzrlib/errors.py:1839
5635
5697
msgid "File %(filename)s is not conflicted."
5636
5698
msgstr ""
5637
5699
5638
#: bzrlib/errors.py:1847
5700
#: bzrlib/errors.py:1861
5639
5701
msgid "No bundle was found in \"%(filename)s\"."
5640
5702
msgstr ""
5641
5703
5642
#: bzrlib/errors.py:1856
5704
#: bzrlib/errors.py:1870
5643
5705
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5644
5706
msgstr ""
5645
5707
5646
#: bzrlib/errors.py:1866
5708
#: bzrlib/errors.py:1880
5647
5709
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5648
5710
msgstr ""
5649
5711
5650
#: bzrlib/errors.py:1879
5712
#: bzrlib/errors.py:1893
5651
5713
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5652
5714
msgstr ""
5653
5715
5654
#: bzrlib/errors.py:1889
5716
#: bzrlib/errors.py:1903
5655
5717
msgid "Key %(key)s is already present in map"
5656
5718
msgstr ""
5657
5719
5658
#: bzrlib/errors.py:1894
5720
#: bzrlib/errors.py:1908
5659
5721
msgid "The prefix %(prefix)s is in the help search path twice."
5660
5722
msgstr ""
5661
5723
5662
#: bzrlib/errors.py:1904
5724
#: bzrlib/errors.py:1918
5663
5725
msgid ""
5664
5726
"No final name for trans_id %(trans_id)r\n"
5665
5727
"file-id: %(file_id)r\n"
5666
5728
"root trans-id: %(root_trans_id)r\n"
5667
5729
msgstr ""
5668
5730
5669
#: bzrlib/errors.py:1936
5731
#: bzrlib/errors.py:1950
5670
5732
msgid "Attempt to reuse a transform that has already been applied."
5671
5733
msgstr ""
5672
5734
5673
#: bzrlib/errors.py:1941
5735
#: bzrlib/errors.py:1955
5674
5736
msgid "Moving the root directory is not supported at this time"
5675
5737
msgstr ""
5676
5738
5677
#: bzrlib/errors.py:1946
5739
#: bzrlib/errors.py:1960
5678
5740
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5679
5741
msgstr ""
5680
5742
5681
#: bzrlib/errors.py:1957
5743
#: bzrlib/errors.py:1971
5682
5744
msgid ""
5683
5745
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5684
5746
msgstr ""
5685
5747
5686
#: bzrlib/errors.py:1993
5748
#: bzrlib/errors.py:2007
5687
5749
msgid ""
5688
5750
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5689
5751
msgstr ""
5690
5752
5691
#: bzrlib/errors.py:2023
5753
#: bzrlib/errors.py:2037
5692
5754
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5693
5755
msgstr ""
5694
5756
5695
#: bzrlib/errors.py:2031
5757
#: bzrlib/errors.py:2045
5696
5758
msgid "Nothing to merge."
5697
5759
msgstr ""
5698
5760
5699
#: bzrlib/errors.py:2036
5761
#: bzrlib/errors.py:2050
5700
5762
msgid "Format %(format)s cannot be initialised by this version of bzr."
5701
5763
msgstr ""
5702
5764
5703
#: bzrlib/errors.py:2045
5765
#: bzrlib/errors.py:2059
5704
5766
msgid ""
5705
5767
"Cannot convert from format %(from_format)s to format %(format)s. "
5706
5768
"%(problem)s"
5707
5769
msgstr ""
5708
5770
5709
#: bzrlib/errors.py:2057
5771
#: bzrlib/errors.py:2071
5710
5772
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5711
5773
msgstr ""
5712
5774
5713
#: bzrlib/errors.py:2065
5775
#: bzrlib/errors.py:2079
5714
5776
msgid "%(exe_name)s could not be found on this machine"
5715
5777
msgstr ""
5716
5778
5717
#: bzrlib/errors.py:2073
5779
#: bzrlib/errors.py:2087
5718
5780
msgid "Diff is not installed on this machine: %(msg)s"
5719
5781
msgstr ""
5720
5782
5721
#: bzrlib/errors.py:2081
5783
#: bzrlib/errors.py:2095
5722
5784
msgid "Diff3 is not installed on this machine."
5723
5785
msgstr ""
5724
5786
5725
#: bzrlib/errors.py:2087
5787
#: bzrlib/errors.py:2101
5726
5788
msgid "The content being inserted is already present."
5727
5789
msgstr ""
5728
5790
5729
#: bzrlib/errors.py:2092
5791
#: bzrlib/errors.py:2106
5730
5792
msgid ""
5731
5793
"This tree contains left-over files from a failed operation.\n"
5732
5794
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5734
5796
" keep, and delete it when you are done."
5735
5797
msgstr ""
5736
5798
5737
#: bzrlib/errors.py:2103
5799
#: bzrlib/errors.py:2117
5738
5800
msgid ""
5739
5801
"This tree contains left-over files from a failed operation.\n"
5740
5802
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5741
5803
" wish to keep, and delete it when you are done."
5742
5804
msgstr ""
5743
5805
5744
#: bzrlib/errors.py:2113
5806
#: bzrlib/errors.py:2127
5745
5807
msgid ""
5746
5808
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5747
5809
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5749
5811
" keep, and delete it when you are done."
5750
5812
msgstr ""
5751
5813
5752
#: bzrlib/errors.py:2124
5814
#: bzrlib/errors.py:2138
5753
5815
msgid ""
5754
5816
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5755
5817
"examine %(pending_deletion)s to see if it contains any files you wish to "
5756
5818
"keep, and delete it when you are done."
5757
5819
msgstr ""
5758
5820
5759
#: bzrlib/errors.py:2134
5821
#: bzrlib/errors.py:2148
5760
5822
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5761
5823
msgstr ""
5762
5824
5763
#: bzrlib/errors.py:2148
5825
#: bzrlib/errors.py:2162
5764
5826
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5765
5827
msgstr ""
5766
5828
5767
#: bzrlib/errors.py:2161
5829
#: bzrlib/errors.py:2175
5768
5830
msgid "Error in merge modified format"
5769
5831
msgstr ""
5770
5832
5771
#: bzrlib/errors.py:2166
5833
#: bzrlib/errors.py:2180
5772
5834
msgid "Format error in conflict listings"
5773
5835
msgstr ""
5774
5836
5775
#: bzrlib/errors.py:2170
5837
#: bzrlib/errors.py:2184
5776
5838
msgid ""
5777
5839
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5778
5840
"Error: %(description)s"
5779
5841
msgstr ""
5780
5842
5781
#: bzrlib/errors.py:2181
5843
#: bzrlib/errors.py:2195
5782
5844
msgid ""
5783
5845
"An error has been detected in the repository %(repo_path)s.\n"
5784
5846
"Please run bzr reconcile on this repository."
5785
5847
msgstr ""
5786
5848
5787
#: bzrlib/errors.py:2192
5849
#: bzrlib/errors.py:2206
5788
5850
msgid ""
5789
5851
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5790
5852
"reason: %(reason)s"
5791
5853
msgstr ""
5792
5854
5793
#: bzrlib/errors.py:2205
5855
#: bzrlib/errors.py:2219
5794
5856
msgid ""
5795
5857
"An inconsistent delta was supplied: %(delta)r\n"
5796
5858
"reason: %(reason)s"
5797
5859
msgstr ""
5798
5860
5799
#: bzrlib/errors.py:2217
5861
#: bzrlib/errors.py:2231
5800
5862
msgid "To use this feature you must upgrade your branch at %(path)s."
5801
5863
msgstr ""
5802
5864
5803
#: bzrlib/errors.py:2226
5865
#: bzrlib/errors.py:2240
5804
5866
msgid "To use this feature you must upgrade your repository at %(path)s."
5805
5867
msgstr ""
5806
5868
5807
#: bzrlib/errors.py:2231
5869
#: bzrlib/errors.py:2245
5808
5870
msgid ""
5809
5871
"To use this feature you must upgrade your branch at %(path)s to a format "
5810
5872
"which supports rich roots."
5811
5873
msgstr ""
5812
5874
5813
#: bzrlib/errors.py:2237
5875
#: bzrlib/errors.py:2251
5814
5876
msgid "Cannot perform local-only commits on unbound branches."
5815
5877
msgstr ""
5816
5878
5817
#: bzrlib/errors.py:2242
5879
#: bzrlib/errors.py:2256
5818
5880
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5819
5881
msgstr ""
5820
5882
5821
#: bzrlib/errors.py:2263
5883
#: bzrlib/errors.py:2277
5822
5884
msgid "Ghost tags not supported by format %(format)r."
5823
5885
msgstr ""
5824
5886
5825
#: bzrlib/errors.py:2271
5887
#: bzrlib/errors.py:2285
5826
5888
msgid "File is binary but should be text."
5827
5889
msgstr ""
5828
5890
5829
#: bzrlib/errors.py:2276
5891
#: bzrlib/errors.py:2290
5830
5892
msgid "The path %(path)s is not permitted on this platform"
5831
5893
msgstr ""
5832
5894
5833
#: bzrlib/errors.py:2285
5895
#: bzrlib/errors.py:2299
5834
5896
msgid ""
5835
5897
"Testament did not match expected value.\n"
5836
5898
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5837
5899
" {%(measured)s}"
5838
5900
msgstr ""
5839
5901
5840
#: bzrlib/errors.py:2297
5902
#: bzrlib/errors.py:2311
5841
5903
msgid "Not a bzr revision-bundle: %(text)r"
5842
5904
msgstr ""
5843
5905
5844
#: bzrlib/errors.py:2306
5906
#: bzrlib/errors.py:2320
5845
5907
msgid "Bad bzr revision-bundle: %(text)r"
5846
5908
msgstr ""
5847
5909
5848
#: bzrlib/errors.py:2315
5910
#: bzrlib/errors.py:2329
5849
5911
msgid "Malformed bzr revision-bundle header: %(text)r"
5850
5912
msgstr ""
5851
5913
5852
#: bzrlib/errors.py:2320
5914
#: bzrlib/errors.py:2334
5853
5915
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5854
5916
msgstr ""
5855
5917
5856
#: bzrlib/errors.py:2325
5918
#: bzrlib/errors.py:2339
5857
5919
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5858
5920
msgstr ""
5859
5921
5860
#: bzrlib/errors.py:2330
5922
#: bzrlib/errors.py:2344
5861
5923
msgid "End of line marker was not \\n in bzr revision-bundle"
5862
5924
msgstr ""
5863
5925
5864
#: bzrlib/errors.py:2340
5926
#: bzrlib/errors.py:2354
5865
5927
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5866
5928
msgstr ""
5867
5929
5868
#: bzrlib/errors.py:2350
5930
#: bzrlib/errors.py:2364
5869
5931
msgid "Root class for inventory serialization errors"
5870
5932
msgstr ""
5871
5933
5872
#: bzrlib/errors.py:2354
5934
#: bzrlib/errors.py:2368
5873
5935
msgid ""
5874
5936
"The inventory was not in the expected format:\n"
5875
5937
" %(msg)s"
5876
5938
msgstr ""
5877
5939
5878
#: bzrlib/errors.py:2363
5940
#: bzrlib/errors.py:2377
5879
5941
msgid "This operation requires rich root data storage"
5880
5942
msgstr ""
5881
5943
5882
#: bzrlib/errors.py:2376
5944
#: bzrlib/errors.py:2390
5883
5945
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5884
5946
msgstr ""
5885
5947
5886
#: bzrlib/errors.py:2385
5948
#: bzrlib/errors.py:2399
5887
5949
msgid ""
5888
5950
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5889
5951
"variable."
5890
5952
msgstr ""
5891
5953
5892
#: bzrlib/errors.py:2392
5954
#: bzrlib/errors.py:2406
5893
5955
msgid ""
5894
5956
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5895
5957
"ghost at {%(ghost_revision_id)s}"
5896
5958
msgstr ""
5897
5959
5898
#: bzrlib/errors.py:2402
5960
#: bzrlib/errors.py:2416
5899
5961
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5900
5962
msgstr ""
5901
5963
5902
#: bzrlib/errors.py:2453
5964
#: bzrlib/errors.py:2467
5903
5965
msgid ""
5904
5966
"A merge directive must provide either a bundle or a public branch location."
5905
5967
msgstr ""
5906
5968
5907
#: bzrlib/errors.py:2460
5969
#: bzrlib/errors.py:2474
5908
5970
msgid "Bad merge directive payload %(start)r"
5909
5971
msgstr ""
5910
5972
5911
#: bzrlib/errors.py:2470
5973
#: bzrlib/errors.py:2484
5912
5974
msgid "Preview patch does not match requested changes."
5913
5975
msgstr ""
5914
5976
5915
#: bzrlib/errors.py:2476
5977
#: bzrlib/errors.py:2490
5916
5978
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5917
5979
msgstr ""
5918
5980
5919
#: bzrlib/errors.py:2486
5981
#: bzrlib/errors.py:2500
5920
5982
msgid ""
5921
5983
"Your branch does not have all of the revisions required in order to merge "
5922
5984
"this merge directive and the target location specified in the merge "
5923
5985
"directive is not a branch: %(location)s."
5924
5986
msgstr ""
5925
5987
5926
#: bzrlib/errors.py:2498
5988
#: bzrlib/errors.py:2512
5927
5989
msgid "Unsupported entry kind %(kind)s"
5928
5990
msgstr ""
5929
5991
5930
#: bzrlib/errors.py:2506
5992
#: bzrlib/errors.py:2520
5931
5993
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5932
5994
msgstr ""
5933
5995
5934
#: bzrlib/errors.py:2516
5996
#: bzrlib/errors.py:2530
5935
5997
msgid "Subsume target %(other_tree)s needs to be upgraded."
5936
5998
msgstr ""
5937
5999
5938
#: bzrlib/errors.py:2535
6000
#: bzrlib/errors.py:2549
5939
6001
msgid "No such tag: %(tag_name)s"
5940
6002
msgstr ""
5941
6003
5942
#: bzrlib/errors.py:2543
6004
#: bzrlib/errors.py:2557
5943
6005
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5944
6006
msgstr ""
5945
6007
5946
#: bzrlib/errors.py:2552
6008
#: bzrlib/errors.py:2566
5947
6009
msgid "Tag %(tag_name)s already exists."
5948
6010
msgstr ""
5949
6011
5950
#: bzrlib/errors.py:2560
6012
#: bzrlib/errors.py:2574
5951
6013
msgid ""
5952
6014
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
5953
6015
"\" for more information on this feature."
5954
6016
msgstr ""
5955
6017
5956
#: bzrlib/errors.py:2570
6018
#: bzrlib/errors.py:2584
5957
6019
msgid ""
5958
6020
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5959
6021
msgstr ""
5960
6022
5961
#: bzrlib/errors.py:2580
6023
#: bzrlib/errors.py:2594
5962
6024
msgid ""
5963
6025
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5964
6026
msgstr ""
5965
6027
5966
#: bzrlib/errors.py:2590
6028
#: bzrlib/errors.py:2604
5967
6029
msgid "Invalid line in bugs property: '%(line)s'"
5968
6030
msgstr ""
5969
6031
5970
#: bzrlib/errors.py:2598
6032
#: bzrlib/errors.py:2612
5971
6033
msgid "Invalid bug status: '%(status)s'"
5972
6034
msgstr ""
5973
6035
5974
#: bzrlib/errors.py:2606
6036
#: bzrlib/errors.py:2620
5975
6037
msgid "Could not understand response from smart server: %(response_tuple)r"
5976
6038
msgstr ""
5977
6039
5978
#: bzrlib/errors.py:2645
6040
#: bzrlib/errors.py:2659
5979
6041
msgid "Server sent an unexpected error: %(error_tuple)r"
5980
6042
msgstr ""
5981
6043
5982
#: bzrlib/errors.py:2664
6044
#: bzrlib/errors.py:2678
5983
6045
msgid "Unrecognised container format: %(container_format)r"
5984
6046
msgstr ""
5985
6047
5986
#: bzrlib/errors.py:2672
6048
#: bzrlib/errors.py:2686
5987
6049
msgid "Unexpected end of container stream"
5988
6050
msgstr ""
5989
6051
5990
#: bzrlib/errors.py:2677
6052
#: bzrlib/errors.py:2691
5991
6053
msgid "Unknown record type: %(record_type)r"
5992
6054
msgstr ""
5993
6055
5994
#: bzrlib/errors.py:2685
6056
#: bzrlib/errors.py:2699
5995
6057
msgid "Invalid record: %(reason)s"
5996
6058
msgstr ""
5997
6059
5998
#: bzrlib/errors.py:2693
6060
#: bzrlib/errors.py:2707
5999
6061
msgid "Container has data after end marker: %(excess)r"
6000
6062
msgstr ""
6001
6063
6002
#: bzrlib/errors.py:2701
6064
#: bzrlib/errors.py:2715
6003
6065
msgid "Container has multiple records with the same name: %(name)s"
6004
6066
msgstr ""
6005
6067
6006
#: bzrlib/errors.py:2714
6068
#: bzrlib/errors.py:2728
6007
6069
msgid "Corrupt or incompatible data stream: %(reason)s"
6008
6070
msgstr ""
6009
6071
6010
#: bzrlib/errors.py:2722
6072
#: bzrlib/errors.py:2736
6011
6073
msgid "SMTP error: %(error)s"
6012
6074
msgstr ""
6013
6075
6014
#: bzrlib/errors.py:2730
6076
#: bzrlib/errors.py:2744
6015
6077
msgid "No message supplied."
6016
6078
msgstr ""
6017
6079
6018
#: bzrlib/errors.py:2735
6080
#: bzrlib/errors.py:2749
6019
6081
msgid "No mail-to address (--mail-to) or output (-o) specified."
6020
6082
msgstr ""
6021
6083
6022
#: bzrlib/errors.py:2740
6084
#: bzrlib/errors.py:2754
6023
6085
msgid "Unknown mail client: %(mail_client)s"
6024
6086
msgstr ""
6025
6087
6026
#: bzrlib/errors.py:2748
6088
#: bzrlib/errors.py:2762
6027
6089
msgid ""
6028
6090
"Unable to find mail client with the following names: "
6029
6091
"%(mail_command_list_string)s"
6030
6092
msgstr ""
6031
6093
6032
#: bzrlib/errors.py:2758
6094
#: bzrlib/errors.py:2772
6033
6095
msgid "SMTP connection to %(host)s refused"
6034
6096
msgstr ""
6035
6097
6036
#: bzrlib/errors.py:2767
6098
#: bzrlib/errors.py:2781
6037
6099
msgid "Please specify smtp_server. No server at default %(host)s."
6038
6100
msgstr ""
6039
6101
6040
#: bzrlib/errors.py:2781
6102
#: bzrlib/errors.py:2795
6041
6103
msgid ""
6042
6104
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6043
6105
"reconfigure."
6044
6106
msgstr ""
6045
6107
6046
#: bzrlib/errors.py:2793
6108
#: bzrlib/errors.py:2807
6047
6109
msgid "'%(display_url)s' is already a branch."
6048
6110
msgstr ""
6049
6111
6050
#: bzrlib/errors.py:2798
6112
#: bzrlib/errors.py:2812
6051
6113
msgid "'%(display_url)s' is already a tree."
6052
6114
msgstr ""
6053
6115
6054
#: bzrlib/errors.py:2803
6116
#: bzrlib/errors.py:2817
6055
6117
msgid "'%(display_url)s' is already a checkout."
6056
6118
msgstr ""
6057
6119
6058
#: bzrlib/errors.py:2808
6120
#: bzrlib/errors.py:2822
6059
6121
msgid "'%(display_url)s' is already a lightweight checkout."
6060
6122
msgstr ""
6061
6123
6062
#: bzrlib/errors.py:2813
6124
#: bzrlib/errors.py:2827
6063
6125
msgid "'%(display_url)s' is already using a shared repository."
6064
6126
msgstr ""
6065
6127
6066
#: bzrlib/errors.py:2818
6128
#: bzrlib/errors.py:2832
6067
6129
msgid "'%(display_url)s' is already standalone."
6068
6130
msgstr ""
6069
6131
6070
#: bzrlib/errors.py:2823
6132
#: bzrlib/errors.py:2837
6071
6133
msgid "Shared repository '%(display_url)s' already creates working trees."
6072
6134
msgstr ""
6073
6135
6074
#: bzrlib/errors.py:2829
6136
#: bzrlib/errors.py:2843
6075
6137
msgid ""
6076
6138
"Shared repository '%(display_url)s' already doesn't create working trees."
6077
6139
msgstr ""
6078
6140
6079
#: bzrlib/errors.py:2835
6141
#: bzrlib/errors.py:2849
6080
6142
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6081
6143
msgstr ""
6082
6144
6083
#: bzrlib/errors.py:2840
6145
#: bzrlib/errors.py:2854
6084
6146
msgid "No location could be found to bind to at %(display_url)s."
6085
6147
msgstr ""
6086
6148
6087
#: bzrlib/errors.py:2845
6149
#: bzrlib/errors.py:2859
6088
6150
msgid ""
6089
6151
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6090
6152
"%(more)s"
6091
6153
msgstr ""
6092
6154
6093
#: bzrlib/errors.py:2864
6155
#: bzrlib/errors.py:2878
6094
6156
msgid ""
6095
6157
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6096
6158
"%(more)s"
6097
6159
msgstr ""
6098
6160
6099
#: bzrlib/errors.py:2870
6161
#: bzrlib/errors.py:2884
6100
6162
msgid "Variable {%(name)s} is not available."
6101
6163
msgstr ""
6102
6164
6103
#: bzrlib/errors.py:2878
6165
#: bzrlib/errors.py:2892
6104
6166
msgid "No template specified."
6105
6167
msgstr ""
6106
6168
6107
#: bzrlib/errors.py:2883
6169
#: bzrlib/errors.py:2897
6108
6170
msgid "Unable to create symlink %(path_str)son this platform"
6109
6171
msgstr ""
6110
6172
6111
#: bzrlib/errors.py:2898
6173
#: bzrlib/errors.py:2912
6112
6174
msgid ""
6113
6175
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6114
6176
"\", \"local\"."
6115
6177
msgstr ""
6116
6178
6117
#: bzrlib/errors.py:2932
6179
#: bzrlib/errors.py:2946
6118
6180
msgid ""
6119
6181
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6120
6182
msgstr ""
6121
6183
6122
#: bzrlib/errors.py:2944
6184
#: bzrlib/errors.py:2958
6123
6185
msgid "The \"%(config_id)s\" configuration does not exist."
6124
6186
msgstr ""
6125
6187
6126
#: bzrlib/errors.py:2952
6188
#: bzrlib/errors.py:2966
6127
6189
msgid "The \"%(option_name)s\" configuration option does not exist."
6128
6190
msgstr ""
6129
6191
6130
#: bzrlib/errors.py:2960
6192
#: bzrlib/errors.py:2974
6131
6193
msgid "The alias \"%(alias_name)s\" does not exist."
6132
6194
msgstr ""
6133
6195
6134
#: bzrlib/errors.py:2974
6196
#: bzrlib/errors.py:2988
6135
6197
msgid "\"%(alias_name)s\" is not a valid location alias."
6136
6198
msgstr ""
6137
6199
6138
#: bzrlib/errors.py:2982
6200
#: bzrlib/errors.py:2996
6139
6201
msgid "No %(alias_name)s location assigned."
6140
6202
msgstr ""
6141
6203
6142
#: bzrlib/errors.py:2990
6204
#: bzrlib/errors.py:3004
6143
6205
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6144
6206
msgstr ""
6145
6207
6146
#: bzrlib/errors.py:3000
6208
#: bzrlib/errors.py:3014
6147
6209
msgid "Unknown rules detected: %(unknowns_str)s."
6148
6210
msgstr ""
6149
6211
6150
#: bzrlib/errors.py:3011
6212
#: bzrlib/errors.py:3025
6151
6213
msgid "Tip change rejected: %(msg)s"
6152
6214
msgstr ""
6153
6215
6154
#: bzrlib/errors.py:3019
6216
#: bzrlib/errors.py:3033
6155
6217
msgid "Shelf corrupt."
6156
6218
msgstr ""
6157
6219
6158
#: bzrlib/errors.py:3024
6220
#: bzrlib/errors.py:3038
6159
6221
msgid "Corruption while decompressing repository file%(orig_error)s"
6160
6222
msgstr ""
6161
6223
6162
#: bzrlib/errors.py:3036
6224
#: bzrlib/errors.py:3050
6163
6225
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6164
6226
msgstr ""
6165
6227
6166
#: bzrlib/errors.py:3044
6228
#: bzrlib/errors.py:3058
6167
6229
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6168
6230
msgstr ""
6169
6231
6170
#: bzrlib/errors.py:3052
6232
#: bzrlib/errors.py:3066
6171
6233
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6172
6234
msgstr ""
6173
6235
6174
#: bzrlib/errors.py:3060
6236
#: bzrlib/errors.py:3074
6175
6237
msgid "The user aborted the operation."
6176
6238
msgstr ""
6177
6239
6178
#: bzrlib/errors.py:3065
6240
#: bzrlib/errors.py:3079
6179
6241
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6180
6242
msgstr ""
6181
6243
6182
#: bzrlib/errors.py:3075
6244
#: bzrlib/errors.py:3089
6183
6245
msgid "No such view: %(view_name)s."
6184
6246
msgstr ""
6185
6247
6186
#: bzrlib/errors.py:3085
6248
#: bzrlib/errors.py:3099
6187
6249
msgid ""
6188
6250
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6189
6251
"to a later format."
6190
6252
msgstr ""
6191
6253
6192
#: bzrlib/errors.py:3094
6254
#: bzrlib/errors.py:3108
6193
6255
msgid ""
6194
6256
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6195
6257
msgstr ""
6196
6258
6197
#: bzrlib/errors.py:3161
6259
#: bzrlib/errors.py:3175
6198
6260
msgid "%(bzrdir)r does not support co-located branches."
6199
6261
msgstr ""
6200
6262
6201
#: bzrlib/errors.py:3167
6263
#: bzrlib/errors.py:3181
6202
6264
msgid ""
6203
6265
"Unable to determine your name.\n"
6204
6266
"Please, set your name with the 'whoami' command.\n"
6205
6267
"E.g. bzr whoami \"Your Name <name@example.com>\""
6206
6268
msgstr ""
6207
6269
6208
#: bzrlib/errors.py:3176
6270
#: bzrlib/errors.py:3190
6209
6271
msgid "Invalid pattern(s) found. %(msg)s"
6210
6272
msgstr ""
6211
6273
6212
#: bzrlib/errors.py:3184
6274
#: bzrlib/errors.py:3198
6213
6275
msgid ""
6214
6276
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6215
6277
"unbind` to fix."
6216
6278
msgstr ""
6217
6279
6218
#: bzrlib/errors.py:3195
6280
#: bzrlib/errors.py:3209
6219
6281
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6220
6282
msgstr ""
6221
6283
6222
#: bzrlib/errors.py:3204
6284
#: bzrlib/errors.py:3218
6223
6285
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6224
6286
msgstr ""
6225
6287
6226
#: bzrlib/errors.py:3213
6288
#: bzrlib/errors.py:3227
6227
6289
msgid ""
6228
6290
"No compatible object available for operations from %(source)r to %(target)r."
6229
6291
msgstr ""
6230
6292
6231
#: bzrlib/errors.py:3223
6293
#: bzrlib/errors.py:3237
6232
6294
msgid ""
6233
6295
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6234
6296
"%(arguments)s."
6235
6297
msgstr ""
6236
6298
6237
#: bzrlib/errors.py:3233
6299
#: bzrlib/errors.py:3247
6238
6300
msgid ""
6239
6301
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6240
6302
"format %(format)r"
6241
6303
msgstr ""
6242
6304
6243
#: bzrlib/errors.py:3249
6305
#: bzrlib/errors.py:3259
6306
msgid ""
6307
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6308
"plugin."
6309
msgstr ""
6310
6311
#: bzrlib/errors.py:3272
6244
6312
msgid "Binary files section encountered."
6245
6313
msgstr ""
6246
6314
6247
#: bzrlib/errors.py:3257
6315
#: bzrlib/errors.py:3280
6248
6316
msgid ""
6249
6317
"Malformed patch header. %(desc)s\n"
6250
6318
"%(line)r"
6251
6319
msgstr ""
6252
6320
6253
#: bzrlib/errors.py:3266
6321
#: bzrlib/errors.py:3289
6254
6322
msgid ""
6255
6323
"Malformed hunk header. %(desc)s\n"
6256
6324
"%(line)r"
6257
6325
msgstr ""
6258
6326
6259
#: bzrlib/errors.py:3275
6327
#: bzrlib/errors.py:3298
6260
6328
msgid ""
6261
6329
"Malformed line. %(desc)s\n"
6262
6330
"%(line)r"
6263
6331
msgstr ""
6264
6332
6265
#: bzrlib/errors.py:3285
6333
#: bzrlib/errors.py:3308
6266
6334
msgid ""
6267
6335
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6268
6336
"but patch says it should be \"%(patch_line)s\""
6269
6337
msgstr ""
6270
6338
6271
#: bzrlib/export_pot.py:246
6339
#: bzrlib/errors.py:3319
6340
msgid "The feature %(feature)s has already been registered."
6341
msgstr ""
6342
6343
#: bzrlib/export_pot.py:252
6272
6344
#, python-format
6273
6345
msgid "Exporting messages from builtin command: %s"
6274
6346
msgstr ""
6275
6347
6276
#: bzrlib/export_pot.py:265
6348
#: bzrlib/export_pot.py:271
6277
6349
msgid "Exporting messages from plugin command: {0} in {1}"
6278
6350
msgstr ""
6279
6351
6280
#: bzrlib/export_pot.py:286
6352
#: bzrlib/export_pot.py:292
6281
6353
#, python-format
6282
6354
msgid "Exporting message from error: %s"
6283
6355
msgstr ""
6284
6356
6285
#: bzrlib/fetch.py:97
6357
#: bzrlib/fetch.py:98
6286
6358
msgid "Finding revisions"
6287
6359
msgstr ""
6288
6360
6289
#: bzrlib/fetch.py:102
6361
#: bzrlib/fetch.py:103
6290
6362
msgid "Fetching revisions"
6291
6363
msgstr ""
6292
6364
6293
#: bzrlib/foreign.py:261
6365
#: bzrlib/foreign.py:262
6294
6366
msgid "Push into a different VCS without any custom bzr metadata."
6295
6367
msgstr ""
6296
6368
6297
#: bzrlib/foreign.py:263
6369
#: bzrlib/foreign.py:264
6298
6370
msgid ""
6299
6371
"This will afterwards rebase the local branch on the remote\n"
6300
6372
"branch unless the --no-rebase option is used, in which case \n"
6301
6373
"the two branches will be out of sync after the push. "
6302
6374
msgstr ""
6303
6375
6304
# help of 'directory' option of 'dpush' command
6305
#: bzrlib/foreign.py:271
6306
msgid ""
6307
"Branch to push from, rather than the one containing the working directory."
6308
msgstr ""
6309
6310
6376
# help of 'no-rebase' option of 'dpush' command
6311
#: bzrlib/foreign.py:276
6377
#: bzrlib/foreign.py:277
6312
6378
msgid "Do not rebase after push."
6313
6379
msgstr ""
6314
6380
6315
# help of 'strict' option of 'dpush' command
6316
#: bzrlib/foreign.py:278
6317
msgid ""
6318
"Refuse to push if there are uncommitted changes in the working tree, --no-"
6319
"strict disables the check."
6320
msgstr ""
6321
6322
#: bzrlib/foreign.py:310
6381
#: bzrlib/foreign.py:311
6323
6382
#, python-format
6324
6383
msgid "Using saved location: %s\n"
6325
6384
msgstr ""
6326
6385
6327
#: bzrlib/foreign.py:320
6386
#: bzrlib/foreign.py:321
6328
6387
msgid ""
6329
6388
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6330
6389
"regular push."
6331
6390
msgstr ""
6332
6391
6333
#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
6392
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6334
6393
msgid "{0} commits with valid signatures"
6335
6394
msgstr ""
6336
6395
6337
#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
6396
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6338
6397
msgid "{0} commit with unknown key"
6339
6398
msgid_plural "{0} commits with unknown keys"
6340
6399
msgstr[0] ""
6341
6400
msgstr[1] ""
6342
6401
6343
#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
6402
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6344
6403
msgid "{0} commit not valid"
6345
6404
msgid_plural "{0} commits not valid"
6346
6405
msgstr[0] ""
6347
6406
msgstr[1] ""
6348
6407
6349
#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
6408
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6350
6409
msgid "{0} commit not signed"
6351
6410
msgid_plural "{0} commits not signed"
6352
6411
msgstr[0] ""
6353
6412
msgstr[1] ""
6354
6413
6355
#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
6414
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6356
6415
msgid "{0} commit with key now expired"
6357
6416
msgid_plural "{0} commits with key now expired"
6358
6417
msgstr[0] ""
6359
6418
msgstr[1] ""
6360
6419
6361
#: bzrlib/gpg.py:336
6420
#: bzrlib/gpg.py:343
6362
6421
msgid "No GnuPG key results for pattern: {0}"
6363
6422
msgstr ""
6364
6423
6365
#: bzrlib/gpg.py:379
6424
#: bzrlib/gpg.py:386
6366
6425
msgid "{0} signed {1} commit"
6367
6426
msgid_plural "{0} signed {1} commits"
6368
6427
msgstr[0] ""
6369
6428
msgstr[1] ""
6370
6429
6371
#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
6430
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6372
6431
msgid "{0} commit by author {1}"
6373
6432
msgid_plural "{0} commits by author {1}"
6374
6433
msgstr[0] ""
6375
6434
msgstr[1] ""
6376
6435
6377
#: bzrlib/gpg.py:426
6436
#: bzrlib/gpg.py:433
6378
6437
msgid "Unknown key {0} signed {1} commit"
6379
6438
msgid_plural "Unknown key {0} signed {1} commits"
6380
6439
msgstr[0] ""
6381
6440
msgstr[1] ""
6382
6441
6383
#: bzrlib/gpg.py:444
6442
#: bzrlib/gpg.py:452
6384
6443
msgid "{0} commit by author {1} with key {2} now expired"
6385
6444
msgid_plural "{0} commits by author {1} with key {2} now expired"
6386
6445
msgstr[0] ""
6387
6446
msgstr[1] ""
6388
6447
6389
#: bzrlib/groupcompress.py:1737
6448
#: bzrlib/groupcompress.py:1739
6390
6449
#, python-format
6391
6450
msgid "Insert claimed random_id=True, but then inserted %r two times"
6392
6451
msgstr ""
6393
6452
6394
#: bzrlib/hooks.py:329
6453
#: bzrlib/hooks.py:331
6395
6454
#, python-format
6396
6455
msgid "Introduced in: %s"
6397
6456
msgstr ""
6398
6457
6399
#: bzrlib/hooks.py:332
6458
#: bzrlib/hooks.py:334
6400
6459
#, python-format
6401
6460
msgid "Deprecated in: %s"
6402
6461
msgstr ""
6403
6462
6404
#: bzrlib/knit.py:1764 bzrlib/knit.py:1800
6463
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6405
6464
msgid "Walking content"
6406
6465
msgstr ""
6407
6466
6408
#: bzrlib/knit.py:3328
6467
#: bzrlib/knit.py:3330
6409
6468
msgid "annotating"
6410
6469
msgstr ""
6411
6470
6412
#: bzrlib/lock.py:547
6471
#: bzrlib/lock.py:548
6413
6472
msgid "{0!r} was {1} locked again"
6414
6473
msgstr ""
6415
6474
6416
#: bzrlib/lockdir.py:320
6475
#: bzrlib/lockdir.py:321
6417
6476
#, python-format
6418
6477
msgid "error removing pending lock: %s"
6419
6478
msgstr ""
6420
6479
6421
#: bzrlib/lockdir.py:615
6480
#: bzrlib/lockdir.py:616
6422
6481
msgid "Unable to obtain"
6423
6482
msgstr ""
6424
6483
6425
#: bzrlib/lockdir.py:617
6484
#: bzrlib/lockdir.py:618
6426
6485
msgid "Lock owner changed for"
6427
6486
msgstr ""
6428
6487
6429
#: bzrlib/lockdir.py:619
6488
#: bzrlib/lockdir.py:620
6430
6489
msgid "{0} lock {1} {2}."
6431
6490
msgstr ""
6432
6491
6433
#: bzrlib/lockdir.py:626
6492
#: bzrlib/lockdir.py:627
6434
6493
#, python-format
6435
6494
msgid "Will continue to try until %s, unless you press Ctrl-C."
6436
6495
msgstr ""
6437
6496
6438
#: bzrlib/lockdir.py:628
6497
#: bzrlib/lockdir.py:629
6439
6498
msgid "See \"bzr help break-lock\" for more."
6440
6499
msgstr ""
6441
6500
6442
#: bzrlib/lockdir.py:738
6501
#: bzrlib/lockdir.py:739
6443
6502
#, python-format
6444
6503
msgid ""
6445
6504
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6454
6513
msgid "invalid direction %r"
6455
6514
msgstr ""
6456
6515
6457
#: bzrlib/log.py:621
6458
msgid "Start revision not found in left-hand history of end revision."
6459
msgstr ""
6460
6461
#: bzrlib/log.py:667
6516
#: bzrlib/log.py:662
6462
6517
msgid "Start revision not found in history of end revision."
6463
6518
msgstr ""
6464
6519
6465
#: bzrlib/log.py:1085 bzrlib/log.py:1143
6520
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6466
6521
msgid "Logging revision 0 is invalid."
6467
6522
msgstr ""
6468
6523
6469
#: bzrlib/log.py:1087 bzrlib/log.py:1145
6524
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6470
6525
msgid "Start revision must be older than the end revision."
6471
6526
msgstr ""
6472
6527
6473
#: bzrlib/log.py:1832
6528
#: bzrlib/log.py:1827
6474
6529
#, python-format
6475
6530
msgid "unknown log formatter: %r"
6476
6531
msgstr ""
6477
6532
6478
#: bzrlib/log.py:2128
6533
#: bzrlib/log.py:2123
6479
6534
msgid "fixes bug"
6480
6535
msgid_plural "fixes bugs"
6481
6536
msgstr[0] ""
6482
6537
msgstr[1] ""
6483
6538
6484
#: bzrlib/merge.py:718
6539
#: bzrlib/merge.py:689
6485
6540
msgid "All changes applied successfully."
6486
6541
msgstr ""
6487
6542
6488
#: bzrlib/merge.py:720
6543
#: bzrlib/merge.py:691
6489
6544
#, python-format
6490
6545
msgid "%d conflicts encountered."
6491
6546
msgstr ""
6492
6547
6493
#: bzrlib/merge.py:868 bzrlib/merge.py:1956
6548
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6494
6549
msgid "Preparing file merge"
6495
6550
msgstr ""
6496
6551
6497
#: bzrlib/multiparent.py:424
6552
#: bzrlib/multiparent.py:426
6498
6553
msgid "Importing revisions"
6499
6554
msgstr ""
6500
6555
6501
6556
# help of 'help' option
6502
#: bzrlib/option.py:524
6557
#: bzrlib/option.py:526
6503
6558
msgid "Show help message."
6504
6559
msgstr ""
6505
6560
6506
6561
# help of 'quiet' option
6507
#: bzrlib/option.py:526
6562
#: bzrlib/option.py:528
6508
6563
msgid "Only display errors and warnings."
6509
6564
msgstr ""
6510
6565
6511
6566
# help of 'usage' option
6512
#: bzrlib/option.py:529
6567
#: bzrlib/option.py:531
6513
6568
msgid "Show usage message and options."
6514
6569
msgstr ""
6515
6570
6516
6571
# help of 'verbose' option
6517
#: bzrlib/option.py:531
6572
#: bzrlib/option.py:533
6518
6573
msgid "Display more information."
6519
6574
msgstr ""
6520
6575
6521
6576
# help of 'change' option
6522
#: bzrlib/option.py:539
6577
#: bzrlib/option.py:541
6523
6578
msgid ""
6524
6579
"Select changes introduced by the specified revision. See also \"help "
6525
6580
"revisionspec\"."
6526
6581
msgstr ""
6527
6582
6528
6583
# help of 'directory' option
6529
#: bzrlib/option.py:541
6584
#: bzrlib/option.py:543
6530
6585
msgid "Branch to operate on, instead of working directory."
6531
6586
msgstr ""
6532
6587
6533
6588
# help of 'log-format=long' option
6534
#: bzrlib/option.py:543
6589
#: bzrlib/option.py:545
6535
6590
msgid "Detailed log format."
6536
6591
msgstr ""
6537
6592
6538
6593
# help of 'log-format=gnu-changelog' option
6539
#: bzrlib/option.py:543
6594
#: bzrlib/option.py:545
6540
6595
msgid "Format used by GNU ChangeLog files."
6541
6596
msgstr ""
6542
6597
6543
6598
# help of 'log-format=line' option
6544
#: bzrlib/option.py:543
6599
#: bzrlib/option.py:545
6545
6600
msgid "Log format with one line per revision."
6546
6601
msgstr ""
6547
6602
6548
6603
# help of 'log-format=short' option
6549
#: bzrlib/option.py:543
6604
#: bzrlib/option.py:545
6550
6605
msgid "Moderately short log format."
6551
6606
msgstr ""
6552
6607
6553
6608
# help of 'log-format' option
6554
#: bzrlib/option.py:543
6609
#: bzrlib/option.py:545
6555
6610
msgid "Use specified log format."
6556
6611
msgstr ""
6557
6612
6558
6613
# title of 'log-format' option
6559
#: bzrlib/option.py:545
6614
#: bzrlib/option.py:547
6560
6615
msgid "Log format"
6561
6616
msgstr ""
6562
6617
6563
6618
# help of 'merge-type=lca' option
6564
#: bzrlib/option.py:547
6619
#: bzrlib/option.py:549
6565
6620
msgid "LCA-newness merge."
6566
6621
msgstr ""
6567
6622
6568
6623
# help of 'merge-type=diff3' option
6569
#: bzrlib/option.py:547
6624
#: bzrlib/option.py:549
6570
6625
msgid "Merge using external diff3."
6571
6626
msgstr ""
6572
6627
6573
6628
# help of 'merge-type=merge3' option
6574
#: bzrlib/option.py:547
6629
#: bzrlib/option.py:549
6575
6630
msgid "Native diff3-style merge."
6576
6631
msgstr ""
6577
6632
6578
6633
# help of 'merge-type' option
6579
#: bzrlib/option.py:547
6634
#: bzrlib/option.py:549
6580
6635
msgid "Select a particular merge algorithm."
6581
6636
msgstr ""
6582
6637
6583
6638
# help of 'merge-type=weave' option
6584
#: bzrlib/option.py:547
6639
#: bzrlib/option.py:549
6585
6640
msgid "Weave-based merge."
6586
6641
msgstr ""
6587
6642
6588
6643
# title of 'merge-type' option
6589
#: bzrlib/option.py:549
6644
#: bzrlib/option.py:551
6590
6645
msgid "Merge algorithm"
6591
6646
msgstr ""
6592
6647
6593
6648
# help of 'message' option
6594
#: bzrlib/option.py:552
6649
#: bzrlib/option.py:554
6595
6650
msgid "Message string."
6596
6651
msgstr ""
6597
6652
6598
6653
# help of 'null' option
6599
#: bzrlib/option.py:554
6654
#: bzrlib/option.py:556
6600
6655
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6601
6656
msgstr ""
6602
6657
6603
6658
# help of 'overwrite' option
6604
#: bzrlib/option.py:556
6659
#: bzrlib/option.py:558
6605
6660
msgid "Ignore differences between branches and overwrite unconditionally."
6606
6661
msgstr ""
6607
6662
6608
6663
# help of 'remember' option
6609
#: bzrlib/option.py:558
6664
#: bzrlib/option.py:560
6610
6665
msgid "Remember the specified location as a default."
6611
6666
msgstr ""
6612
6667
6613
6668
# help of 'reprocess' option
6614
#: bzrlib/option.py:560
6669
#: bzrlib/option.py:562
6615
6670
msgid "Reprocess to reduce spurious conflicts."
6616
6671
msgstr ""
6617
6672
6618
6673
# help of 'revision' option
6619
#: bzrlib/option.py:564
6674
#: bzrlib/option.py:566
6620
6675
msgid "See \"help revisionspec\" for details."
6621
6676
msgstr ""
6622
6677
6623
6678
# help of 'show-ids' option
6624
#: bzrlib/option.py:566
6679
#: bzrlib/option.py:568
6625
6680
msgid "Show internal object ids."
6626
6681
msgstr ""
6627
6682
6628
6683
# help of 'timezone' option
6629
#: bzrlib/option.py:569
6684
#: bzrlib/option.py:571
6630
6685
msgid "Display timezone as local, original, or utc."
6631
6686
msgstr ""
6632
6687
6633
#: bzrlib/osutils.py:94
6688
#: bzrlib/osutils.py:100
6634
6689
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6635
6690
msgstr ""
6636
6691
6637
#: bzrlib/osutils.py:214
6692
#: bzrlib/osutils.py:220
6638
6693
msgid "lstat/stat of ({0!r}): {1!r}"
6639
6694
msgstr ""
6640
6695
6641
#: bzrlib/osutils.py:964 bzrlib/osutils.py:975
6696
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6642
6697
#, python-format
6643
6698
msgid "sorry, %r not allowed in path"
6644
6699
msgstr ""
6645
6700
6646
#: bzrlib/osutils.py:1193
6701
#: bzrlib/osutils.py:1226
6647
6702
#, python-format
6648
6703
msgid "%r is too short to calculate a relative path"
6649
6704
msgstr ""
6650
6705
6651
#: bzrlib/plugin.py:142
6706
#: bzrlib/plugin.py:143
6652
6707
#, python-format
6653
6708
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6654
6709
msgstr ""
6655
6710
6656
6711
# help of 'plugin' option of 'bash-completion' command
6657
#: bzrlib/plugins/bash_completion/bashcomp.py:408
6712
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6658
6713
msgid "Enable completions for the selected plugin (default: all plugins)"
6659
6714
msgstr ""
6660
6715
6661
#: bzrlib/plugins/bash_completion/bashcomp.py:409
6716
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6662
6717
msgid "Generate a shell function for bash command line completion."
6663
6718
msgstr ""
6664
6719
6665
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6720
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6666
6721
msgid ""
6667
6722
"This command generates a shell function which can be used by bash to\n"
6668
6723
"automatically complete the currently typed command when the user presses\n"
6669
6724
"the completion key (usually tab)."
6670
6725
msgstr ""
6671
6726
6672
#: bzrlib/plugins/bash_completion/bashcomp.py:415
6727
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6673
6728
msgid ""
6674
6729
"Commonly used like this:\n"
6675
6730
" eval \"`bzr bash-completion`\""
6676
6731
msgstr ""
6677
6732
6678
6733
# help of 'function-name' option of 'bash-completion' command
6679
#: bzrlib/plugins/bash_completion/bashcomp.py:421
6734
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6680
6735
msgid "Name of the generated function (default: _bzr)"
6681
6736
msgstr ""
6682
6737
6683
6738
# help of 'function-only' option of 'bash-completion' command
6684
#: bzrlib/plugins/bash_completion/bashcomp.py:423
6739
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6685
6740
msgid "Generate only the shell function, don't enable it"
6686
6741
msgstr ""
6687
6742
6688
#: bzrlib/plugins/launchpad/__init__.py:79
6743
#: bzrlib/plugins/launchpad/__init__.py:81
6689
6744
msgid "Register a branch with launchpad.net."
6690
6745
msgstr ""
6691
6746
6692
#: bzrlib/plugins/launchpad/__init__.py:81
6747
#: bzrlib/plugins/launchpad/__init__.py:83
6693
6748
msgid ""
6694
6749
"This command lists a bzr branch in the directory of branches on\n"
6695
6750
"launchpad.net. Registration allows the branch to be associated with\n"
6696
6751
"bugs or specifications."
6697
6752
msgstr ""
6698
6753
6699
#: bzrlib/plugins/launchpad/__init__.py:85
6754
#: bzrlib/plugins/launchpad/__init__.py:87
6700
6755
msgid ""
6701
6756
"Before using this command you must register the project to which the\n"
6702
6757
"branch belongs, and create an account for yourself on launchpad.net."
6703
6758
msgstr ""
6704
6759
6705
#: bzrlib/plugins/launchpad/__init__.py:88
6760
#: bzrlib/plugins/launchpad/__init__.py:90
6706
6761
msgid ""
6707
6762
"arguments:\n"
6708
6763
" public_url: The publicly visible url for the branch to register.\n"
6714
6769
" otherwise error."
6715
6770
msgstr ""
6716
6771
6717
#: bzrlib/plugins/launchpad/__init__.py:97
6772
#: bzrlib/plugins/launchpad/__init__.py:99
6718
6773
msgid ""
6719
6774
"example:\n"
6720
6775
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6722
6777
msgstr ""
6723
6778
6724
6779
# help of 'project' option of 'register-branch' command
6725
#: bzrlib/plugins/launchpad/__init__.py:104
6780
#: bzrlib/plugins/launchpad/__init__.py:106
6726
6781
msgid "Launchpad project short name to associate with the branch."
6727
6782
msgstr ""
6728
6783
6729
6784
# help of 'branch-name' option of 'register-branch' command
6730
#: bzrlib/plugins/launchpad/__init__.py:111
6785
#: bzrlib/plugins/launchpad/__init__.py:113
6731
6786
msgid ""
6732
6787
"Short name for the branch; by default taken from the last component of the "
6733
6788
"url."
6734
6789
msgstr ""
6735
6790
6736
6791
# help of 'branch-title' option of 'register-branch' command
6737
#: bzrlib/plugins/launchpad/__init__.py:115
6792
#: bzrlib/plugins/launchpad/__init__.py:117
6738
6793
msgid "One-sentence description of the branch."
6739
6794
msgstr ""
6740
6795
6741
6796
# help of 'branch-description' option of 'register-branch' command
6742
#: bzrlib/plugins/launchpad/__init__.py:118
6797
#: bzrlib/plugins/launchpad/__init__.py:120
6743
6798
msgid "Longer description of the purpose or contents of the branch."
6744
6799
msgstr ""
6745
6800
6746
6801
# help of 'author' option of 'register-branch' command
6747
#: bzrlib/plugins/launchpad/__init__.py:121
6802
#: bzrlib/plugins/launchpad/__init__.py:123
6748
6803
msgid "Branch author's email address, if not yourself."
6749
6804
msgstr ""
6750
6805
6751
6806
# help of 'link-bug' option of 'register-branch' command
6752
#: bzrlib/plugins/launchpad/__init__.py:124
6807
#: bzrlib/plugins/launchpad/__init__.py:126
6753
6808
msgid "The bug this branch fixes."
6754
6809
msgstr ""
6755
6810
6756
6811
# help of 'dry-run' option of 'register-branch' command
6757
#: bzrlib/plugins/launchpad/__init__.py:127
6812
#: bzrlib/plugins/launchpad/__init__.py:129
6758
6813
msgid "Prepare the request but don't actually send it."
6759
6814
msgstr ""
6760
6815
6761
#: bzrlib/plugins/launchpad/__init__.py:149
6816
#: bzrlib/plugins/launchpad/__init__.py:151
6762
6817
msgid ""
6763
6818
"register-branch requires a public branch url - see bzr help register-branch."
6764
6819
msgstr ""
6765
6820
6766
#: bzrlib/plugins/launchpad/__init__.py:157
6821
#: bzrlib/plugins/launchpad/__init__.py:159
6767
6822
msgid "--product is deprecated; please use --project."
6768
6823
msgstr ""
6769
6824
6770
#: bzrlib/plugins/launchpad/__init__.py:189
6825
#: bzrlib/plugins/launchpad/__init__.py:191
6771
6826
msgid "Open a Launchpad branch page in your web browser."
6772
6827
msgstr ""
6773
6828
6774
6829
# help of 'dry-run' option of 'launchpad-open' command
6775
#: bzrlib/plugins/launchpad/__init__.py:194
6830
#: bzrlib/plugins/launchpad/__init__.py:196
6776
6831
msgid "Do not actually open the browser. Just say the URL we would use."
6777
6832
msgstr ""
6778
6833
6779
#: bzrlib/plugins/launchpad/__init__.py:229
6834
#: bzrlib/plugins/launchpad/__init__.py:231
6780
6835
#, python-format
6781
6836
msgid "Opening %s in web browser"
6782
6837
msgstr ""
6783
6838
6784
#: bzrlib/plugins/launchpad/__init__.py:239
6839
#: bzrlib/plugins/launchpad/__init__.py:241
6785
6840
msgid "Show or set the Launchpad user ID."
6786
6841
msgstr ""
6787
6842
6788
#: bzrlib/plugins/launchpad/__init__.py:241
6843
#: bzrlib/plugins/launchpad/__init__.py:243
6789
6844
msgid ""
6790
6845
"When communicating with Launchpad, some commands need to know your\n"
6791
6846
"Launchpad user ID. This command can be used to set or show the\n"
6792
6847
"user ID that Bazaar will use for such communication."
6793
6848
msgstr ""
6794
6849
6795
#: bzrlib/plugins/launchpad/__init__.py:245
6850
#: bzrlib/plugins/launchpad/__init__.py:247
6796
6851
msgid ""
6797
6852
":Examples:\n"
6798
6853
" Show the Launchpad ID of the current user::"
6799
6854
msgstr ""
6800
6855
6801
#: bzrlib/plugins/launchpad/__init__.py:248
6856
#: bzrlib/plugins/launchpad/__init__.py:250
6802
6857
msgid " bzr launchpad-login"
6803
6858
msgstr ""
6804
6859
6805
#: bzrlib/plugins/launchpad/__init__.py:250
6860
#: bzrlib/plugins/launchpad/__init__.py:252
6806
6861
msgid " Set the Launchpad ID of the current user to 'bob'::"
6807
6862
msgstr ""
6808
6863
6809
#: bzrlib/plugins/launchpad/__init__.py:252
6864
#: bzrlib/plugins/launchpad/__init__.py:254
6810
6865
msgid " bzr launchpad-login bob"
6811
6866
msgstr ""
6812
6867
6813
6868
# help of 'no-check' option of 'launchpad-login' command
6814
#: bzrlib/plugins/launchpad/__init__.py:259
6869
#: bzrlib/plugins/launchpad/__init__.py:261
6815
6870
msgid "Don't check that the user name is valid."
6816
6871
msgstr ""
6817
6872
6818
#: bzrlib/plugins/launchpad/__init__.py:274
6819
#: bzrlib/plugins/launchpad/__init__.py:285
6873
#: bzrlib/plugins/launchpad/__init__.py:276
6874
#: bzrlib/plugins/launchpad/__init__.py:287
6820
6875
msgid "Launchpad user ID exists and has SSH keys.\n"
6821
6876
msgstr ""
6822
6877
6823
#: bzrlib/plugins/launchpad/__init__.py:277
6878
#: bzrlib/plugins/launchpad/__init__.py:279
6824
6879
msgid "No Launchpad user ID configured.\n"
6825
6880
msgstr ""
6826
6881
6827
#: bzrlib/plugins/launchpad/__init__.py:288
6882
#: bzrlib/plugins/launchpad/__init__.py:290
6828
6883
#, python-format
6829
6884
msgid "Launchpad user ID set to '%s'.\n"
6830
6885
msgstr ""
6831
6886
6832
#: bzrlib/plugins/launchpad/__init__.py:296
6887
#: bzrlib/plugins/launchpad/__init__.py:298
6833
6888
msgid "Ask Launchpad to mirror a branch now."
6834
6889
msgstr ""
6835
6890
6836
#: bzrlib/plugins/launchpad/__init__.py:316
6891
#: bzrlib/plugins/launchpad/__init__.py:318
6837
6892
msgid "Propose merging a branch on Launchpad."
6838
6893
msgstr ""
6839
6894
6840
#: bzrlib/plugins/launchpad/__init__.py:318
6895
#: bzrlib/plugins/launchpad/__init__.py:320
6841
6896
msgid ""
6842
6897
"This will open your usual editor to provide the initial comment. When it\n"
6843
6898
"has created the proposal, it will open it in your default web browser."
6844
6899
msgstr ""
6845
6900
6846
#: bzrlib/plugins/launchpad/__init__.py:321
6901
#: bzrlib/plugins/launchpad/__init__.py:323
6847
6902
msgid ""
6848
6903
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6849
6904
"is not supplied, the remembered submit branch will be used. If no submit\n"
6850
6905
"branch is remembered, the development focus will be used."
6851
6906
msgstr ""
6852
6907
6853
#: bzrlib/plugins/launchpad/__init__.py:325
6908
#: bzrlib/plugins/launchpad/__init__.py:327
6854
6909
msgid ""
6855
6910
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6856
6911
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6858
6913
"may optionally be followed by '=' and the review type. For example:"
6859
6914
msgstr ""
6860
6915
6861
#: bzrlib/plugins/launchpad/__init__.py:330
6916
#: bzrlib/plugins/launchpad/__init__.py:332
6862
6917
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6863
6918
msgstr ""
6864
6919
6865
#: bzrlib/plugins/launchpad/__init__.py:332
6920
#: bzrlib/plugins/launchpad/__init__.py:334
6866
6921
msgid ""
6867
6922
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6868
6923
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6869
6924
msgstr ""
6870
6925
6871
6926
# help of 'staging' option of 'lp-propose-merge' command
6872
#: bzrlib/plugins/launchpad/__init__.py:337
6927
#: bzrlib/plugins/launchpad/__init__.py:339
6873
6928
msgid "Propose the merge on staging."
6874
6929
msgstr ""
6875
6930
6876
6931
# help of 'message' option of 'lp-propose-merge' command
6877
#: bzrlib/plugins/launchpad/__init__.py:339
6932
#: bzrlib/plugins/launchpad/__init__.py:341
6878
6933
msgid "Commit message."
6879
6934
msgstr ""
6880
6935
6881
6936
# help of 'approve' option of 'lp-propose-merge' command
6882
#: bzrlib/plugins/launchpad/__init__.py:341
6937
#: bzrlib/plugins/launchpad/__init__.py:343
6883
6938
msgid "Mark the proposal as approved immediately."
6884
6939
msgstr ""
6885
6940
6886
6941
# help of 'review' option of 'lp-propose-merge' command
6887
#: bzrlib/plugins/launchpad/__init__.py:343
6942
#: bzrlib/plugins/launchpad/__init__.py:345
6888
6943
msgid "Requested reviewer and optional type."
6889
6944
msgstr ""
6890
6945
6891
#: bzrlib/plugins/launchpad/__init__.py:380
6946
#: bzrlib/plugins/launchpad/__init__.py:382
6892
6947
msgid "Find the proposal to merge this revision."
6893
6948
msgstr ""
6894
6949
6895
#: bzrlib/plugins/launchpad/__init__.py:382
6950
#: bzrlib/plugins/launchpad/__init__.py:384
6896
6951
msgid ""
6897
6952
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6898
6953
"This works only if the selected branch was the merge proposal target, and\n"
6900
6955
"are opened in a web browser."
6901
6956
msgstr ""
6902
6957
6903
#: bzrlib/plugins/launchpad/__init__.py:387
6958
#: bzrlib/plugins/launchpad/__init__.py:389
6904
6959
msgid ""
6905
6960
"Any revision involved in the merge may be specified-- the revision in\n"
6906
6961
"which the merge was performed, or one of the revisions that was merged."
6907
6962
msgstr ""
6908
6963
6909
#: bzrlib/plugins/launchpad/__init__.py:390
6964
#: bzrlib/plugins/launchpad/__init__.py:392
6910
6965
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6911
6966
msgstr ""
6912
6967
6913
#: bzrlib/plugins/launchpad/__init__.py:392
6968
#: bzrlib/plugins/launchpad/__init__.py:394
6914
6969
msgid " bzr lp-find-proposal -r annotate:README:1"
6915
6970
msgstr ""
6916
6971
6917
#: bzrlib/plugins/launchpad/__init__.py:407
6972
#: bzrlib/plugins/launchpad/__init__.py:409
6918
6973
msgid "No review found."
6919
6974
msgstr ""
6920
6975
6921
#: bzrlib/plugins/launchpad/__init__.py:408
6976
#: bzrlib/plugins/launchpad/__init__.py:410
6922
6977
#, python-format
6923
6978
msgid "%d proposals(s) found."
6924
6979
msgstr ""
6925
6980
6926
#: bzrlib/plugins/launchpad/__init__.py:418
6981
#: bzrlib/plugins/launchpad/__init__.py:420
6927
6982
msgid "Finding revision-id"
6928
6983
msgstr ""
6929
6984
6930
#: bzrlib/plugins/launchpad/__init__.py:425
6985
#: bzrlib/plugins/launchpad/__init__.py:427
6931
6986
msgid "Finding merge"
6932
6987
msgstr ""
6933
6988
6934
#: bzrlib/plugins/launchpad/__init__.py:430
6989
#: bzrlib/plugins/launchpad/__init__.py:432
6935
6990
msgid "Finding revno"
6936
6991
msgstr ""
6937
6992
6938
#: bzrlib/plugins/launchpad/__init__.py:435
6993
#: bzrlib/plugins/launchpad/__init__.py:437
6939
6994
msgid "Finding Launchpad branch"
6940
6995
msgstr ""
6941
6996
6942
#: bzrlib/plugins/launchpad/__init__.py:438
6997
#: bzrlib/plugins/launchpad/__init__.py:440
6943
6998
msgid "Finding proposals"
6944
6999
msgstr ""
6945
7000
6946
#: bzrlib/plugins/launchpad/account.py:64
7001
#: bzrlib/plugins/launchpad/account.py:66
6947
7002
msgid "Setting ssh/sftp usernames for launchpad.net."
6948
7003
msgstr ""
6949
7004
6950
#: bzrlib/plugins/launchpad/lp_api.py:239
6951
#: bzrlib/plugins/launchpad/lp_api.py:244
7005
#: bzrlib/plugins/launchpad/lp_api.py:241
7006
#: bzrlib/plugins/launchpad/lp_api.py:246
6952
7007
#, python-format
6953
7008
msgid "%s is not registered on Launchpad"
6954
7009
msgstr ""
6955
7010
6956
#: bzrlib/plugins/launchpad/lp_api.py:254
7011
#: bzrlib/plugins/launchpad/lp_api.py:256
6957
7012
#, python-format
6958
7013
msgid "%s has no development focus."
6959
7014
msgstr ""
6960
7015
6961
#: bzrlib/plugins/launchpad/lp_api.py:259
7016
#: bzrlib/plugins/launchpad/lp_api.py:261
6962
7017
#, python-format
6963
7018
msgid "development focus %s has no branch."
6964
7019
msgstr ""
6965
7020
6966
#: bzrlib/plugins/launchpad/lp_api.py:264
7021
#: bzrlib/plugins/launchpad/lp_api.py:266
6967
7022
#, python-format
6968
7023
msgid "source package %s has no branch."
6969
7024
msgstr ""
6970
7025
6971
#: bzrlib/plugins/launchpad/lp_api.py:268
7026
#: bzrlib/plugins/launchpad/lp_api.py:270
6972
7027
#, python-format
6973
7028
msgid "%s has no associated product or source package."
6974
7029
msgstr ""
6975
7030
6976
#: bzrlib/plugins/launchpad/lp_api.py:280
7031
#: bzrlib/plugins/launchpad/lp_api.py:282
6977
7032
#, python-format
6978
7033
msgid "%s is already up-to-date."
6979
7034
msgstr ""
6980
7035
6981
#: bzrlib/plugins/launchpad/lp_api.py:287
7036
#: bzrlib/plugins/launchpad/lp_api.py:289
6982
7037
#, python-format
6983
7038
msgid "Pushing to %s"
6984
7039
msgstr ""
6985
7040
6986
#: bzrlib/plugins/launchpad/lp_directory.py:169
7041
#: bzrlib/plugins/launchpad/lp_directory.py:170
6987
7042
msgid ""
6988
7043
"resolution for {0}\n"
6989
7044
" local: {1}\n"
6990
7045
" remote: {2}"
6991
7046
msgstr ""
6992
7047
6993
#: bzrlib/plugins/launchpad/lp_propose.py:147
7048
#: bzrlib/plugins/launchpad/lp_propose.py:149
6994
7049
#, python-format
6995
7050
msgid "There is already a branch merge proposal: %s"
6996
7051
msgstr ""
6997
7052
6998
#: bzrlib/plugins/weave_fmt/bzrdir.py:226
7053
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6999
7054
msgid "pb parameter to convert() is deprecated"
7000
7055
msgstr ""
7001
7056
7002
#: bzrlib/plugins/weave_fmt/bzrdir.py:229
7057
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7003
7058
msgid "starting upgrade from format 4 to 5"
7004
7059
msgstr ""
7005
7060
7006
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7061
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7007
7062
msgid "note: upgrade may be faster if all store files are ungzipped first"
7008
7063
msgstr ""
7009
7064
7010
#: bzrlib/plugins/weave_fmt/bzrdir.py:268
7065
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7011
7066
msgid "converting revision"
7012
7067
msgstr ""
7013
7068
7014
#: bzrlib/plugins/weave_fmt/bzrdir.py:273
7069
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7015
7070
msgid "upgraded to weaves:"
7016
7071
msgstr ""
7017
7072
7018
#: bzrlib/plugins/weave_fmt/bzrdir.py:274
7073
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7019
7074
#, python-format
7020
7075
msgid "%6d revisions and inventories"
7021
7076
msgstr ""
7022
7077
7023
#: bzrlib/plugins/weave_fmt/bzrdir.py:276
7078
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7024
7079
#, python-format
7025
7080
msgid "%6d revisions not present"
7026
7081
msgstr ""
7027
7082
7028
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7083
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7029
7084
#, python-format
7030
7085
msgid "%6d texts"
7031
7086
msgstr ""
7032
7087
7033
#: bzrlib/plugins/weave_fmt/bzrdir.py:314
7088
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7034
7089
msgid "writing weave"
7035
7090
msgstr ""
7036
7091
7037
#: bzrlib/plugins/weave_fmt/bzrdir.py:318
7038
#: bzrlib/plugins/weave_fmt/bzrdir.py:320
7092
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7093
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7039
7094
msgid "inventory"
7040
7095
msgstr ""
7041
7096
7042
#: bzrlib/plugins/weave_fmt/bzrdir.py:337
7097
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7043
7098
msgid "write revision"
7044
7099
msgstr ""
7045
7100
7046
#: bzrlib/plugins/weave_fmt/bzrdir.py:351
7101
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7047
7102
msgid "loading revision"
7048
7103
msgstr ""
7049
7104
7050
#: bzrlib/plugins/weave_fmt/bzrdir.py:356
7105
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7051
7106
#, python-format
7052
7107
msgid "revision {%s} not present in branch; will be converted as a ghost"
7053
7108
msgstr ""
7054
7109
7055
#: bzrlib/plugins/weave_fmt/bzrdir.py:496
7110
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7056
7111
msgid "starting upgrade from format 5 to 6"
7057
7112
msgstr ""
7058
7113
7059
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7114
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7060
7115
#, python-format
7061
7116
msgid "adding prefixes to %s"
7062
7117
msgstr ""
7063
7118
7064
#: bzrlib/plugins/weave_fmt/bzrdir.py:546
7119
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7065
7120
msgid "starting upgrade from format 6 to metadir"
7066
7121
msgstr ""
7067
7122
7068
#: bzrlib/plugins/weave_fmt/bzrdir.py:554
7123
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7069
7124
msgid "Removing ancestry.weave"
7070
7125
msgstr ""
7071
7126
7072
#: bzrlib/plugins/weave_fmt/bzrdir.py:559
7127
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7073
7128
msgid "Finding branch files"
7074
7129
msgstr ""
7075
7130
7076
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7131
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7077
7132
msgid "Upgrading repository"
7078
7133
msgstr ""
7079
7134
7080
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7135
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7081
7136
msgid "Upgrading branch"
7082
7137
msgstr ""
7083
7138
7084
#: bzrlib/plugins/weave_fmt/bzrdir.py:602
7139
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7085
7140
msgid "No working tree."
7086
7141
msgstr ""
7087
7142
7088
#: bzrlib/plugins/weave_fmt/bzrdir.py:609
7143
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7089
7144
msgid "Upgrading working tree"
7090
7145
msgstr ""
7091
7146
7092
#: bzrlib/plugins/weave_fmt/bzrdir.py:630
7147
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7093
7148
#, python-format
7094
7149
msgid "Make %s lock"
7095
7150
msgstr ""
7096
7151
7097
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7152
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7098
7153
#, python-format
7099
7154
msgid "Moving %s"
7100
7155
msgstr ""
7101
7156
7102
#: bzrlib/push.py:54
7157
#: bzrlib/push.py:56
7103
7158
msgid "Created new branch."
7104
7159
msgstr ""
7105
7160
7106
#: bzrlib/push.py:96
7161
#: bzrlib/push.py:98
7107
7162
#, python-format
7108
7163
msgid ""
7109
7164
"Target directory %s already contains a .bzr directory, but it is not valid."
7110
7165
msgstr ""
7111
7166
7112
#: bzrlib/push.py:99
7167
#: bzrlib/push.py:101
7113
7168
#, python-format
7114
7169
msgid ""
7115
7170
"Target directory %s already exists, but does not have a .bzr directory. "
7116
7171
"Supply --use-existing-dir to push there anyway."
7117
7172
msgstr ""
7118
7173
7119
#: bzrlib/push.py:120
7174
#: bzrlib/push.py:122
7120
7175
#, python-format
7121
7176
msgid "Too many redirections trying to make %s."
7122
7177
msgstr ""
7123
7178
7124
#: bzrlib/push.py:145
7179
#: bzrlib/push.py:147
7125
7180
msgid ""
7126
7181
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7127
7182
"information."
7128
7183
msgstr ""
7129
7184
7130
#: bzrlib/push.py:149
7185
#: bzrlib/push.py:151
7131
7186
#, python-format
7132
7187
msgid ""
7133
7188
"It is not possible to losslessly push to %s. You may want to use dpush "
7134
7189
"instead."
7135
7190
msgstr ""
7136
7191
7137
#: bzrlib/push.py:155
7192
#: bzrlib/push.py:157
7138
7193
#, python-format
7139
7194
msgid ""
7140
7195
"At %s you have a valid .bzr control directory, but not a branch or "
7142
7197
"directory out of the way and try again."
7143
7198
msgstr ""
7144
7199
7145
#: bzrlib/reconcile.py:96
7200
#: bzrlib/reconcile.py:97
7146
7201
#, python-format
7147
7202
msgid "Reconciling branch %s"
7148
7203
msgstr ""
7149
7204
7150
#: bzrlib/reconcile.py:102
7205
#: bzrlib/reconcile.py:103
7151
7206
#, python-format
7152
7207
msgid "Reconciling repository %s"
7153
7208
msgstr ""
7154
7209
7155
#: bzrlib/reconcile.py:104
7210
#: bzrlib/reconcile.py:105
7156
7211
msgid "Reconciling repository"
7157
7212
msgstr ""
7158
7213
7159
#: bzrlib/reconcile.py:110
7214
#: bzrlib/reconcile.py:111
7160
7215
#, python-format
7161
7216
msgid "%s cannot canonicalize CHKs."
7162
7217
msgstr ""
7163
7218
7164
#: bzrlib/reconcile.py:118
7219
#: bzrlib/reconcile.py:119
7165
7220
msgid "Reconcile aborted: revision index has inconsistent parents."
7166
7221
msgstr ""
7167
7222
7168
#: bzrlib/reconcile.py:120
7223
#: bzrlib/reconcile.py:121
7169
7224
msgid "Run \"bzr check\" for more details."
7170
7225
msgstr ""
7171
7226
7172
#: bzrlib/reconcile.py:122
7227
#: bzrlib/reconcile.py:123
7173
7228
msgid "Reconciliation complete."
7174
7229
msgstr ""
7175
7230
7176
#: bzrlib/reconcile.py:165
7231
#: bzrlib/reconcile.py:166
7177
7232
msgid "Fixing last revision info {0} => {1}"
7178
7233
msgstr ""
7179
7234
7180
#: bzrlib/reconcile.py:172
7235
#: bzrlib/reconcile.py:173
7181
7236
msgid "revision_history ok."
7182
7237
msgstr ""
7183
7238
7184
#: bzrlib/reconcile.py:233
7239
#: bzrlib/reconcile.py:234
7185
7240
msgid "Reading inventory data"
7186
7241
msgstr ""
7187
7242
7188
#: bzrlib/reconcile.py:253 bzrlib/reconcile.py:383
7243
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7189
7244
msgid "Inventory ok."
7190
7245
msgstr ""
7191
7246
7192
#: bzrlib/reconcile.py:255 bzrlib/reconcile.py:385
7247
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7193
7248
msgid "Backing up inventory"
7194
7249
msgstr ""
7195
7250
7196
#: bzrlib/reconcile.py:257
7251
#: bzrlib/reconcile.py:258
7197
7252
msgid "Backup inventory created."
7198
7253
msgstr ""
7199
7254
7200
#: bzrlib/reconcile.py:273 bzrlib/reconcile.py:404
7255
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7201
7256
msgid "Writing weave"
7202
7257
msgstr ""
7203
7258
7204
#: bzrlib/reconcile.py:276 bzrlib/reconcile.py:407
7259
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7205
7260
msgid "Inventory regenerated."
7206
7261
msgstr ""
7207
7262
7208
#: bzrlib/reconcile.py:370 bzrlib/reconcile.py:372 bzrlib/reconcile.py:375
7263
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7209
7264
msgid "Reading indexes"
7210
7265
msgstr ""
7211
7266
7212
#: bzrlib/reconcile.py:379 bzrlib/reconcile.py:381
7267
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7213
7268
msgid "Checking unused inventories"
7214
7269
msgstr ""
7215
7270
7216
#: bzrlib/reconcile.py:387
7271
#: bzrlib/reconcile.py:388
7217
7272
msgid "Backup Inventory created"
7218
7273
msgstr ""
7219
7274
7220
#: bzrlib/reconcile.py:445
7275
#: bzrlib/reconcile.py:446
7221
7276
msgid "Fixing text parents"
7222
7277
msgstr ""
7223
7278
7224
#: bzrlib/reconfigure.py:52
7279
#: bzrlib/reconfigure.py:54
7225
7280
msgid "{0} is now stacked on {1}\n"
7226
7281
msgstr ""
7227
7282
7228
#: bzrlib/reconfigure.py:67
7283
#: bzrlib/reconfigure.py:69
7229
7284
#, python-format
7230
7285
msgid "%s is now not stacked\n"
7231
7286
msgstr ""
7232
7287
7233
#: bzrlib/remote.py:1134 bzrlib/repository.py:287
7288
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7234
7289
#, python-format
7235
7290
msgid "bzr: ERROR (ignored): %s"
7236
7291
msgstr ""
7237
7292
7238
#: bzrlib/remote.py:2217
7293
#: bzrlib/remote.py:2493
7239
7294
msgid "Copying repository content as tarball..."
7240
7295
msgstr ""
7241
7296
7242
#: bzrlib/rename_map.py:68
7297
#: bzrlib/rename_map.py:69
7243
7298
msgid "Calculating hashes"
7244
7299
msgstr ""
7245
7300
7246
#: bzrlib/rename_map.py:106
7301
#: bzrlib/rename_map.py:107
7247
7302
msgid "Determining hash hits"
7248
7303
msgstr ""
7249
7304
7250
#: bzrlib/rename_map.py:241
7305
#: bzrlib/rename_map.py:242
7251
7306
msgid "{0} => {1}"
7252
7307
msgstr ""
7253
7308
7254
#: bzrlib/repository.py:1781
7309
#: bzrlib/repository.py:1787
7255
7310
msgid "Moving repository to repository.backup"
7256
7311
msgstr ""
7257
7312
7258
#: bzrlib/repository.py:1788
7313
#: bzrlib/repository.py:1794
7259
7314
msgid "Creating new repository"
7260
7315
msgstr ""
7261
7316
7262
#: bzrlib/repository.py:1793
7317
#: bzrlib/repository.py:1799
7263
7318
msgid "Copying content"
7264
7319
msgstr ""
7265
7320
7266
#: bzrlib/repository.py:1797
7321
#: bzrlib/repository.py:1803
7267
7322
msgid "Deleting old repository content"
7268
7323
msgstr ""
7269
7324
7270
#: bzrlib/repository.py:1799
7325
#: bzrlib/repository.py:1805
7271
7326
msgid "repository converted"
7272
7327
msgstr ""
7273
7328
7274
#: bzrlib/revisionspec.py:904
7329
#: bzrlib/revisionspec.py:903
7275
7330
msgid "Using {0} {1}"
7276
7331
msgstr ""
7277
7332
7278
#: bzrlib/send.py:57
7333
#: bzrlib/send.py:58
7279
7334
#, python-format
7280
7335
msgid "Mail client \"%s\" does not support specifying body"
7281
7336
msgstr ""
7282
7337
7283
#: bzrlib/send.py:61
7338
#: bzrlib/send.py:62
7284
7339
msgid "--remember requires a branch to be specified."
7285
7340
msgstr ""
7286
7341
7287
#: bzrlib/send.py:75
7342
#: bzrlib/send.py:77
7288
7343
msgid "No submit branch known or specified"
7289
7344
msgstr ""
7290
7345
7291
#: bzrlib/send.py:78
7346
#: bzrlib/send.py:80
7292
7347
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7293
7348
msgstr ""
7294
7349
7295
#: bzrlib/send.py:95
7350
#: bzrlib/send.py:98
7296
7351
#, python-format
7297
7352
msgid "No such send format '%s'."
7298
7353
msgstr ""
7299
7354
7300
#: bzrlib/send.py:112
7355
#: bzrlib/send.py:114
7301
7356
msgid "bzr send takes at most two one revision identifiers"
7302
7357
msgstr ""
7303
7358
7304
#: bzrlib/send.py:125
7359
#: bzrlib/send.py:127
7305
7360
msgid "No revisions to submit."
7306
7361
msgstr ""
7307
7362
7308
#: bzrlib/send.py:136
7363
#: bzrlib/send.py:139
7309
7364
msgid ""
7310
7365
"- not supported for merge directives that use more than one output file."
7311
7366
msgstr ""
7312
7367
7313
#: bzrlib/send.py:178
7368
#: bzrlib/send.py:185
7314
7369
msgid "Format 0.9 does not permit bundle with no patch"
7315
7370
msgstr ""
7316
7371
7317
#: bzrlib/shelf_ui.py:45
7372
#: bzrlib/shelf_ui.py:46
7318
7373
#, python-format
7319
7374
msgid "Shelve adding file \"%(path)s\"?"
7320
7375
msgstr ""
7321
7376
7322
#: bzrlib/shelf_ui.py:46
7377
#: bzrlib/shelf_ui.py:47
7323
7378
msgid "Shelve binary changes?"
7324
7379
msgstr ""
7325
7380
7326
#: bzrlib/shelf_ui.py:47
7381
#: bzrlib/shelf_ui.py:48
7327
7382
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7328
7383
msgstr ""
7329
7384
7330
#: bzrlib/shelf_ui.py:49
7385
#: bzrlib/shelf_ui.py:50
7331
7386
#, python-format
7332
7387
msgid "Shelve removing file \"%(path)s\"?"
7333
7388
msgstr ""
7334
7389
7335
#: bzrlib/shelf_ui.py:50
7390
#: bzrlib/shelf_ui.py:51
7336
7391
#, python-format
7337
7392
msgid "Shelve %d change(s)?"
7338
7393
msgstr ""
7339
7394
7340
#: bzrlib/shelf_ui.py:51
7395
#: bzrlib/shelf_ui.py:52
7341
7396
msgid "Shelve?"
7342
7397
msgstr ""
7343
7398
7344
#: bzrlib/shelf_ui.py:52
7399
#: bzrlib/shelf_ui.py:53
7345
7400
#, python-format
7346
7401
msgid ""
7347
7402
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7348
7403
msgstr ""
7349
7404
7350
#: bzrlib/shelf_ui.py:54
7405
#: bzrlib/shelf_ui.py:55
7351
7406
#, python-format
7352
7407
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7353
7408
msgstr ""
7354
7409
7355
#: bzrlib/shelf_ui.py:69
7410
#: bzrlib/shelf_ui.py:70
7356
7411
#, python-format
7357
7412
msgid "Changes shelved with id \"%d\"."
7358
7413
msgstr ""
7359
7414
7360
#: bzrlib/shelf_ui.py:73
7415
#: bzrlib/shelf_ui.py:74
7361
7416
msgid "Selected changes destroyed."
7362
7417
msgstr ""
7363
7418
7364
#: bzrlib/shelf_ui.py:77
7419
#: bzrlib/shelf_ui.py:78
7365
7420
msgid "Selected changes:"
7366
7421
msgstr ""
7367
7422
7368
#: bzrlib/shelf_ui.py:97
7423
#: bzrlib/shelf_ui.py:98
7369
7424
#, python-format
7370
7425
msgid "Delete file \"%(path)s\"?"
7371
7426
msgstr ""
7372
7427
7373
#: bzrlib/shelf_ui.py:98
7428
#: bzrlib/shelf_ui.py:99
7374
7429
msgid "Apply binary changes?"
7375
7430
msgstr ""
7376
7431
7377
#: bzrlib/shelf_ui.py:99
7432
#: bzrlib/shelf_ui.py:100
7378
7433
#, python-format
7379
7434
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7380
7435
msgstr ""
7381
7436
7382
#: bzrlib/shelf_ui.py:101
7437
#: bzrlib/shelf_ui.py:102
7383
7438
#, python-format
7384
7439
msgid "Add file \"%(path)s\"?"
7385
7440
msgstr ""
7386
7441
7387
#: bzrlib/shelf_ui.py:102
7442
#: bzrlib/shelf_ui.py:103
7388
7443
#, python-format
7389
7444
msgid "Apply %d change(s)?"
7390
7445
msgstr ""
7391
7446
7392
#: bzrlib/shelf_ui.py:103
7447
#: bzrlib/shelf_ui.py:104
7393
7448
msgid "Apply change?"
7394
7449
msgstr ""
7395
7450
7396
#: bzrlib/shelf_ui.py:104
7451
#: bzrlib/shelf_ui.py:105
7397
7452
#, python-format
7398
7453
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7399
7454
msgstr ""
7400
7455
7401
#: bzrlib/shelf_ui.py:106
7456
#: bzrlib/shelf_ui.py:107
7402
7457
#, python-format
7403
7458
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7404
7459
msgstr ""
7405
7460
7406
#: bzrlib/shelf_ui.py:401
7461
#: bzrlib/shelf_ui.py:402
7407
7462
msgid "No changes are shelved."
7408
7463
msgstr ""
7409
7464
7410
#: bzrlib/shelf_ui.py:459
7465
#: bzrlib/shelf_ui.py:460
7411
7466
#, python-format
7412
7467
msgid "Using changes with id \"%d\"."
7413
7468
msgstr ""
7414
7469
7415
#: bzrlib/shelf_ui.py:463
7470
#: bzrlib/shelf_ui.py:464
7416
7471
#, python-format
7417
7472
msgid "Message: %s"
7418
7473
msgstr ""
7419
7474
7420
#: bzrlib/shelf_ui.py:475
7475
#: bzrlib/shelf_ui.py:476
7421
7476
#, python-format
7422
7477
msgid "Deleted changes with id \"%d\"."
7423
7478
msgstr ""
7424
7479
7425
#: bzrlib/smart/medium.py:712
7480
#: bzrlib/smart/medium.py:714
7426
7481
msgid "HPSS calls: {0} ({1} vfs) {2}"
7427
7482
msgstr ""
7428
7483
7429
#: bzrlib/smart/server.py:167
7484
#: bzrlib/smart/server.py:169
7430
7485
msgid "Requested to stop gracefully"
7431
7486
msgstr ""
7432
7487
7433
#: bzrlib/smart/server.py:177
7488
#: bzrlib/smart/server.py:179
7434
7489
#, python-format
7435
7490
msgid "Waiting for %d client(s) to finish"
7436
7491
msgstr ""
7437
7492
7438
#: bzrlib/smart/server.py:183
7493
#: bzrlib/smart/server.py:185
7439
7494
#, python-format
7440
7495
msgid "Still waiting for %d client(s) to finish"
7441
7496
msgstr ""
7442
7497
7443
#: bzrlib/smart/server.py:217
7498
#: bzrlib/smart/server.py:219
7444
7499
#, python-format
7445
7500
msgid "listening socket error: %s"
7446
7501
msgstr ""
7447
7502
7448
#: bzrlib/smart/server.py:450
7503
#: bzrlib/smart/server.py:452
7449
7504
#, python-format
7450
7505
msgid "listening on port: %s"
7451
7506
msgstr ""
7452
7507
7453
#: bzrlib/switch.py:67
7508
#: bzrlib/switch.py:69
7454
7509
msgid "Pending merges must be committed or reverted before using switch."
7455
7510
msgstr ""
7456
7511
7457
#: bzrlib/switch.py:94
7512
#: bzrlib/switch.py:96
7458
7513
msgid ""
7459
7514
"Cannot switch as local commits found in the checkout. Commit these to the "
7460
7515
"bound branch or use --force to throw them away."
7461
7516
msgstr ""
7462
7517
7463
#: bzrlib/switch.py:99
7518
#: bzrlib/switch.py:101
7464
7519
#, python-format
7465
7520
msgid ""
7466
7521
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7467
7522
"anyway, use --force."
7468
7523
msgstr ""
7469
7524
7470
#: bzrlib/switch.py:108
7525
#: bzrlib/switch.py:110
7471
7526
msgid "Cannot switch a branch, only a checkout."
7472
7527
msgstr ""
7473
7528
7474
#: bzrlib/switch.py:144
7529
#: bzrlib/switch.py:146
7475
7530
#, python-format
7476
7531
msgid "Tree is up to date at revision %d."
7477
7532
msgstr ""
7478
7533
7479
#: bzrlib/switch.py:150
7534
#: bzrlib/switch.py:152
7480
7535
#, python-format
7481
7536
msgid "Updated to revision %d."
7482
7537
msgstr ""
7483
7538
7484
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7539
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7485
7540
msgid "Apply phase"
7486
7541
msgstr ""
7487
7542
7488
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7543
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7489
7544
msgid "removing file"
7490
7545
msgstr ""
7491
7546
7492
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7547
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7493
7548
msgid "adding file"
7494
7549
msgstr ""
7495
7550
7496
#: bzrlib/transform.py:2580
7551
#: bzrlib/transform.py:2587
7497
7552
msgid "Building tree"
7498
7553
msgstr ""
7499
7554
7500
#: bzrlib/transform.py:2670 bzrlib/transform.py:2697
7555
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7501
7556
msgid "Adding file contents"
7502
7557
msgstr ""
7503
7558
7504
#: bzrlib/transform.py:3017
7559
#: bzrlib/transform.py:3024
7505
7560
msgid "Resolution pass"
7506
7561
msgstr ""
7507
7562
7508
#: bzrlib/transport/ftp/_gssapi.py:86
7563
#: bzrlib/transport/ftp/_gssapi.py:88
7509
7564
#, python-format
7510
7565
msgid "Authenticated as %s"
7511
7566
msgstr ""
7512
7567
7513
#: bzrlib/tree.py:632
7568
#: bzrlib/tree.py:634
7514
7569
msgid "*** {0} content-filter: {1} => {2!r}"
7515
7570
msgstr ""
7516
7571
7517
#: bzrlib/upgrade.py:76
7572
#: bzrlib/upgrade.py:77
7518
7573
#, python-format
7519
7574
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7520
7575
msgstr ""
7521
7576
7522
#: bzrlib/upgrade.py:99
7577
#: bzrlib/upgrade.py:100
7523
7578
#, python-format
7524
7579
msgid "cannot upgrade from bzrdir format %s"
7525
7580
msgstr ""
7526
7581
7527
#: bzrlib/upgrade.py:102
7582
#: bzrlib/upgrade.py:103
7528
7583
#, python-format
7529
7584
msgid "starting upgrade of %s"
7530
7585
msgstr ""
7531
7586
7532
#: bzrlib/upgrade.py:109
7587
#: bzrlib/upgrade.py:110
7533
7588
msgid "finished"
7534
7589
msgstr ""
7535
7590
7536
#: bzrlib/upgrade.py:119
7591
#: bzrlib/upgrade.py:120
7537
7592
msgid "Deleting backup.bzr"
7538
7593
msgstr ""
7539
7594
7540
#: bzrlib/upgrade.py:150
7595
#: bzrlib/upgrade.py:151
7541
7596
msgid ""
7542
7597
"\n"
7543
7598
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7544
7599
msgstr ""
7545
7600
7546
#: bzrlib/upgrade.py:207
7601
#: bzrlib/upgrade.py:208
7547
7602
#, python-format
7548
7603
msgid "Found %d dependent branches - upgrading ..."
7549
7604
msgstr ""
7550
7605
7551
#: bzrlib/upgrade.py:275
7606
#: bzrlib/upgrade.py:276
7552
7607
msgid "Upgrading bzrdirs"
7553
7608
msgstr ""
7554
7609
7555
#: bzrlib/upgrade.py:281
7610
#: bzrlib/upgrade.py:282
7556
7611
#, python-format
7557
7612
msgid "Upgrading %s"
7558
7613
msgstr ""
7559
7614
7560
#: bzrlib/upgrade.py:282
7615
#: bzrlib/upgrade.py:283
7561
7616
msgid "Upgrading {0} {1} ..."
7562
7617
msgstr ""
7563
7618
7564
#: bzrlib/upgrade.py:300
7619
#: bzrlib/upgrade.py:301
7565
7620
msgid "Removing backup ..."
7566
7621
msgstr ""
7567
7622
7568
#: bzrlib/upgrade.py:304
7623
#: bzrlib/upgrade.py:305
7569
7624
msgid "failed to clean-up {0}: {1}"
7570
7625
msgstr ""
7571
7626
7572
#: bzrlib/vf_repository.py:1093
7627
#: bzrlib/vf_repository.py:1090
7573
7628
msgid "inventories"
7574
7629
msgstr ""
7575
7630
7576
#: bzrlib/vf_repository.py:1119
7631
#: bzrlib/vf_repository.py:1116
7577
7632
msgid "texts"
7578
7633
msgstr ""
7579
7634
7580
#: bzrlib/vf_repository.py:1624 bzrlib/vf_repository.py:1633
7635
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7581
7636
msgid "Calculating text parents"
7582
7637
msgstr ""
7583
7638
7584
#: bzrlib/vf_repository.py:1709
7639
#: bzrlib/vf_repository.py:1706
7585
7640
msgid "Fetch texts"
7586
7641
msgstr ""
7587
7642
7588
#: bzrlib/vf_repository.py:2538
7643
#: bzrlib/vf_repository.py:2535
7589
7644
msgid "loading text store"
7590
7645
msgstr ""
7591
7646
7592
#: bzrlib/vf_repository.py:2544
7647
#: bzrlib/vf_repository.py:2541
7593
7648
msgid "checking text graph"
7594
7649
msgstr ""
7595
7650
7596
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7597
#: bzrlib/vf_repository.py:3127
7651
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7652
#: bzrlib/vf_repository.py:3124
7598
7653
msgid "Transferring revisions"
7599
7654
msgstr ""
7600
7655
7601
#: bzrlib/win32utils.py:137
7656
#: bzrlib/win32utils.py:146
7602
7657
msgid "Failed to GetProcessMemoryInfo()"
7603
7658
msgstr ""
7604
7659
7605
#: bzrlib/win32utils.py:158
7660
#: bzrlib/win32utils.py:167
7606
7661
msgid "Cannot debug memory on win32 without ctypes or win32process"
7607
7662
msgstr ""
7608
7663
7609
#: bzrlib/win32utils.py:163
7664
#: bzrlib/win32utils.py:172
7610
7665
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7611
7666
msgstr ""
7612
7667
7613
#: bzrlib/win32utils.py:171
7668
#: bzrlib/win32utils.py:180
7614
7669
#, python-format
7615
7670
msgid "WorkingSize %8d KiB"
7616
7671
msgstr ""
7617
7672
7618
#: bzrlib/win32utils.py:172
7673
#: bzrlib/win32utils.py:181
7619
7674
#, python-format
7620
7675
msgid "PeakWorking %8d KiB"
7621
7676
msgstr ""
7622
7677
7623
#: bzrlib/win32utils.py:173
7678
#: bzrlib/win32utils.py:182
7624
7679
#, python-format
7625
7680
msgid "PagefileUsage %8d KiB"
7626
7681
msgstr ""
7627
7682
7628
#: bzrlib/win32utils.py:174
7683
#: bzrlib/win32utils.py:183
7629
7684
#, python-format
7630
7685
msgid "PeakPagefileUsage %8d KiB"
7631
7686
msgstr ""
7632
7687
7633
#: bzrlib/win32utils.py:176
7688
#: bzrlib/win32utils.py:185
7634
7689
#, python-format
7635
7690
msgid "PrivateUsage %8d KiB"
7636
7691
msgstr ""
7637
7692
7638
#: bzrlib/win32utils.py:177
7693
#: bzrlib/win32utils.py:186
7639
7694
#, python-format
7640
7695
msgid "PageFaultCount %8d"
7641
7696
msgstr ""
7642
7697
7643
#: bzrlib/workingtree.py:1467
7698
#: bzrlib/workingtree.py:1478
7644
7699
msgid "Rerun update after fixing the conflicts."
7645
7700
msgstr ""
7646
7701
7650
7705
7651
7706
#: dummy/help_topics/basic/detail.txt:1
7652
7707
msgid ""
7653
"Bazaar 2.5b4 -- a free distributed version-control tool\n"
7708
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7654
7709
"http://bazaar.canonical.com/"
7655
7710
msgstr ""
7656
7711
7721
7776
msgstr ""
7722
7777
7723
7778
#: dummy/help_topics/branches/detail.txt:15
7779
#: dummy/help_topics/checkouts/detail.txt:66
7780
#: dummy/help_topics/repositories/detail.txt:36
7724
7781
msgid "Related commands::"
7725
7782
msgstr ""
7726
7783
9009
9066
msgid " bzr commit --fixes <tracker>:<id>"
9010
9067
msgstr ""
9011
9068
9012
#: en/help_topics/bugs.txt:13
9069
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9013
9070
msgid "or::"
9014
9071
msgstr ""
9015
9072
9868
9925
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9869
9926
msgstr ""
9870
9927
9871
#: en/help_topics/configuration.txt:318
9928
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9872
9929
msgid ""
9873
9930
" $ bzr config mypush\n"
9874
9931
" lp:~vila/bzr/832013-expand-in-stack"
10732
10789
"--------------"
10733
10790
msgstr ""
10734
10791
10735
#: en/help_topics/conflict-types.txt:63
10792
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10793
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10794
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10795
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10796
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10736
10797
msgid "Typical message::"
10737
10798
msgstr ""
10738
10799
10864
10925
"copy\" has been renamed to THIS or OTHER."
10865
10926
msgstr ""
10866
10927
10867
#: en/help_topics/conflict-types.txt:134
10928
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10868
10929
msgid ""
10869
10930
"To resolve that kind of conflict, you should rebuild FILE from either "
10870
10931
"version\n"
10871
10932
"or a combination of both."
10872
10933
msgstr ""
10873
10934
10874
#: en/help_topics/conflict-types.txt:137
10935
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10936
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10937
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10938
#: en/help_topics/conflict-types.txt:361
10875
10939
msgid "``bzr resolve`` recognizes the following actions:"
10876
10940
msgstr ""
10877
10941
10889
10953
"``.OTHER`` files if they are still present in the working tree."
10890
10954
msgstr ""
10891
10955
10892
#: en/help_topics/conflict-types.txt:146
10956
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10957
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10958
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10959
#: en/help_topics/conflict-types.txt:369
10893
10960
msgid ""
10894
10961
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10895
10962
msgstr ""
11007
11074
"Resolving this issue depends very much on the particular scenario."
11008
11075
msgstr ""
11009
11076
11010
#: en/help_topics/conflict-types.txt:223
11077
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11011
11078
msgid ""
11012
11079
"To resolve that kind of conflict, you should either remove or rename the\n"
11013
11080
"children or the directory or a combination of both."
11401
11468
" transition."
11402
11469
msgstr ""
11403
11470
11404
#: en/help_topics/current-formats.txt:8
11471
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11405
11472
msgid ""
11406
11473
"\n"
11407
11474
"See :doc:`formats-help` for more about storage formats."
11608
11675
"to use as a starting point::"
11609
11676
msgstr ""
11610
11677
11611
#: en/help_topics/eol.txt:42
11678
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11679
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11612
11680
msgid ""
11613
11681
" [name *]\n"
11614
11682
" eol = native"
11781
11849
"====="
11782
11850
msgstr ""
11783
11851
11784
#: en/help_topics/hooks.txt:5
11852
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11785
11853
msgid ""
11786
11854
"Introduction\n"
11787
11855
"------------"
11848
11916
"~~~~~~~~~~~~~~~~~~"
11849
11917
msgstr ""
11850
11918
11851
#: en/help_topics/hooks.txt:38
11919
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11920
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11852
11921
msgid "Introduced in: 2.2"
11853
11922
msgstr ""
11854
11923
11866
11935
"~~~~"
11867
11936
msgstr ""
11868
11937
11869
#: en/help_topics/hooks.txt:48
11938
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11939
#: en/help_topics/hooks.txt:304
11870
11940
msgid "Introduced in: 1.8"
11871
11941
msgstr ""
11872
11942
11896
11966
"~~~~~~~~~~~~~~~~~~~~~~"
11897
11967
msgstr ""
11898
11968
11899
#: en/help_topics/hooks.txt:66
11969
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11900
11970
msgid "Introduced in: 1.4"
11901
11971
msgstr ""
11902
11972
11908
11978
"uncommit will all trigger this hook."
11909
11979
msgstr ""
11910
11980
11911
#: en/help_topics/hooks.txt:73
11981
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11912
11982
msgid ""
11913
11983
"post_commit\n"
11914
11984
"~~~~~~~~~~~"
11915
11985
msgstr ""
11916
11986
11917
#: en/help_topics/hooks.txt:76
11987
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11988
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11989
#: en/help_topics/hooks.txt:145
11918
11990
msgid "Introduced in: 0.15"
11919
11991
msgstr ""
11920
11992
12085
12157
"~~~~~~~~~~~"
12086
12158
msgstr ""
12087
12159
12088
#: en/help_topics/hooks.txt:184
12160
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12161
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
12089
12162
msgid "Introduced in: 1.17"
12090
12163
msgstr ""
12091
12164
12138
12211
"~~~"
12139
12212
msgstr ""
12140
12213
12141
#: en/help_topics/hooks.txt:218
12214
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12215
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12216
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12217
#: en/help_topics/hooks.txt:427
12142
12218
msgid "Introduced in: 2.4"
12143
12219
msgstr ""
12144
12220
12238
12314
"~~~~~~~~~~"
12239
12315
msgstr ""
12240
12316
12241
#: en/help_topics/hooks.txt:278
12317
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12318
#: en/help_topics/hooks.txt:505
12242
12319
msgid "Introduced in: 1.15"
12243
12320
msgstr ""
12244
12321
12313
12390
12314
12391
#: en/help_topics/hooks.txt:323
12315
12392
msgid ""
12393
"post_merge\n"
12394
"~~~~~~~~~~"
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12398
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12399
msgid "Introduced in: 2.5"
12400
msgstr ""
12401
12402
#: en/help_topics/hooks.txt:328
12403
msgid ""
12404
"Called after a merge. Receives a Merger object as the single argument.\n"
12405
"The return value is ignored."
12406
msgstr ""
12407
12408
#: en/help_topics/hooks.txt:331
12409
msgid ""
12410
"pre_merge\n"
12411
"~~~~~~~~~"
12412
msgstr ""
12413
12414
#: en/help_topics/hooks.txt:336
12415
msgid ""
12416
"Called before a merge. Receives a Merger object as the single\n"
12417
"argument."
12418
msgstr ""
12419
12420
#: en/help_topics/hooks.txt:339
12421
msgid ""
12316
12422
"MergeDirectiveHooks\n"
12317
12423
"-------------------"
12318
12424
msgstr ""
12319
12425
12320
#: en/help_topics/hooks.txt:326
12426
#: en/help_topics/hooks.txt:342
12321
12427
msgid ""
12322
12428
"merge_request_body\n"
12323
12429
"~~~~~~~~~~~~~~~~~~"
12324
12430
msgstr ""
12325
12431
12326
#: en/help_topics/hooks.txt:329
12432
#: en/help_topics/hooks.txt:345
12327
12433
msgid "Introduced in: 1.15.0"
12328
12434
msgstr ""
12329
12435
12330
#: en/help_topics/hooks.txt:331
12436
#: en/help_topics/hooks.txt:347
12331
12437
msgid ""
12332
12438
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12333
12439
"request. Callbacks must return a body. If more than one callback is\n"
12334
12440
"registered, the output of one callback is provided to the next."
12335
12441
msgstr ""
12336
12442
12337
#: en/help_topics/hooks.txt:335
12443
#: en/help_topics/hooks.txt:351
12338
12444
msgid ""
12339
12445
"MessageEditorHooks\n"
12340
12446
"------------------"
12341
12447
msgstr ""
12342
12448
12343
#: en/help_topics/hooks.txt:338
12449
#: en/help_topics/hooks.txt:354
12344
12450
msgid ""
12345
12451
"commit_message_template\n"
12346
12452
"~~~~~~~~~~~~~~~~~~~~~~~"
12347
12453
msgstr ""
12348
12454
12349
#: en/help_topics/hooks.txt:341
12455
#: en/help_topics/hooks.txt:357
12350
12456
msgid "Introduced in: 1.10"
12351
12457
msgstr ""
12352
12458
12353
#: en/help_topics/hooks.txt:343
12459
#: en/help_topics/hooks.txt:359
12354
12460
msgid ""
12355
12461
"Called when a commit message is being generated.\n"
12356
12462
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12361
12467
"second, and so on."
12362
12468
msgstr ""
12363
12469
12364
#: en/help_topics/hooks.txt:351
12470
#: en/help_topics/hooks.txt:367
12365
12471
msgid ""
12366
12472
"set_commit_message\n"
12367
12473
"~~~~~~~~~~~~~~~~~~"
12368
12474
msgstr ""
12369
12475
12370
#: en/help_topics/hooks.txt:356
12476
#: en/help_topics/hooks.txt:372
12371
12477
msgid ""
12372
12478
"Set a fixed commit message. set_commit_message is called with the\n"
12373
12479
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12376
12482
"should use the message editor as normal."
12377
12483
msgstr ""
12378
12484
12379
#: en/help_topics/hooks.txt:362
12485
#: en/help_topics/hooks.txt:378
12380
12486
msgid ""
12381
12487
"MutableTreeHooks\n"
12382
12488
"----------------"
12383
12489
msgstr ""
12384
12490
12385
#: en/help_topics/hooks.txt:368
12491
#: en/help_topics/hooks.txt:381
12492
msgid ""
12493
"post_build_tree\n"
12494
"~~~~~~~~~~~~~~~"
12495
msgstr ""
12496
12497
#: en/help_topics/hooks.txt:386
12498
msgid ""
12499
"Called after a completely new tree is built. The hook is called with\n"
12500
"the tree as its only argument."
12501
msgstr ""
12502
12503
#: en/help_topics/hooks.txt:392
12386
12504
msgid "Introduced in: 2.0"
12387
12505
msgstr ""
12388
12506
12389
#: en/help_topics/hooks.txt:370
12507
#: en/help_topics/hooks.txt:394
12390
12508
msgid ""
12391
12509
"Called after a commit is performed on a tree. The hook is called with\n"
12392
12510
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12394
12512
"that object."
12395
12513
msgstr ""
12396
12514
12397
#: en/help_topics/hooks.txt:375
12515
#: en/help_topics/hooks.txt:399
12398
12516
msgid ""
12399
12517
"start_commit\n"
12400
12518
"~~~~~~~~~~~~"
12401
12519
msgstr ""
12402
12520
12403
#: en/help_topics/hooks.txt:380
12521
#: en/help_topics/hooks.txt:404
12404
12522
msgid ""
12405
12523
"Called before a commit is performed on a tree. The start commit hook\n"
12406
12524
"is able to change the tree before the commit takes place. start_commit\n"
12408
12526
"being performed on."
12409
12527
msgstr ""
12410
12528
12411
#: en/help_topics/hooks.txt:385
12529
#: en/help_topics/hooks.txt:409
12412
12530
msgid ""
12413
12531
"SmartClientHooks\n"
12414
12532
"----------------"
12415
12533
msgstr ""
12416
12534
12417
#: en/help_topics/hooks.txt:388
12535
#: en/help_topics/hooks.txt:412
12418
12536
msgid ""
12419
12537
"call\n"
12420
12538
"~~~~"
12421
12539
msgstr ""
12422
12540
12423
#: en/help_topics/hooks.txt:391
12541
#: en/help_topics/hooks.txt:415
12424
12542
msgid "Introduced in: unknown"
12425
12543
msgstr ""
12426
12544
12427
#: en/help_topics/hooks.txt:393
12545
#: en/help_topics/hooks.txt:417
12428
12546
msgid ""
12429
12547
"Called when the smart client is submitting a request to the smart\n"
12430
12548
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12431
12549
"Streaming request bodies, and responses, are not accessible."
12432
12550
msgstr ""
12433
12551
12434
#: en/help_topics/hooks.txt:397
12552
#: en/help_topics/hooks.txt:421
12435
12553
msgid ""
12436
12554
"SmartServerHooks\n"
12437
12555
"----------------"
12438
12556
msgstr ""
12439
12557
12440
#: en/help_topics/hooks.txt:400
12558
#: en/help_topics/hooks.txt:424
12441
12559
msgid ""
12442
12560
"server_exception\n"
12443
12561
"~~~~~~~~~~~~~~~~"
12444
12562
msgstr ""
12445
12563
12446
#: en/help_topics/hooks.txt:405
12564
#: en/help_topics/hooks.txt:429
12447
12565
msgid ""
12448
12566
"Called by the bzr server when an exception occurs. server_exception is\n"
12449
12567
"called with the sys.exc_info() tuple return true for the hook if the\n"
12451
12569
"normally."
12452
12570
msgstr ""
12453
12571
12454
#: en/help_topics/hooks.txt:410
12572
#: en/help_topics/hooks.txt:434
12455
12573
msgid ""
12456
12574
"server_started\n"
12457
12575
"~~~~~~~~~~~~~~"
12458
12576
msgstr ""
12459
12577
12460
#: en/help_topics/hooks.txt:413
12578
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12461
12579
msgid "Introduced in: 0.16"
12462
12580
msgstr ""
12463
12581
12464
#: en/help_topics/hooks.txt:415
12582
#: en/help_topics/hooks.txt:439
12465
12583
msgid ""
12466
12584
"Called by the bzr server when it starts serving a directory.\n"
12467
12585
"server_started is called with (backing urls, public url), where\n"
12470
12588
"served."
12471
12589
msgstr ""
12472
12590
12473
#: en/help_topics/hooks.txt:421
12591
#: en/help_topics/hooks.txt:445
12474
12592
msgid ""
12475
12593
"server_started_ex\n"
12476
12594
"~~~~~~~~~~~~~~~~~"
12477
12595
msgstr ""
12478
12596
12479
#: en/help_topics/hooks.txt:426
12597
#: en/help_topics/hooks.txt:450
12480
12598
msgid ""
12481
12599
"Called by the bzr server when it starts serving a directory.\n"
12482
12600
"server_started is called with (backing_urls, server_obj)."
12483
12601
msgstr ""
12484
12602
12485
#: en/help_topics/hooks.txt:429
12603
#: en/help_topics/hooks.txt:453
12486
12604
msgid ""
12487
12605
"server_stopped\n"
12488
12606
"~~~~~~~~~~~~~~"
12489
12607
msgstr ""
12490
12608
12491
#: en/help_topics/hooks.txt:434
12609
#: en/help_topics/hooks.txt:458
12492
12610
msgid ""
12493
12611
"Called by the bzr server when it stops serving a directory.\n"
12494
12612
"server_stopped is called with the same parameters as the\n"
12495
12613
"server_started hook: (backing_urls, public_url)."
12496
12614
msgstr ""
12497
12615
12498
#: en/help_topics/hooks.txt:438
12616
#: en/help_topics/hooks.txt:462
12499
12617
msgid ""
12500
12618
"StatusHooks\n"
12501
12619
"-----------"
12502
12620
msgstr ""
12503
12621
12504
#: en/help_topics/hooks.txt:441
12622
#: en/help_topics/hooks.txt:465
12505
12623
msgid ""
12506
12624
"post_status\n"
12507
12625
"~~~~~~~~~~~"
12508
12626
msgstr ""
12509
12627
12510
#: en/help_topics/hooks.txt:444
12628
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12511
12629
msgid "Introduced in: 2.3"
12512
12630
msgstr ""
12513
12631
12514
#: en/help_topics/hooks.txt:446
12632
#: en/help_topics/hooks.txt:470
12515
12633
msgid ""
12516
12634
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12517
12635
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12520
12638
"status command. to_file is the output stream for writing."
12521
12639
msgstr ""
12522
12640
12523
#: en/help_topics/hooks.txt:452
12641
#: en/help_topics/hooks.txt:476
12524
12642
msgid ""
12525
12643
"pre_status\n"
12526
12644
"~~~~~~~~~~"
12527
12645
msgstr ""
12528
12646
12529
#: en/help_topics/hooks.txt:457
12647
#: en/help_topics/hooks.txt:481
12530
12648
msgid ""
12531
12649
"Called with argument StatusHookParams before Bazaar displays the\n"
12532
12650
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12535
12653
"status command. to_file is the output stream for writing."
12536
12654
msgstr ""
12537
12655
12538
#: en/help_topics/hooks.txt:463
12656
#: en/help_topics/hooks.txt:487
12657
msgid ""
12658
"TransportHooks\n"
12659
"--------------"
12660
msgstr ""
12661
12662
#: en/help_topics/hooks.txt:490
12663
msgid ""
12664
"post_connect\n"
12665
"~~~~~~~~~~~~"
12666
msgstr ""
12667
12668
#: en/help_topics/hooks.txt:495
12669
msgid ""
12670
"Called after a new connection is established or a reconnect occurs.\n"
12671
"The sole argument passed is either the connected transport or smart\n"
12672
"medium instance."
12673
msgstr ""
12674
12675
#: en/help_topics/hooks.txt:499
12539
12676
msgid ""
12540
12677
"RioVersionInfoBuilderHooks\n"
12541
12678
"--------------------------"
12542
12679
msgstr ""
12543
12680
12544
#: en/help_topics/hooks.txt:466
12681
#: en/help_topics/hooks.txt:502
12545
12682
msgid ""
12546
12683
"revision\n"
12547
12684
"~~~~~~~~"
12548
12685
msgstr ""
12549
12686
12550
#: en/help_topics/hooks.txt:471
12687
#: en/help_topics/hooks.txt:507
12551
12688
msgid ""
12552
12689
"Invoked when adding information about a revision to the RIO stanza\n"
12553
12690
"that is printed. revision is called with a revision object and a RIO\n"
12859
12996
" is specified, the parent branch is used instead."
12860
12997
msgstr ""
12861
12998
12862
#: en/help_topics/revisionspec.txt:73
12999
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12863
13000
msgid ""
12864
13001
" The common ancestor is the last revision that existed in both\n"
12865
13002
" branches. Usually this is the branch point, but it could also be\n"
12866
13003
" a revision that was merged."
12867
13004
msgstr ""
12868
13005
12869
#: en/help_topics/revisionspec.txt:77
13006
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13007
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13008
#: en/help_topics/revisionspec.txt:153
12870
13009
msgid " Examples::"
12871
13010
msgstr ""
12872
13011
Loggerhead is a web-based interface for Breezy
Version: 2.0.1