« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 158
- compare with another revision
- download diff
- download tarball
- view history from revision 158
- Committer: Max Bowsher
- Date: 2012-07-25 06:26:58 UTC
- mfrom: (156.1.4 maverick) (144.1.23 natty)
- Revision ID: _@maxb.eu-20120725062658-y1i8tqas899zrrs9
Merge from main PPA.
- files added:
- bzrlib/_annotator_pyx.c
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- debian/tests
- files removed:
- bzrlib/_annotator_pyx.c
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- .bzr-builddeb/default.conf => debian/bzr-builddeb.conf
- files modified:
- Makefile
added
removed
po/bzr.pot
8
8
msgstr ""
9
9
"Project-Id-Version: bzr\n"
10
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2011-09-20 10:41+0100\n"
11
"POT-Creation-Date: 2012-02-02 17:39+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:852
25
#: bzrlib/branch.py:872
26
26
msgid "Unstacking"
27
27
msgstr ""
28
28
29
#: bzrlib/branch.py:3138
29
#: bzrlib/branch.py:3205
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr ""
33
33
34
#: bzrlib/branch.py:3140
34
#: bzrlib/branch.py:3207
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] ""
39
39
msgstr[1] ""
40
40
41
#: bzrlib/branch.py:3143
41
#: bzrlib/branch.py:3210
42
42
msgid "No new revisions or tags to push."
43
43
msgstr ""
44
44
45
#: bzrlib/branch.py:3145
45
#: bzrlib/branch.py:3212
46
46
msgid "No new revisions to push."
47
47
msgstr ""
48
48
49
#: bzrlib/branch.py:3165
49
#: bzrlib/branch.py:3232
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3168
53
#: bzrlib/branch.py:3235
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr ""
57
57
58
#: bzrlib/builtins.py:116 bzrlib/builtins.py:2782 bzrlib/workingtree.py:306
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr ""
62
62
63
#: bzrlib/builtins.py:125
63
#: bzrlib/builtins.py:218
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr ""
67
67
68
#: bzrlib/builtins.py:210
68
#: bzrlib/builtins.py:303
69
69
msgid "Display status summary."
70
70
msgstr ""
71
71
72
#: bzrlib/builtins.py:212
72
#: bzrlib/builtins.py:305
73
73
msgid ""
74
74
"This reports on versioned and unknown files, reporting them\n"
75
75
"grouped by state. Possible states are:"
76
76
msgstr ""
77
77
78
#: bzrlib/builtins.py:215
78
#: bzrlib/builtins.py:308
79
79
msgid ""
80
80
"added\n"
81
81
" Versioned in the working copy but not in the previous revision."
82
82
msgstr ""
83
83
84
#: bzrlib/builtins.py:218
84
#: bzrlib/builtins.py:311
85
85
msgid ""
86
86
"removed\n"
87
87
" Versioned in the previous revision but removed or deleted\n"
88
88
" in the working copy."
89
89
msgstr ""
90
90
91
#: bzrlib/builtins.py:222
91
#: bzrlib/builtins.py:315
92
92
msgid ""
93
93
"renamed\n"
94
94
" Path of this file changed from the previous revision;\n"
96
96
" parent directory was renamed."
97
97
msgstr ""
98
98
99
#: bzrlib/builtins.py:227
99
#: bzrlib/builtins.py:320
100
100
msgid ""
101
101
"modified\n"
102
102
" Text has changed since the previous revision."
103
103
msgstr ""
104
104
105
#: bzrlib/builtins.py:230
105
#: bzrlib/builtins.py:323
106
106
msgid ""
107
107
"kind changed\n"
108
108
" File kind has been changed (e.g. from file to directory)."
109
109
msgstr ""
110
110
111
#: bzrlib/builtins.py:233
111
#: bzrlib/builtins.py:326
112
112
msgid ""
113
113
"unknown\n"
114
114
" Not versioned and not matching an ignore pattern."
115
115
msgstr ""
116
116
117
#: bzrlib/builtins.py:236
117
#: bzrlib/builtins.py:329
118
118
msgid ""
119
119
"Additionally for directories, symlinks and files with a changed\n"
120
120
"executable bit, Bazaar indicates their type using a trailing\n"
122
122
"disabled using the '--no-classify' option."
123
123
msgstr ""
124
124
125
#: bzrlib/builtins.py:241
125
#: bzrlib/builtins.py:334
126
126
msgid ""
127
127
"To see ignored files use 'bzr ignored'. For details on the\n"
128
128
"changes to file texts, use 'bzr diff'."
129
129
msgstr ""
130
130
131
#: bzrlib/builtins.py:244
131
#: bzrlib/builtins.py:337
132
132
msgid ""
133
133
"Note that --short or -S gives status flags for each item, similar\n"
134
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
135
"use bzr status -SV."
136
136
msgstr ""
137
137
138
#: bzrlib/builtins.py:248
138
#: bzrlib/builtins.py:341
139
139
msgid ""
140
140
"If no arguments are specified, the status of the entire working\n"
141
141
"directory is shown. Otherwise, only the status of the specified\n"
143
143
"is reported for everything inside that directory."
144
144
msgstr ""
145
145
146
#: bzrlib/builtins.py:253
146
#: bzrlib/builtins.py:346
147
147
msgid ""
148
148
"Before merges are committed, the pending merge tip revisions are\n"
149
149
"shown. To see all pending merge revisions, use the -v option.\n"
151
151
"the no-pending option or specify a file/directory."
152
152
msgstr ""
153
153
154
#: bzrlib/builtins.py:258
154
#: bzrlib/builtins.py:351
155
155
msgid ""
156
156
"To compare the working directory to a specific revision, pass a\n"
157
157
"single revision to the revision argument."
158
158
msgstr ""
159
159
160
#: bzrlib/builtins.py:261
160
#: bzrlib/builtins.py:354
161
161
msgid ""
162
162
"To see which files have changed in a specific revision, or between\n"
163
163
"two revisions, pass a revision range to the revision argument.\n"
165
165
msgstr ""
166
166
167
167
# help of 'short' option of 'status' command
168
#: bzrlib/builtins.py:270
168
#: bzrlib/builtins.py:363
169
169
msgid "Use short status indicators."
170
170
msgstr ""
171
171
172
172
# help of 'versioned' option of 'status' command
173
#: bzrlib/builtins.py:272
173
#: bzrlib/builtins.py:365
174
174
msgid "Only show versioned files."
175
175
msgstr ""
176
176
177
177
# help of 'no-pending' option of 'status' command
178
#: bzrlib/builtins.py:274
178
#: bzrlib/builtins.py:367
179
179
msgid "Don't show pending merges."
180
180
msgstr ""
181
181
182
182
# help of 'no-classify' option of 'status' command
183
#: bzrlib/builtins.py:277
183
#: bzrlib/builtins.py:370
184
184
msgid "Do not mark object type using indicator."
185
185
msgstr ""
186
186
187
#: bzrlib/builtins.py:292
187
#: bzrlib/builtins.py:385
188
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
189
msgstr ""
190
190
191
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4927
191
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
192
192
msgid "You can only supply one of revision_id or --revision"
193
193
msgstr ""
194
194
195
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4929
195
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
196
196
msgid "You must supply either --revision or a revision_id"
197
197
msgstr ""
198
198
199
#: bzrlib/builtins.py:346
199
#: bzrlib/builtins.py:439
200
200
#, python-format
201
201
msgid "Repository %r does not support access to raw revision texts"
202
202
msgstr ""
203
203
204
#: bzrlib/builtins.py:357
204
#: bzrlib/builtins.py:450
205
205
msgid "The repository {0} contains no revision {1}."
206
206
msgstr ""
207
207
208
#: bzrlib/builtins.py:364
208
#: bzrlib/builtins.py:457
209
209
msgid "You cannot specify a NULL revision."
210
210
msgstr ""
211
211
212
#: bzrlib/builtins.py:456
212
#: bzrlib/builtins.py:549
213
213
msgid "Remove the working tree from a given branch/checkout."
214
214
msgstr ""
215
215
216
#: bzrlib/builtins.py:458
216
#: bzrlib/builtins.py:551
217
217
msgid ""
218
218
"Since a lightweight checkout is little more than a working tree\n"
219
219
"this will refuse to run against one."
220
220
msgstr ""
221
221
222
#: bzrlib/builtins.py:461
222
#: bzrlib/builtins.py:554
223
223
msgid "To re-create the working tree, use \"bzr checkout\"."
224
224
msgstr ""
225
225
226
226
# help of 'force' option of 'remove-tree' command
227
#: bzrlib/builtins.py:467
227
#: bzrlib/builtins.py:560
228
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
229
msgstr ""
230
230
231
#: bzrlib/builtins.py:481
231
#: bzrlib/builtins.py:574
232
232
msgid "No working tree to remove"
233
233
msgstr ""
234
234
235
#: bzrlib/builtins.py:483
235
#: bzrlib/builtins.py:576
236
236
msgid "You cannot remove the working tree of a remote path"
237
237
msgstr ""
238
238
239
#: bzrlib/builtins.py:492
239
#: bzrlib/builtins.py:585
240
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
241
msgstr ""
242
242
243
#: bzrlib/builtins.py:532
243
#: bzrlib/builtins.py:625
244
244
msgid ""
245
245
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
246
246
"instead. Use \"--force\" if you are sure you want to reset the working tree."
247
247
msgstr ""
248
248
249
#: bzrlib/builtins.py:543
249
#: bzrlib/builtins.py:636
250
250
msgid ""
251
251
", the header appears corrupt, try passing -r -1 to set the state to the last "
252
252
"commit"
253
253
msgstr ""
254
254
255
#: bzrlib/builtins.py:547
255
#: bzrlib/builtins.py:640
256
256
msgid "failed to reset the tree state{0}"
257
257
msgstr ""
258
258
259
#: bzrlib/builtins.py:551
259
#: bzrlib/builtins.py:644
260
260
msgid "Show current revision number."
261
261
msgstr ""
262
262
263
#: bzrlib/builtins.py:553
263
#: bzrlib/builtins.py:646
264
264
msgid "This is equal to the number of revisions on this branch."
265
265
msgstr ""
266
266
267
#: bzrlib/builtins.py:659
268
msgid "--tree and --revision can not be used together"
269
msgstr ""
270
271
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
272
msgid "Tags can only be placed on a single revision, not on a range"
273
msgstr ""
274
267
275
# help of 'tree' option of 'revno' command
268
#: bzrlib/builtins.py:594
269
msgid "Show revno of working tree"
276
#: bzrlib/builtins.py:700
277
msgid "Show revno of working tree."
270
278
msgstr ""
271
279
272
#: bzrlib/builtins.py:642
280
#: bzrlib/builtins.py:748
273
281
msgid "Add specified files or directories."
274
282
msgstr ""
275
283
276
#: bzrlib/builtins.py:644
284
#: bzrlib/builtins.py:750
277
285
msgid ""
278
286
"In non-recursive mode, all the named items are added, regardless\n"
279
287
"of whether they were previously ignored. A warning is given if\n"
280
288
"any of the named files are already versioned."
281
289
msgstr ""
282
290
283
#: bzrlib/builtins.py:648
291
#: bzrlib/builtins.py:754
284
292
msgid ""
285
293
"In recursive mode (the default), files are treated the same way\n"
286
294
"but the behaviour for directories is different. Directories that\n"
291
299
"directories. If no names are given '.' is assumed."
292
300
msgstr ""
293
301
294
#: bzrlib/builtins.py:656
302
#: bzrlib/builtins.py:762
303
msgid ""
304
"A warning will be printed when nested trees are encountered,\n"
305
"unless they are explicitly ignored."
306
msgstr ""
307
308
#: bzrlib/builtins.py:765
295
309
msgid ""
296
310
"Therefore simply saying 'bzr add' will version all files that\n"
297
311
"are currently unknown."
298
312
msgstr ""
299
313
300
#: bzrlib/builtins.py:659
314
#: bzrlib/builtins.py:768
301
315
msgid ""
302
316
"Adding a file whose parent directory is not versioned will\n"
303
317
"implicitly add the parent, and so on up to the root. This means\n"
305
319
"get added when you add a file in the directory."
306
320
msgstr ""
307
321
308
#: bzrlib/builtins.py:664
322
#: bzrlib/builtins.py:773
309
323
msgid ""
310
324
"--dry-run will show which files would be added, but not actually\n"
311
325
"add them."
312
326
msgstr ""
313
327
314
#: bzrlib/builtins.py:667
328
#: bzrlib/builtins.py:776
315
329
msgid ""
316
330
"--file-ids-from will try to use the file ids from the supplied path.\n"
317
331
"It looks up ids trying to find a matching parent directory with the\n"
322
336
"into a subdirectory of this one."
323
337
msgstr ""
324
338
325
#: bzrlib/builtins.py:675
339
#: bzrlib/builtins.py:784
326
340
msgid ""
327
341
"Any files matching patterns in the ignore list will not be added\n"
328
342
"unless they are explicitly mentioned."
329
343
msgstr ""
330
344
331
#: bzrlib/builtins.py:678
345
#: bzrlib/builtins.py:787
332
346
msgid ""
333
347
"In recursive mode, files larger than the configuration option \n"
334
348
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
336
350
msgstr ""
337
351
338
352
# help of 'no-recurse' option of 'add' command
339
#: bzrlib/builtins.py:685
353
#: bzrlib/builtins.py:794
340
354
msgid "Don't recursively add the contents of directories."
341
355
msgstr ""
342
356
343
357
# help of 'file-ids-from' option of 'add' command
344
#: bzrlib/builtins.py:691
358
#: bzrlib/builtins.py:800
345
359
msgid "Lookup file ids from this tree."
346
360
msgstr ""
347
361
348
#: bzrlib/builtins.py:727
362
#: bzrlib/builtins.py:836
349
363
msgid "ignored {0} matching \"{1}\"\n"
350
364
msgstr ""
351
365
352
#: bzrlib/builtins.py:732
366
#: bzrlib/builtins.py:841
353
367
msgid "Create a new versioned directory."
354
368
msgstr ""
355
369
356
#: bzrlib/builtins.py:734
370
#: bzrlib/builtins.py:843
357
371
msgid "This is equivalent to creating the directory and then adding it."
358
372
msgstr ""
359
373
360
#: bzrlib/builtins.py:748
374
# help of 'parents' option of 'mkdir' command
375
#: bzrlib/builtins.py:850
376
msgid "No error if existing, make parent directories as needed."
377
msgstr ""
378
379
#: bzrlib/builtins.py:884
361
380
#, python-format
362
381
msgid "added %s\n"
363
382
msgstr ""
364
383
365
#: bzrlib/builtins.py:792
384
#: bzrlib/builtins.py:926
366
385
#, python-format
367
386
msgid "invalid kind %r specified"
368
387
msgstr ""
369
388
370
#: bzrlib/builtins.py:829
389
#: bzrlib/builtins.py:963
371
390
msgid "Move or rename a file."
372
391
msgstr ""
373
392
374
#: bzrlib/builtins.py:831
393
#: bzrlib/builtins.py:965
375
394
msgid " bzr mv SOURCE... DESTINATION"
376
395
msgstr ""
377
396
378
#: bzrlib/builtins.py:833
397
#: bzrlib/builtins.py:967
379
398
msgid ""
380
399
"If the last argument is a versioned directory, all the other names\n"
381
400
"are moved into it. Otherwise, there must be exactly two arguments\n"
382
401
"and the file is changed to a new name."
383
402
msgstr ""
384
403
385
#: bzrlib/builtins.py:837
404
#: bzrlib/builtins.py:971
386
405
msgid ""
387
406
"If OLDNAME does not exist on the filesystem but is versioned and\n"
388
407
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
391
410
"The same is valid when moving many SOURCE files to a DESTINATION."
392
411
msgstr ""
393
412
394
#: bzrlib/builtins.py:843
413
#: bzrlib/builtins.py:977
395
414
msgid "Files cannot be moved between branches."
396
415
msgstr ""
397
416
398
417
# help of 'after' option of 'mv' command
399
#: bzrlib/builtins.py:850
418
#: bzrlib/builtins.py:984
400
419
msgid ""
401
420
"Move only the bzr identifier of the file, because the file has already been "
402
421
"moved."
403
422
msgstr ""
404
423
405
424
# help of 'auto' option of 'mv' command
406
#: bzrlib/builtins.py:852
425
#: bzrlib/builtins.py:986
407
426
msgid "Automatically guess renames."
408
427
msgstr ""
409
428
410
429
# help of 'dry-run' option of 'mv' command
411
#: bzrlib/builtins.py:853
430
#: bzrlib/builtins.py:987
412
431
msgid "Avoid making changes when guessing renames."
413
432
msgstr ""
414
433
415
#: bzrlib/builtins.py:862
434
#: bzrlib/builtins.py:996
416
435
msgid "--dry-run requires --auto."
417
436
msgstr ""
418
437
419
#: bzrlib/builtins.py:866
438
#: bzrlib/builtins.py:1000
420
439
msgid "missing file argument"
421
440
msgstr ""
422
441
423
#: bzrlib/builtins.py:873
442
#: bzrlib/builtins.py:1004
443
msgid "can not move root of branch"
444
msgstr ""
445
446
#: bzrlib/builtins.py:1010
424
447
msgid "Only one path may be specified to --auto."
425
448
msgstr ""
426
449
427
#: bzrlib/builtins.py:876
450
#: bzrlib/builtins.py:1013
428
451
msgid "--after cannot be specified with --auto."
429
452
msgstr ""
430
453
431
#: bzrlib/builtins.py:913
454
#: bzrlib/builtins.py:1050
432
455
msgid "to mv multiple files the destination must be a versioned directory"
433
456
msgstr ""
434
457
435
#: bzrlib/builtins.py:965
458
#: bzrlib/builtins.py:1102
436
459
msgid "Turn this branch into a mirror of another branch."
437
460
msgstr ""
438
461
439
#: bzrlib/builtins.py:967
462
#: bzrlib/builtins.py:1104
440
463
msgid ""
441
464
"By default, this command only works on branches that have not diverged.\n"
442
465
"Branches are considered diverged if the destination branch's most recent \n"
444
467
"parent."
445
468
msgstr ""
446
469
447
#: bzrlib/builtins.py:972
470
#: bzrlib/builtins.py:1109
448
471
msgid ""
449
472
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
450
473
"from one into the other. Once one branch has merged, the other should\n"
451
474
"be able to pull it again."
452
475
msgstr ""
453
476
454
#: bzrlib/builtins.py:976
477
#: bzrlib/builtins.py:1113
455
478
msgid ""
456
479
"If you want to replace your local changes and just want your branch to\n"
457
480
"match the remote one, use pull --overwrite. This will work even if the two\n"
458
481
"branches have diverged."
459
482
msgstr ""
460
483
461
#: bzrlib/builtins.py:980
484
#: bzrlib/builtins.py:1117
462
485
msgid ""
463
486
"If there is no default location set, the first pull will set it (use\n"
464
487
"--no-remember to avoid setting it). After that, you can omit the\n"
466
489
"value will only be saved if the remote location can be accessed."
467
490
msgstr ""
468
491
469
#: bzrlib/builtins.py:985
492
#: bzrlib/builtins.py:1122
493
msgid ""
494
"The --verbose option will display the revisions pulled using the log_format\n"
495
"configuration option. You can use a different format by overriding it with\n"
496
"-Olog_format=<other_format>."
497
msgstr ""
498
499
#: bzrlib/builtins.py:1126
470
500
msgid ""
471
501
"Note: The location can be specified either in the form of a branch,\n"
472
502
"or in the form of a path to a file containing a merge directive generated\n"
474
504
msgstr ""
475
505
476
506
# help of 'verbose' option of 'pull' command
477
#: bzrlib/builtins.py:993
507
#: bzrlib/builtins.py:1134
478
508
msgid "Show logs of pulled revisions."
479
509
msgstr ""
480
510
481
511
# help of 'directory' option of 'pull' command
482
#: bzrlib/builtins.py:995
512
#: bzrlib/builtins.py:1136
483
513
msgid ""
484
514
"Branch to pull into, rather than the one containing the working directory."
485
515
msgstr ""
486
516
487
517
# help of 'local' option of 'pull' command
488
#: bzrlib/builtins.py:998
518
#: bzrlib/builtins.py:1139
489
519
msgid ""
490
520
"Perform a local pull in a bound branch. Local pulls are not applied to the "
491
521
"master branch."
492
522
msgstr ""
493
523
494
#: bzrlib/builtins.py:1027
524
#: bzrlib/builtins.py:1168
495
525
msgid "Need working tree for --show-base."
496
526
msgstr ""
497
527
498
#: bzrlib/builtins.py:1043
528
#: bzrlib/builtins.py:1184
499
529
msgid "No pull location known or specified."
500
530
msgstr ""
501
531
502
#: bzrlib/builtins.py:1049
532
#: bzrlib/builtins.py:1190
503
533
#, python-format
504
534
msgid "Using saved parent location: %s\n"
505
535
msgstr ""
506
536
507
#: bzrlib/builtins.py:1056 bzrlib/builtins.py:4137
537
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
508
538
msgid "Cannot use -r with merge directives or bundles"
509
539
msgstr ""
510
540
511
#: bzrlib/builtins.py:1097
541
#: bzrlib/builtins.py:1238
512
542
msgid "Update a mirror of this branch."
513
543
msgstr ""
514
544
515
#: bzrlib/builtins.py:1099
545
#: bzrlib/builtins.py:1240
516
546
msgid ""
517
547
"The target branch will not have its working tree populated because this\n"
518
548
"is both expensive, and is not supported on remote file systems."
519
549
msgstr ""
520
550
521
#: bzrlib/builtins.py:1102
551
#: bzrlib/builtins.py:1243
522
552
msgid ""
523
553
"Some smart servers or protocols *may* put the working tree in place in\n"
524
554
"the future."
525
555
msgstr ""
526
556
527
#: bzrlib/builtins.py:1105
557
#: bzrlib/builtins.py:1246
528
558
msgid ""
529
559
"This command only works on branches that have not diverged. Branches are\n"
530
560
"considered diverged if the destination branch's most recent commit is one\n"
531
561
"that has not been merged (directly or indirectly) by the source branch."
532
562
msgstr ""
533
563
534
#: bzrlib/builtins.py:1109
564
#: bzrlib/builtins.py:1250
535
565
msgid ""
536
566
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
537
567
"the other branch completely, discarding its unmerged changes."
538
568
msgstr ""
539
569
540
#: bzrlib/builtins.py:1112
570
#: bzrlib/builtins.py:1253
541
571
msgid ""
542
572
"If you want to ensure you have the different changes in the other branch,\n"
543
573
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
544
574
"After that you will be able to do a push without '--overwrite'."
545
575
msgstr ""
546
576
547
#: bzrlib/builtins.py:1116
577
#: bzrlib/builtins.py:1257
548
578
msgid ""
549
579
"If there is no default push location set, the first push will set it (use\n"
550
580
"--no-remember to avoid setting it). After that, you can omit the\n"
552
582
"value will only be saved if the remote location can be accessed."
553
583
msgstr ""
554
584
585
#: bzrlib/builtins.py:1262
586
msgid ""
587
"The --verbose option will display the revisions pushed using the log_format\n"
588
"configuration option. You can use a different format by overriding it with\n"
589
"-Olog_format=<other_format>."
590
msgstr ""
591
592
# help of 'directory' option of 'dpush' command
555
593
# help of 'directory' option of 'push' command
556
#: bzrlib/builtins.py:1128
594
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
557
595
msgid ""
558
596
"Branch to push from, rather than the one containing the working directory."
559
597
msgstr ""
560
598
561
599
# help of 'use-existing-dir' option of 'push' command
562
#: bzrlib/builtins.py:1131
600
#: bzrlib/builtins.py:1276
563
601
msgid ""
564
602
"By default push will fail if the target directory exists, but does not "
565
603
"already have a control directory. This flag will allow push to proceed."
566
604
msgstr ""
567
605
568
606
# help of 'stacked' option of 'push' command
569
#: bzrlib/builtins.py:1136
607
#: bzrlib/builtins.py:1281
570
608
msgid ""
571
609
"Create a stacked branch that references the public location of the parent "
572
610
"branch."
573
611
msgstr ""
574
612
575
613
# help of 'stacked-on' option of 'push' command
576
#: bzrlib/builtins.py:1139
614
#: bzrlib/builtins.py:1284
577
615
msgid ""
578
616
"Create a stacked branch that refers to another branch for the commit "
579
617
"history. Only the work not present in the referenced branch is included in "
580
618
"the branch created."
581
619
msgstr ""
582
620
621
# help of 'strict' option of 'dpush' command
583
622
# help of 'strict' option of 'push' command
584
#: bzrlib/builtins.py:1144
623
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
585
624
msgid ""
586
625
"Refuse to push if there are uncommitted changes in the working tree, --no-"
587
626
"strict disables the check."
588
627
msgstr ""
589
628
590
629
# help of 'no-tree' option of 'push' command
591
#: bzrlib/builtins.py:1147
630
#: bzrlib/builtins.py:1292
592
631
msgid "Don't populate the working tree, even for protocols that support it."
593
632
msgstr ""
594
633
595
#: bzrlib/builtins.py:1191
634
#: bzrlib/builtins.py:1336
596
635
msgid "Could not determine branch to refer to."
597
636
msgstr ""
598
637
599
#: bzrlib/builtins.py:1198 bzrlib/foreign.py:306
638
#: bzrlib/builtins.py:1345
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:1351 bzrlib/foreign.py:306
600
646
msgid "No push location known or specified."
601
647
msgstr ""
602
648
603
#: bzrlib/builtins.py:1202
649
#: bzrlib/builtins.py:1355
604
650
#, python-format
605
651
msgid "Using saved push location: %s"
606
652
msgstr ""
607
653
608
#: bzrlib/builtins.py:1212
654
#: bzrlib/builtins.py:1365
609
655
msgid "Create a new branch that is a copy of an existing branch."
610
656
msgstr ""
611
657
612
#: bzrlib/builtins.py:1214
658
#: bzrlib/builtins.py:1367
613
659
msgid ""
614
660
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
615
661
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
620
666
"create ./foo-bar."
621
667
msgstr ""
622
668
623
#: bzrlib/builtins.py:1221
669
#: bzrlib/builtins.py:1374
624
670
msgid ""
625
671
"To retrieve the branch as of a particular revision, supply the --revision\n"
626
672
"parameter, as in \"branch foo/bar -r 5\"."
627
673
msgstr ""
628
674
629
#: bzrlib/builtins.py:1224
675
#: bzrlib/builtins.py:1377
630
676
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
631
677
msgstr ""
632
678
633
679
# help of 'no-tree' option of 'branch' command
634
#: bzrlib/builtins.py:1234
680
#: bzrlib/builtins.py:1387
635
681
msgid "Create a branch without a working-tree."
636
682
msgstr ""
637
683
638
684
# help of 'switch' option of 'branch' command
639
#: bzrlib/builtins.py:1236
685
#: bzrlib/builtins.py:1389
640
686
msgid "Switch the checkout in the current directory to the new branch."
641
687
msgstr ""
642
688
643
689
# help of 'stacked' option of 'branch' command
644
#: bzrlib/builtins.py:1239
690
#: bzrlib/builtins.py:1392
645
691
msgid ""
646
692
"Create a stacked branch referring to the source branch. The new branch will "
647
693
"depend on the availability of the source branch for all operations."
648
694
msgstr ""
649
695
650
696
# help of 'standalone' option of 'branch' command
651
#: bzrlib/builtins.py:1243
697
#: bzrlib/builtins.py:1396
652
698
msgid "Do not use a shared repository, even if available."
653
699
msgstr ""
654
700
655
701
# help of 'use-existing-dir' option of 'branch' command
656
#: bzrlib/builtins.py:1245
702
#: bzrlib/builtins.py:1398
657
703
msgid ""
658
704
"By default branch will fail if the target directory exists, but does not "
659
705
"already have a control directory. This flag will allow branch to proceed."
660
706
msgstr ""
661
707
662
708
# help of 'bind' option of 'branch' command
663
#: bzrlib/builtins.py:1250
709
#: bzrlib/builtins.py:1403
664
710
msgid "Bind new branch to from location."
665
711
msgstr ""
666
712
667
#: bzrlib/builtins.py:1291
713
#: bzrlib/builtins.py:1450
668
714
#, python-format
669
715
msgid "Target directory \"%s\" already exists."
670
716
msgstr ""
671
717
672
#: bzrlib/builtins.py:1301
718
#: bzrlib/builtins.py:1462
673
719
#, python-format
674
720
msgid "Parent of \"%s\" does not exist."
675
721
msgstr ""
676
722
677
#: bzrlib/builtins.py:1315
723
#: bzrlib/builtins.py:1481
678
724
msgid "The branch {0} has no revision {1}."
679
725
msgstr ""
680
726
681
#: bzrlib/builtins.py:1323 bzrlib/push.py:51
727
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
682
728
#, python-format
683
729
msgid "Created new stacked branch referring to %s."
684
730
msgstr ""
685
731
686
#: bzrlib/builtins.py:1327
732
#: bzrlib/builtins.py:1500
687
733
#, python-format
688
734
msgid "Branched %d revision."
689
735
msgid_plural "Branched %d revisions."
690
736
msgstr[0] ""
691
737
msgstr[1] ""
692
738
693
#: bzrlib/builtins.py:1332
739
#: bzrlib/builtins.py:1505
694
740
#, python-format
695
741
msgid "New branch bound to %s"
696
742
msgstr ""
697
743
698
#: bzrlib/builtins.py:1337 bzrlib/builtins.py:5968
744
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
699
745
#, python-format
700
746
msgid "Switched to branch: %s"
701
747
msgstr ""
702
748
703
#: bzrlib/builtins.py:1342
749
#: bzrlib/builtins.py:1515
704
750
msgid "List the branches available at the current location."
705
751
msgstr ""
706
752
707
#: bzrlib/builtins.py:1344
708
msgid ""
709
"This command will print the names of all the branches at the current "
710
"location."
711
msgstr ""
712
713
#: bzrlib/builtins.py:1353
714
msgid " (default)\n"
715
msgstr ""
716
717
#: bzrlib/builtins.py:1359
753
#: bzrlib/builtins.py:1517
754
msgid ""
755
"This command will print the names of all the branches at the current\n"
756
"location."
757
msgstr ""
758
759
# help of 'recursive' option of 'branches' command
760
#: bzrlib/builtins.py:1524
761
msgid ""
762
"Recursively scan for branches rather than just looking in the specified "
763
"location."
764
msgstr ""
765
766
#: bzrlib/builtins.py:1554
767
msgid "(default)"
768
msgstr ""
769
770
#: bzrlib/builtins.py:1566
718
771
msgid "Create a new checkout of an existing branch."
719
772
msgstr ""
720
773
721
#: bzrlib/builtins.py:1361
774
#: bzrlib/builtins.py:1568
722
775
msgid ""
723
776
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
724
777
"for\n"
728
781
"location using SFTP."
729
782
msgstr ""
730
783
731
#: bzrlib/builtins.py:1366
784
#: bzrlib/builtins.py:1573
732
785
msgid ""
733
786
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
734
787
"will\n"
740
793
"create ./foo-bar."
741
794
msgstr ""
742
795
743
#: bzrlib/builtins.py:1373
796
#: bzrlib/builtins.py:1580
744
797
msgid ""
745
798
"To retrieve the branch as of a particular revision, supply the --revision\n"
746
799
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
751
804
msgstr ""
752
805
753
806
# help of 'lightweight' option of 'checkout' command
754
#: bzrlib/builtins.py:1383
807
#: bzrlib/builtins.py:1590
755
808
msgid ""
756
809
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
757
810
"the branch for every operation. Normal checkouts can perform common "
760
813
msgstr ""
761
814
762
815
# help of 'files-from' option of 'branch' command
763
#: bzrlib/builtins.py:1390
816
# help of 'files-from' option of 'checkout' command
817
#: bzrlib/builtins.py:1597
764
818
msgid "Get file contents from this tree."
765
819
msgstr ""
766
820
767
821
# help of 'hardlink' option of 'branch' command
768
#: bzrlib/builtins.py:1392
822
# help of 'hardlink' option of 'checkout' command
823
#: bzrlib/builtins.py:1599
769
824
msgid "Hard-link working tree files where possible."
770
825
msgstr ""
771
826
772
#: bzrlib/builtins.py:1433
827
#: bzrlib/builtins.py:1640
773
828
msgid ""
774
829
"Show list of renamed files.\n"
775
830
" "
776
831
msgstr ""
777
832
778
#: bzrlib/builtins.py:1463
779
msgid "Update a tree to have the latest code committed to its branch."
780
msgstr ""
781
782
#: bzrlib/builtins.py:1465
783
msgid ""
784
"This will perform a merge into the working tree, and may generate\n"
785
"conflicts. If you have any local changes, you will still\n"
786
"need to commit them after the update for the update to be complete."
787
msgstr ""
788
789
#: bzrlib/builtins.py:1469
790
msgid ""
791
"If you want to discard your local changes, you can just do a\n"
792
"'bzr revert' instead of 'bzr commit' after the update."
793
msgstr ""
794
795
#: bzrlib/builtins.py:1472
796
msgid ""
797
"If you want to restore a file that has been removed locally, use\n"
798
"'bzr revert' instead of 'bzr update'."
799
msgstr ""
800
801
#: bzrlib/builtins.py:1475
802
msgid ""
803
"If the tree's branch is bound to a master branch, it will also update\n"
833
#: bzrlib/builtins.py:1670
834
msgid "Update a working tree to a new revision."
835
msgstr ""
836
837
#: bzrlib/builtins.py:1672
838
msgid ""
839
"This will perform a merge of the destination revision (the tip of the\n"
840
"branch, or the specified revision) into the working tree, and then make\n"
841
"that revision the basis revision for the working tree. "
842
msgstr ""
843
844
#: bzrlib/builtins.py:1676
845
msgid ""
846
"You can use this to visit an older revision, or to update a working tree\n"
847
"that is out of date from its branch."
848
msgstr ""
849
850
#: bzrlib/builtins.py:1679
851
msgid ""
852
"If there are any uncommitted changes in the tree, they will be carried\n"
853
"across and remain as uncommitted changes after the update. To discard\n"
854
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
855
"with the changes brought in by the change in basis revision."
856
msgstr ""
857
858
#: bzrlib/builtins.py:1684
859
msgid ""
860
"If the tree's branch is bound to a master branch, bzr will also update\n"
804
861
"the branch from the master."
805
862
msgstr ""
806
863
807
#: bzrlib/builtins.py:1490
864
#: bzrlib/builtins.py:1687
865
msgid ""
866
"You cannot update just a single file or directory, because each Bazaar\n"
867
"working tree has just a single basis revision. If you want to restore a\n"
868
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
869
"update'. If you want to restore a file to its state in a previous\n"
870
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
871
"out the old content of that file to a new location."
872
msgstr ""
873
874
#: bzrlib/builtins.py:1694
875
msgid ""
876
"The 'dir' argument, if given, must be the location of the root of a\n"
877
"working tree to update. By default, the working tree that contains the \n"
878
"current working directory is used."
879
msgstr ""
880
881
#: bzrlib/builtins.py:1710
808
882
msgid "bzr update --revision takes exactly one revision"
809
883
msgstr ""
810
884
811
#: bzrlib/builtins.py:1521
885
#: bzrlib/builtins.py:1718
886
msgid "bzr update can only update a whole tree, not a file or subdirectory"
887
msgstr ""
888
889
#: bzrlib/builtins.py:1749
812
890
msgid "Tree is up to date at revision {0} of branch {1}"
813
891
msgstr ""
814
892
815
#: bzrlib/builtins.py:1537
893
#: bzrlib/builtins.py:1765
816
894
#, python-format
817
895
msgid ""
818
896
"branch has no revision %s\n"
819
897
"bzr update --revision only works for a revision in the branch history"
820
898
msgstr ""
821
899
822
#: bzrlib/builtins.py:1543
900
#: bzrlib/builtins.py:1771
823
901
msgid "Updated to revision {0} of branch {1}"
824
902
msgstr ""
825
903
826
#: bzrlib/builtins.py:1547
904
#: bzrlib/builtins.py:1775
827
905
msgid ""
828
906
"Your local commits will now show as pending merges with 'bzr status', and "
829
907
"can be committed with 'bzr commit'."
830
908
msgstr ""
831
909
832
#: bzrlib/builtins.py:1556
910
#: bzrlib/builtins.py:1784
833
911
msgid "Show information about a working tree, branch or repository."
834
912
msgstr ""
835
913
836
#: bzrlib/builtins.py:1558
914
#: bzrlib/builtins.py:1786
837
915
msgid ""
838
916
"This command will show all known locations and formats associated to the\n"
839
917
"tree, branch or repository."
840
918
msgstr ""
841
919
842
#: bzrlib/builtins.py:1561
920
#: bzrlib/builtins.py:1789
843
921
msgid ""
844
922
"In verbose mode, statistical information is included with each report.\n"
845
923
"To see extended statistic information, use a verbosity level of 2 or\n"
846
924
"higher by specifying the verbose option multiple times, e.g. -vv."
847
925
msgstr ""
848
926
849
#: bzrlib/builtins.py:1565
927
#: bzrlib/builtins.py:1793
850
928
msgid "Branches and working trees will also report any missing revisions."
851
929
msgstr ""
852
930
853
#: bzrlib/builtins.py:1569
931
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
932
#: bzrlib/builtins.py:6442
933
msgid ":Examples:"
934
msgstr ""
935
936
#: bzrlib/builtins.py:1797
854
937
msgid " Display information on the format and related locations:"
855
938
msgstr ""
856
939
857
#: bzrlib/builtins.py:1571
940
#: bzrlib/builtins.py:1799
858
941
msgid " bzr info"
859
942
msgstr ""
860
943
861
#: bzrlib/builtins.py:1573
944
#: bzrlib/builtins.py:1801
862
945
msgid ""
863
946
" Display the above together with extended format information and\n"
864
947
" basic statistics (like the number of files in the working tree and\n"
865
948
" number of revisions in the branch and repository):"
866
949
msgstr ""
867
950
868
#: bzrlib/builtins.py:1577
951
#: bzrlib/builtins.py:1805
869
952
msgid " bzr info -v"
870
953
msgstr ""
871
954
872
#: bzrlib/builtins.py:1579
955
#: bzrlib/builtins.py:1807
873
956
msgid " Display the above together with number of committers to the branch:"
874
957
msgstr ""
875
958
876
#: bzrlib/builtins.py:1581
959
#: bzrlib/builtins.py:1809
877
960
msgid " bzr info -vv"
878
961
msgstr ""
879
962
880
#: bzrlib/builtins.py:1600
963
#: bzrlib/builtins.py:1828
881
964
msgid "Remove files or directories."
882
965
msgstr ""
883
966
884
#: bzrlib/builtins.py:1602
967
#: bzrlib/builtins.py:1830
885
968
msgid ""
886
969
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
887
970
"delete them if they can easily be recovered using revert otherwise they\n"
891
974
msgstr ""
892
975
893
976
# help of 'new' option of 'remove' command
894
#: bzrlib/builtins.py:1610
977
#: bzrlib/builtins.py:1838
895
978
msgid "Only remove files that have never been committed."
896
979
msgstr ""
897
980
898
981
# help of 'file-deletion-strategy' option of 'remove' command
899
#: bzrlib/builtins.py:1612
982
#: bzrlib/builtins.py:1840
900
983
msgid "The file deletion mode to be used."
901
984
msgstr ""
902
985
903
986
# title of 'file-deletion-strategy' option of 'remove' command
904
#: bzrlib/builtins.py:1613
987
#: bzrlib/builtins.py:1841
905
988
msgid "Deletion Strategy"
906
989
msgstr ""
907
990
908
#: bzrlib/builtins.py:1626
991
# help of 'file-deletion-strategy=safe' option of 'remove' command
992
#: bzrlib/builtins.py:1842
993
msgid "Backup changed files (default)."
994
msgstr ""
995
996
# help of 'file-deletion-strategy=keep' option of 'remove' command
997
#: bzrlib/builtins.py:1843
998
msgid "Delete from bzr but leave the working copy."
999
msgstr ""
1000
1001
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
1002
#: bzrlib/builtins.py:1844
1003
msgid "Don't backup changed files."
1004
msgstr ""
1005
1006
# help of 'file-deletion-strategy=force' option of 'remove' command
1007
#: bzrlib/builtins.py:1845
1008
msgid ""
1009
"Delete all the specified files, even if they can not be recovered and even "
1010
"if they are non-empty directories. (deprecated, use no-backup)"
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1854
909
1014
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
910
1015
msgstr ""
911
1016
912
#: bzrlib/builtins.py:1643
1017
#: bzrlib/builtins.py:1871
913
1018
msgid "No matching files."
914
1019
msgstr ""
915
1020
916
#: bzrlib/builtins.py:1704
1021
#: bzrlib/builtins.py:1932
917
1022
msgid "Reconcile bzr metadata in a branch."
918
1023
msgstr ""
919
1024
920
#: bzrlib/builtins.py:1706
1025
#: bzrlib/builtins.py:1934
921
1026
msgid ""
922
1027
"This can correct data mismatches that may have been caused by\n"
923
1028
"previous ghost operations or bzr upgrades. You should only\n"
925
1030
"advises you to run it."
926
1031
msgstr ""
927
1032
928
#: bzrlib/builtins.py:1711
1033
#: bzrlib/builtins.py:1939
929
1034
msgid ""
930
1035
"If a second branch is provided, cross-branch reconciliation is\n"
931
1036
"also attempted, which will check that data like the tree root\n"
933
1038
"correctly in both branches."
934
1039
msgstr ""
935
1040
936
#: bzrlib/builtins.py:1716
1041
#: bzrlib/builtins.py:1944
937
1042
msgid ""
938
1043
"At the same time it is run it may recompress data resulting in\n"
939
1044
"a potential saving in disk space or performance gain."
940
1045
msgstr ""
941
1046
942
#: bzrlib/builtins.py:1719
1047
#: bzrlib/builtins.py:1947
943
1048
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
944
1049
msgstr ""
945
1050
946
#: bzrlib/builtins.py:1783
1051
# help of 'format=2a' option of 'init' command
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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1058
msgid ""
1059
"Format for the bzr 2.0 series.\n"
1060
"Uses group-compress storage.\n"
1061
"Provides rich roots which are a one-way transition.\n"
1062
msgstr ""
1063
1064
# help of 'format=pack-0.92' option of 'init' command
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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1068
msgid ""
1069
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1070
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1071
msgstr ""
1072
1073
# help of 'format=development-colo' option of 'init' command
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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1077
msgid "The 2a format with experimental support for colocated branches.\n"
1078
msgstr ""
1079
1080
#: bzrlib/builtins.py:2015
947
1081
msgid "Make a directory into a versioned branch."
948
1082
msgstr ""
949
1083
950
#: bzrlib/builtins.py:1785
1084
#: bzrlib/builtins.py:2017
951
1085
msgid ""
952
1086
"Use this to create an empty branch, or before importing an\n"
953
1087
"existing project."
954
1088
msgstr ""
955
1089
956
#: bzrlib/builtins.py:1788
1090
#: bzrlib/builtins.py:2020
957
1091
msgid ""
958
1092
"If there is a repository in a parent directory of the location, then\n"
959
1093
"the history of the branch will be stored in the repository. Otherwise\n"
961
1095
"in the .bzr directory."
962
1096
msgstr ""
963
1097
964
#: bzrlib/builtins.py:1793
1098
#: bzrlib/builtins.py:2025
965
1099
msgid ""
966
1100
"If there is already a branch at the location but it has no working tree,\n"
967
1101
"the tree can be populated with 'bzr checkout'."
968
1102
msgstr ""
969
1103
970
#: bzrlib/builtins.py:1796
1104
#: bzrlib/builtins.py:2028
971
1105
msgid "Recipe for importing a tree of files::"
972
1106
msgstr ""
973
1107
974
#: bzrlib/builtins.py:1798
1108
#: bzrlib/builtins.py:2030
975
1109
msgid ""
976
1110
" cd ~/project\n"
977
1111
" bzr init\n"
981
1115
msgstr ""
982
1116
983
1117
# help of 'create-prefix' option of 'init' command
984
#: bzrlib/builtins.py:1809
1118
# help of 'create-prefix' option of 'push' command
1119
#: bzrlib/builtins.py:2041
985
1120
msgid "Create the path leading up to the branch if it does not already exist."
986
1121
msgstr ""
987
1122
988
1123
# help of 'format' option of 'init' command
989
#: bzrlib/builtins.py:1812
1124
#: bzrlib/builtins.py:2044
990
1125
msgid "Specify a format for this branch. See \"help formats\"."
991
1126
msgstr ""
992
1127
993
1128
# help of 'append-revisions-only' option of 'init' command
994
#: bzrlib/builtins.py:1820
1129
#: bzrlib/builtins.py:2052
995
1130
msgid "Never change revnos or the existing log. Append revisions to it only."
996
1131
msgstr ""
997
1132
998
1133
# help of 'no-tree' option of 'init' command
999
#: bzrlib/builtins.py:1823
1134
#: bzrlib/builtins.py:2055
1000
1135
msgid "Create a branch without a working tree."
1001
1136
msgstr ""
1002
1137
1003
#: bzrlib/builtins.py:1843 bzrlib/push.py:108
1138
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1004
1139
#, python-format
1005
1140
msgid ""
1006
1141
"Parent directory of %s does not exist.\n"
1007
1142
"You may supply --create-prefix to create all leading parent directories."
1008
1143
msgstr ""
1009
1144
1010
#: bzrlib/builtins.py:1877
1145
#: bzrlib/builtins.py:2109
1011
1146
msgid ""
1012
1147
"This branch format cannot be set to append-revisions-only. Try --default."
1013
1148
msgstr ""
1014
1149
1015
#: bzrlib/builtins.py:1888
1150
#: bzrlib/builtins.py:2120
1016
1151
msgid "Created a {0} (format: {1})\n"
1017
1152
msgstr ""
1018
1153
1019
#: bzrlib/builtins.py:1897
1154
#: bzrlib/builtins.py:2129
1020
1155
#, python-format
1021
1156
msgid "Using shared repository: %s\n"
1022
1157
msgstr ""
1023
1158
1024
#: bzrlib/builtins.py:1901
1159
#: bzrlib/builtins.py:2133
1025
1160
msgid "Create a shared repository for branches to share storage space."
1026
1161
msgstr ""
1027
1162
1028
#: bzrlib/builtins.py:1903
1163
#: bzrlib/builtins.py:2135
1029
1164
msgid ""
1030
1165
"New branches created under the repository directory will store their\n"
1031
1166
"revisions in the repository, not in the branch directory. For branches\n"
1033
1168
"speeds up the creation of new branches."
1034
1169
msgstr ""
1035
1170
1036
#: bzrlib/builtins.py:1908
1171
#: bzrlib/builtins.py:2140
1037
1172
msgid ""
1038
1173
"If the --no-trees option is given then the branches in the repository\n"
1039
1174
"will not have working trees by default. They will still exist as \n"
1043
1178
"branches, such as on a server."
1044
1179
msgstr ""
1045
1180
1046
#: bzrlib/builtins.py:1915
1181
#: bzrlib/builtins.py:2147
1047
1182
msgid ""
1048
1183
":Examples:\n"
1049
1184
" Create a shared repository holding just branches::"
1050
1185
msgstr ""
1051
1186
1052
#: bzrlib/builtins.py:1918
1187
#: bzrlib/builtins.py:2150
1053
1188
msgid ""
1054
1189
" bzr init-repo --no-trees repo\n"
1055
1190
" bzr init repo/trunk"
1056
1191
msgstr ""
1057
1192
1058
#: bzrlib/builtins.py:1921
1193
#: bzrlib/builtins.py:2153
1059
1194
msgid " Make a lightweight checkout elsewhere::"
1060
1195
msgstr ""
1061
1196
1062
#: bzrlib/builtins.py:1923
1197
#: bzrlib/builtins.py:2155
1063
1198
msgid ""
1064
1199
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1065
1200
" cd trunk-checkout\n"
1067
1202
msgstr ""
1068
1203
1069
1204
# help of 'format' option of 'init-repository' command
1070
#: bzrlib/builtins.py:1931
1205
#: bzrlib/builtins.py:2163
1071
1206
msgid ""
1072
1207
"Specify a format for this repository. See \"bzr help formats\" for details."
1073
1208
msgstr ""
1074
1209
1075
1210
# title of 'format' option of 'init-repository' command
1076
#: bzrlib/builtins.py:1935
1211
#: bzrlib/builtins.py:2167
1077
1212
msgid "Repository format"
1078
1213
msgstr ""
1079
1214
1080
1215
# help of 'no-trees' option of 'init-repository' command
1081
#: bzrlib/builtins.py:1937
1216
#: bzrlib/builtins.py:2169
1082
1217
msgid "Branches in the repository will default to not having a working tree."
1083
1218
msgstr ""
1084
1219
1085
#: bzrlib/builtins.py:1961
1220
#: bzrlib/builtins.py:2195
1086
1221
msgid "Show differences in the working tree, between revisions or branches."
1087
1222
msgstr ""
1088
1223
1089
#: bzrlib/builtins.py:1963
1224
#: bzrlib/builtins.py:2197
1090
1225
msgid ""
1091
1226
"If no arguments are given, all changes for the current tree are listed.\n"
1092
1227
"If files are given, only the changes in those files are listed.\n"
1096
1231
"given."
1097
1232
msgstr ""
1098
1233
1099
#: bzrlib/builtins.py:1970
1234
#: bzrlib/builtins.py:2204
1100
1235
msgid ""
1101
1236
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1102
1237
"produces patches suitable for \"patch -p1\"."
1103
1238
msgstr ""
1104
1239
1105
#: bzrlib/builtins.py:1973
1240
#: bzrlib/builtins.py:2207
1106
1241
msgid ""
1107
1242
"Note that when using the -r argument with a range of revisions, the\n"
1108
1243
"differences are computed between the two specified revisions. That\n"
1112
1247
"in the range."
1113
1248
msgstr ""
1114
1249
1115
#: bzrlib/builtins.py:1980
1250
#: bzrlib/builtins.py:2214
1116
1251
msgid ""
1117
1252
":Exit values:\n"
1118
1253
" 1 - changed\n"
1121
1256
" 0 - no change"
1122
1257
msgstr ""
1123
1258
1124
#: bzrlib/builtins.py:1986
1259
#: bzrlib/builtins.py:2220
1125
1260
msgid ""
1126
1261
":Examples:\n"
1127
1262
" Shows the difference in the working tree versus the last commit::"
1128
1263
msgstr ""
1129
1264
1130
#: bzrlib/builtins.py:1989
1265
#: bzrlib/builtins.py:2223
1131
1266
msgid " bzr diff"
1132
1267
msgstr ""
1133
1268
1134
#: bzrlib/builtins.py:1991
1269
#: bzrlib/builtins.py:2225
1135
1270
msgid " Difference between the working tree and revision 1::"
1136
1271
msgstr ""
1137
1272
1138
#: bzrlib/builtins.py:1993
1273
#: bzrlib/builtins.py:2227
1139
1274
msgid " bzr diff -r1"
1140
1275
msgstr ""
1141
1276
1142
#: bzrlib/builtins.py:1995
1277
#: bzrlib/builtins.py:2229
1143
1278
msgid " Difference between revision 3 and revision 1::"
1144
1279
msgstr ""
1145
1280
1146
#: bzrlib/builtins.py:1997
1281
#: bzrlib/builtins.py:2231
1147
1282
msgid " bzr diff -r1..3"
1148
1283
msgstr ""
1149
1284
1150
#: bzrlib/builtins.py:1999
1285
#: bzrlib/builtins.py:2233
1151
1286
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1152
1287
msgstr ""
1153
1288
1154
#: bzrlib/builtins.py:2001
1289
#: bzrlib/builtins.py:2235
1155
1290
msgid " bzr diff -r1..3 xxx"
1156
1291
msgstr ""
1157
1292
1158
#: bzrlib/builtins.py:2003
1293
#: bzrlib/builtins.py:2237
1159
1294
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1160
1295
msgstr ""
1161
1296
1162
#: bzrlib/builtins.py:2005
1297
#: bzrlib/builtins.py:2239
1163
1298
msgid " bzr diff -c2"
1164
1299
msgstr ""
1165
1300
1166
#: bzrlib/builtins.py:2007
1301
#: bzrlib/builtins.py:2241
1167
1302
msgid ""
1168
1303
" To see the changes introduced by revision X::\n"
1169
1304
" \n"
1170
1305
" bzr diff -cX"
1171
1306
msgstr ""
1172
1307
1173
#: bzrlib/builtins.py:2011
1308
#: bzrlib/builtins.py:2245
1174
1309
msgid ""
1175
1310
" Note that in the case of a merge, the -c option shows the changes\n"
1176
1311
" compared to the left hand parent. To see the changes against\n"
1177
1312
" another parent, use::"
1178
1313
msgstr ""
1179
1314
1180
#: bzrlib/builtins.py:2015
1315
#: bzrlib/builtins.py:2249
1181
1316
msgid " bzr diff -r<chosen_parent>..X"
1182
1317
msgstr ""
1183
1318
1184
#: bzrlib/builtins.py:2017
1319
#: bzrlib/builtins.py:2251
1185
1320
msgid ""
1186
1321
" The changes between the current revision and the previous revision\n"
1187
1322
" (equivalent to -c-1 and -r-2..-1)"
1188
1323
msgstr ""
1189
1324
1190
#: bzrlib/builtins.py:2020
1325
#: bzrlib/builtins.py:2254
1191
1326
msgid " bzr diff -r-2.."
1192
1327
msgstr ""
1193
1328
1194
#: bzrlib/builtins.py:2022
1329
#: bzrlib/builtins.py:2256
1195
1330
msgid " Show just the differences for file NEWS::"
1196
1331
msgstr ""
1197
1332
1198
#: bzrlib/builtins.py:2024
1333
#: bzrlib/builtins.py:2258
1199
1334
msgid " bzr diff NEWS"
1200
1335
msgstr ""
1201
1336
1202
#: bzrlib/builtins.py:2026
1337
#: bzrlib/builtins.py:2260
1203
1338
msgid " Show the differences in working tree xxx for file NEWS::"
1204
1339
msgstr ""
1205
1340
1206
#: bzrlib/builtins.py:2028
1341
#: bzrlib/builtins.py:2262
1207
1342
msgid " bzr diff xxx/NEWS"
1208
1343
msgstr ""
1209
1344
1210
#: bzrlib/builtins.py:2030
1345
#: bzrlib/builtins.py:2264
1211
1346
msgid " Show the differences from branch xxx to this working tree:"
1212
1347
msgstr ""
1213
1348
1214
#: bzrlib/builtins.py:2032
1349
#: bzrlib/builtins.py:2266
1215
1350
msgid " bzr diff --old xxx"
1216
1351
msgstr ""
1217
1352
1218
#: bzrlib/builtins.py:2034
1353
#: bzrlib/builtins.py:2268
1219
1354
msgid " Show the differences between two branches for file NEWS::"
1220
1355
msgstr ""
1221
1356
1222
#: bzrlib/builtins.py:2036
1357
#: bzrlib/builtins.py:2270
1223
1358
msgid " bzr diff --old xxx --new yyy NEWS"
1224
1359
msgstr ""
1225
1360
1226
#: bzrlib/builtins.py:2038
1361
#: bzrlib/builtins.py:2272
1227
1362
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1228
1363
msgstr ""
1229
1364
1230
#: bzrlib/builtins.py:2040
1365
#: bzrlib/builtins.py:2274
1231
1366
msgid ""
1232
1367
" bzr diff --prefix old/:new/\n"
1233
1368
" \n"
1237
1372
msgstr ""
1238
1373
1239
1374
# help of 'diff-options' option of 'diff' command
1240
#: bzrlib/builtins.py:2050
1375
#: bzrlib/builtins.py:2284
1241
1376
msgid "Pass these options to the external diff program."
1242
1377
msgstr ""
1243
1378
1244
1379
# help of 'prefix' option of 'diff' command
1245
#: bzrlib/builtins.py:2053
1380
#: bzrlib/builtins.py:2287
1246
1381
msgid ""
1247
1382
"Set prefixes added to old and new filenames, as two values separated by a "
1248
1383
"colon. (eg \"old/:new/\")."
1249
1384
msgstr ""
1250
1385
1251
1386
# help of 'old' option of 'diff' command
1252
#: bzrlib/builtins.py:2056
1387
#: bzrlib/builtins.py:2290
1253
1388
msgid "Branch/tree to compare from."
1254
1389
msgstr ""
1255
1390
1256
1391
# help of 'new' option of 'diff' command
1257
#: bzrlib/builtins.py:2060
1392
#: bzrlib/builtins.py:2294
1258
1393
msgid "Branch/tree to compare to."
1259
1394
msgstr ""
1260
1395
1261
1396
# help of 'using' option of 'diff' command
1262
#: bzrlib/builtins.py:2066
1397
#: bzrlib/builtins.py:2300
1263
1398
msgid "Use this command to compare files."
1264
1399
msgstr ""
1265
1400
1266
1401
# help of 'format' option of 'diff' command
1267
#: bzrlib/builtins.py:2071
1402
#: bzrlib/builtins.py:2305
1268
1403
msgid "Diff format to use."
1269
1404
msgstr ""
1270
1405
1271
1406
# title of 'format' option of 'diff' command
1272
#: bzrlib/builtins.py:2073
1407
#: bzrlib/builtins.py:2307
1273
1408
msgid "Diff format"
1274
1409
msgstr ""
1275
1410
1276
#: bzrlib/builtins.py:2095
1411
#: bzrlib/builtins.py:2329
1277
1412
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1278
1413
msgstr ""
1279
1414
1280
#: bzrlib/builtins.py:2099
1415
#: bzrlib/builtins.py:2333
1281
1416
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1282
1417
msgstr ""
1283
1418
1284
#: bzrlib/builtins.py:2104 bzrlib/builtins.py:2502 bzrlib/builtins.py:2515
1285
#: bzrlib/builtins.py:2523 bzrlib/builtins.py:4663
1419
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1420
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1286
1421
msgid "{0} and {1} are mutually exclusive"
1287
1422
msgstr ""
1288
1423
1289
#: bzrlib/builtins.py:2124
1424
#: bzrlib/builtins.py:2358
1290
1425
msgid ""
1291
1426
"List files deleted in the working tree.\n"
1292
1427
" "
1293
1428
msgstr ""
1294
1429
1295
#: bzrlib/builtins.py:2202
1430
#: bzrlib/builtins.py:2436
1296
1431
msgid "Show the tree root directory."
1297
1432
msgstr ""
1298
1433
1299
#: bzrlib/builtins.py:2204
1434
#: bzrlib/builtins.py:2438
1300
1435
msgid ""
1301
1436
"The root is the nearest enclosing directory with a .bzr control\n"
1302
1437
"directory."
1303
1438
msgstr ""
1304
1439
1305
#: bzrlib/builtins.py:2219
1440
#: bzrlib/builtins.py:2453
1306
1441
msgid "The limit argument must be an integer."
1307
1442
msgstr ""
1308
1443
1309
#: bzrlib/builtins.py:2227
1444
#: bzrlib/builtins.py:2461
1310
1445
msgid "The levels argument must be an integer."
1311
1446
msgstr ""
1312
1447
1313
#: bzrlib/builtins.py:2232
1448
#: bzrlib/builtins.py:2466
1314
1449
msgid "Show historical log for a branch or subset of a branch."
1315
1450
msgstr ""
1316
1451
1317
#: bzrlib/builtins.py:2234
1452
#: bzrlib/builtins.py:2468
1318
1453
msgid ""
1319
1454
"log is bzr's default tool for exploring the history of a branch.\n"
1320
1455
"The branch to use is taken from the first parameter. If no parameters\n"
1322
1457
"Here are some simple examples::"
1323
1458
msgstr ""
1324
1459
1325
#: bzrlib/builtins.py:2239
1460
#: bzrlib/builtins.py:2473
1326
1461
msgid ""
1327
1462
" bzr log log the current branch\n"
1328
1463
" bzr log foo.py log a file in its branch\n"
1329
1464
" bzr log http://server/branch log a branch on a server"
1330
1465
msgstr ""
1331
1466
1332
#: bzrlib/builtins.py:2243
1467
#: bzrlib/builtins.py:2477
1333
1468
msgid ""
1334
1469
"The filtering, ordering and information shown for each revision can\n"
1335
1470
"be controlled as explained below. By default, all revisions are\n"
1339
1474
"were merged."
1340
1475
msgstr ""
1341
1476
1342
#: bzrlib/builtins.py:2250
1477
#: bzrlib/builtins.py:2484
1343
1478
msgid ":Output control:"
1344
1479
msgstr ""
1345
1480
1346
#: bzrlib/builtins.py:2252
1481
#: bzrlib/builtins.py:2486
1347
1482
msgid ""
1348
1483
" The log format controls how information about each revision is\n"
1349
1484
" displayed. The standard log formats are called ``long``, ``short``\n"
1351
1486
" for more details on log formats."
1352
1487
msgstr ""
1353
1488
1354
#: bzrlib/builtins.py:2257
1489
#: bzrlib/builtins.py:2491
1355
1490
msgid ""
1356
1491
" The following options can be used to control what information is\n"
1357
1492
" displayed::"
1358
1493
msgstr ""
1359
1494
1360
#: bzrlib/builtins.py:2260
1495
#: bzrlib/builtins.py:2494
1361
1496
msgid ""
1362
1497
" -l N display a maximum of N revisions\n"
1363
1498
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1366
1501
" --show-ids display revision-ids (and file-ids), not just revnos"
1367
1502
msgstr ""
1368
1503
1369
#: bzrlib/builtins.py:2266
1504
#: bzrlib/builtins.py:2500
1370
1505
msgid ""
1371
1506
" Note that the default number of levels to display is a function of the\n"
1372
1507
" log format. If the -n option is not used, the standard log formats show\n"
1373
1508
" just the top level (mainline)."
1374
1509
msgstr ""
1375
1510
1376
#: bzrlib/builtins.py:2270
1511
#: bzrlib/builtins.py:2504
1377
1512
msgid ""
1378
1513
" Status summaries are shown using status flags like A, M, etc. To see\n"
1379
1514
" the changes explained using words like ``added`` and ``modified``\n"
1380
1515
" instead, use the -vv option."
1381
1516
msgstr ""
1382
1517
1383
#: bzrlib/builtins.py:2274
1518
#: bzrlib/builtins.py:2508
1384
1519
msgid ":Ordering control:"
1385
1520
msgstr ""
1386
1521
1387
#: bzrlib/builtins.py:2276
1522
#: bzrlib/builtins.py:2510
1388
1523
msgid ""
1389
1524
" To display revisions from oldest to newest, use the --forward option.\n"
1390
1525
" In most cases, using this option will have little impact on the total\n"
1392
1527
" display revisions like --reverse does when it can."
1393
1528
msgstr ""
1394
1529
1395
#: bzrlib/builtins.py:2281
1530
#: bzrlib/builtins.py:2515
1396
1531
msgid ":Revision filtering:"
1397
1532
msgstr ""
1398
1533
1399
#: bzrlib/builtins.py:2283
1534
#: bzrlib/builtins.py:2517
1400
1535
msgid ""
1401
1536
" The -r option can be used to specify what revision or range of revisions\n"
1402
1537
" to filter against. The various forms are shown below::"
1403
1538
msgstr ""
1404
1539
1405
#: bzrlib/builtins.py:2286
1540
#: bzrlib/builtins.py:2520
1406
1541
msgid ""
1407
1542
" -rX display revision X\n"
1408
1543
" -rX.. display revision X and later\n"
1410
1545
" -rX..Y display from X to Y inclusive"
1411
1546
msgstr ""
1412
1547
1413
#: bzrlib/builtins.py:2291
1548
#: bzrlib/builtins.py:2525
1414
1549
msgid ""
1415
1550
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1416
1551
" Some common examples are given below::"
1417
1552
msgstr ""
1418
1553
1419
#: bzrlib/builtins.py:2294
1554
#: bzrlib/builtins.py:2528
1420
1555
msgid ""
1421
1556
" -r-1 show just the tip\n"
1422
1557
" -r-10.. show the last 10 mainline revisions\n"
1426
1561
" -rdate:yesterday.. show changes since yesterday"
1427
1562
msgstr ""
1428
1563
1429
#: bzrlib/builtins.py:2301
1564
#: bzrlib/builtins.py:2535
1430
1565
msgid ""
1431
1566
" When logging a range of revisions using -rX..Y, log starts at\n"
1432
1567
" revision Y and searches back in history through the primary\n"
1436
1571
" a nested merge revision and the log will be truncated accordingly."
1437
1572
msgstr ""
1438
1573
1439
#: bzrlib/builtins.py:2308
1574
#: bzrlib/builtins.py:2542
1440
1575
msgid ":Path filtering:"
1441
1576
msgstr ""
1442
1577
1443
#: bzrlib/builtins.py:2310
1578
#: bzrlib/builtins.py:2544
1444
1579
msgid ""
1445
1580
" If parameters are given and the first one is not a branch, the log\n"
1446
1581
" will be filtered to show only those revisions that changed the\n"
1447
1582
" nominated files or directories."
1448
1583
msgstr ""
1449
1584
1450
#: bzrlib/builtins.py:2314
1585
#: bzrlib/builtins.py:2548
1451
1586
msgid ""
1452
1587
" Filenames are interpreted within their historical context. To log a\n"
1453
1588
" deleted file, specify a revision range so that the file existed at\n"
1454
1589
" the end or start of the range."
1455
1590
msgstr ""
1456
1591
1457
#: bzrlib/builtins.py:2318
1592
#: bzrlib/builtins.py:2552
1458
1593
msgid ""
1459
1594
" Historical context is also important when interpreting pathnames of\n"
1460
1595
" renamed files/directories. Consider the following example:"
1461
1596
msgstr ""
1462
1597
1463
#: bzrlib/builtins.py:2321
1598
#: bzrlib/builtins.py:2555
1464
1599
msgid ""
1465
1600
" * revision 1: add tutorial.txt\n"
1466
1601
" * revision 2: modify tutorial.txt\n"
1467
1602
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1468
1603
msgstr ""
1469
1604
1470
#: bzrlib/builtins.py:2325
1605
#: bzrlib/builtins.py:2559
1471
1606
msgid " In this case:"
1472
1607
msgstr ""
1473
1608
1474
#: bzrlib/builtins.py:2327
1609
#: bzrlib/builtins.py:2561
1475
1610
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1476
1611
msgstr ""
1477
1612
1478
#: bzrlib/builtins.py:2329
1613
#: bzrlib/builtins.py:2563
1479
1614
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1480
1615
msgstr ""
1481
1616
1482
#: bzrlib/builtins.py:2331
1617
#: bzrlib/builtins.py:2565
1483
1618
msgid ""
1484
1619
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1485
1620
" the original file in revision 2."
1486
1621
msgstr ""
1487
1622
1488
#: bzrlib/builtins.py:2334
1623
#: bzrlib/builtins.py:2568
1489
1624
msgid ""
1490
1625
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1491
1626
" was no file called guide.txt in revision 2."
1492
1627
msgstr ""
1493
1628
1494
#: bzrlib/builtins.py:2337
1629
#: bzrlib/builtins.py:2571
1495
1630
msgid ""
1496
1631
" Renames are always followed by log. By design, there is no need to\n"
1497
1632
" explicitly ask for this (and no way to stop logging a file back\n"
1498
1633
" until it was last renamed)."
1499
1634
msgstr ""
1500
1635
1501
#: bzrlib/builtins.py:2341
1636
#: bzrlib/builtins.py:2575
1502
1637
msgid ":Other filtering:"
1503
1638
msgstr ""
1504
1639
1505
#: bzrlib/builtins.py:2343
1640
#: bzrlib/builtins.py:2577
1506
1641
msgid ""
1507
1642
" The --match option can be used for finding revisions that match a\n"
1508
1643
" regular expression in a commit message, committer, author or bug.\n"
1511
1646
" --match-message can be used to only match a specific field."
1512
1647
msgstr ""
1513
1648
1514
#: bzrlib/builtins.py:2349
1649
#: bzrlib/builtins.py:2583
1515
1650
msgid ":Tips & tricks:"
1516
1651
msgstr ""
1517
1652
1518
#: bzrlib/builtins.py:2351
1653
#: bzrlib/builtins.py:2585
1519
1654
msgid ""
1520
1655
" GUI tools and IDEs are often better at exploring history than command\n"
1521
1656
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1524
1659
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1525
1660
msgstr ""
1526
1661
1527
#: bzrlib/builtins.py:2357
1662
#: bzrlib/builtins.py:2591
1528
1663
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1529
1664
msgstr ""
1530
1665
1531
#: bzrlib/builtins.py:2359
1666
#: bzrlib/builtins.py:2593
1532
1667
msgid ""
1533
1668
" [ALIASES]\n"
1534
1669
" tip = log -r-1\n"
1536
1671
" show = log -v -p"
1537
1672
msgstr ""
1538
1673
1539
#: bzrlib/builtins.py:2364
1674
#: bzrlib/builtins.py:2598
1540
1675
msgid ""
1541
1676
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1542
1677
" will show the last 10 mainline revisions. To see the details of a\n"
1543
1678
" particular revision X, ``bzr show -rX``."
1544
1679
msgstr ""
1545
1680
1546
#: bzrlib/builtins.py:2368
1681
#: bzrlib/builtins.py:2602
1547
1682
msgid ""
1548
1683
" If you are interested in looking deeper into a particular merge X,\n"
1549
1684
" use ``bzr log -n0 -rX``."
1550
1685
msgstr ""
1551
1686
1552
#: bzrlib/builtins.py:2371
1687
#: bzrlib/builtins.py:2605
1553
1688
msgid ""
1554
1689
" ``bzr log -v`` on a branch with lots of history is currently\n"
1555
1690
" very slow. A fix for this issue is currently under development.\n"
1557
1692
" be given when using the -v option."
1558
1693
msgstr ""
1559
1694
1560
#: bzrlib/builtins.py:2376
1695
#: bzrlib/builtins.py:2610
1561
1696
msgid ""
1562
1697
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1563
1698
" used to find revisions matching user names, commit messages, etc.\n"
1565
1700
" a list of words but not others."
1566
1701
msgstr ""
1567
1702
1568
#: bzrlib/builtins.py:2381
1703
#: bzrlib/builtins.py:2615
1569
1704
msgid ""
1570
1705
" When exploring non-mainline history on large projects with deep\n"
1571
1706
" history, the performance of log can be greatly improved by installing\n"
1574
1709
msgstr ""
1575
1710
1576
1711
# help of 'forward' option of 'log' command
1577
#: bzrlib/builtins.py:2390
1712
#: bzrlib/builtins.py:2624
1578
1713
msgid "Show from oldest to newest."
1579
1714
msgstr ""
1580
1715
1581
1716
# help of 'verbose' option of 'log' command
1582
#: bzrlib/builtins.py:2393
1717
#: bzrlib/builtins.py:2627
1583
1718
msgid "Show files changed in each revision."
1584
1719
msgstr ""
1585
1720
1586
1721
# help of 'change' option of 'log' command
1587
#: bzrlib/builtins.py:2399
1722
#: bzrlib/builtins.py:2633
1588
1723
msgid "Show just the specified revision. See also \"help revisionspec\"."
1589
1724
msgstr ""
1590
1725
1591
1726
# help of 'authors' option of 'log' command
1592
#: bzrlib/builtins.py:2403
1727
#: bzrlib/builtins.py:2637
1593
1728
msgid "What names to list as authors - first, all or committer."
1594
1729
msgstr ""
1595
1730
1596
1731
# title of 'authors' option of 'log' command
1597
#: bzrlib/builtins.py:2404
1732
#: bzrlib/builtins.py:2638
1598
1733
msgid "Authors"
1599
1734
msgstr ""
1600
1735
1601
1736
# help of 'levels' option of 'log' command
1602
#: bzrlib/builtins.py:2409
1737
#: bzrlib/builtins.py:2643
1603
1738
msgid "Number of levels to display - 0 for all, 1 for flat."
1604
1739
msgstr ""
1605
1740
1606
1741
# help of 'limit' option of 'log' command
1607
#: bzrlib/builtins.py:2419
1742
#: bzrlib/builtins.py:2653
1608
1743
msgid "Limit the output to the first N revisions."
1609
1744
msgstr ""
1610
1745
1611
1746
# help of 'show-diff' option of 'log' command
1612
#: bzrlib/builtins.py:2424
1747
#: bzrlib/builtins.py:2658
1613
1748
msgid "Show changes made in each revision as a patch."
1614
1749
msgstr ""
1615
1750
1616
1751
# help of 'include-merged' option of 'log' command
1617
#: bzrlib/builtins.py:2426
1752
#: bzrlib/builtins.py:2660
1618
1753
msgid "Show merged revisions like --levels 0 does."
1619
1754
msgstr ""
1620
1755
1621
1756
# help of 'omit-merges' option of 'log' command
1622
#: bzrlib/builtins.py:2430
1757
#: bzrlib/builtins.py:2664
1623
1758
msgid "Do not report commits with more than one parent."
1624
1759
msgstr ""
1625
1760
1626
1761
# help of 'exclude-common-ancestry' option of 'log' command
1627
#: bzrlib/builtins.py:2432
1762
#: bzrlib/builtins.py:2666
1628
1763
msgid ""
1629
1764
"Display only the revisions that are not part of both ancestries (require -"
1630
"rX..Y)"
1765
"rX..Y)."
1631
1766
msgstr ""
1632
1767
1633
1768
# help of 'signatures' option of 'log' command
1634
#: bzrlib/builtins.py:2436
1635
msgid "Show digital signature validity"
1769
#: bzrlib/builtins.py:2670
1770
msgid "Show digital signature validity."
1636
1771
msgstr ""
1637
1772
1638
1773
# help of 'match' option of 'log' command
1639
#: bzrlib/builtins.py:2439
1774
#: bzrlib/builtins.py:2673
1640
1775
msgid "Show revisions whose properties match this expression."
1641
1776
msgstr ""
1642
1777
1643
1778
# help of 'match-message' option of 'log' command
1644
#: bzrlib/builtins.py:2443
1779
#: bzrlib/builtins.py:2677
1645
1780
msgid "Show revisions whose message matches this expression."
1646
1781
msgstr ""
1647
1782
1648
1783
# help of 'match-committer' option of 'log' command
1649
#: bzrlib/builtins.py:2447
1784
#: bzrlib/builtins.py:2681
1650
1785
msgid "Show revisions whose committer matches this expression."
1651
1786
msgstr ""
1652
1787
1653
1788
# help of 'match-author' option of 'log' command
1654
#: bzrlib/builtins.py:2451
1789
#: bzrlib/builtins.py:2685
1655
1790
msgid "Show revisions whose authors match this expression."
1656
1791
msgstr ""
1657
1792
1658
1793
# help of 'match-bugs' option of 'log' command
1659
#: bzrlib/builtins.py:2455
1794
#: bzrlib/builtins.py:2689
1660
1795
msgid "Show revisions whose bugs match this expression."
1661
1796
msgstr ""
1662
1797
1663
#: bzrlib/builtins.py:2509
1798
#: bzrlib/builtins.py:2743
1664
1799
msgid "--exclude-common-ancestry requires -r with two revisions"
1665
1800
msgstr ""
1666
1801
1667
#: bzrlib/builtins.py:2537
1802
#: bzrlib/builtins.py:2771
1668
1803
#, python-format
1669
1804
msgid "Path unknown at end or start of revision range: %s"
1670
1805
msgstr ""
1671
1806
1672
#: bzrlib/builtins.py:2654
1807
#: bzrlib/builtins.py:2888
1673
1808
#, python-format
1674
1809
msgid "bzr %s doesn't accept two revisions in different branches."
1675
1810
msgstr ""
1676
1811
1677
#: bzrlib/builtins.py:2670
1812
#: bzrlib/builtins.py:2904
1678
1813
#, python-format
1679
1814
msgid "bzr %s --revision takes one or two values."
1680
1815
msgstr ""
1681
1816
1682
#: bzrlib/builtins.py:2715
1817
#: bzrlib/builtins.py:2949
1683
1818
msgid ""
1684
1819
"List files in a tree.\n"
1685
1820
" "
1686
1821
msgstr ""
1687
1822
1688
1823
# help of 'recursive' option of 'ls' command
1689
#: bzrlib/builtins.py:2724
1824
#: bzrlib/builtins.py:2958
1690
1825
msgid "Recurse into subdirectories."
1691
1826
msgstr ""
1692
1827
1693
1828
# help of 'from-root' option of 'ls' command
1694
#: bzrlib/builtins.py:2726
1829
#: bzrlib/builtins.py:2960
1695
1830
msgid "Print paths relative to the root of the branch."
1696
1831
msgstr ""
1697
1832
1698
1833
# help of 'unknown' option of 'ls' command
1699
#: bzrlib/builtins.py:2728
1834
#: bzrlib/builtins.py:2962
1700
1835
msgid "Print unknown files."
1701
1836
msgstr ""
1702
1837
1703
1838
# help of 'versioned' option of 'ls' command
1704
#: bzrlib/builtins.py:2729
1839
#: bzrlib/builtins.py:2963
1705
1840
msgid "Print versioned files."
1706
1841
msgstr ""
1707
1842
1708
1843
# help of 'ignored' option of 'ls' command
1709
#: bzrlib/builtins.py:2732
1844
#: bzrlib/builtins.py:2966
1710
1845
msgid "Print ignored files."
1711
1846
msgstr ""
1712
1847
1713
1848
# help of 'kind' option of 'ls' command
1714
#: bzrlib/builtins.py:2734
1849
#: bzrlib/builtins.py:2968
1715
1850
msgid "List entries of a particular kind: file, directory, symlink."
1716
1851
msgstr ""
1717
1852
1718
#: bzrlib/builtins.py:2747
1853
#: bzrlib/builtins.py:2981
1719
1854
msgid "invalid kind specified"
1720
1855
msgstr ""
1721
1856
1722
#: bzrlib/builtins.py:2750
1857
#: bzrlib/builtins.py:2984
1723
1858
msgid "Cannot set both --verbose and --null"
1724
1859
msgstr ""
1725
1860
1726
#: bzrlib/builtins.py:2759
1861
#: bzrlib/builtins.py:2993
1727
1862
msgid "cannot specify both --from-root and PATH"
1728
1863
msgstr ""
1729
1864
1730
#: bzrlib/builtins.py:2846
1865
#: bzrlib/builtins.py:3080
1731
1866
msgid "Ignore specified files or patterns."
1732
1867
msgstr ""
1733
1868
1734
#: bzrlib/builtins.py:2848
1869
#: bzrlib/builtins.py:3082
1735
1870
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1736
1871
msgstr ""
1737
1872
1738
#: bzrlib/builtins.py:2850
1873
#: bzrlib/builtins.py:3084
1739
1874
msgid ""
1740
1875
"If a .bzrignore file does not exist, the ignore command\n"
1741
1876
"will create one and add the specified files or patterns to the newly\n"
1744
1879
"the use of the ignore command will require an explicit add command."
1745
1880
msgstr ""
1746
1881
1747
#: bzrlib/builtins.py:2856
1882
#: bzrlib/builtins.py:3090
1748
1883
msgid ""
1749
1884
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1750
1885
"After adding, editing or deleting that file either indirectly by\n"
1752
1887
"it."
1753
1888
msgstr ""
1754
1889
1755
#: bzrlib/builtins.py:2861
1890
#: bzrlib/builtins.py:3095
1756
1891
msgid ""
1757
1892
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1758
1893
"the global ignore file can be found in the application data directory as\n"
1761
1896
"can be edited directly using an editor."
1762
1897
msgstr ""
1763
1898
1764
#: bzrlib/builtins.py:2867
1899
#: bzrlib/builtins.py:3101
1765
1900
msgid ""
1766
1901
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1767
1902
"precedence over regular ignores. Such exceptions are used to specify\n"
1768
1903
"files that should be versioned which would otherwise be ignored."
1769
1904
msgstr ""
1770
1905
1771
#: bzrlib/builtins.py:2871
1906
#: bzrlib/builtins.py:3105
1772
1907
msgid ""
1773
1908
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1774
1909
"precedence over the '!' exception patterns."
1775
1910
msgstr ""
1776
1911
1777
#: bzrlib/builtins.py:2874
1912
#: bzrlib/builtins.py:3108
1778
1913
msgid ""
1779
1914
":Notes: \n"
1780
1915
" \n"
1782
1917
" the shell on Unix."
1783
1918
msgstr ""
1784
1919
1785
#: bzrlib/builtins.py:2879
1920
#: bzrlib/builtins.py:3113
1786
1921
msgid ""
1787
1922
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1788
1923
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1789
1924
msgstr ""
1790
1925
1791
#: bzrlib/builtins.py:2882
1926
#: bzrlib/builtins.py:3116
1792
1927
msgid ""
1793
1928
":Examples:\n"
1794
1929
" Ignore the top level Makefile::"
1795
1930
msgstr ""
1796
1931
1797
#: bzrlib/builtins.py:2885
1932
#: bzrlib/builtins.py:3119
1798
1933
msgid " bzr ignore ./Makefile"
1799
1934
msgstr ""
1800
1935
1801
#: bzrlib/builtins.py:2887
1936
#: bzrlib/builtins.py:3121
1802
1937
msgid " Ignore .class files in all directories...::"
1803
1938
msgstr ""
1804
1939
1805
#: bzrlib/builtins.py:2889
1940
#: bzrlib/builtins.py:3123
1806
1941
msgid " bzr ignore \"*.class\""
1807
1942
msgstr ""
1808
1943
1809
#: bzrlib/builtins.py:2891
1944
#: bzrlib/builtins.py:3125
1810
1945
msgid " ...but do not ignore \"special.class\"::"
1811
1946
msgstr ""
1812
1947
1813
#: bzrlib/builtins.py:2893
1948
#: bzrlib/builtins.py:3127
1814
1949
msgid " bzr ignore \"!special.class\""
1815
1950
msgstr ""
1816
1951
1817
#: bzrlib/builtins.py:2895
1952
#: bzrlib/builtins.py:3129
1818
1953
msgid " Ignore files whose name begins with the \"#\" character::"
1819
1954
msgstr ""
1820
1955
1821
#: bzrlib/builtins.py:2897
1956
#: bzrlib/builtins.py:3131
1822
1957
msgid " bzr ignore \"RE:^#\""
1823
1958
msgstr ""
1824
1959
1825
#: bzrlib/builtins.py:2899
1960
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1826
1961
msgid " Ignore .o files under the lib directory::"
1827
1962
msgstr ""
1828
1963
1829
#: bzrlib/builtins.py:2901
1964
#: bzrlib/builtins.py:3135
1830
1965
msgid " bzr ignore \"lib/**/*.o\""
1831
1966
msgstr ""
1832
1967
1833
#: bzrlib/builtins.py:2905
1968
#: bzrlib/builtins.py:3139
1834
1969
msgid " bzr ignore \"RE:lib/.*\\.o\""
1835
1970
msgstr ""
1836
1971
1837
#: bzrlib/builtins.py:2907
1972
#: bzrlib/builtins.py:3141
1838
1973
msgid " Ignore everything but the \"debian\" toplevel directory::"
1839
1974
msgstr ""
1840
1975
1841
#: bzrlib/builtins.py:2909
1976
#: bzrlib/builtins.py:3143
1842
1977
msgid ""
1843
1978
" bzr ignore \"RE:(?!debian/).*\"\n"
1844
1979
" \n"
1851
1986
msgstr ""
1852
1987
1853
1988
# help of 'default-rules' option of 'ignore' command
1854
#: bzrlib/builtins.py:2923
1989
#: bzrlib/builtins.py:3157
1855
1990
msgid "Display the default ignore rules that bzr uses."
1856
1991
msgstr ""
1857
1992
1858
#: bzrlib/builtins.py:2935
1993
#: bzrlib/builtins.py:3169
1859
1994
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1860
1995
msgstr ""
1861
1996
1862
#: bzrlib/builtins.py:2946
1997
#: bzrlib/builtins.py:3180
1863
1998
#, python-format
1864
1999
msgid "Invalid ignore pattern found. %s"
1865
2000
msgid_plural "Invalid ignore patterns found. %s"
1866
2001
msgstr[0] ""
1867
2002
msgstr[1] ""
1868
2003
1869
#: bzrlib/builtins.py:2955
2004
#: bzrlib/builtins.py:3189
1870
2005
msgid "NAME_PATTERN should not be an absolute path"
1871
2006
msgstr ""
1872
2007
1873
#: bzrlib/builtins.py:2968
2008
#: bzrlib/builtins.py:3202
1874
2009
#, python-format
1875
2010
msgid ""
1876
2011
"Warning: the following files are version controlled and match your ignore "
1880
2015
"them.\n"
1881
2016
msgstr ""
1882
2017
1883
#: bzrlib/builtins.py:2975
2018
#: bzrlib/builtins.py:3209
1884
2019
msgid "List ignored files and the patterns that matched them."
1885
2020
msgstr ""
1886
2021
1887
#: bzrlib/builtins.py:2977
2022
#: bzrlib/builtins.py:3211
1888
2023
msgid ""
1889
2024
"List all the ignored files and the ignore pattern that caused the file to\n"
1890
2025
"be ignored."
1891
2026
msgstr ""
1892
2027
1893
#: bzrlib/builtins.py:2980
2028
#: bzrlib/builtins.py:3214
1894
2029
msgid "Alternatively, to list just the files::"
1895
2030
msgstr ""
1896
2031
1897
#: bzrlib/builtins.py:2982
2032
#: bzrlib/builtins.py:3216
1898
2033
msgid " bzr ls --ignored"
1899
2034
msgstr ""
1900
2035
1901
#: bzrlib/builtins.py:3016
2036
#: bzrlib/builtins.py:3250
1902
2037
#, python-format
1903
2038
msgid "not a valid revision-number: %r"
1904
2039
msgstr ""
1905
2040
1906
#: bzrlib/builtins.py:3023
2041
#: bzrlib/builtins.py:3257
1907
2042
msgid "Export current or past revision to a destination directory or archive."
1908
2043
msgstr ""
1909
2044
1910
#: bzrlib/builtins.py:3025
2045
#: bzrlib/builtins.py:3259
1911
2046
msgid "If no revision is specified this exports the last committed revision."
1912
2047
msgstr ""
1913
2048
1914
#: bzrlib/builtins.py:3027
2049
#: bzrlib/builtins.py:3261
1915
2050
msgid ""
1916
2051
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1917
2052
"given, try to find the format with the extension. If no extension\n"
1918
2053
"is found exports to a directory (equivalent to --format=dir)."
1919
2054
msgstr ""
1920
2055
1921
#: bzrlib/builtins.py:3031
2056
#: bzrlib/builtins.py:3265
1922
2057
msgid ""
1923
2058
"If root is supplied, it will be used as the root directory inside\n"
1924
2059
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1925
2060
"to the exported filename. The root option has no effect for 'dir' format."
1926
2061
msgstr ""
1927
2062
1928
#: bzrlib/builtins.py:3035
2063
#: bzrlib/builtins.py:3269
1929
2064
msgid ""
1930
2065
"If branch is omitted then the branch containing the current working\n"
1931
2066
"directory will be used."
1932
2067
msgstr ""
1933
2068
1934
#: bzrlib/builtins.py:3038
2069
#: bzrlib/builtins.py:3272
1935
2070
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1936
2071
msgstr ""
1937
2072
1938
#: bzrlib/builtins.py:3040
2073
#: bzrlib/builtins.py:3274
1939
2074
msgid ""
1940
2075
" ================= =========================\n"
1941
2076
" Supported formats Autodetected by extension\n"
1949
2084
msgstr ""
1950
2085
1951
2086
# help of 'format' option of 'export' command
1952
#: bzrlib/builtins.py:3054
2087
#: bzrlib/builtins.py:3288
1953
2088
msgid "Type of file to export to."
1954
2089
msgstr ""
1955
2090
1956
2091
# help of 'filters' option of 'export' command
1957
#: bzrlib/builtins.py:3057
2092
#: bzrlib/builtins.py:3291
1958
2093
msgid "Apply content filters to export the convenient form."
1959
2094
msgstr ""
1960
2095
1961
2096
# help of 'root' option of 'export' command
1962
#: bzrlib/builtins.py:3061
2097
#: bzrlib/builtins.py:3295
1963
2098
msgid "Name of the root directory inside the exported file."
1964
2099
msgstr ""
1965
2100
1966
2101
# help of 'per-file-timestamps' option of 'export' command
1967
#: bzrlib/builtins.py:3063
2102
#: bzrlib/builtins.py:3297
1968
2103
msgid ""
1969
2104
"Set modification time of files to that of the last revision in which it was "
1970
2105
"changed."
1971
2106
msgstr ""
1972
2107
1973
#: bzrlib/builtins.py:3083
2108
# help of 'uncommitted' option of 'export' command
2109
#: bzrlib/builtins.py:3300
2110
msgid "Export the working tree contents rather than that of the last revision."
2111
msgstr ""
2112
2113
#: bzrlib/builtins.py:3319
2114
msgid "--uncommitted requires a working tree"
2115
msgstr ""
2116
2117
#: bzrlib/builtins.py:3328
1974
2118
#, python-format
1975
2119
msgid "Unsupported export format: %s"
1976
2120
msgstr ""
1977
2121
1978
#: bzrlib/builtins.py:3087
2122
#: bzrlib/builtins.py:3332
1979
2123
msgid "Write the contents of a file as of a given revision to standard output."
1980
2124
msgstr ""
1981
2125
1982
#: bzrlib/builtins.py:3089
2126
#: bzrlib/builtins.py:3334
1983
2127
msgid "If no revision is nominated, the last revision is used."
1984
2128
msgstr ""
1985
2129
1986
#: bzrlib/builtins.py:3091
2130
#: bzrlib/builtins.py:3336
1987
2131
msgid ""
1988
2132
"Note: Take care to redirect standard output when using this command on a\n"
1989
2133
"binary file."
1990
2134
msgstr ""
1991
2135
2136
# help of 'name-from-revision' option of 'cat' command
2137
#: bzrlib/builtins.py:3342
2138
msgid "The path name in the old tree."
2139
msgstr ""
2140
1992
2141
# help of 'filters' option of 'cat' command
1993
#: bzrlib/builtins.py:3098
2142
#: bzrlib/builtins.py:3343
1994
2143
msgid "Apply content filters to display the convenience form."
1995
2144
msgstr ""
1996
2145
1997
#: bzrlib/builtins.py:3109
2146
#: bzrlib/builtins.py:3354
1998
2147
msgid "bzr cat --revision takes exactly one revision specifier"
1999
2148
msgstr ""
2000
2149
2001
#: bzrlib/builtins.py:3134 bzrlib/builtins.py:3146
2150
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2002
2151
msgid "{0!r} is not present in revision {1}"
2003
2152
msgstr ""
2004
2153
2005
#: bzrlib/builtins.py:3169
2154
#: bzrlib/builtins.py:3414
2006
2155
msgid "Commit changes into a new revision."
2007
2156
msgstr ""
2008
2157
2009
#: bzrlib/builtins.py:3171
2158
#: bzrlib/builtins.py:3416
2010
2159
msgid ""
2011
2160
"An explanatory message needs to be given for each commit. This is\n"
2012
2161
"often done by using the --message option (getting the message from the\n"
2016
2165
"boilerplate text loaded into the editor, use the --show-diff option."
2017
2166
msgstr ""
2018
2167
2019
#: bzrlib/builtins.py:3178
2168
#: bzrlib/builtins.py:3423
2020
2169
msgid ""
2021
2170
"By default, the entire tree is committed and the person doing the\n"
2022
2171
"commit is assumed to be the author. These defaults can be overridden\n"
2023
2172
"as explained below."
2024
2173
msgstr ""
2025
2174
2026
#: bzrlib/builtins.py:3182
2175
#: bzrlib/builtins.py:3427
2027
2176
msgid ":Selective commits:"
2028
2177
msgstr ""
2029
2178
2030
#: bzrlib/builtins.py:3184
2179
#: bzrlib/builtins.py:3429
2031
2180
msgid ""
2032
2181
" If selected files are specified, only changes to those files are\n"
2033
2182
" committed. If a directory is specified then the directory and\n"
2034
2183
" everything within it is committed."
2035
2184
msgstr ""
2036
2185
2037
#: bzrlib/builtins.py:3188
2186
#: bzrlib/builtins.py:3433
2038
2187
msgid ""
2039
2188
" When excludes are given, they take precedence over selected files.\n"
2040
2189
" For example, to commit only changes within foo, but not changes\n"
2041
2190
" within foo/bar::"
2042
2191
msgstr ""
2043
2192
2044
#: bzrlib/builtins.py:3192
2193
#: bzrlib/builtins.py:3437
2045
2194
msgid " bzr commit foo -x foo/bar"
2046
2195
msgstr ""
2047
2196
2048
#: bzrlib/builtins.py:3194
2197
#: bzrlib/builtins.py:3439
2049
2198
msgid " A selective commit after a merge is not yet supported."
2050
2199
msgstr ""
2051
2200
2052
#: bzrlib/builtins.py:3196
2201
#: bzrlib/builtins.py:3441
2053
2202
msgid ":Custom authors:"
2054
2203
msgstr ""
2055
2204
2056
#: bzrlib/builtins.py:3198
2205
#: bzrlib/builtins.py:3443
2057
2206
msgid ""
2058
2207
" If the author of the change is not the same person as the committer,\n"
2059
2208
" you can specify the author's name using the --author option. The\n"
2063
2212
" author."
2064
2213
msgstr ""
2065
2214
2066
#: bzrlib/builtins.py:3205
2215
#: bzrlib/builtins.py:3450
2067
2216
msgid ":Checks:"
2068
2217
msgstr ""
2069
2218
2070
#: bzrlib/builtins.py:3207
2219
#: bzrlib/builtins.py:3452
2071
2220
msgid ""
2072
2221
" A common mistake is to forget to add a new file or directory before\n"
2073
2222
" running the commit command. The --strict option checks for unknown\n"
2076
2225
" for details."
2077
2226
msgstr ""
2078
2227
2079
#: bzrlib/builtins.py:3213
2228
#: bzrlib/builtins.py:3458
2080
2229
msgid ":Things to note:"
2081
2230
msgstr ""
2082
2231
2083
#: bzrlib/builtins.py:3215
2232
#: bzrlib/builtins.py:3460
2084
2233
msgid ""
2085
2234
" If you accidentially commit the wrong changes or make a spelling\n"
2086
2235
" mistake in the commit message say, you can use the uncommit command\n"
2087
2236
" to undo it. See ``bzr help uncommit`` for details."
2088
2237
msgstr ""
2089
2238
2090
#: bzrlib/builtins.py:3219
2239
#: bzrlib/builtins.py:3464
2091
2240
msgid ""
2092
2241
" Hooks can also be configured to run after a commit. This allows you\n"
2093
2242
" to trigger updates to external systems like bug trackers. The --fixes\n"
2096
2245
msgstr ""
2097
2246
2098
2247
# help of 'exclude' option of 'commit' command
2099
#: bzrlib/builtins.py:3229
2248
#: bzrlib/builtins.py:3474
2100
2249
msgid "Do not consider changes made to a given path."
2101
2250
msgstr ""
2102
2251
2103
2252
# help of 'message' option of 'commit' command
2104
#: bzrlib/builtins.py:3232
2253
#: bzrlib/builtins.py:3477
2105
2254
msgid "Description of the new revision."
2106
2255
msgstr ""
2107
2256
2108
2257
# help of 'unchanged' option of 'commit' command
2109
#: bzrlib/builtins.py:3235
2258
#: bzrlib/builtins.py:3480
2110
2259
msgid "Commit even if nothing has changed."
2111
2260
msgstr ""
2112
2261
2113
2262
# help of 'file' option of 'commit' command
2114
#: bzrlib/builtins.py:3239
2263
#: bzrlib/builtins.py:3484
2115
2264
msgid "Take commit message from this file."
2116
2265
msgstr ""
2117
2266
2118
2267
# help of 'strict' option of 'commit' command
2119
#: bzrlib/builtins.py:3241
2268
#: bzrlib/builtins.py:3486
2120
2269
msgid "Refuse to commit if there are unknown files in the working tree."
2121
2270
msgstr ""
2122
2271
2123
2272
# help of 'commit-time' option of 'commit' command
2124
#: bzrlib/builtins.py:3244
2273
#: bzrlib/builtins.py:3489
2125
2274
msgid ""
2126
2275
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2127
2276
"08:00:00 +0100'."
2128
2277
msgstr ""
2129
2278
2130
2279
# help of 'fixes' option of 'commit' command
2131
#: bzrlib/builtins.py:3247
2280
#: bzrlib/builtins.py:3492
2132
2281
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2133
2282
msgstr ""
2134
2283
2135
2284
# help of 'author' option of 'commit' command
2136
#: bzrlib/builtins.py:3250
2285
#: bzrlib/builtins.py:3495
2137
2286
msgid "Set the author's name, if it's different from the committer."
2138
2287
msgstr ""
2139
2288
2140
2289
# help of 'local' option of 'commit' command
2141
#: bzrlib/builtins.py:3253
2290
#: bzrlib/builtins.py:3498
2142
2291
msgid ""
2143
2292
"Perform a local commit in a bound branch. Local commits are not pushed to "
2144
2293
"the master branch until a normal commit is performed."
2145
2294
msgstr ""
2146
2295
2147
2296
# help of 'show-diff' option of 'commit' command
2148
#: bzrlib/builtins.py:3259
2297
#: bzrlib/builtins.py:3504
2149
2298
msgid ""
2150
2299
"When no message is supplied, show the diff along with the status summary in "
2151
2300
"the message editor."
2152
2301
msgstr ""
2153
2302
2154
2303
# help of 'lossy' option of 'commit' command
2155
#: bzrlib/builtins.py:3262
2304
#: bzrlib/builtins.py:3507
2156
2305
msgid ""
2157
2306
"When committing to a foreign version control system do not push data that "
2158
2307
"can not be natively represented."
2159
2308
msgstr ""
2160
2309
2161
#: bzrlib/builtins.py:3280
2310
#: bzrlib/builtins.py:3525
2162
2311
#, python-format
2163
2312
msgid ""
2164
2313
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2166
2315
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2167
2316
msgstr ""
2168
2317
2169
#: bzrlib/builtins.py:3289
2318
#: bzrlib/builtins.py:3534
2170
2319
#, python-format
2171
2320
msgid ""
2172
2321
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2174
2323
"Commit refused."
2175
2324
msgstr ""
2176
2325
2177
#: bzrlib/builtins.py:3298
2326
#: bzrlib/builtins.py:3543
2178
2327
#, python-format
2179
2328
msgid "Unrecognized bug %s. Commit refused."
2180
2329
msgstr ""
2181
2330
2182
#: bzrlib/builtins.py:3301
2331
#: bzrlib/builtins.py:3546
2183
2332
#, python-format
2184
2333
msgid ""
2185
2334
"%s\n"
2186
2335
"Commit refused."
2187
2336
msgstr ""
2188
2337
2189
#: bzrlib/builtins.py:3325
2338
#: bzrlib/builtins.py:3570
2190
2339
msgid "Could not parse --commit-time: "
2191
2340
msgstr ""
2192
2341
2193
#: bzrlib/builtins.py:3365
2342
#: bzrlib/builtins.py:3610
2194
2343
msgid "please specify either --message or --file"
2195
2344
msgstr ""
2196
2345
2197
#: bzrlib/builtins.py:3394
2346
#: bzrlib/builtins.py:3639
2198
2347
msgid "please specify a commit message with either --message or --file"
2199
2348
msgstr ""
2200
2349
2201
#: bzrlib/builtins.py:3397
2350
#: bzrlib/builtins.py:3642
2202
2351
msgid ""
2203
2352
"Empty commit message specified. Please specify a commit message with either "
2204
2353
"--message or --file or leave a blank message with --message \"\"."
2205
2354
msgstr ""
2206
2355
2207
#: bzrlib/builtins.py:3417
2356
#: bzrlib/builtins.py:3662
2208
2357
msgid ""
2209
2358
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2210
2359
"--unchanged to force an empty commit."
2211
2360
msgstr ""
2212
2361
2213
#: bzrlib/builtins.py:3421
2362
#: bzrlib/builtins.py:3666
2214
2363
msgid ""
2215
2364
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2216
2365
"resolve FILE\" to resolve."
2217
2366
msgstr ""
2218
2367
2219
#: bzrlib/builtins.py:3425
2368
#: bzrlib/builtins.py:3670
2220
2369
msgid "Commit refused because there are unknown files in the working tree."
2221
2370
msgstr ""
2222
2371
2223
#: bzrlib/builtins.py:3428
2372
#: bzrlib/builtins.py:3673
2224
2373
msgid ""
2225
2374
"\n"
2226
2375
"To commit to master branch, run update and then commit.\n"
2227
2376
"You can also pass --local to commit to continue working disconnected."
2228
2377
msgstr ""
2229
2378
2230
#: bzrlib/builtins.py:3436
2379
#: bzrlib/builtins.py:3681
2231
2380
msgid ""
2232
2381
"Validate working tree structure, branch consistency and repository history."
2233
2382
msgstr ""
2234
2383
2235
#: bzrlib/builtins.py:3438
2384
#: bzrlib/builtins.py:3683
2236
2385
msgid ""
2237
2386
"This command checks various invariants about branch and repository storage\n"
2238
2387
"to detect data corruption or bzr bugs."
2239
2388
msgstr ""
2240
2389
2241
#: bzrlib/builtins.py:3441
2390
#: bzrlib/builtins.py:3686
2242
2391
msgid ""
2243
2392
"The working tree and branch checks will only give output if a problem is\n"
2244
2393
"detected. The output fields of the repository check are:"
2245
2394
msgstr ""
2246
2395
2247
#: bzrlib/builtins.py:3444
2396
#: bzrlib/builtins.py:3689
2248
2397
msgid ""
2249
2398
"revisions\n"
2250
2399
" This is just the number of revisions checked. It doesn't\n"
2251
2400
" indicate a problem."
2252
2401
msgstr ""
2253
2402
2254
#: bzrlib/builtins.py:3448
2403
#: bzrlib/builtins.py:3693
2255
2404
msgid ""
2256
2405
"versionedfiles\n"
2257
2406
" This is just the number of versionedfiles checked. It\n"
2258
2407
" doesn't indicate a problem."
2259
2408
msgstr ""
2260
2409
2261
#: bzrlib/builtins.py:3452
2410
#: bzrlib/builtins.py:3697
2262
2411
msgid ""
2263
2412
"unreferenced ancestors\n"
2264
2413
" Texts that are ancestors of other texts, but\n"
2266
2415
" subtle problem that Bazaar can work around."
2267
2416
msgstr ""
2268
2417
2269
#: bzrlib/builtins.py:3457
2418
#: bzrlib/builtins.py:3702
2270
2419
msgid ""
2271
2420
"unique file texts\n"
2272
2421
" This is the total number of unique file contents\n"
2273
2422
" seen in the checked revisions. It does not indicate a problem."
2274
2423
msgstr ""
2275
2424
2276
#: bzrlib/builtins.py:3461
2425
#: bzrlib/builtins.py:3706
2277
2426
msgid ""
2278
2427
"repeated file texts\n"
2279
2428
" This is the total number of repeated texts seen\n"
2282
2431
" indicate a problem."
2283
2432
msgstr ""
2284
2433
2285
#: bzrlib/builtins.py:3467
2434
#: bzrlib/builtins.py:3712
2286
2435
msgid ""
2287
2436
"If no restrictions are specified, all Bazaar data that is found at the "
2288
2437
"given\n"
2289
2438
"location will be checked."
2290
2439
msgstr ""
2291
2440
2292
#: bzrlib/builtins.py:3470
2293
msgid ":Examples:"
2294
msgstr ""
2295
2296
#: bzrlib/builtins.py:3472
2441
#: bzrlib/builtins.py:3717
2297
2442
msgid " Check the tree and branch at 'foo'::"
2298
2443
msgstr ""
2299
2444
2300
#: bzrlib/builtins.py:3474
2445
#: bzrlib/builtins.py:3719
2301
2446
msgid " bzr check --tree --branch foo"
2302
2447
msgstr ""
2303
2448
2304
#: bzrlib/builtins.py:3476
2449
#: bzrlib/builtins.py:3721
2305
2450
msgid " Check only the repository at 'bar'::"
2306
2451
msgstr ""
2307
2452
2308
#: bzrlib/builtins.py:3478
2453
#: bzrlib/builtins.py:3723
2309
2454
msgid " bzr check --repo bar"
2310
2455
msgstr ""
2311
2456
2312
#: bzrlib/builtins.py:3480
2457
#: bzrlib/builtins.py:3725
2313
2458
msgid " Check everything at 'baz'::"
2314
2459
msgstr ""
2315
2460
2316
#: bzrlib/builtins.py:3482
2461
#: bzrlib/builtins.py:3727
2317
2462
msgid " bzr check baz"
2318
2463
msgstr ""
2319
2464
2320
2465
# help of 'branch' option of 'check' command
2321
#: bzrlib/builtins.py:3488
2466
#: bzrlib/builtins.py:3733
2322
2467
msgid "Check the branch related to the current directory."
2323
2468
msgstr ""
2324
2469
2325
2470
# help of 'repo' option of 'check' command
2326
#: bzrlib/builtins.py:3490
2471
#: bzrlib/builtins.py:3735
2327
2472
msgid "Check the repository related to the current directory."
2328
2473
msgstr ""
2329
2474
2330
2475
# help of 'tree' option of 'check' command
2331
#: bzrlib/builtins.py:3492
2476
#: bzrlib/builtins.py:3737
2332
2477
msgid "Check the working tree related to the current directory."
2333
2478
msgstr ""
2334
2479
2335
#: bzrlib/builtins.py:3506
2480
#: bzrlib/builtins.py:3751
2336
2481
msgid "Upgrade a repository, branch or working tree to a newer format."
2337
2482
msgstr ""
2338
2483
2339
#: bzrlib/builtins.py:3508
2484
#: bzrlib/builtins.py:3753
2340
2485
msgid ""
2341
2486
"When the default format has changed after a major new release of\n"
2342
2487
"Bazaar, you may be informed during certain operations that you\n"
2345
2490
"with older repositories or with older versions of Bazaar."
2346
2491
msgstr ""
2347
2492
2348
#: bzrlib/builtins.py:3514
2493
#: bzrlib/builtins.py:3759
2349
2494
msgid ""
2350
2495
"If you wish to upgrade to a particular format rather than the\n"
2351
2496
"current default, that can be specified using the --format option.\n"
2355
2500
"2.x default) so downgrading is not always possible."
2356
2501
msgstr ""
2357
2502
2358
#: bzrlib/builtins.py:3521
2503
#: bzrlib/builtins.py:3766
2359
2504
msgid ""
2360
2505
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2361
2506
"process (where # is a number). By default, this is left there on\n"
2366
2511
"afterwards."
2367
2512
msgstr ""
2368
2513
2369
#: bzrlib/builtins.py:3529
2514
#: bzrlib/builtins.py:3774
2370
2515
msgid ""
2371
2516
"If the location given is a shared repository, dependent branches\n"
2372
2517
"are also converted provided the repository converts successfully.\n"
2374
2519
"tried."
2375
2520
msgstr ""
2376
2521
2377
#: bzrlib/builtins.py:3534
2522
#: bzrlib/builtins.py:3779
2378
2523
msgid ""
2379
2524
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2380
2525
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2381
2526
msgstr ""
2382
2527
2383
2528
# help of 'format' option of 'upgrade' command
2384
#: bzrlib/builtins.py:3542
2529
#: bzrlib/builtins.py:3787
2385
2530
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2386
2531
msgstr ""
2387
2532
2388
2533
# title of 'format' option of 'init' command
2389
#: bzrlib/builtins.py:3546
2534
# title of 'format' option of 'upgrade' command
2535
#: bzrlib/builtins.py:3791
2390
2536
msgid "Branch format"
2391
2537
msgstr ""
2392
2538
2393
2539
# help of 'clean' option of 'upgrade' command
2394
#: bzrlib/builtins.py:3548
2540
#: bzrlib/builtins.py:3793
2395
2541
msgid "Remove the backup.bzr directory if successful."
2396
2542
msgstr ""
2397
2543
2398
#: bzrlib/builtins.py:3565
2544
# help of 'dry-run' option of 'add' command
2545
# help of 'dry-run' option of 'upgrade' command
2546
#: bzrlib/builtins.py:3795
2547
msgid "Show what would be done, but don't actually do anything."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3810
2399
2551
msgid "Show or set bzr user id."
2400
2552
msgstr ""
2401
2553
2402
#: bzrlib/builtins.py:3567
2554
#: bzrlib/builtins.py:3812
2403
2555
msgid ""
2404
2556
":Examples:\n"
2405
2557
" Show the email of the current user::"
2406
2558
msgstr ""
2407
2559
2408
#: bzrlib/builtins.py:3570
2560
#: bzrlib/builtins.py:3815
2409
2561
msgid " bzr whoami --email"
2410
2562
msgstr ""
2411
2563
2412
#: bzrlib/builtins.py:3572
2564
#: bzrlib/builtins.py:3817
2413
2565
msgid " Set the current user::"
2414
2566
msgstr ""
2415
2567
2416
#: bzrlib/builtins.py:3574
2568
#: bzrlib/builtins.py:3819
2417
2569
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2418
2570
msgstr ""
2419
2571
2420
2572
# help of 'email' option of 'whoami' command
2421
#: bzrlib/builtins.py:3578
2573
#: bzrlib/builtins.py:3823
2422
2574
msgid "Display email address only."
2423
2575
msgstr ""
2424
2576
2425
2577
# help of 'branch' option of 'whoami' command
2426
#: bzrlib/builtins.py:3580
2578
#: bzrlib/builtins.py:3825
2427
2579
msgid "Set identity for the current branch instead of globally."
2428
2580
msgstr ""
2429
2581
2430
#: bzrlib/builtins.py:3604
2582
#: bzrlib/builtins.py:3851
2431
2583
msgid "--email can only be used to display existing identity"
2432
2584
msgstr ""
2433
2585
2434
#: bzrlib/builtins.py:3626
2586
#: bzrlib/builtins.py:3873
2435
2587
msgid "Print or set the branch nickname."
2436
2588
msgstr ""
2437
2589
2438
#: bzrlib/builtins.py:3628
2590
#: bzrlib/builtins.py:3875
2439
2591
msgid ""
2440
2592
"If unset, the tree root directory name is used as the nickname.\n"
2441
2593
"To print the current nickname, execute with no argument."
2442
2594
msgstr ""
2443
2595
2444
#: bzrlib/builtins.py:3631
2596
#: bzrlib/builtins.py:3878
2445
2597
msgid ""
2446
2598
"Bound branches use the nickname of its master branch unless it is set\n"
2447
2599
"locally."
2448
2600
msgstr ""
2449
2601
2450
#: bzrlib/builtins.py:3651
2602
#: bzrlib/builtins.py:3898
2451
2603
msgid "Set/unset and display aliases."
2452
2604
msgstr ""
2453
2605
2454
#: bzrlib/builtins.py:3653
2606
#: bzrlib/builtins.py:3900
2455
2607
msgid ""
2456
2608
":Examples:\n"
2457
2609
" Show the current aliases::"
2458
2610
msgstr ""
2459
2611
2460
#: bzrlib/builtins.py:3656
2612
#: bzrlib/builtins.py:3903
2461
2613
msgid " bzr alias"
2462
2614
msgstr ""
2463
2615
2464
#: bzrlib/builtins.py:3658
2616
#: bzrlib/builtins.py:3905
2465
2617
msgid " Show the alias specified for 'll'::"
2466
2618
msgstr ""
2467
2619
2468
#: bzrlib/builtins.py:3660
2620
#: bzrlib/builtins.py:3907
2469
2621
msgid " bzr alias ll"
2470
2622
msgstr ""
2471
2623
2472
#: bzrlib/builtins.py:3662
2624
#: bzrlib/builtins.py:3909
2473
2625
msgid " Set an alias for 'll'::"
2474
2626
msgstr ""
2475
2627
2476
#: bzrlib/builtins.py:3664
2628
#: bzrlib/builtins.py:3911
2477
2629
msgid " bzr alias ll=\"log --line -r-10..-1\""
2478
2630
msgstr ""
2479
2631
2480
#: bzrlib/builtins.py:3666
2632
#: bzrlib/builtins.py:3913
2481
2633
msgid " To remove an alias for 'll'::"
2482
2634
msgstr ""
2483
2635
2484
#: bzrlib/builtins.py:3668
2636
#: bzrlib/builtins.py:3915
2485
2637
msgid " bzr alias --remove ll"
2486
2638
msgstr ""
2487
2639
2488
2640
# help of 'remove' option of 'alias' command
2489
#: bzrlib/builtins.py:3673
2641
#: bzrlib/builtins.py:3920
2490
2642
msgid "Remove the alias."
2491
2643
msgstr ""
2492
2644
2493
#: bzrlib/builtins.py:3691
2645
#: bzrlib/builtins.py:3938
2494
2646
msgid "bzr alias --remove expects an alias to remove."
2495
2647
msgstr ""
2496
2648
2497
#: bzrlib/builtins.py:3863
2649
#: bzrlib/builtins.py:4119
2498
2650
msgid "subunit not available. subunit needs to be installed to use --subunit."
2499
2651
msgstr ""
2500
2652
2501
#: bzrlib/builtins.py:3880
2653
#: bzrlib/builtins.py:4136
2502
2654
msgid ""
2503
2655
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2504
2656
msgstr ""
2505
2657
2506
#: bzrlib/builtins.py:3927
2658
#: bzrlib/builtins.py:4183
2507
2659
msgid "Show version of bzr."
2508
2660
msgstr ""
2509
2661
2510
2662
# help of 'short' option of 'version' command
2511
#: bzrlib/builtins.py:3931
2663
#: bzrlib/builtins.py:4187
2512
2664
msgid "Print just the version number."
2513
2665
msgstr ""
2514
2666
2515
#: bzrlib/builtins.py:3950
2667
#: bzrlib/builtins.py:4206
2516
2668
msgid "It sure does!\n"
2517
2669
msgstr ""
2518
2670
2519
#: bzrlib/builtins.py:3974
2671
#: bzrlib/builtins.py:4230
2520
2672
#, python-format
2521
2673
msgid "merge base is revision %s\n"
2522
2674
msgstr ""
2523
2675
2524
#: bzrlib/builtins.py:3978
2676
#: bzrlib/builtins.py:4234
2525
2677
msgid "Perform a three-way merge."
2526
2678
msgstr ""
2527
2679
2528
#: bzrlib/builtins.py:3980
2680
#: bzrlib/builtins.py:4236
2529
2681
msgid ""
2530
2682
"The source of the merge can be specified either in the form of a branch,\n"
2531
2683
"or in the form of a path to a file containing a merge directive generated\n"
2536
2688
"the current working tree."
2537
2689
msgstr ""
2538
2690
2539
#: bzrlib/builtins.py:3988
2691
#: bzrlib/builtins.py:4244
2540
2692
msgid ""
2541
2693
"When merging from a branch, by default bzr will try to merge in all new\n"
2542
2694
"work from the other branch, automatically determining an appropriate base\n"
2543
2695
"revision. If this fails, you may need to give an explicit base."
2544
2696
msgstr ""
2545
2697
2546
#: bzrlib/builtins.py:3992
2698
#: bzrlib/builtins.py:4248
2547
2699
msgid ""
2548
2700
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2549
2701
"try to merge in all new work up to and including revision OTHER."
2550
2702
msgstr ""
2551
2703
2552
#: bzrlib/builtins.py:3995
2704
#: bzrlib/builtins.py:4251
2553
2705
msgid ""
2554
2706
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2555
2707
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2560
2712
"changes from the other branch is not stored in the commit."
2561
2713
msgstr ""
2562
2714
2563
#: bzrlib/builtins.py:4003
2715
#: bzrlib/builtins.py:4259
2564
2716
msgid "Revision numbers are always relative to the source branch."
2565
2717
msgstr ""
2566
2718
2567
#: bzrlib/builtins.py:4010
2719
#: bzrlib/builtins.py:4261 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 can commit."
2725
msgstr ""
2726
2727
#: bzrlib/builtins.py:4266
2568
2728
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2569
2729
msgstr ""
2570
2730
2571
#: bzrlib/builtins.py:4012
2731
#: bzrlib/builtins.py:4268
2572
2732
msgid ""
2573
2733
"If there is no default branch set, the first merge will set it (use\n"
2574
2734
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2576
2736
"only be saved if the remote location can be accessed."
2577
2737
msgstr ""
2578
2738
2579
#: bzrlib/builtins.py:4017
2739
#: bzrlib/builtins.py:4273
2580
2740
msgid ""
2581
2741
"The results of the merge are placed into the destination working\n"
2582
2742
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2583
2743
"committed to record the result of the merge."
2584
2744
msgstr ""
2585
2745
2586
#: bzrlib/builtins.py:4021
2746
#: bzrlib/builtins.py:4277
2587
2747
msgid ""
2588
2748
"merge refuses to run if there are any uncommitted changes, unless\n"
2589
2749
"--force is given. If --force is given, then the changes from the source \n"
2592
2752
"merge revision which has more than two parents."
2593
2753
msgstr ""
2594
2754
2595
#: bzrlib/builtins.py:4027
2755
#: bzrlib/builtins.py:4283
2596
2756
msgid ""
2597
2757
"If one would like to merge changes from the working tree of the other\n"
2598
2758
"branch without merging any committed revisions, the --uncommitted option\n"
2599
2759
"can be given."
2600
2760
msgstr ""
2601
2761
2602
#: bzrlib/builtins.py:4031
2762
#: bzrlib/builtins.py:4287
2603
2763
msgid ""
2604
2764
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2605
2765
"you to apply each diff hunk and file change, similar to \"shelve\"."
2606
2766
msgstr ""
2607
2767
2608
#: bzrlib/builtins.py:4034
2768
#: bzrlib/builtins.py:4290
2609
2769
msgid ""
2610
2770
":Examples:\n"
2611
2771
" To merge all new revisions from bzr.dev::"
2612
2772
msgstr ""
2613
2773
2614
#: bzrlib/builtins.py:4037
2774
#: bzrlib/builtins.py:4293
2615
2775
msgid " bzr merge ../bzr.dev"
2616
2776
msgstr ""
2617
2777
2618
#: bzrlib/builtins.py:4039
2778
#: bzrlib/builtins.py:4295
2619
2779
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2620
2780
msgstr ""
2621
2781
2622
#: bzrlib/builtins.py:4041
2782
#: bzrlib/builtins.py:4297
2623
2783
msgid " bzr merge -r 82 ../bzr.dev"
2624
2784
msgstr ""
2625
2785
2626
#: bzrlib/builtins.py:4043
2786
#: bzrlib/builtins.py:4299
2627
2787
msgid " To merge the changes introduced by 82, without previous changes::"
2628
2788
msgstr ""
2629
2789
2630
#: bzrlib/builtins.py:4045
2790
#: bzrlib/builtins.py:4301
2631
2791
msgid " bzr merge -r 81..82 ../bzr.dev"
2632
2792
msgstr ""
2633
2793
2634
#: bzrlib/builtins.py:4047
2794
#: bzrlib/builtins.py:4303
2635
2795
msgid " To apply a merge directive contained in /tmp/merge::"
2636
2796
msgstr ""
2637
2797
2638
#: bzrlib/builtins.py:4049
2798
#: bzrlib/builtins.py:4305
2639
2799
msgid " bzr merge /tmp/merge"
2640
2800
msgstr ""
2641
2801
2642
#: bzrlib/builtins.py:4051
2802
#: bzrlib/builtins.py:4307
2643
2803
msgid ""
2644
2804
" To create a merge revision with three parents from two branches\n"
2645
2805
" feature1a and feature1b:"
2646
2806
msgstr ""
2647
2807
2648
#: bzrlib/builtins.py:4054
2808
#: bzrlib/builtins.py:4310
2649
2809
msgid ""
2650
2810
" bzr merge ../feature1a\n"
2651
2811
" bzr merge ../feature1b --force\n"
2653
2813
msgstr ""
2654
2814
2655
2815
# help of 'force' option of 'merge' command
2656
#: bzrlib/builtins.py:4066
2816
#: bzrlib/builtins.py:4322
2657
2817
msgid "Merge even if the destination tree has uncommitted changes."
2658
2818
msgstr ""
2659
2819
2660
2820
# help of 'uncommitted' option of 'merge' command
2661
#: bzrlib/builtins.py:4072
2821
#: bzrlib/builtins.py:4328
2662
2822
msgid ""
2663
2823
"Apply uncommitted changes from a working copy, instead of branch changes."
2664
2824
msgstr ""
2665
2825
2666
2826
# help of 'pull' option of 'merge' command
2667
#: bzrlib/builtins.py:4074
2827
#: bzrlib/builtins.py:4330
2668
2828
msgid ""
2669
2829
"If the destination is already completely merged into the source, pull from "
2670
2830
"the source rather than merging. When this happens, you do not need to "
2672
2832
msgstr ""
2673
2833
2674
2834
# help of 'directory' option of 'merge' command
2675
#: bzrlib/builtins.py:4079
2835
#: bzrlib/builtins.py:4335
2676
2836
msgid ""
2677
2837
"Branch to merge into, rather than the one containing the working directory."
2678
2838
msgstr ""
2679
2839
2680
2840
# help of 'preview' option of 'merge' command
2681
#: bzrlib/builtins.py:4081
2841
#: bzrlib/builtins.py:4337
2682
2842
msgid "Instead of merging, show a diff of the merge."
2683
2843
msgstr ""
2684
2844
2685
2845
# help of 'interactive' option of 'merge' command
2686
#: bzrlib/builtins.py:4083
2846
#: bzrlib/builtins.py:4339
2687
2847
msgid "Select changes interactively."
2688
2848
msgstr ""
2689
2849
2690
#: bzrlib/builtins.py:4105
2850
#: bzrlib/builtins.py:4361
2691
2851
msgid ""
2692
2852
"Merging into empty branches not currently supported, https://bugs.launchpad."
2693
2853
"net/bzr/+bug/308562"
2694
2854
msgstr ""
2695
2855
2696
#: bzrlib/builtins.py:4132
2856
#: bzrlib/builtins.py:4388
2697
2857
msgid "Cannot use --uncommitted with bundles or merge directives."
2698
2858
msgstr ""
2699
2859
2700
#: bzrlib/builtins.py:4143
2860
#: bzrlib/builtins.py:4399
2701
2861
msgid "Cannot use --uncommitted and --revision at the same time."
2702
2862
msgstr ""
2703
2863
2704
#: bzrlib/builtins.py:4163
2864
#: bzrlib/builtins.py:4419
2705
2865
msgid "merger: "
2706
2866
msgstr ""
2707
2867
2708
#: bzrlib/builtins.py:4165 bzrlib/bundle/apply_bundle.py:67
2868
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2709
2869
msgid "Nothing to do."
2710
2870
msgstr ""
2711
2871
2712
#: bzrlib/builtins.py:4169
2872
#: bzrlib/builtins.py:4425
2713
2873
msgid "Cannot pull individual files"
2714
2874
msgstr ""
2715
2875
2716
#: bzrlib/builtins.py:4177
2876
#: bzrlib/builtins.py:4433
2717
2877
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2718
2878
msgstr ""
2719
2879
2720
#: bzrlib/builtins.py:4235
2880
#: bzrlib/builtins.py:4491
2721
2881
#, python-format
2722
2882
msgid "Show-base is not supported for this merge type. %s"
2723
2883
msgstr ""
2724
2884
2725
#: bzrlib/builtins.py:4244
2885
#: bzrlib/builtins.py:4500
2726
2886
#, python-format
2727
2887
msgid "Conflict reduction is not supported for merge type %s."
2728
2888
msgstr ""
2729
2889
2730
#: bzrlib/builtins.py:4248
2890
#: bzrlib/builtins.py:4504
2731
2891
msgid "Cannot do conflict reduction and show base."
2732
2892
msgstr ""
2733
2893
2734
#: bzrlib/builtins.py:4359
2894
#: bzrlib/builtins.py:4615
2735
2895
msgid "No location specified or remembered"
2736
2896
msgstr ""
2737
2897
2738
#: bzrlib/builtins.py:4361
2898
#: bzrlib/builtins.py:4617
2739
2899
msgid "{0} remembered {1} location {2}"
2740
2900
msgstr ""
2741
2901
2742
#: bzrlib/builtins.py:4367
2902
#: bzrlib/builtins.py:4623
2743
2903
msgid "Redo a merge."
2744
2904
msgstr ""
2745
2905
2746
#: bzrlib/builtins.py:4369
2906
#: bzrlib/builtins.py:4625
2747
2907
msgid ""
2748
2908
"Use this if you want to try a different merge technique while resolving\n"
2749
2909
"conflicts. Some merge techniques are better than others, and remerge\n"
2750
2910
"lets you try different ones on different files."
2751
2911
msgstr ""
2752
2912
2753
#: bzrlib/builtins.py:4373
2913
#: bzrlib/builtins.py:4629
2754
2914
msgid ""
2755
2915
"The options for remerge have the same meaning and defaults as the ones for\n"
2756
2916
"merge. The difference is that remerge can (only) be run when there is a\n"
2757
2917
"pending merge, and it lets you specify particular files."
2758
2918
msgstr ""
2759
2919
2760
#: bzrlib/builtins.py:4377
2920
#: bzrlib/builtins.py:4633
2761
2921
msgid ""
2762
2922
":Examples:\n"
2763
2923
" Re-do the merge of all conflicted files, and show the base text in\n"
2764
2924
" conflict regions, in addition to the usual THIS and OTHER texts::"
2765
2925
msgstr ""
2766
2926
2767
#: bzrlib/builtins.py:4381
2927
#: bzrlib/builtins.py:4637
2768
2928
msgid " bzr remerge --show-base"
2769
2929
msgstr ""
2770
2930
2771
#: bzrlib/builtins.py:4383
2931
#: bzrlib/builtins.py:4639
2772
2932
msgid ""
2773
2933
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2774
2934
" additional processing to reduce the size of conflict regions::"
2775
2935
msgstr ""
2776
2936
2777
#: bzrlib/builtins.py:4386
2937
#: bzrlib/builtins.py:4642
2778
2938
msgid " bzr remerge --merge-type weave --reprocess foobar"
2779
2939
msgstr ""
2780
2940
2781
2941
# help of 'show-base' option of 'merge' command
2782
#: bzrlib/builtins.py:4393
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:4649
2783
2946
msgid "Show base revision text in conflicts."
2784
2947
msgstr ""
2785
2948
2786
#: bzrlib/builtins.py:4405
2949
#: bzrlib/builtins.py:4661
2787
2950
msgid ""
2788
2951
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2789
2952
"merges."
2790
2953
msgstr ""
2791
2954
2792
#: bzrlib/builtins.py:4461
2955
#: bzrlib/builtins.py:4717
2793
2956
msgid "Revert files to a previous revision."
2794
2957
msgstr ""
2795
2958
2796
#: bzrlib/builtins.py:4463
2959
#: bzrlib/builtins.py:4719
2797
2960
msgid ""
2798
2961
"Giving a list of files will revert only those files. Otherwise, all files\n"
2799
2962
"will be reverted. If the revision is not specified with '--revision', the\n"
2800
2963
"last committed revision is used."
2801
2964
msgstr ""
2802
2965
2803
#: bzrlib/builtins.py:4467
2966
#: bzrlib/builtins.py:4723
2804
2967
msgid ""
2805
2968
"To remove only some changes, without reverting to a prior version, use\n"
2806
2969
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2809
2972
"certain changes on a hunk-by-hunk basis, see the shelve command."
2810
2973
msgstr ""
2811
2974
2812
#: bzrlib/builtins.py:4473
2975
#: bzrlib/builtins.py:4729
2813
2976
msgid ""
2814
2977
"By default, any files that have been manually changed will be backed up\n"
2815
2978
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2816
2979
"'.~#~' appended to their name, where # is a number."
2817
2980
msgstr ""
2818
2981
2819
#: bzrlib/builtins.py:4477
2982
#: bzrlib/builtins.py:4733
2820
2983
msgid ""
2821
2984
"When you provide files, you can use their current pathname or the pathname\n"
2822
2985
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2824
2987
"reverted."
2825
2988
msgstr ""
2826
2989
2827
#: bzrlib/builtins.py:4482
2990
#: bzrlib/builtins.py:4738
2828
2991
msgid ""
2829
2992
"If you have newly added files since the target revision, they will be\n"
2830
2993
"removed. If the files to be removed have been changed, backups will be\n"
2832
2995
"deleted."
2833
2996
msgstr ""
2834
2997
2835
#: bzrlib/builtins.py:4487
2998
#: bzrlib/builtins.py:4743
2836
2999
msgid ""
2837
3000
"The working tree contains a list of revisions that have been merged but\n"
2838
3001
"not yet committed. These revisions will be included as additional parents\n"
2844
3007
"reverting any files."
2845
3008
msgstr ""
2846
3009
2847
#: bzrlib/builtins.py:4496
3010
#: bzrlib/builtins.py:4752
2848
3011
msgid ""
2849
3012
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2850
3013
"changes from a branch in a single revision. To do this, perform the merge\n"
2859
3022
msgstr ""
2860
3023
2861
3024
# help of 'no-backup' option of 'revert' command
2862
#: bzrlib/builtins.py:4510
3025
#: bzrlib/builtins.py:4766
2863
3026
msgid "Do not save backups of reverted files."
2864
3027
msgstr ""
2865
3028
2866
3029
# help of 'forget-merges' option of 'revert' command
2867
#: bzrlib/builtins.py:4512
3030
#: bzrlib/builtins.py:4768
2868
3031
msgid "Remove pending merge marker, without changing any files."
2869
3032
msgstr ""
2870
3033
2871
#: bzrlib/builtins.py:4543
3034
#: bzrlib/builtins.py:4799
2872
3035
msgid ""
2873
3036
"Show help on a command or other topic.\n"
2874
3037
" "
2875
3038
msgstr ""
2876
3039
2877
3040
# help of 'long' option of 'help' command
2878
#: bzrlib/builtins.py:4548
3041
#: bzrlib/builtins.py:4804
2879
3042
msgid "Show help on all commands."
2880
3043
msgstr ""
2881
3044
2882
#: bzrlib/builtins.py:4577
3045
#: bzrlib/builtins.py:4833
2883
3046
msgid "Show unmerged/unpulled revisions between two branches."
2884
3047
msgstr ""
2885
3048
2886
#: bzrlib/builtins.py:4579
3049
#: bzrlib/builtins.py:4835
2887
3050
msgid "OTHER_BRANCH may be local or remote."
2888
3051
msgstr ""
2889
3052
2890
#: bzrlib/builtins.py:4581
3053
#: bzrlib/builtins.py:4837
2891
3054
msgid ""
2892
3055
"To filter on a range of revisions, you can use the command -r begin..end\n"
2893
3056
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2898
3061
" 0 - no missing revisions"
2899
3062
msgstr ""
2900
3063
2901
#: bzrlib/builtins.py:4591
3064
#: bzrlib/builtins.py:4847
2902
3065
msgid ""
2903
3066
" Determine the missing revisions between this and the branch at the\n"
2904
3067
" remembered pull location::"
2905
3068
msgstr ""
2906
3069
2907
#: bzrlib/builtins.py:4594
3070
#: bzrlib/builtins.py:4850
2908
3071
msgid " bzr missing"
2909
3072
msgstr ""
2910
3073
2911
#: bzrlib/builtins.py:4596
3074
#: bzrlib/builtins.py:4852
2912
3075
msgid " Determine the missing revisions between this and another branch::"
2913
3076
msgstr ""
2914
3077
2915
#: bzrlib/builtins.py:4598
3078
#: bzrlib/builtins.py:4854
2916
3079
msgid " bzr missing http://server/branch"
2917
3080
msgstr ""
2918
3081
2919
#: bzrlib/builtins.py:4600
3082
#: bzrlib/builtins.py:4856
2920
3083
msgid ""
2921
3084
" Determine the missing revisions up to a specific revision on the other\n"
2922
3085
" branch::"
2923
3086
msgstr ""
2924
3087
2925
#: bzrlib/builtins.py:4603
3088
#: bzrlib/builtins.py:4859
2926
3089
msgid " bzr missing -r ..-10"
2927
3090
msgstr ""
2928
3091
2929
#: bzrlib/builtins.py:4605
3092
#: bzrlib/builtins.py:4861
2930
3093
msgid ""
2931
3094
" Determine the missing revisions up to a specific revision on this\n"
2932
3095
" branch::"
2933
3096
msgstr ""
2934
3097
2935
#: bzrlib/builtins.py:4608
3098
#: bzrlib/builtins.py:4864
2936
3099
msgid " bzr missing --my-revision ..-10"
2937
3100
msgstr ""
2938
3101
2939
3102
# help of 'reverse' option of 'missing' command
2940
#: bzrlib/builtins.py:4615
3103
#: bzrlib/builtins.py:4871
2941
3104
msgid "Reverse the order of revisions."
2942
3105
msgstr ""
2943
3106
2944
3107
# help of 'mine-only' option of 'missing' command
2945
#: bzrlib/builtins.py:4617
3108
#: bzrlib/builtins.py:4873
2946
3109
msgid "Display changes in the local branch only."
2947
3110
msgstr ""
2948
3111
2949
3112
# help of 'this' option of 'missing' command
2950
#: bzrlib/builtins.py:4618
3113
#: bzrlib/builtins.py:4874
2951
3114
msgid "Same as --mine-only."
2952
3115
msgstr ""
2953
3116
2954
3117
# help of 'theirs-only' option of 'missing' command
2955
#: bzrlib/builtins.py:4620
3118
#: bzrlib/builtins.py:4876
2956
3119
msgid "Display changes in the remote branch only."
2957
3120
msgstr ""
2958
3121
2959
3122
# help of 'other' option of 'missing' command
2960
#: bzrlib/builtins.py:4621
3123
#: bzrlib/builtins.py:4877
2961
3124
msgid "Same as --theirs-only."
2962
3125
msgstr ""
2963
3126
2964
3127
# help of 'revision' option of 'missing' command
2965
#: bzrlib/builtins.py:4626
3128
#: bzrlib/builtins.py:4882
2966
3129
msgid ""
2967
3130
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2968
3131
"details."
2969
3132
msgstr ""
2970
3133
2971
3134
# help of 'my-revision' option of 'missing' command
2972
#: bzrlib/builtins.py:4630
3135
#: bzrlib/builtins.py:4886
2973
3136
msgid ""
2974
3137
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2975
3138
"details."
2976
3139
msgstr ""
2977
3140
2978
3141
# help of 'include-merged' option of 'missing' command
2979
#: bzrlib/builtins.py:4633
3142
#: bzrlib/builtins.py:4889
2980
3143
msgid "Show all revisions in addition to the mainline ones."
2981
3144
msgstr ""
2982
3145
2983
#: bzrlib/builtins.py:4687
3146
#: bzrlib/builtins.py:4943
2984
3147
msgid "No peer location known or specified."
2985
3148
msgstr ""
2986
3149
2987
#: bzrlib/builtins.py:4691
3150
#: bzrlib/builtins.py:4947
2988
3151
msgid "Using saved parent location: {0}\n"
2989
3152
msgstr ""
2990
3153
2991
#: bzrlib/builtins.py:4724
3154
#: bzrlib/builtins.py:4980
2992
3155
#, python-format
2993
3156
msgid "You have %d extra revision:\n"
2994
3157
msgid_plural "You have %d extra revisions:\n"
2995
3158
msgstr[0] ""
2996
3159
msgstr[1] ""
2997
3160
2998
#: bzrlib/builtins.py:4740
3161
#: bzrlib/builtins.py:4996
2999
3162
#, python-format
3000
3163
msgid "You are missing %d revision:\n"
3001
3164
msgid_plural "You are missing %d revisions:\n"
3002
3165
msgstr[0] ""
3003
3166
msgstr[1] ""
3004
3167
3005
#: bzrlib/builtins.py:4752
3168
#: bzrlib/builtins.py:5008
3006
3169
msgid "This branch has no new revisions.\n"
3007
3170
msgstr ""
3008
3171
3009
#: bzrlib/builtins.py:4755
3172
#: bzrlib/builtins.py:5011
3010
3173
msgid "Other branch has no new revisions.\n"
3011
3174
msgstr ""
3012
3175
3013
#: bzrlib/builtins.py:4760
3176
#: bzrlib/builtins.py:5016
3014
3177
msgid "Branches are up to date.\n"
3015
3178
msgstr ""
3016
3179
3017
#: bzrlib/builtins.py:4771
3180
#: bzrlib/builtins.py:5027
3018
3181
msgid "Compress the data within a repository."
3019
3182
msgstr ""
3020
3183
3021
#: bzrlib/builtins.py:4773
3184
#: bzrlib/builtins.py:5029
3022
3185
msgid ""
3023
3186
"This operation compresses the data within a bazaar repository. As\n"
3024
3187
"bazaar supports automatic packing of repository, this operation is\n"
3025
3188
"normally not required to be done manually."
3026
3189
msgstr ""
3027
3190
3028
#: bzrlib/builtins.py:4777
3191
#: bzrlib/builtins.py:5033
3029
3192
msgid ""
3030
3193
"During the pack operation, bazaar takes a backup of existing repository\n"
3031
3194
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3034
3197
"used."
3035
3198
msgstr ""
3036
3199
3037
#: bzrlib/builtins.py:4783
3200
#: bzrlib/builtins.py:5039
3038
3201
msgid ""
3039
3202
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3040
3203
"during or immediately after repacking, you may be left with a state\n"
3043
3206
msgstr ""
3044
3207
3045
3208
# help of 'clean-obsolete-packs' option of 'pack' command
3046
#: bzrlib/builtins.py:4792
3209
#: bzrlib/builtins.py:5048
3047
3210
msgid "Delete obsolete packs to save disk space."
3048
3211
msgstr ""
3049
3212
3050
#: bzrlib/builtins.py:4806
3213
#: bzrlib/builtins.py:5062
3051
3214
msgid "List the installed plugins."
3052
3215
msgstr ""
3053
3216
3054
#: bzrlib/builtins.py:4808
3217
#: bzrlib/builtins.py:5064
3055
3218
msgid ""
3056
3219
"This command displays the list of installed plugins including\n"
3057
3220
"version of plugin and a short description of each."
3058
3221
msgstr ""
3059
3222
3060
#: bzrlib/builtins.py:4811
3223
#: bzrlib/builtins.py:5067
3061
3224
msgid "--verbose shows the path where each plugin is located."
3062
3225
msgstr ""
3063
3226
3064
#: bzrlib/builtins.py:4813
3227
#: bzrlib/builtins.py:5069
3065
3228
msgid ""
3066
3229
"A plugin is an external component for Bazaar that extends the\n"
3067
3230
"revision control system, by adding or replacing code in Bazaar.\n"
3070
3233
"customizing log output."
3071
3234
msgstr ""
3072
3235
3073
#: bzrlib/builtins.py:4819
3236
#: bzrlib/builtins.py:5075
3074
3237
msgid ""
3075
3238
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3076
3239
"for further information on plugins including where to find them and how to\n"
3078
3241
"plugins using the Python programming language."
3079
3242
msgstr ""
3080
3243
3081
#: bzrlib/builtins.py:4835
3244
#: bzrlib/builtins.py:5091
3082
3245
msgid "Show testament (signing-form) of a revision."
3083
3246
msgstr ""
3084
3247
3085
3248
# help of 'long' option of 'testament' command
3086
#: bzrlib/builtins.py:4838
3249
#: bzrlib/builtins.py:5094
3087
3250
msgid "Produce long-format testament."
3088
3251
msgstr ""
3089
3252
3090
3253
# help of 'strict' option of 'testament' command
3091
#: bzrlib/builtins.py:4840
3254
#: bzrlib/builtins.py:5096
3092
3255
msgid "Produce a strict-format testament."
3093
3256
msgstr ""
3094
3257
3095
#: bzrlib/builtins.py:4866
3258
#: bzrlib/builtins.py:5122
3096
3259
msgid "Show the origin of each line in a file."
3097
3260
msgstr ""
3098
3261
3099
#: bzrlib/builtins.py:4868
3262
#: bzrlib/builtins.py:5124
3100
3263
msgid ""
3101
3264
"This prints out the given file with an annotation on the left side\n"
3102
3265
"indicating which revision, author and date introduced the change."
3103
3266
msgstr ""
3104
3267
3105
#: bzrlib/builtins.py:4871
3268
#: bzrlib/builtins.py:5127
3106
3269
msgid ""
3107
3270
"If the origin is the same for a run of consecutive lines, it is\n"
3108
3271
"shown only at the top, unless the --all option is given."
3109
3272
msgstr ""
3110
3273
3111
3274
# help of 'all' option of 'annotate' command
3112
#: bzrlib/builtins.py:4879
3275
#: bzrlib/builtins.py:5135
3113
3276
msgid "Show annotations on all lines."
3114
3277
msgstr ""
3115
3278
3116
3279
# help of 'long' option of 'annotate' command
3117
#: bzrlib/builtins.py:4880
3280
#: bzrlib/builtins.py:5136
3118
3281
msgid "Show commit date in annotations."
3119
3282
msgstr ""
3120
3283
3121
#: bzrlib/builtins.py:4967
3284
#: bzrlib/builtins.py:5223
3122
3285
msgid "Cannot sign a range of non-revision-history revisions"
3123
3286
msgstr ""
3124
3287
3125
#: bzrlib/builtins.py:4979
3288
#: bzrlib/builtins.py:5235
3126
3289
msgid "Please supply either one revision, or a range."
3127
3290
msgstr ""
3128
3291
3129
#: bzrlib/builtins.py:4983
3292
#: bzrlib/builtins.py:5239
3130
3293
msgid ""
3131
3294
"Convert the current branch into a checkout of the supplied branch.\n"
3132
3295
"If no branch is supplied, rebind to the last bound location."
3133
3296
msgstr ""
3134
3297
3135
#: bzrlib/builtins.py:4986
3298
#: bzrlib/builtins.py:5242
3136
3299
msgid ""
3137
3300
"Once converted into a checkout, commits must succeed on the master branch\n"
3138
3301
"before they will be applied to the local branch."
3139
3302
msgstr ""
3140
3303
3141
#: bzrlib/builtins.py:4989
3304
#: bzrlib/builtins.py:5245
3142
3305
msgid ""
3143
3306
"Bound branches use the nickname of its master branch unless it is set\n"
3144
3307
"locally, in which case binding will update the local nickname to be\n"
3145
3308
"that of the master."
3146
3309
msgstr ""
3147
3310
3148
#: bzrlib/builtins.py:5004
3311
#: bzrlib/builtins.py:5260
3149
3312
msgid "No location supplied. This format does not remember old locations."
3150
3313
msgstr ""
3151
3314
3152
#: bzrlib/builtins.py:5009
3315
#: bzrlib/builtins.py:5265
3153
3316
msgid "Branch is already bound"
3154
3317
msgstr ""
3155
3318
3156
#: bzrlib/builtins.py:5011
3319
#: bzrlib/builtins.py:5267
3157
3320
msgid "No location supplied and no previous location known"
3158
3321
msgstr ""
3159
3322
3160
#: bzrlib/builtins.py:5017
3323
#: bzrlib/builtins.py:5273
3161
3324
msgid "These branches have diverged. Try merging, and then bind again."
3162
3325
msgstr ""
3163
3326
3164
#: bzrlib/builtins.py:5024
3327
#: bzrlib/builtins.py:5280
3165
3328
msgid "Convert the current checkout into a regular branch."
3166
3329
msgstr ""
3167
3330
3168
#: bzrlib/builtins.py:5026
3331
#: bzrlib/builtins.py:5282
3169
3332
msgid ""
3170
3333
"After unbinding, the local branch is considered independent and subsequent\n"
3171
3334
"commits will be local only."
3172
3335
msgstr ""
3173
3336
3174
#: bzrlib/builtins.py:5037
3337
#: bzrlib/builtins.py:5293
3175
3338
msgid "Local branch is not bound"
3176
3339
msgstr ""
3177
3340
3178
#: bzrlib/builtins.py:5041
3341
#: bzrlib/builtins.py:5297
3179
3342
msgid "Remove the last committed revision."
3180
3343
msgstr ""
3181
3344
3182
#: bzrlib/builtins.py:5043
3345
#: bzrlib/builtins.py:5299
3183
3346
msgid ""
3184
3347
"--verbose will print out what is being removed.\n"
3185
3348
"--dry-run will go through all the motions, but not actually\n"
3186
3349
"remove anything."
3187
3350
msgstr ""
3188
3351
3189
#: bzrlib/builtins.py:5047
3352
#: bzrlib/builtins.py:5303
3190
3353
msgid ""
3191
3354
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3192
3355
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3193
3356
"branch at revision 15."
3194
3357
msgstr ""
3195
3358
3196
#: bzrlib/builtins.py:5051
3359
#: bzrlib/builtins.py:5307
3197
3360
msgid ""
3198
3361
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3199
3362
"it may make is to restore any pending merges that were present before\n"
3201
3364
msgstr ""
3202
3365
3203
3366
# help of 'dry-run' option of 'uncommit' command
3204
#: bzrlib/builtins.py:5062
3367
#: bzrlib/builtins.py:5318
3205
3368
msgid "Don't actually make changes."
3206
3369
msgstr ""
3207
3370
3208
3371
# help of 'force' option of 'uncommit' command
3209
#: bzrlib/builtins.py:5063
3372
#: bzrlib/builtins.py:5319
3210
3373
msgid "Say yes to all questions."
3211
3374
msgstr ""
3212
3375
3213
3376
# help of 'keep-tags' option of 'uncommit' command
3214
#: bzrlib/builtins.py:5065
3377
#: bzrlib/builtins.py:5321
3215
3378
msgid "Keep tags that point to removed revisions."
3216
3379
msgstr ""
3217
3380
3218
3381
# help of 'local' option of 'uncommit' command
3219
#: bzrlib/builtins.py:5067
3382
#: bzrlib/builtins.py:5323
3220
3383
msgid "Only remove the commits from the local branch when in a checkout."
3221
3384
msgstr ""
3222
3385
3223
#: bzrlib/builtins.py:5116
3386
#: bzrlib/builtins.py:5372
3224
3387
msgid "No revisions to uncommit.\n"
3225
3388
msgstr ""
3226
3389
3227
#: bzrlib/builtins.py:5131
3390
#: bzrlib/builtins.py:5387
3228
3391
msgid "Dry-run, pretending to remove the above revisions.\n"
3229
3392
msgstr ""
3230
3393
3231
#: bzrlib/builtins.py:5134
3394
#: bzrlib/builtins.py:5390
3232
3395
msgid "The above revision(s) will be removed.\n"
3233
3396
msgstr ""
3234
3397
3235
#: bzrlib/builtins.py:5138
3398
#: bzrlib/builtins.py:5394
3236
3399
msgid "Uncommit these revisions"
3237
3400
msgstr ""
3238
3401
3239
#: bzrlib/builtins.py:5141
3402
#: bzrlib/builtins.py:5397
3240
3403
msgid "Canceled\n"
3241
3404
msgstr ""
3242
3405
3243
#: bzrlib/builtins.py:5148
3406
#: bzrlib/builtins.py:5404
3244
3407
#, python-format
3245
3408
msgid ""
3246
3409
"You can restore the old tip by running:\n"
3247
3410
" bzr pull . -r revid:%s\n"
3248
3411
msgstr ""
3249
3412
3250
#: bzrlib/builtins.py:5153
3413
#: bzrlib/builtins.py:5409
3251
3414
msgid "Break a dead lock."
3252
3415
msgstr ""
3253
3416
3254
#: bzrlib/builtins.py:5155
3417
#: bzrlib/builtins.py:5411
3255
3418
msgid ""
3256
3419
"This command breaks a lock on a repository, branch, working directory or\n"
3257
3420
"config file."
3258
3421
msgstr ""
3259
3422
3260
#: bzrlib/builtins.py:5158
3423
#: bzrlib/builtins.py:5414
3261
3424
msgid ""
3262
3425
"CAUTION: Locks should only be broken when you are sure that the process\n"
3263
3426
"holding the lock has been stopped."
3264
3427
msgstr ""
3265
3428
3266
#: bzrlib/builtins.py:5161
3429
#: bzrlib/builtins.py:5417
3267
3430
msgid ""
3268
3431
"You can get information on what locks are open via the 'bzr info\n"
3269
3432
"[location]' command."
3270
3433
msgstr ""
3271
3434
3272
#: bzrlib/builtins.py:5164
3435
#: bzrlib/builtins.py:5420
3273
3436
msgid ""
3274
3437
":Examples:\n"
3275
3438
" bzr break-lock\n"
3278
3441
msgstr ""
3279
3442
3280
3443
# help of 'config' option of 'break-lock' command
3281
#: bzrlib/builtins.py:5173
3444
#: bzrlib/builtins.py:5429
3282
3445
msgid "LOCATION is the directory where the config lock is."
3283
3446
msgstr ""
3284
3447
3285
3448
# help of 'force' option of 'break-lock' command
3286
#: bzrlib/builtins.py:5175
3449
#: bzrlib/builtins.py:5431
3287
3450
msgid "Do not ask for confirmation before breaking the lock."
3288
3451
msgstr ""
3289
3452
3290
#: bzrlib/builtins.py:5211
3453
# help of 'protocol=bzr' option of 'serve' command
3454
#: bzrlib/builtins.py:5466
3455
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3456
msgstr ""
3457
3458
#: bzrlib/builtins.py:5467
3291
3459
msgid "Run the bzr server."
3292
3460
msgstr ""
3293
3461
3294
3462
# help of 'inet' option of 'serve' command
3295
#: bzrlib/builtins.py:5217
3463
#: bzrlib/builtins.py:5473
3296
3464
msgid "Serve on stdin/out for use from inetd or sshd."
3297
3465
msgstr ""
3298
3466
3299
3467
# title of 'protocol' option of 'serve' command
3300
#: bzrlib/builtins.py:5218
3468
#: bzrlib/builtins.py:5474
3301
3469
msgid "protocol"
3302
3470
msgstr ""
3303
3471
3304
3472
# help of 'protocol' option of 'serve' command
3305
#: bzrlib/builtins.py:5219
3473
#: bzrlib/builtins.py:5475
3306
3474
msgid "Protocol to serve."
3307
3475
msgstr ""
3308
3476
3309
3477
# help of 'port' option of 'serve' command
3310
#: bzrlib/builtins.py:5223
3478
#: bzrlib/builtins.py:5479
3311
3479
msgid ""
3312
3480
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3313
3481
"Passing 0 as the port number will result in a dynamically allocated port. "
3315
3483
msgstr ""
3316
3484
3317
3485
# help of 'directory' option of 'serve' command
3318
#: bzrlib/builtins.py:5229
3486
#: bzrlib/builtins.py:5485
3319
3487
msgid "Serve contents of this directory."
3320
3488
msgstr ""
3321
3489
3322
3490
# help of 'allow-writes' option of 'serve' command
3323
#: bzrlib/builtins.py:5231
3491
#: bzrlib/builtins.py:5487
3324
3492
msgid ""
3325
3493
"By default the server is a readonly server. Supplying --allow-writes "
3326
3494
"enables write access to the contents of the served directory and below. "
3329
3497
"uncontrolled write access to your file system."
3330
3498
msgstr ""
3331
3499
3332
#: bzrlib/builtins.py:5276
3500
# help of 'client-timeout' option of 'serve' command
3501
#: bzrlib/builtins.py:5496
3502
msgid "Override the default idle client timeout (5min)."
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:5546
3333
3506
msgid "Combine a tree into its containing tree."
3334
3507
msgstr ""
3335
3508
3336
#: bzrlib/builtins.py:5278
3509
#: bzrlib/builtins.py:5548
3337
3510
msgid "This command requires the target tree to be in a rich-root format."
3338
3511
msgstr ""
3339
3512
3340
#: bzrlib/builtins.py:5280
3513
#: bzrlib/builtins.py:5550
3341
3514
msgid ""
3342
3515
"The TREE argument should be an independent tree, inside another tree, but\n"
3343
3516
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3344
3517
"running \"bzr branch\" with the target inside a tree.)"
3345
3518
msgstr ""
3346
3519
3347
#: bzrlib/builtins.py:5284
3520
#: bzrlib/builtins.py:5554
3348
3521
msgid ""
3349
3522
"The result is a combined tree, with the subtree no longer an independent\n"
3350
3523
"part. This is marked as a merge of the subtree into the containing tree,\n"
3351
3524
"and all history is preserved."
3352
3525
msgstr ""
3353
3526
3354
#: bzrlib/builtins.py:5302
3527
#: bzrlib/builtins.py:5572
3355
3528
#, python-format
3356
3529
msgid ""
3357
3530
"Can't join trees because %s doesn't support rich root data.\n"
3358
3531
"You can use bzr upgrade on the repository."
3359
3532
msgstr ""
3360
3533
3361
#: bzrlib/builtins.py:5312 bzrlib/builtins.py:5318
3534
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3362
3535
msgid "Cannot join {0}. {1}"
3363
3536
msgstr ""
3364
3537
3365
#: bzrlib/builtins.py:5322
3538
#: bzrlib/builtins.py:5592
3366
3539
msgid "Split a subdirectory of a tree into a separate tree."
3367
3540
msgstr ""
3368
3541
3369
#: bzrlib/builtins.py:5324
3542
#: bzrlib/builtins.py:5594
3370
3543
msgid ""
3371
3544
"This command will produce a target tree in a format that supports\n"
3372
3545
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3373
3546
"converted into earlier formats like 'dirstate-tags'."
3374
3547
msgstr ""
3375
3548
3376
#: bzrlib/builtins.py:5328
3549
#: bzrlib/builtins.py:5598
3377
3550
msgid ""
3378
3551
"The TREE argument should be a subdirectory of a working tree. That\n"
3379
3552
"subdirectory will be converted into an independent tree, with its own\n"
3380
3553
"branch. Commits in the top-level tree will not apply to the new subtree."
3381
3554
msgstr ""
3382
3555
3383
#: bzrlib/builtins.py:5408
3556
#: bzrlib/builtins.py:5678
3384
3557
msgid "No submit branch specified or known"
3385
3558
msgstr ""
3386
3559
3387
#: bzrlib/builtins.py:5416 bzrlib/send.py:105
3560
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3388
3561
msgid "No public branch specified or known"
3389
3562
msgstr ""
3390
3563
3391
#: bzrlib/builtins.py:5421
3564
#: bzrlib/builtins.py:5691
3392
3565
msgid "bzr merge-directive takes at most two one revision identifiers"
3393
3566
msgstr ""
3394
3567
3395
#: bzrlib/builtins.py:5430
3568
#: bzrlib/builtins.py:5700
3396
3569
msgid "No revisions to bundle."
3397
3570
msgstr ""
3398
3571
3399
#: bzrlib/builtins.py:5449
3572
#: bzrlib/builtins.py:5719
3400
3573
msgid "Mail or create a merge-directive for submitting changes."
3401
3574
msgstr ""
3402
3575
3403
#: bzrlib/builtins.py:5451
3576
#: bzrlib/builtins.py:5721
3404
3577
msgid "A merge directive provides many things needed for requesting merges:"
3405
3578
msgstr ""
3406
3579
3407
#: bzrlib/builtins.py:5453
3580
#: bzrlib/builtins.py:5723
3408
3581
msgid "* A machine-readable description of the merge to perform"
3409
3582
msgstr ""
3410
3583
3411
#: bzrlib/builtins.py:5455
3584
#: bzrlib/builtins.py:5725
3412
3585
msgid "* An optional patch that is a preview of the changes requested"
3413
3586
msgstr ""
3414
3587
3415
#: bzrlib/builtins.py:5457
3588
#: bzrlib/builtins.py:5727
3416
3589
msgid ""
3417
3590
"* An optional bundle of revision data, so that the changes can be applied\n"
3418
3591
" directly from the merge directive, without retrieving data from a\n"
3419
3592
" branch."
3420
3593
msgstr ""
3421
3594
3422
#: bzrlib/builtins.py:5461
3595
#: bzrlib/builtins.py:5731
3423
3596
msgid ""
3424
3597
"`bzr send` creates a compact data set that, when applied using bzr\n"
3425
3598
"merge, has the same effect as merging from the source branch. "
3426
3599
msgstr ""
3427
3600
3428
#: bzrlib/builtins.py:5464
3601
#: bzrlib/builtins.py:5734
3429
3602
msgid ""
3430
3603
"By default the merge directive is self-contained and can be applied to any\n"
3431
3604
"branch containing submit_branch in its ancestory without needing access to\n"
3432
3605
"the source branch."
3433
3606
msgstr ""
3434
3607
3435
#: bzrlib/builtins.py:5468
3608
#: bzrlib/builtins.py:5738
3436
3609
msgid ""
3437
3610
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3438
3611
"revisions, but only a structured request to merge from the\n"
3441
3614
"included if known, so that people can check it later."
3442
3615
msgstr ""
3443
3616
3444
#: bzrlib/builtins.py:5474
3617
#: bzrlib/builtins.py:5744
3445
3618
msgid ""
3446
3619
"The submit branch defaults to the parent of the source branch, but can be\n"
3447
3620
"overridden. Both submit branch and public branch will be remembered in\n"
3450
3623
"be changed using --from."
3451
3624
msgstr ""
3452
3625
3453
#: bzrlib/builtins.py:5480
3626
#: bzrlib/builtins.py:5750
3454
3627
msgid ""
3455
3628
"Both the submit branch and the public branch follow the usual behavior with\n"
3456
3629
"respect to --remember: If there is no default location set, the first send\n"
3459
3632
"--remember. The value will only be saved if the location can be accessed."
3460
3633
msgstr ""
3461
3634
3462
#: bzrlib/builtins.py:5486
3635
#: bzrlib/builtins.py:5756
3463
3636
msgid ""
3464
3637
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3465
3638
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3467
3640
"in the merge directive."
3468
3641
msgstr ""
3469
3642
3470
#: bzrlib/builtins.py:5491
3643
#: bzrlib/builtins.py:5761
3471
3644
msgid ""
3472
3645
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3473
3646
"given, in which case it is sent to a file."
3474
3647
msgstr ""
3475
3648
3476
#: bzrlib/builtins.py:5494
3649
#: bzrlib/builtins.py:5764
3477
3650
msgid ""
3478
3651
"Mail is sent using your preferred mail program. This should be transparent\n"
3479
3652
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3480
3653
"If the preferred client can't be found (or used), your editor will be used."
3481
3654
msgstr ""
3482
3655
3483
#: bzrlib/builtins.py:5498
3656
#: bzrlib/builtins.py:5768
3484
3657
msgid ""
3485
3658
"To use a specific mail program, set the mail_client configuration option.\n"
3486
3659
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3492
3665
"supported clients."
3493
3666
msgstr ""
3494
3667
3495
#: bzrlib/builtins.py:5505
3668
#: bzrlib/builtins.py:5775
3496
3669
msgid ""
3497
3670
"If mail is being sent, a to address is required. This can be supplied\n"
3498
3671
"either on the commandline, by setting the submit_to configuration\n"
3500
3673
"in the submit branch."
3501
3674
msgstr ""
3502
3675
3503
#: bzrlib/builtins.py:5510
3676
#: bzrlib/builtins.py:5780
3504
3677
msgid ""
3505
3678
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3506
3679
"and\n"
3510
3683
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3511
3684
msgstr ""
3512
3685
3513
#: bzrlib/builtins.py:5516
3686
#: bzrlib/builtins.py:5786
3514
3687
msgid ""
3515
3688
"The merge directives created by bzr send may be applied using bzr merge or\n"
3516
3689
"bzr pull by specifying a file containing a merge directive as the location."
3517
3690
msgstr ""
3518
3691
3519
#: bzrlib/builtins.py:5519
3692
#: bzrlib/builtins.py:5789
3520
3693
msgid ""
3521
3694
"bzr send makes extensive use of public locations to map local locations "
3522
3695
"into\n"
3525
3698
msgstr ""
3526
3699
3527
3700
# help of 'output' option of 'send' command
3528
#: bzrlib/builtins.py:5543
3701
#: bzrlib/builtins.py:5813
3529
3702
msgid "Write merge directive to this file or directory; use - for stdout."
3530
3703
msgstr ""
3531
3704
3532
3705
# help of 'strict' option of 'send' command
3533
#: bzrlib/builtins.py:5547
3706
#: bzrlib/builtins.py:5817
3534
3707
msgid ""
3535
3708
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3536
3709
"strict disables the check."
3537
3710
msgstr ""
3538
3711
3539
3712
# help of 'mail-to' option of 'send' command
3540
#: bzrlib/builtins.py:5549
3713
#: bzrlib/builtins.py:5819
3541
3714
msgid "Mail the request to this address."
3542
3715
msgstr ""
3543
3716
3544
3717
# help of 'body' option of 'send' command
3545
#: bzrlib/builtins.py:5553
3718
#: bzrlib/builtins.py:5823
3546
3719
msgid "Body for the email."
3547
3720
msgstr ""
3548
3721
3549
3722
# help of 'no-bundle' option of 'send' command
3550
#: bzrlib/builtins.py:5606
3723
#: bzrlib/builtins.py:5876
3551
3724
msgid "Do not include a bundle in the merge directive."
3552
3725
msgstr ""
3553
3726
3554
3727
# help of 'no-patch' option of 'send' command
3555
#: bzrlib/builtins.py:5607
3728
#: bzrlib/builtins.py:5877
3556
3729
msgid "Do not include a preview patch in the merge directive."
3557
3730
msgstr ""
3558
3731
3559
3732
# help of 'remember' option of 'send' command
3560
#: bzrlib/builtins.py:5610
3733
#: bzrlib/builtins.py:5880
3561
3734
msgid "Remember submit and public branch."
3562
3735
msgstr ""
3563
3736
3564
3737
# help of 'from' option of 'send' command
3565
#: bzrlib/builtins.py:5612
3738
#: bzrlib/builtins.py:5882
3566
3739
msgid ""
3567
3740
"Branch to generate the submission from, rather than the one containing the "
3568
3741
"working directory."
3569
3742
msgstr ""
3570
3743
3571
3744
# title of 'format' option of 'send' command
3572
#: bzrlib/builtins.py:5622
3745
# title of 'format' option of 'version-info' command
3746
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3573
3747
msgid "format"
3574
3748
msgstr ""
3575
3749
3576
3750
# help of 'format' option of 'send' command
3577
#: bzrlib/builtins.py:5623
3751
#: bzrlib/builtins.py:5893
3578
3752
msgid "Use the specified output format."
3579
3753
msgstr ""
3580
3754
3581
#: bzrlib/builtins.py:5645
3755
#: bzrlib/builtins.py:5915
3582
3756
msgid "Create, remove or modify a tag naming a revision."
3583
3757
msgstr ""
3584
3758
3585
#: bzrlib/builtins.py:5647
3759
#: bzrlib/builtins.py:5917
3586
3760
msgid ""
3587
3761
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3588
3762
"(--revision) option can be given -rtag:X, where X is any previously\n"
3589
3763
"created tag."
3590
3764
msgstr ""
3591
3765
3592
#: bzrlib/builtins.py:5651
3766
#: bzrlib/builtins.py:5921
3593
3767
msgid ""
3594
3768
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3595
3769
"along when you branch, push, pull or merge."
3596
3770
msgstr ""
3597
3771
3598
#: bzrlib/builtins.py:5654
3772
#: bzrlib/builtins.py:5924
3599
3773
msgid ""
3600
3774
"It is an error to give a tag name that already exists unless you pass\n"
3601
3775
"--force, in which case the tag is moved to point to the new revision."
3602
3776
msgstr ""
3603
3777
3604
#: bzrlib/builtins.py:5657
3778
#: bzrlib/builtins.py:5927
3605
3779
msgid ""
3606
3780
"To rename a tag (change the name but keep it on the same revsion), run "
3607
3781
"``bzr\n"
3608
3782
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3609
3783
msgstr ""
3610
3784
3611
#: bzrlib/builtins.py:5660
3785
#: bzrlib/builtins.py:5930
3612
3786
msgid ""
3613
3787
"If no tag name is specified it will be determined through the \n"
3614
3788
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3617
3791
msgstr ""
3618
3792
3619
3793
# help of 'delete' option of 'tag' command
3620
#: bzrlib/builtins.py:5670
3794
#: bzrlib/builtins.py:5940
3621
3795
msgid "Delete this tag rather than placing it."
3622
3796
msgstr ""
3623
3797
3624
3798
# help of 'directory' option of 'tag' command
3625
#: bzrlib/builtins.py:5673
3799
#: bzrlib/builtins.py:5943
3626
3800
msgid "Branch in which to place the tag."
3627
3801
msgstr ""
3628
3802
3629
3803
# help of 'force' option of 'tag' command
3630
#: bzrlib/builtins.py:5675
3804
#: bzrlib/builtins.py:5945
3631
3805
msgid "Replace existing tags."
3632
3806
msgstr ""
3633
3807
3634
#: bzrlib/builtins.py:5690
3808
#: bzrlib/builtins.py:5960
3635
3809
msgid "No tag specified to delete."
3636
3810
msgstr ""
3637
3811
3638
#: bzrlib/builtins.py:5692
3812
#: bzrlib/builtins.py:5962
3639
3813
#, python-format
3640
3814
msgid "Deleted tag %s."
3641
3815
msgstr ""
3642
3816
3643
#: bzrlib/builtins.py:5697
3644
msgid "Tags can only be placed on a single revision, not on a range"
3645
msgstr ""
3646
3647
#: bzrlib/builtins.py:5706
3817
#: bzrlib/builtins.py:5976
3648
3818
msgid "Please specify a tag name."
3649
3819
msgstr ""
3650
3820
3651
#: bzrlib/builtins.py:5714
3821
#: bzrlib/builtins.py:5984
3652
3822
#, python-format
3653
3823
msgid "Tag %s already exists for that revision."
3654
3824
msgstr ""
3655
3825
3656
#: bzrlib/builtins.py:5718
3826
#: bzrlib/builtins.py:5988
3657
3827
#, python-format
3658
3828
msgid "Created tag %s."
3659
3829
msgstr ""
3660
3830
3661
#: bzrlib/builtins.py:5720
3831
#: bzrlib/builtins.py:5990
3662
3832
#, python-format
3663
3833
msgid "Updated tag %s."
3664
3834
msgstr ""
3665
3835
3666
#: bzrlib/builtins.py:5724
3836
#: bzrlib/builtins.py:5994
3667
3837
msgid "List tags."
3668
3838
msgstr ""
3669
3839
3670
#: bzrlib/builtins.py:5726
3840
#: bzrlib/builtins.py:5996
3671
3841
msgid ""
3672
3842
"This command shows a table of tag names and the revisions they reference."
3673
3843
msgstr ""
3674
3844
3675
3845
# help of 'directory' option of 'tags' command
3676
#: bzrlib/builtins.py:5732
3846
#: bzrlib/builtins.py:6002
3677
3847
msgid "Branch whose tags should be displayed."
3678
3848
msgstr ""
3679
3849
3680
3850
# help of 'sort' option of 'tags' command
3681
#: bzrlib/builtins.py:5734
3851
#: bzrlib/builtins.py:6004
3682
3852
msgid "Sort tags by different criteria."
3683
3853
msgstr ""
3684
3854
3685
3855
# title of 'sort' option of 'tags' command
3686
#: bzrlib/builtins.py:5734
3856
#: bzrlib/builtins.py:6004
3687
3857
msgid "Sorting"
3688
3858
msgstr ""
3689
3859
3690
#: bzrlib/builtins.py:5779
3860
#: bzrlib/builtins.py:6073
3691
3861
msgid "Reconfigure the type of a bzr directory."
3692
3862
msgstr ""
3693
3863
3694
#: bzrlib/builtins.py:5781
3864
#: bzrlib/builtins.py:6075
3695
3865
msgid "A target configuration must be specified."
3696
3866
msgstr ""
3697
3867
3698
#: bzrlib/builtins.py:5783
3868
#: bzrlib/builtins.py:6077
3699
3869
msgid ""
3700
3870
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3701
3871
"The order of preference is\n"
3707
3877
msgstr ""
3708
3878
3709
3879
# title of 'tree_type' option of 'reconfigure' command
3710
#: bzrlib/builtins.py:5797
3880
#: bzrlib/builtins.py:6091
3711
3881
msgid "Tree type"
3712
3882
msgstr ""
3713
3883
3714
3884
# help of 'tree_type' option of 'reconfigure' command
3715
#: bzrlib/builtins.py:5798
3885
#: bzrlib/builtins.py:6092
3716
3886
msgid "The relation between branch and tree."
3717
3887
msgstr ""
3718
3888
3889
# help of 'tree_type=branch' option of 'reconfigure' command
3890
#: bzrlib/builtins.py:6094
3891
msgid "Reconfigure to be an unbound branch with no working tree."
3892
msgstr ""
3893
3894
# help of 'tree_type=tree' option of 'reconfigure' command
3895
#: bzrlib/builtins.py:6095
3896
msgid "Reconfigure to be an unbound branch with a working tree."
3897
msgstr ""
3898
3899
# help of 'tree_type=checkout' option of 'reconfigure' command
3900
#: bzrlib/builtins.py:6096
3901
msgid "Reconfigure to be a bound branch with a working tree."
3902
msgstr ""
3903
3904
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3905
#: bzrlib/builtins.py:6097
3906
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3907
msgstr ""
3908
3719
3909
# title of 'repository_type' option of 'reconfigure' command
3720
#: bzrlib/builtins.py:5808
3910
#: bzrlib/builtins.py:6102
3721
3911
msgid "Repository type"
3722
3912
msgstr ""
3723
3913
3724
3914
# help of 'repository_type' option of 'reconfigure' command
3725
#: bzrlib/builtins.py:5809
3915
#: bzrlib/builtins.py:6103
3726
3916
msgid "Location fo the repository."
3727
3917
msgstr ""
3728
3918
3919
# help of 'repository_type=standalone' option of 'reconfigure' command
3920
#: bzrlib/builtins.py:6105
3921
msgid ""
3922
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3923
msgstr ""
3924
3925
# help of 'repository_type=use-shared' option of 'reconfigure' command
3926
#: bzrlib/builtins.py:6107
3927
msgid "Reconfigure to use a shared repository."
3928
msgstr ""
3929
3729
3930
# title of 'repository_trees' option of 'reconfigure' command
3730
#: bzrlib/builtins.py:5817
3931
#: bzrlib/builtins.py:6111
3731
3932
msgid "Trees in Repository"
3732
3933
msgstr ""
3733
3934
3734
3935
# help of 'repository_trees' option of 'reconfigure' command
3735
#: bzrlib/builtins.py:5818
3936
#: bzrlib/builtins.py:6112
3736
3937
msgid "Whether new branches in the repository have trees."
3737
3938
msgstr ""
3738
3939
3940
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3941
#: bzrlib/builtins.py:6114
3942
msgid "Reconfigure repository to create working trees on branches by default."
3943
msgstr ""
3944
3945
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3946
#: bzrlib/builtins.py:6116
3947
msgid ""
3948
"Reconfigure repository to not create working trees on branches by default."
3949
msgstr ""
3950
3739
3951
# help of 'bind-to' option of 'reconfigure' command
3740
#: bzrlib/builtins.py:5825
3952
#: bzrlib/builtins.py:6119
3741
3953
msgid "Branch to bind checkout to."
3742
3954
msgstr ""
3743
3955
3744
3956
# help of 'force' option of 'reconfigure' command
3745
#: bzrlib/builtins.py:5827
3957
#: bzrlib/builtins.py:6121
3746
3958
msgid "Perform reconfiguration even if local changes will be lost."
3747
3959
msgstr ""
3748
3960
3749
3961
# help of 'stacked-on' option of 'reconfigure' command
3750
#: bzrlib/builtins.py:5830
3962
#: bzrlib/builtins.py:6124
3751
3963
msgid "Reconfigure a branch to be stacked on another branch."
3752
3964
msgstr ""
3753
3965
3754
3966
# help of 'unstacked' option of 'reconfigure' command
3755
#: bzrlib/builtins.py:5834
3967
#: bzrlib/builtins.py:6128
3756
3968
msgid ""
3757
3969
"Reconfigure a branch to be unstacked. This may require copying substantial "
3758
3970
"data into it."
3759
3971
msgstr ""
3760
3972
3761
#: bzrlib/builtins.py:5844
3973
#: bzrlib/builtins.py:6138
3762
3974
msgid "Can't use both --stacked-on and --unstacked"
3763
3975
msgstr ""
3764
3976
3765
#: bzrlib/builtins.py:5858
3977
#: bzrlib/builtins.py:6152
3766
3978
msgid "No target configuration specified"
3767
3979
msgstr ""
3768
3980
3769
#: bzrlib/builtins.py:5893
3981
#: bzrlib/builtins.py:6187
3770
3982
msgid "Set the branch of a checkout and update."
3771
3983
msgstr ""
3772
3984
3773
#: bzrlib/builtins.py:5895
3985
#: bzrlib/builtins.py:6189
3774
3986
msgid ""
3775
3987
"For lightweight checkouts, this changes the branch being referenced.\n"
3776
3988
"For heavyweight checkouts, this checks that there are no local commits\n"
3778
3990
"of the new location and binds to it."
3779
3991
msgstr ""
3780
3992
3781
#: bzrlib/builtins.py:5900
3993
#: bzrlib/builtins.py:6194
3782
3994
msgid ""
3783
3995
"In both cases, the working tree is updated and uncommitted changes\n"
3784
3996
"are merged. The user can commit or revert these as they desire."
3785
3997
msgstr ""
3786
3998
3787
#: bzrlib/builtins.py:5903
3999
#: bzrlib/builtins.py:6197
3788
4000
msgid "Pending merges need to be committed or reverted before using switch."
3789
4001
msgstr ""
3790
4002
3791
#: bzrlib/builtins.py:5905
4003
#: bzrlib/builtins.py:6199
3792
4004
msgid ""
3793
4005
"The path to the branch to switch to can be specified relative to the parent\n"
3794
4006
"directory of the current branch. For example, if you are currently in a\n"
3796
4008
"/path/to/newbranch."
3797
4009
msgstr ""
3798
4010
3799
#: bzrlib/builtins.py:5910
4011
#: bzrlib/builtins.py:6204
3800
4012
msgid ""
3801
4013
"Bound branches use the nickname of its master branch unless it is set\n"
3802
4014
"locally, in which case switching will update the local nickname to be\n"
3804
4016
msgstr ""
3805
4017
3806
4018
# help of 'force' option of 'switch' command
3807
#: bzrlib/builtins.py:5918
4019
#: bzrlib/builtins.py:6212
3808
4020
msgid "Switch even if local commits will be lost."
3809
4021
msgstr ""
3810
4022
3811
4023
# help of 'create-branch' option of 'switch' command
3812
#: bzrlib/builtins.py:5921
4024
#: bzrlib/builtins.py:6215
3813
4025
msgid "Create the target branch from this one before switching to it."
3814
4026
msgstr ""
3815
4027
3816
#: bzrlib/builtins.py:5933
4028
#: bzrlib/builtins.py:6229
3817
4029
msgid "You must supply either a revision or a location"
3818
4030
msgstr ""
3819
4031
3820
#: bzrlib/builtins.py:5944
4032
#: bzrlib/builtins.py:6242
3821
4033
msgid "cannot create branch without source branch"
3822
4034
msgstr ""
3823
4035
3824
#: bzrlib/builtins.py:5990
4036
#: bzrlib/builtins.py:6262
3825
4037
msgid "Manage filtered views."
3826
4038
msgstr ""
3827
4039
3828
#: bzrlib/builtins.py:5992
4040
#: bzrlib/builtins.py:6264
3829
4041
msgid ""
3830
4042
"Views provide a mask over the tree so that users can focus on\n"
3831
4043
"a subset of a tree when doing their work. After creating a view,\n"
3835
4047
"must be within the current view."
3836
4048
msgstr ""
3837
4049
3838
#: bzrlib/builtins.py:5999
4050
#: bzrlib/builtins.py:6271
3839
4051
msgid ""
3840
4052
"In most cases, a view has a short life-span: it is created to make\n"
3841
4053
"a selected change and is deleted once that change is committed.\n"
3843
4055
"and switch between them."
3844
4056
msgstr ""
3845
4057
3846
#: bzrlib/builtins.py:6004
4058
#: bzrlib/builtins.py:6276
3847
4059
msgid ""
3848
4060
"To disable the current view without deleting it, you can switch to\n"
3849
4061
"the pseudo view called ``off``. This can be useful when you need\n"
3851
4063
"want to switch back to your view after that."
3852
4064
msgstr ""
3853
4065
3854
#: bzrlib/builtins.py:6009
4066
#: bzrlib/builtins.py:6281
3855
4067
msgid ""
3856
4068
":Examples:\n"
3857
4069
" To define the current view::"
3858
4070
msgstr ""
3859
4071
3860
#: bzrlib/builtins.py:6012
4072
#: bzrlib/builtins.py:6284
3861
4073
msgid " bzr view file1 dir1 ..."
3862
4074
msgstr ""
3863
4075
3864
#: bzrlib/builtins.py:6014
4076
#: bzrlib/builtins.py:6286
3865
4077
msgid " To list the current view::"
3866
4078
msgstr ""
3867
4079
3868
#: bzrlib/builtins.py:6016
4080
#: bzrlib/builtins.py:6288
3869
4081
msgid " bzr view"
3870
4082
msgstr ""
3871
4083
3872
#: bzrlib/builtins.py:6018
4084
#: bzrlib/builtins.py:6290
3873
4085
msgid " To delete the current view::"
3874
4086
msgstr ""
3875
4087
3876
#: bzrlib/builtins.py:6020
4088
#: bzrlib/builtins.py:6292
3877
4089
msgid " bzr view --delete"
3878
4090
msgstr ""
3879
4091
3880
#: bzrlib/builtins.py:6022
4092
#: bzrlib/builtins.py:6294
3881
4093
msgid " To disable the current view without deleting it::"
3882
4094
msgstr ""
3883
4095
3884
#: bzrlib/builtins.py:6024
4096
#: bzrlib/builtins.py:6296
3885
4097
msgid " bzr view --switch off"
3886
4098
msgstr ""
3887
4099
3888
#: bzrlib/builtins.py:6026
4100
#: bzrlib/builtins.py:6298
3889
4101
msgid " To define a named view and switch to it::"
3890
4102
msgstr ""
3891
4103
3892
#: bzrlib/builtins.py:6028
4104
#: bzrlib/builtins.py:6300
3893
4105
msgid " bzr view --name view-name file1 dir1 ..."
3894
4106
msgstr ""
3895
4107
3896
#: bzrlib/builtins.py:6030
4108
#: bzrlib/builtins.py:6302
3897
4109
msgid " To list a named view::"
3898
4110
msgstr ""
3899
4111
3900
#: bzrlib/builtins.py:6032
4112
#: bzrlib/builtins.py:6304
3901
4113
msgid " bzr view --name view-name"
3902
4114
msgstr ""
3903
4115
3904
#: bzrlib/builtins.py:6034
4116
#: bzrlib/builtins.py:6306
3905
4117
msgid " To delete a named view::"
3906
4118
msgstr ""
3907
4119
3908
#: bzrlib/builtins.py:6036
4120
#: bzrlib/builtins.py:6308
3909
4121
msgid " bzr view --name view-name --delete"
3910
4122
msgstr ""
3911
4123
3912
#: bzrlib/builtins.py:6038
4124
#: bzrlib/builtins.py:6310
3913
4125
msgid " To switch to a named view::"
3914
4126
msgstr ""
3915
4127
3916
#: bzrlib/builtins.py:6040
4128
#: bzrlib/builtins.py:6312
3917
4129
msgid " bzr view --switch view-name"
3918
4130
msgstr ""
3919
4131
3920
#: bzrlib/builtins.py:6042
4132
#: bzrlib/builtins.py:6314
3921
4133
msgid " To list all views defined::"
3922
4134
msgstr ""
3923
4135
3924
#: bzrlib/builtins.py:6044
4136
#: bzrlib/builtins.py:6316
3925
4137
msgid " bzr view --all"
3926
4138
msgstr ""
3927
4139
3928
#: bzrlib/builtins.py:6046
4140
#: bzrlib/builtins.py:6318
3929
4141
msgid " To delete all views::"
3930
4142
msgstr ""
3931
4143
3932
#: bzrlib/builtins.py:6048
4144
#: bzrlib/builtins.py:6320
3933
4145
msgid " bzr view --delete --all"
3934
4146
msgstr ""
3935
4147
3936
4148
# help of 'all' option of 'view' command
3937
#: bzrlib/builtins.py:6055
4149
#: bzrlib/builtins.py:6327
3938
4150
msgid "Apply list or delete action to all views."
3939
4151
msgstr ""
3940
4152
3941
4153
# help of 'delete' option of 'view' command
3942
#: bzrlib/builtins.py:6058
4154
#: bzrlib/builtins.py:6330
3943
4155
msgid "Delete the view."
3944
4156
msgstr ""
3945
4157
3946
4158
# help of 'name' option of 'view' command
3947
#: bzrlib/builtins.py:6061
4159
#: bzrlib/builtins.py:6333
3948
4160
msgid "Name of the view to define, list or delete."
3949
4161
msgstr ""
3950
4162
3951
4163
# help of 'switch' option of 'view' command
3952
#: bzrlib/builtins.py:6065
4164
#: bzrlib/builtins.py:6337
3953
4165
msgid "Name of the view to switch to."
3954
4166
msgstr ""
3955
4167
3956
#: bzrlib/builtins.py:6084
4168
#: bzrlib/builtins.py:6356
3957
4169
msgid "Both --delete and a file list specified"
3958
4170
msgstr ""
3959
4171
3960
#: bzrlib/builtins.py:6087
4172
#: bzrlib/builtins.py:6359
3961
4173
msgid "Both --delete and --switch specified"
3962
4174
msgstr ""
3963
4175
3964
#: bzrlib/builtins.py:6090
4176
#: bzrlib/builtins.py:6362
3965
4177
msgid "Deleted all views.\n"
3966
4178
msgstr ""
3967
4179
3968
#: bzrlib/builtins.py:6092
4180
#: bzrlib/builtins.py:6364
3969
4181
msgid "No current view to delete"
3970
4182
msgstr ""
3971
4183
3972
#: bzrlib/builtins.py:6095
4184
#: bzrlib/builtins.py:6367
3973
4185
#, python-format
3974
4186
msgid "Deleted '%s' view.\n"
3975
4187
msgstr ""
3976
4188
3977
#: bzrlib/builtins.py:6099
4189
#: bzrlib/builtins.py:6371
3978
4190
msgid "Both --switch and a file list specified"
3979
4191
msgstr ""
3980
4192
3981
#: bzrlib/builtins.py:6102
4193
#: bzrlib/builtins.py:6374
3982
4194
msgid "Both --switch and --all specified"
3983
4195
msgstr ""
3984
4196
3985
#: bzrlib/builtins.py:6105
4197
#: bzrlib/builtins.py:6377
3986
4198
msgid "No current view to disable"
3987
4199
msgstr ""
3988
4200
3989
#: bzrlib/builtins.py:6107
4201
#: bzrlib/builtins.py:6379
3990
4202
#, python-format
3991
4203
msgid "Disabled '%s' view.\n"
3992
4204
msgstr ""
3993
4205
3994
#: bzrlib/builtins.py:6111 bzrlib/builtins.py:6133
4206
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
3995
4207
msgid "Using '{0}' view: {1}\n"
3996
4208
msgstr ""
3997
4209
3998
#: bzrlib/builtins.py:6114
4210
#: bzrlib/builtins.py:6386
3999
4211
msgid "Views defined:\n"
4000
4212
msgstr ""
4001
4213
4002
#: bzrlib/builtins.py:6123
4214
#: bzrlib/builtins.py:6395
4003
4215
msgid "No views defined.\n"
4004
4216
msgstr ""
4005
4217
4006
#: bzrlib/builtins.py:6130
4218
#: bzrlib/builtins.py:6402
4007
4219
msgid "Cannot change the 'off' pseudo view"
4008
4220
msgstr ""
4009
4221
4010
#: bzrlib/builtins.py:6138
4222
#: bzrlib/builtins.py:6410
4011
4223
msgid "No current view.\n"
4012
4224
msgstr ""
4013
4225
4014
#: bzrlib/builtins.py:6141
4226
#: bzrlib/builtins.py:6413
4015
4227
msgid "'{0}' view is: {1}\n"
4016
4228
msgstr ""
4017
4229
4018
#: bzrlib/builtins.py:6161
4230
#: bzrlib/builtins.py:6433
4019
4231
msgid " <no hooks installed>\n"
4020
4232
msgstr ""
4021
4233
4022
#: bzrlib/builtins.py:6165
4234
#: bzrlib/builtins.py:6437
4023
4235
msgid "Remove a branch."
4024
4236
msgstr ""
4025
4237
4026
#: bzrlib/builtins.py:6167
4238
#: bzrlib/builtins.py:6439
4027
4239
msgid ""
4028
4240
"This will remove the branch from the specified location but \n"
4029
4241
"will keep any working tree or repository in place."
4030
4242
msgstr ""
4031
4243
4032
#: bzrlib/builtins.py:6172
4244
#: bzrlib/builtins.py:6444
4033
4245
msgid " Remove the branch at repo/trunk::"
4034
4246
msgstr ""
4035
4247
4036
#: bzrlib/builtins.py:6174
4248
#: bzrlib/builtins.py:6446
4037
4249
msgid " bzr remove-branch repo/trunk"
4038
4250
msgstr ""
4039
4251
4040
#: bzrlib/builtins.py:6190
4252
# help of 'writer=plain' option of 'shelve' command
4253
#: bzrlib/builtins.py:6461
4254
msgid "Plaintext diff output."
4255
msgstr ""
4256
4257
#: bzrlib/builtins.py:6462
4041
4258
msgid "Temporarily set aside some changes from the current tree."
4042
4259
msgstr ""
4043
4260
4044
#: bzrlib/builtins.py:6192
4261
#: bzrlib/builtins.py:6464
4045
4262
msgid ""
4046
4263
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4047
4264
"ie. out of the way, until a later time when you can bring them back from\n"
4050
4267
"will they survive its deletion."
4051
4268
msgstr ""
4052
4269
4053
#: bzrlib/builtins.py:6198
4270
#: bzrlib/builtins.py:6470
4054
4271
msgid "If shelve --list is specified, previously-shelved changes are listed."
4055
4272
msgstr ""
4056
4273
4057
#: bzrlib/builtins.py:6200
4274
#: bzrlib/builtins.py:6472
4058
4275
msgid ""
4059
4276
"Shelve is intended to help separate several sets of changes that have\n"
4060
4277
"been inappropriately mingled. If you just want to get rid of all changes\n"
4062
4279
"shelve all text changes at once, use shelve --all."
4063
4280
msgstr ""
4064
4281
4065
#: bzrlib/builtins.py:6205
4282
#: bzrlib/builtins.py:6477
4066
4283
msgid ""
4067
4284
"If filenames are specified, only the changes to those files will be\n"
4068
4285
"shelved. Other files will be left untouched."
4069
4286
msgstr ""
4070
4287
4071
#: bzrlib/builtins.py:6208
4288
#: bzrlib/builtins.py:6480
4072
4289
msgid ""
4073
4290
"If a revision is specified, changes since that revision will be shelved."
4074
4291
msgstr ""
4075
4292
4076
#: bzrlib/builtins.py:6210
4293
#: bzrlib/builtins.py:6482
4077
4294
msgid ""
4078
4295
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4079
4296
"restore the most recently shelved changes."
4080
4297
msgstr ""
4081
4298
4082
#: bzrlib/builtins.py:6213
4299
#: bzrlib/builtins.py:6485
4083
4300
msgid ""
4084
4301
"For complicated changes, it is possible to edit the changes in a separate\n"
4085
4302
"editor program to decide what the file remaining in the working copy\n"
4086
4303
"should look like. To do this, add the configuration option"
4087
4304
msgstr ""
4088
4305
4089
#: bzrlib/builtins.py:6217
4306
#: bzrlib/builtins.py:6489
4090
4307
msgid " change_editor = PROGRAM @new_path @old_path"
4091
4308
msgstr ""
4092
4309
4093
#: bzrlib/builtins.py:6219
4310
#: bzrlib/builtins.py:6491
4094
4311
msgid ""
4095
4312
"where @new_path is replaced with the path of the new version of the \n"
4096
4313
"file and @old_path is replaced with the path of the old version of \n"
4100
4317
msgstr ""
4101
4318
4102
4319
# help of 'all' option of 'shelve' command
4103
#: bzrlib/builtins.py:6231
4320
#: bzrlib/builtins.py:6503
4104
4321
msgid "Shelve all changes."
4105
4322
msgstr ""
4106
4323
4107
4324
# help of 'writer' option of 'shelve' command
4108
#: bzrlib/builtins.py:6233
4325
#: bzrlib/builtins.py:6505
4109
4326
msgid "Method to use for writing diffs."
4110
4327
msgstr ""
4111
4328
4112
4329
# title of 'writer' option of 'shelve' command
4113
#: bzrlib/builtins.py:6233
4330
#: bzrlib/builtins.py:6505
4114
4331
msgid "writer"
4115
4332
msgstr ""
4116
4333
4117
4334
# help of 'list' option of 'shelve' command
4118
#: bzrlib/builtins.py:6237
4335
#: bzrlib/builtins.py:6509
4119
4336
msgid "List shelved changes."
4120
4337
msgstr ""
4121
4338
4122
4339
# help of 'destroy' option of 'shelve' command
4123
#: bzrlib/builtins.py:6239
4340
#: bzrlib/builtins.py:6511
4124
4341
msgid "Destroy removed changes instead of shelving them."
4125
4342
msgstr ""
4126
4343
4127
#: bzrlib/builtins.py:6268
4344
#: bzrlib/builtins.py:6540
4128
4345
msgid "No shelved changes."
4129
4346
msgstr ""
4130
4347
4131
#: bzrlib/builtins.py:6279
4348
#: bzrlib/builtins.py:6551
4132
4349
msgid "Restore shelved changes."
4133
4350
msgstr ""
4134
4351
4135
#: bzrlib/builtins.py:6281
4352
#: bzrlib/builtins.py:6553
4136
4353
msgid ""
4137
4354
"By default, the most recently shelved changes are restored. However if you\n"
4138
4355
"specify a shelf by id those changes will be restored instead. This works\n"
4140
4357
msgstr ""
4141
4358
4142
4359
# help of 'action' option of 'unshelve' command
4143
#: bzrlib/builtins.py:6290
4360
#: bzrlib/builtins.py:6562
4144
4361
msgid "The action to perform."
4145
4362
msgstr ""
4146
4363
4147
#: bzrlib/builtins.py:6312
4364
# title of 'action' option of 'resolve' command
4365
# title of 'action' option of 'unshelve' command
4366
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4367
msgid "action"
4368
msgstr ""
4369
4370
# help of 'action=apply' option of 'unshelve' command
4371
#: bzrlib/builtins.py:6564
4372
msgid "Apply changes and remove from the shelf."
4373
msgstr ""
4374
4375
# help of 'action=dry-run' option of 'unshelve' command
4376
#: bzrlib/builtins.py:6565
4377
msgid "Show changes, but do not apply or remove them."
4378
msgstr ""
4379
4380
# help of 'action=preview' option of 'unshelve' command
4381
#: bzrlib/builtins.py:6566
4382
msgid ""
4383
"Instead of unshelving the changes, show the diff that would result from "
4384
"unshelving."
4385
msgstr ""
4386
4387
# help of 'action=delete-only' option of 'unshelve' command
4388
#: bzrlib/builtins.py:6568
4389
msgid "Delete changes without applying them."
4390
msgstr ""
4391
4392
# help of 'action=keep' option of 'unshelve' command
4393
#: bzrlib/builtins.py:6569
4394
msgid "Apply changes but don't delete them."
4395
msgstr ""
4396
4397
#: bzrlib/builtins.py:6584
4148
4398
msgid "Remove unwanted files from working tree."
4149
4399
msgstr ""
4150
4400
4151
#: bzrlib/builtins.py:6314
4401
#: bzrlib/builtins.py:6586
4152
4402
msgid ""
4153
4403
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4154
4404
"files are never deleted."
4155
4405
msgstr ""
4156
4406
4157
#: bzrlib/builtins.py:6317
4407
#: bzrlib/builtins.py:6589
4158
4408
msgid ""
4159
4409
"Another class is 'detritus', which includes files emitted by bzr during\n"
4160
4410
"normal operations and selftests. (The value of these files decreases with\n"
4161
4411
"time.)"
4162
4412
msgstr ""
4163
4413
4164
#: bzrlib/builtins.py:6321
4414
#: bzrlib/builtins.py:6593
4165
4415
msgid ""
4166
4416
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4167
4417
"flags are respected, and may be combined."
4168
4418
msgstr ""
4169
4419
4170
#: bzrlib/builtins.py:6324
4420
#: bzrlib/builtins.py:6596
4171
4421
msgid "To check what clean-tree will do, use --dry-run."
4172
4422
msgstr ""
4173
4423
4174
4424
# help of 'ignored' option of 'clean-tree' command
4175
#: bzrlib/builtins.py:6327
4425
#: bzrlib/builtins.py:6599
4176
4426
msgid "Delete all ignored files."
4177
4427
msgstr ""
4178
4428
4179
4429
# help of 'detritus' option of 'clean-tree' command
4180
#: bzrlib/builtins.py:6328
4430
#: bzrlib/builtins.py:6600
4181
4431
msgid ""
4182
4432
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4183
4433
msgstr ""
4184
4434
4185
4435
# help of 'unknown' option of 'clean-tree' command
4186
#: bzrlib/builtins.py:6331
4436
#: bzrlib/builtins.py:6603
4187
4437
msgid "Delete files unknown to bzr (default)."
4188
4438
msgstr ""
4189
4439
4190
4440
# help of 'dry-run' option of 'clean-tree' command
4191
#: bzrlib/builtins.py:6332
4441
#: bzrlib/builtins.py:6604
4192
4442
msgid "Show files to delete instead of deleting them."
4193
4443
msgstr ""
4194
4444
4195
4445
# help of 'force' option of 'clean-tree' command
4196
#: bzrlib/builtins.py:6334
4446
#: bzrlib/builtins.py:6606
4197
4447
msgid "Do not prompt before deleting."
4198
4448
msgstr ""
4199
4449
4200
#: bzrlib/bundle/__init__.py:57
4450
#: bzrlib/bundle/__init__.py:59
4201
4451
msgid "A directory cannot be a bundle"
4202
4452
msgstr ""
4203
4453
4204
#: bzrlib/bundle/serializer/v4.py:326
4454
#: bzrlib/bundle/apply_bundle.py:40
4455
msgid "Install revisions"
4456
msgstr ""
4457
4458
#: bzrlib/bundle/commands.py:64
4459
msgid "--verbose requires a merge directive"
4460
msgstr ""
4461
4462
#: bzrlib/bundle/commands.py:67
4463
msgid "Bundle format not supported"
4464
msgstr ""
4465
4466
#: bzrlib/bundle/commands.py:77
4467
msgid "Records\n"
4468
msgstr ""
4469
4470
#: bzrlib/bundle/commands.py:81
4471
msgid "{0}: {1} ({2} multiparent)\n"
4472
msgstr ""
4473
4474
#: bzrlib/bundle/commands.py:83
4475
#, python-format
4476
msgid "unique files: %d\n"
4477
msgstr ""
4478
4479
#: bzrlib/bundle/commands.py:92
4480
msgid "Revisions\n"
4481
msgstr ""
4482
4483
#: bzrlib/bundle/commands.py:93
4484
#, python-format
4485
msgid "nicks: %s\n"
4486
msgstr ""
4487
4488
#: bzrlib/bundle/commands.py:95
4489
#, python-format
4490
msgid ""
4491
"committers: \n"
4492
"%s\n"
4493
msgstr ""
4494
4495
#: bzrlib/bundle/commands.py:103
4496
msgid "Decoded contents\n"
4497
msgstr ""
4498
4499
#: bzrlib/bundle/serializer/v4.py:327
4205
4500
#, python-format
4206
4501
msgid "Bundling %d revision."
4207
4502
msgid_plural "Bundling %d revisions."
4208
4503
msgstr[0] ""
4209
4504
msgstr[1] ""
4210
4505
4211
#: bzrlib/bzrdir.py:636
4506
#: bzrlib/bzrdir.py:490
4212
4507
msgid ""
4213
4508
"making backup of {0}\n"
4214
4509
" to {1}"
4215
4510
msgstr ""
4216
4511
4217
#: bzrlib/bzrdir.py:659
4512
#: bzrlib/bzrdir.py:513
4218
4513
msgid "renamed {0} to {1}"
4219
4514
msgstr ""
4220
4515
4221
#: bzrlib/bzrdir.py:851
4222
msgid "{0} is{1} redirected to {2}"
4223
msgstr ""
4224
4225
#: bzrlib/bzrdir.py:1727
4516
#: bzrlib/bzrdir.py:1652
4226
4517
#, python-format
4227
4518
msgid ""
4228
4519
"Source repository format does not support stacking, using format:\n"
4229
4520
" %s"
4230
4521
msgstr ""
4231
4522
4232
#: bzrlib/bzrdir.py:1747
4523
#: bzrlib/bzrdir.py:1672
4233
4524
#, python-format
4234
4525
msgid ""
4235
4526
"Source branch format does not support stacking, using format:\n"
4236
4527
" %s"
4237
4528
msgstr ""
4238
4529
4239
#: bzrlib/bzrdir.py:1858
4530
#: bzrlib/bzrdir.py:1818
4240
4531
msgid "starting repository conversion"
4241
4532
msgstr ""
4242
4533
4243
#: bzrlib/check.py:106
4534
#: bzrlib/bzrdir.py:2039
4535
msgid "Using default stacking branch {0} at {1}"
4536
msgstr ""
4537
4538
#: bzrlib/check.py:108
4244
4539
msgid "check"
4245
4540
msgstr ""
4246
4541
4247
#: bzrlib/check.py:108
4542
#: bzrlib/check.py:110
4248
4543
msgid "checking revisions"
4249
4544
msgstr ""
4250
4545
4251
#: bzrlib/check.py:110
4546
#: bzrlib/check.py:112
4252
4547
msgid "checking commit contents"
4253
4548
msgstr ""
4254
4549
4255
#: bzrlib/check.py:112
4550
#: bzrlib/check.py:114
4256
4551
msgid "checking file graphs"
4257
4552
msgstr ""
4258
4553
4259
#: bzrlib/check.py:116
4554
#: bzrlib/check.py:118
4260
4555
msgid "checking branches and trees"
4261
4556
msgstr ""
4262
4557
4263
#: bzrlib/check.py:203
4558
#: bzrlib/check.py:205
4264
4559
msgid "checked repository {0} format {1}"
4265
4560
msgstr ""
4266
4561
4267
#: bzrlib/check.py:206
4562
#: bzrlib/check.py:208
4268
4563
#, python-format
4269
4564
msgid "%6d revisions"
4270
4565
msgstr ""
4271
4566
4272
#: bzrlib/check.py:207
4567
#: bzrlib/check.py:209
4273
4568
#, python-format
4274
4569
msgid "%6d file-ids"
4275
4570
msgstr ""
4276
4571
4277
#: bzrlib/check.py:209
4572
#: bzrlib/check.py:211
4278
4573
#, python-format
4279
4574
msgid "%6d unreferenced text versions"
4280
4575
msgstr ""
4281
4576
4282
#: bzrlib/check.py:213
4577
#: bzrlib/check.py:215
4283
4578
msgid "unreferenced version: {{{0}}} in {1}"
4284
4579
msgstr ""
4285
4580
4286
#: bzrlib/check.py:216
4581
#: bzrlib/check.py:218
4287
4582
#, python-format
4288
4583
msgid "%6d revisions are missing inventory_sha1"
4289
4584
msgstr ""
4290
4585
4291
#: bzrlib/check.py:219
4586
#: bzrlib/check.py:221
4292
4587
#, python-format
4293
4588
msgid "%6d revisions are mentioned but not present"
4294
4589
msgstr ""
4295
4590
4296
#: bzrlib/check.py:222
4591
#: bzrlib/check.py:224
4297
4592
#, python-format
4298
4593
msgid "%6d ghost revisions"
4299
4594
msgstr ""
4300
4595
4301
#: bzrlib/check.py:227
4596
#: bzrlib/check.py:229
4302
4597
#, python-format
4303
4598
msgid "%6d revisions missing parents in ancestry"
4304
4599
msgstr ""
4305
4600
4306
#: bzrlib/check.py:231
4601
#: bzrlib/check.py:233
4307
4602
#, python-format
4308
4603
msgid " %s should be in the ancestry for:"
4309
4604
msgstr ""
4310
4605
4311
#: bzrlib/check.py:235
4606
#: bzrlib/check.py:237
4312
4607
#, python-format
4313
4608
msgid "%6d inconsistent parents"
4314
4609
msgstr ""
4315
4610
4316
#: bzrlib/check.py:239
4611
#: bzrlib/check.py:241
4317
4612
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4318
4613
msgstr ""
4319
4614
4320
#: bzrlib/check.py:245
4615
#: bzrlib/check.py:247
4321
4616
#, python-format
4322
4617
msgid "%6d revisions have incorrect parents in the revision index"
4323
4618
msgstr ""
4324
4619
4325
#: bzrlib/check.py:251
4620
#: bzrlib/check.py:253
4326
4621
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4327
4622
msgstr ""
4328
4623
4329
#: bzrlib/check.py:265
4624
#: bzrlib/check.py:267
4330
4625
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4331
4626
msgstr ""
4332
4627
4333
#: bzrlib/check.py:294
4628
#: bzrlib/check.py:296
4334
4629
msgid ""
4335
4630
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4336
4631
"{{{4}}}"
4337
4632
msgstr ""
4338
4633
4339
#: bzrlib/check.py:352
4634
#: bzrlib/check.py:354
4340
4635
#, python-format
4341
4636
msgid "Checking branch at '%s'."
4342
4637
msgstr ""
4343
4638
4344
#: bzrlib/check.py:372
4639
#: bzrlib/check.py:374
4345
4640
#, python-format
4346
4641
msgid "Checking working tree at '%s'."
4347
4642
msgstr ""
4348
4643
4349
#: bzrlib/check.py:425 bzrlib/check.py:439
4644
#: bzrlib/check.py:427 bzrlib/check.py:441
4350
4645
msgid "No branch found at specified location."
4351
4646
msgstr ""
4352
4647
4353
#: bzrlib/check.py:427 bzrlib/check.py:437
4648
#: bzrlib/check.py:429 bzrlib/check.py:439
4354
4649
msgid "No working tree found at specified location."
4355
4650
msgstr ""
4356
4651
4357
#: bzrlib/check.py:430
4652
#: bzrlib/check.py:432
4358
4653
#, python-format
4359
4654
msgid "Checking repository at '%s'."
4360
4655
msgstr ""
4361
4656
4362
#: bzrlib/check.py:441
4657
#: bzrlib/check.py:443
4363
4658
msgid "No repository found at specified location."
4364
4659
msgstr ""
4365
4660
4366
#: bzrlib/clean_tree.py:62
4661
#: bzrlib/clean_tree.py:63
4367
4662
msgid "Nothing to delete."
4368
4663
msgstr ""
4369
4664
4370
#: bzrlib/clean_tree.py:108
4665
#: bzrlib/clean_tree.py:68
4666
msgid "Are you sure you wish to delete these"
4667
msgstr ""
4668
4669
#: bzrlib/clean_tree.py:70
4670
msgid "Canceled"
4671
msgstr ""
4672
4673
#: bzrlib/clean_tree.py:107
4371
4674
#, python-format
4372
4675
msgid "unable to remove %s"
4373
4676
msgstr ""
4374
4677
4375
#: bzrlib/clean_tree.py:112
4678
#: bzrlib/clean_tree.py:111
4376
4679
msgid "deleting paths:"
4377
4680
msgstr ""
4378
4681
4379
#: bzrlib/clean_tree.py:126
4682
#: bzrlib/clean_tree.py:125
4380
4683
msgid "unable to remove \"{0}\": {1}."
4381
4684
msgstr ""
4382
4685
4383
#: bzrlib/clean_tree.py:131
4686
#: bzrlib/clean_tree.py:130
4384
4687
msgid "No files deleted."
4385
4688
msgstr ""
4386
4689
4387
#: bzrlib/cmd_version_info.py:45
4690
#: bzrlib/cmd_version_info.py:47
4388
4691
msgid "No known version info format {0}. Supported types are: {1}"
4389
4692
msgstr ""
4390
4693
4391
#: bzrlib/cmd_version_info.py:51
4694
# help of 'format=custom' option of 'version-info' command
4695
#: bzrlib/cmd_version_info.py:52
4696
msgid "Version info in Custom template-based format."
4697
msgstr ""
4698
4699
# help of 'format=python' option of 'version-info' command
4700
#: bzrlib/cmd_version_info.py:52
4701
msgid "Version info in Python format."
4702
msgstr ""
4703
4704
# help of 'format=rio' option of 'version-info' command
4705
#: bzrlib/cmd_version_info.py:52
4706
msgid "Version info in RIO (simple text) format (default)."
4707
msgstr ""
4708
4709
#: bzrlib/cmd_version_info.py:53
4392
4710
msgid "Show version information about this tree."
4393
4711
msgstr ""
4394
4712
4395
#: bzrlib/cmd_version_info.py:53
4713
#: bzrlib/cmd_version_info.py:55
4396
4714
msgid ""
4397
4715
"You can use this command to add information about version into\n"
4398
4716
"source code of an application. The output can be in one of the\n"
4399
4717
"supported formats or in a custom format based on a template."
4400
4718
msgstr ""
4401
4719
4402
#: 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
4403
4722
msgid "For example::"
4404
4723
msgstr ""
4405
4724
4406
#: bzrlib/cmd_version_info.py:59
4725
#: bzrlib/cmd_version_info.py:61
4407
4726
msgid ""
4408
4727
" bzr version-info --custom \\\n"
4409
4728
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4410
4729
msgstr ""
4411
4730
4412
#: bzrlib/cmd_version_info.py:62
4731
#: bzrlib/cmd_version_info.py:64
4413
4732
msgid ""
4414
4733
"will produce a C header file with formatted string containing the\n"
4415
4734
"current revision number. Other supported variables in templates are:"
4416
4735
msgstr ""
4417
4736
4418
#: bzrlib/cmd_version_info.py:65
4737
#: bzrlib/cmd_version_info.py:67
4419
4738
msgid ""
4420
4739
" * {date} - date of the last revision\n"
4421
4740
" * {build_date} - current date\n"
4427
4746
msgstr ""
4428
4747
4429
4748
# help of 'format' option of 'version-info' command
4430
#: bzrlib/cmd_version_info.py:75
4749
#: bzrlib/cmd_version_info.py:77
4431
4750
msgid "Select the output format."
4432
4751
msgstr ""
4433
4752
4434
4753
# help of 'all' option of 'version-info' command
4435
#: bzrlib/cmd_version_info.py:79
4754
#: bzrlib/cmd_version_info.py:81
4436
4755
msgid "Include all possible information."
4437
4756
msgstr ""
4438
4757
4439
4758
# help of 'check-clean' option of 'version-info' command
4440
#: bzrlib/cmd_version_info.py:80
4759
#: bzrlib/cmd_version_info.py:82
4441
4760
msgid "Check if tree is clean."
4442
4761
msgstr ""
4443
4762
4444
4763
# help of 'include-history' option of 'version-info' command
4445
#: bzrlib/cmd_version_info.py:82
4764
#: bzrlib/cmd_version_info.py:84
4446
4765
msgid "Include the revision-history."
4447
4766
msgstr ""
4448
4767
4449
4768
# help of 'include-file-revisions' option of 'version-info' command
4450
#: bzrlib/cmd_version_info.py:84
4769
#: bzrlib/cmd_version_info.py:86
4451
4770
msgid "Include the last revision for each file."
4452
4771
msgstr ""
4453
4772
4454
4773
# help of 'template' option of 'version-info' command
4455
#: bzrlib/cmd_version_info.py:85
4774
#: bzrlib/cmd_version_info.py:87
4456
4775
msgid "Template for the output."
4457
4776
msgstr ""
4458
4777
4459
#: bzrlib/commands.py:232
4778
#: bzrlib/cmd_version_info.py:101
4779
msgid "bzr version-info --revision takes exactly one revision specifier"
4780
msgstr ""
4781
4782
#: bzrlib/commands.py:229
4460
4783
#, python-format
4461
4784
msgid "unknown command \"%s\""
4462
4785
msgstr ""
4463
4786
4464
#: bzrlib/commands.py:479
4787
#: bzrlib/commands.py:476
4465
4788
msgid "No help for this command."
4466
4789
msgstr ""
4467
4790
4468
#: bzrlib/commands.py:492
4791
#: bzrlib/commands.py:489
4469
4792
#, python-format
4470
4793
msgid ":Purpose: %s\n"
4471
4794
msgstr ""
4472
4795
4473
#: bzrlib/commands.py:494
4796
#: bzrlib/commands.py:491
4474
4797
#, python-format
4475
4798
msgid ""
4476
4799
":Usage:\n"
4477
4800
"%s\n"
4478
4801
msgstr ""
4479
4802
4480
#: bzrlib/commands.py:496
4803
#: bzrlib/commands.py:493
4481
4804
#, python-format
4482
4805
msgid ":Usage: %s\n"
4483
4806
msgstr ""
4484
4807
4485
#: bzrlib/commands.py:515
4808
#: bzrlib/commands.py:512
4486
4809
#, python-format
4487
4810
msgid ":Options:%s"
4488
4811
msgstr ""
4489
4812
4490
#: bzrlib/commands.py:526
4813
#: bzrlib/commands.py:523
4491
4814
#, python-format
4492
4815
msgid ""
4493
4816
":Description:\n"
4495
4818
"\n"
4496
4819
msgstr ""
4497
4820
4498
#: bzrlib/commands.py:536
4821
#: bzrlib/commands.py:533
4499
4822
#, python-format
4500
4823
msgid ""
4501
4824
"See bzr help %s for more details and examples.\n"
4502
4825
"\n"
4503
4826
msgstr ""
4504
4827
4505
#: bzrlib/commands.py:541
4828
#: bzrlib/commands.py:538
4506
4829
msgid ":Aliases: "
4507
4830
msgstr ""
4508
4831
4509
#: bzrlib/commands.py:545
4832
#: bzrlib/commands.py:542
4510
4833
#, python-format
4511
4834
msgid ":From: plugin \"%s\"\n"
4512
4835
msgstr ""
4513
4836
4514
#: bzrlib/commands.py:557
4837
#: bzrlib/commands.py:554
4515
4838
msgid ":doc:`{0} <{1}-help>`"
4516
4839
msgstr ""
4517
4840
4518
#: bzrlib/commands.py:561
4841
#: bzrlib/commands.py:558
4519
4842
#, python-format
4520
4843
msgid ":See also: %s"
4521
4844
msgstr ""
4522
4845
4523
#: bzrlib/commands.py:819 bzrlib/gpg.py:317
4846
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4524
4847
msgid "Only ASCII permitted in option names"
4525
4848
msgstr ""
4526
4849
4527
#: bzrlib/commands.py:844 bzrlib/commands.py:852
4850
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4528
4851
msgid "command {0!r} needs one or more {1}"
4529
4852
msgstr ""
4530
4853
4531
#: bzrlib/commands.py:861
4854
#: bzrlib/commands.py:858
4532
4855
msgid "command {0!r} requires argument {1}"
4533
4856
msgstr ""
4534
4857
4535
#: bzrlib/commands.py:868
4858
#: bzrlib/commands.py:865
4536
4859
msgid "extra argument to command {0}: {1}"
4537
4860
msgstr ""
4538
4861
4539
#: bzrlib/commands.py:965
4862
#: bzrlib/commands.py:962
4540
4863
#, python-format
4541
4864
msgid "Profile data written to \"%s\"."
4542
4865
msgstr ""
4543
4866
4544
#: bzrlib/commit.py:116 bzrlib/commit.py:709
4867
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4545
4868
msgid "added"
4546
4869
msgstr ""
4547
4870
4548
#: bzrlib/commit.py:116 bzrlib/commit.py:717
4871
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4549
4872
msgid "modified"
4550
4873
msgstr ""
4551
4874
4552
#: bzrlib/commit.py:130
4875
#: bzrlib/commit.py:131
4553
4876
#, python-format
4554
4877
msgid "Committing%s"
4555
4878
msgstr ""
4556
4879
4557
#: bzrlib/commit.py:133
4880
#: bzrlib/commit.py:134
4558
4881
#, python-format
4559
4882
msgid "Committed revision %d."
4560
4883
msgstr ""
4561
4884
4562
#: bzrlib/commit.py:142
4885
#: bzrlib/commit.py:143
4563
4886
#, python-format
4564
4887
msgid "deleted %s"
4565
4888
msgstr ""
4566
4889
4567
#: bzrlib/commit.py:145
4890
#: bzrlib/commit.py:146
4568
4891
#, python-format
4569
4892
msgid "missing %s"
4570
4893
msgstr ""
4571
4894
4572
#: bzrlib/commit.py:471
4895
#: bzrlib/commit.py:511
4573
4896
msgid ""
4574
4897
"Conflicting tags in bound branch:\n"
4575
4898
"{0}"
4576
4899
msgstr ""
4577
4900
4578
#: bzrlib/commit.py:711
4901
#: bzrlib/commit.py:742
4579
4902
msgid "renamed"
4580
4903
msgstr ""
4581
4904
4582
#: bzrlib/commit.py:946
4905
#: bzrlib/commit.py:977
4583
4906
msgid "unchanged"
4584
4907
msgstr ""
4585
4908
4586
#: bzrlib/commit.py:968
4909
#: bzrlib/commit.py:999
4587
4910
msgid "{0} [{1}] - Stage"
4588
4911
msgstr ""
4589
4912
4590
#: bzrlib/commit.py:971
4913
#: bzrlib/commit.py:1002
4591
4914
#, python-format
4592
4915
msgid "%s - Stage"
4593
4916
msgstr ""
4594
4917
4595
#: bzrlib/commit_signature_commands.py:34
4918
#: bzrlib/commit_signature_commands.py:36
4596
4919
msgid "Sign all commits by a given committer."
4597
4920
msgstr ""
4598
4921
4599
#: bzrlib/commit_signature_commands.py:36
4922
#: bzrlib/commit_signature_commands.py:38
4600
4923
msgid ""
4601
4924
"If location is not specified the local tree is used.\n"
4602
4925
"If committer is not specified the default committer is used."
4603
4926
msgstr ""
4604
4927
4605
#: bzrlib/commit_signature_commands.py:39
4928
#: bzrlib/commit_signature_commands.py:41
4606
4929
msgid "This does not sign commits that already have signatures."
4607
4930
msgstr ""
4608
4931
4609
4932
# help of 'dry-run' option of 'sign-my-commits' command
4610
#: bzrlib/commit_signature_commands.py:47
4933
#: bzrlib/commit_signature_commands.py:49
4611
4934
msgid ""
4612
4935
"Don't actually sign anything, just print the revisions that would be signed."
4613
4936
msgstr ""
4614
4937
4615
#: bzrlib/commit_signature_commands.py:101
4938
#: bzrlib/commit_signature_commands.py:103
4616
4939
msgid "Verify all commit signatures."
4617
4940
msgstr ""
4618
4941
4619
#: bzrlib/commit_signature_commands.py:103
4942
#: bzrlib/commit_signature_commands.py:105
4620
4943
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4621
4944
msgstr ""
4622
4945
4623
4946
# help of 'acceptable-keys' option of 'verify-signatures' command
4624
#: bzrlib/commit_signature_commands.py:108
4947
#: bzrlib/commit_signature_commands.py:110
4625
4948
msgid ""
4626
4949
"Comma separated list of GPG key patterns which are acceptable for "
4627
4950
"verification."
4628
4951
msgstr ""
4629
4952
4630
#: bzrlib/commit_signature_commands.py:145
4953
#: bzrlib/commit_signature_commands.py:147
4631
4954
msgid "Cannot verify a range of non-revision-history revisions"
4632
4955
msgstr ""
4633
4956
4634
#: bzrlib/commit_signature_commands.py:166
4957
#: bzrlib/commit_signature_commands.py:168
4635
4958
msgid "All commits signed with verifiable keys"
4636
4959
msgstr ""
4637
4960
4638
#: bzrlib/config.py:448
4961
#: bzrlib/config.py:475
4639
4962
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4640
4963
msgstr ""
4641
4964
4642
#: bzrlib/config.py:3293
4965
#: bzrlib/config.py:2485
4966
msgid "{0} is not an SI unit."
4967
msgstr ""
4968
4969
#: bzrlib/config.py:2949
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:3093
4976
#, python-format
4977
msgid "Invalid '%s', should be of the form 'name=value'"
4978
msgstr ""
4979
4980
#: bzrlib/config.py:3962
4643
4981
msgid "Display, set or remove a configuration option."
4644
4982
msgstr ""
4645
4983
4646
#: bzrlib/config.py:3295
4984
#: bzrlib/config.py:3964
4647
4985
msgid "Display the active value for a given option."
4648
4986
msgstr ""
4649
4987
4650
#: bzrlib/config.py:3297
4988
#: bzrlib/config.py:3966
4651
4989
msgid ""
4652
4990
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4653
4991
"matching options are displayed mentioning their scope. The active value\n"
4654
4992
"that bzr will take into account is the first one displayed for each option."
4655
4993
msgstr ""
4656
4994
4657
#: bzrlib/config.py:3301
4995
#: bzrlib/config.py:3970
4658
4996
msgid "If no NAME is given, --all .* is implied."
4659
4997
msgstr ""
4660
4998
4661
#: bzrlib/config.py:3303
4999
#: bzrlib/config.py:3972
4662
5000
msgid ""
4663
5001
"Setting a value is achieved by using name=value without spaces. The value\n"
4664
5002
"is set in the most relevant scope and can be checked by displaying the\n"
4666
5004
msgstr ""
4667
5005
4668
5006
# help of 'scope' option of 'config' command
4669
#: bzrlib/config.py:3314
4670
msgid "Reduce the scope to the specified configuration file"
5007
#: bzrlib/config.py:3984
5008
msgid "Reduce the scope to the specified configuration file."
4671
5009
msgstr ""
4672
5010
4673
5011
# help of 'all' option of 'config' command
4674
#: bzrlib/config.py:3318
5012
#: bzrlib/config.py:3988
4675
5013
msgid "Display all the defined values for the matching options."
4676
5014
msgstr ""
4677
5015
4678
5016
# help of 'remove' option of 'config' command
4679
#: bzrlib/config.py:3320
4680
msgid "Remove the option from the configuration file"
5017
#: bzrlib/config.py:3990
5018
msgid "Remove the option from the configuration file."
4681
5019
msgstr ""
4682
5020
4683
#: bzrlib/conflicts.py:48
5021
#: bzrlib/conflicts.py:50
4684
5022
msgid "List files with conflicts."
4685
5023
msgstr ""
4686
5024
4687
#: bzrlib/conflicts.py:50
4688
msgid ""
4689
"Merge will do its best to combine the changes in two branches, but there\n"
4690
"are some kinds of problems only a human can fix. When it encounters those,\n"
4691
"it will mark a conflict. A conflict means that you need to fix something,\n"
4692
"before you should commit."
4693
msgstr ""
4694
4695
#: bzrlib/conflicts.py:55
5025
#: bzrlib/conflicts.py:57
4696
5026
msgid ""
4697
5027
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4698
5028
"is supplied, the pathnames of files with text conflicts are listed,\n"
4699
5029
"instead. (This is useful for editing all files with text conflicts.)"
4700
5030
msgstr ""
4701
5031
4702
#: bzrlib/conflicts.py:59
5032
#: bzrlib/conflicts.py:61
4703
5033
msgid "Use bzr resolve when you have fixed a problem."
4704
5034
msgstr ""
4705
5035
4706
5036
# help of 'text' option of 'conflicts' command
4707
#: bzrlib/conflicts.py:64
5037
#: bzrlib/conflicts.py:66
4708
5038
msgid "List paths of files with text conflicts."
4709
5039
msgstr ""
4710
5040
5041
# help of 'action=done' option of 'resolve' command
5042
#: bzrlib/conflicts.py:85
5043
msgid "Marks the conflict as resolved."
5044
msgstr ""
5045
5046
# help of 'action=take-this' option of 'resolve' command
5047
#: bzrlib/conflicts.py:88
5048
msgid "Resolve the conflict preserving the version in the working tree."
5049
msgstr ""
5050
5051
# help of 'action=take-other' option of 'resolve' command
5052
#: bzrlib/conflicts.py:91
5053
msgid "Resolve the conflict taking the merged version into account."
5054
msgstr ""
5055
4711
5056
# help of 'action' option of 'resolve' command
4712
#: bzrlib/conflicts.py:96
5057
#: bzrlib/conflicts.py:98
4713
5058
msgid "How to resolve the conflict."
4714
5059
msgstr ""
4715
5060
4716
#: bzrlib/conflicts.py:102
5061
#: bzrlib/conflicts.py:104
4717
5062
msgid "Mark a conflict as resolved."
4718
5063
msgstr ""
4719
5064
4720
#: bzrlib/conflicts.py:109
5065
#: bzrlib/conflicts.py:111
4721
5066
msgid ""
4722
5067
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4723
5068
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4726
5071
msgstr ""
4727
5072
4728
5073
# help of 'all' option of 'resolve' command
4729
#: bzrlib/conflicts.py:117
5074
#: bzrlib/conflicts.py:119
4730
5075
msgid "Resolve all conflicts in this tree."
4731
5076
msgstr ""
4732
5077
4733
#: bzrlib/conflicts.py:124
5078
#: bzrlib/conflicts.py:126
4734
5079
msgid "If --all is specified, no FILE may be provided"
4735
5080
msgstr ""
4736
5081
4737
#: bzrlib/conflicts.py:149
5082
#: bzrlib/conflicts.py:151
4738
5083
#, python-format
4739
5084
msgid "%d conflict auto-resolved."
4740
5085
msgid_plural "%d conflicts auto-resolved."
4741
5086
msgstr[0] ""
4742
5087
msgstr[1] ""
4743
5088
4744
#: bzrlib/conflicts.py:152
5089
#: bzrlib/conflicts.py:154
4745
5090
msgid "Remaining conflicts:"
4746
5091
msgstr ""
4747
5092
4748
#: bzrlib/conflicts.py:157
5093
#: bzrlib/conflicts.py:159
4749
5094
msgid "All conflicts resolved."
4750
5095
msgstr ""
4751
5096
4752
#: bzrlib/conflicts.py:166
5097
#: bzrlib/conflicts.py:168
4753
5098
msgid "{0} conflict resolved, {1} remaining"
4754
5099
msgid_plural "{0} conflicts resolved, {1} remaining"
4755
5100
msgstr[0] ""
4756
5101
msgstr[1] ""
4757
5102
4758
# title of 'action' option of 'resolve' command
4759
#: bzrlib/conflicts.py:692
4760
msgid "action"
5103
#: bzrlib/controldir.py:710
5104
msgid "{0} is{1} redirected to {2}"
4761
5105
msgstr ""
4762
5106
4763
#: bzrlib/diff.py:397
5107
#: bzrlib/diff.py:399
4764
5108
#, python-format
4765
5109
msgid "*** Ignoring files outside view. View is %s"
4766
5110
msgstr ""
4767
5111
4768
#: bzrlib/errors.py:215
5112
#: bzrlib/errors.py:157
4769
5113
msgid "The tree builder is already building a tree."
4770
5114
msgstr ""
4771
5115
4772
#: bzrlib/errors.py:236
5116
#: bzrlib/errors.py:178
4773
5117
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4774
5118
msgstr ""
4775
5119
4776
#: bzrlib/errors.py:255
5120
#: bzrlib/errors.py:197
4777
5121
msgid ""
4778
5122
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4779
5123
"versions \"%(minimum)s\" to \"%(current)s\"."
4780
5124
msgstr ""
4781
5125
4782
#: bzrlib/errors.py:267
5126
#: bzrlib/errors.py:209
4783
5127
msgid "The transport '%(transport)s' is only accessible within this process."
4784
5128
msgstr ""
4785
5129
4786
#: bzrlib/errors.py:285
5130
#: bzrlib/errors.py:227
4787
5131
msgid "Invalid revision number %(revno)s"
4788
5132
msgstr ""
4789
5133
4790
#: bzrlib/errors.py:294
5134
#: bzrlib/errors.py:236
4791
5135
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4792
5136
msgstr ""
4793
5137
4794
#: bzrlib/errors.py:305
5138
#: bzrlib/errors.py:247
4795
5139
msgid "Reserved revision-id {%(revision_id)s}"
4796
5140
msgstr ""
4797
5141
4798
#: bzrlib/errors.py:319
5142
#: bzrlib/errors.py:261
4799
5143
msgid "There is no public branch set for \"%(branch_url)s\"."
4800
5144
msgstr ""
4801
5145
4802
#: bzrlib/errors.py:329
5146
#: bzrlib/errors.py:271
4803
5147
msgid ""
4804
5148
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4805
5149
"obtain a list of topics."
4806
5150
msgstr ""
4807
5151
4808
#: bzrlib/errors.py:338
5152
#: bzrlib/errors.py:280
4809
5153
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4810
5154
msgstr ""
4811
5155
4812
#: bzrlib/errors.py:348
5156
#: bzrlib/errors.py:290
4813
5157
msgid ""
4814
5158
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4815
5159
msgstr ""
4816
5160
4817
#: bzrlib/errors.py:357
5161
#: bzrlib/errors.py:299
4818
5162
msgid "The branch '%(branch)s' is not stacked."
4819
5163
msgstr ""
4820
5164
4821
#: bzrlib/errors.py:371
5165
#: bzrlib/errors.py:313
4822
5166
msgid "No WorkingTree exists for \"%(base)s\"."
4823
5167
msgstr ""
4824
5168
4825
#: bzrlib/errors.py:380
5169
#: bzrlib/errors.py:322
4826
5170
msgid "Not currently building a tree."
4827
5171
msgstr ""
4828
5172
4829
#: bzrlib/errors.py:385
5173
#: bzrlib/errors.py:327
4830
5174
msgid "%(url)s is not a local path."
4831
5175
msgstr ""
4832
5176
4833
#: bzrlib/errors.py:413
5177
#: bzrlib/errors.py:355
4834
5178
msgid "%(not_locked)r is not write locked but needs to be."
4835
5179
msgstr ""
4836
5180
4837
#: bzrlib/errors.py:421
5181
#: bzrlib/errors.py:363
4838
5182
msgid "Error in command line options"
4839
5183
msgstr ""
4840
5184
4841
#: bzrlib/errors.py:426
5185
#: bzrlib/errors.py:368
4842
5186
msgid "%(value)s is not an index of type %(_type)s."
4843
5187
msgstr ""
4844
5188
4845
#: bzrlib/errors.py:436
5189
#: bzrlib/errors.py:378
4846
5190
msgid "Error in data for index %(value)s."
4847
5191
msgstr ""
4848
5192
4849
#: bzrlib/errors.py:445
5193
#: bzrlib/errors.py:387
4850
5194
msgid "The key '%(key)s' is already in index '%(index)s'."
4851
5195
msgstr ""
4852
5196
4853
#: bzrlib/errors.py:455
5197
#: bzrlib/errors.py:397
4854
5198
msgid "The key '%(key)s' is not a valid key."
4855
5199
msgstr ""
4856
5200
4857
#: bzrlib/errors.py:464
5201
#: bzrlib/errors.py:406
4858
5202
msgid "Could not parse options for index %(value)s."
4859
5203
msgstr ""
4860
5204
4861
#: bzrlib/errors.py:473
5205
#: bzrlib/errors.py:415
4862
5206
msgid "The value '%(value)s' is not a valid value."
4863
5207
msgstr ""
4864
5208
4865
#: bzrlib/errors.py:501
5209
#: bzrlib/errors.py:424
5210
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:443
4866
5214
msgid "Generic path error: %(path)r%(extra)s)"
4867
5215
msgstr ""
4868
5216
4869
#: bzrlib/errors.py:514
5217
#: bzrlib/errors.py:456
4870
5218
msgid "No such file: %(path)r%(extra)s"
4871
5219
msgstr ""
4872
5220
4873
#: bzrlib/errors.py:519
5221
#: bzrlib/errors.py:461
4874
5222
msgid "File exists: %(path)r%(extra)s"
4875
5223
msgstr ""
4876
5224
4877
#: bzrlib/errors.py:525
5225
#: bzrlib/errors.py:467
4878
5226
msgid ""
4879
5227
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
4880
5228
"after to tell bzr about a rename that has already happened)%(extra)s"
4881
5229
msgstr ""
4882
5230
4883
#: bzrlib/errors.py:541
5231
#: bzrlib/errors.py:483
4884
5232
msgid "\"%(path)s\" is not a directory %(extra)s"
4885
5233
msgstr ""
4886
5234
4887
#: bzrlib/errors.py:546
5235
#: bzrlib/errors.py:488
4888
5236
msgid "\"%(path)s\" is not in the working directory %(extra)s"
4889
5237
msgstr ""
4890
5238
4891
#: bzrlib/errors.py:551
5239
#: bzrlib/errors.py:493
4892
5240
msgid "Directory not empty: \"%(path)s\"%(extra)s"
4893
5241
msgstr ""
4894
5242
4895
#: bzrlib/errors.py:556
5243
#: bzrlib/errors.py:498
4896
5244
msgid "Hard-linking \"%(path)s\" is not supported"
4897
5245
msgstr ""
4898
5246
4899
#: bzrlib/errors.py:571
5247
#: bzrlib/errors.py:513
4900
5248
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
4901
5249
msgstr ""
4902
5250
4903
#: bzrlib/errors.py:576
5251
#: bzrlib/errors.py:518
4904
5252
msgid "Permission denied: \"%(path)s\"%(extra)s"
4905
5253
msgstr ""
4906
5254
4907
#: bzrlib/errors.py:581
5255
#: bzrlib/errors.py:523
4908
5256
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
4909
5257
msgstr ""
4910
5258
4911
#: bzrlib/errors.py:586
5259
#: bzrlib/errors.py:528
4912
5260
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
4913
5261
msgstr ""
4914
5262
4915
#: bzrlib/errors.py:597
5263
#: bzrlib/errors.py:539
4916
5264
msgid "URLs differ by more than path: %(from_)r and %(to)r"
4917
5265
msgstr ""
4918
5266
4919
#: bzrlib/errors.py:619
5267
#: bzrlib/errors.py:561
4920
5268
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
4921
5269
msgstr ""
4922
5270
4923
#: bzrlib/errors.py:629
5271
#: bzrlib/errors.py:571
4924
5272
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
4925
5273
msgstr ""
4926
5274
4927
#: bzrlib/errors.py:637
5275
#: bzrlib/errors.py:579
4928
5276
msgid ""
4929
5277
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
4930
5278
"upgrade the branch to permit branch stacking."
4931
5279
msgstr ""
4932
5280
4933
#: bzrlib/errors.py:648
5281
#: bzrlib/errors.py:590
4934
5282
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
4935
5283
msgstr ""
4936
5284
4937
#: bzrlib/errors.py:658
5285
#: bzrlib/errors.py:600
4938
5286
msgid ""
4939
5287
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
4940
5288
"need to upgrade the repository to permit branch stacking."
4941
5289
msgstr ""
4942
5290
4943
#: bzrlib/errors.py:669
5291
#: bzrlib/errors.py:611
4944
5292
msgid "Error reading from %(path)r."
4945
5293
msgstr ""
4946
5294
4947
#: bzrlib/errors.py:688
5295
#: bzrlib/errors.py:630
4948
5296
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
4949
5297
msgstr ""
4950
5298
4951
#: bzrlib/errors.py:704
5299
#: bzrlib/errors.py:646
4952
5300
msgid "Path \"%(path)s\" is not unicode normalized"
4953
5301
msgstr ""
4954
5302
4955
#: bzrlib/errors.py:712
5303
#: bzrlib/errors.py:654
4956
5304
msgid "Not a branch: \"%(path)s\"%(detail)s."
4957
5305
msgstr ""
4958
5306
4959
#: bzrlib/errors.py:754
5307
#: bzrlib/errors.py:696
4960
5308
msgid "No submit branch available for branch \"%(path)s\""
4961
5309
msgstr ""
4962
5310
4963
#: bzrlib/errors.py:763
5311
#: bzrlib/errors.py:705
5312
msgid "A control directory already exists: \"%(path)s\"."
5313
msgstr ""
5314
5315
#: bzrlib/errors.py:710
4964
5316
msgid "Already a branch: \"%(path)s\"."
4965
5317
msgstr ""
4966
5318
4967
#: bzrlib/errors.py:769
5319
#: bzrlib/errors.py:715
5320
msgid "Parent branch already exists: \"%(path)s\"."
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:721
4968
5324
msgid ""
4969
5325
"Directory contains a branch, but no working tree (use bzr checkout if you "
4970
5326
"wish to build a working tree): \"%(path)s\""
4971
5327
msgstr ""
4972
5328
4973
#: bzrlib/errors.py:774
5329
#: bzrlib/errors.py:726
4974
5330
msgid ""
4975
5331
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
4976
5332
msgstr ""
4977
5333
4978
#: bzrlib/errors.py:784
5334
#: bzrlib/errors.py:736
4979
5335
msgid ""
4980
5336
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
4981
5337
msgstr ""
4982
5338
4983
#: bzrlib/errors.py:794
5339
#: bzrlib/errors.py:746
4984
5340
msgid "No repository present: \"%(path)s\""
4985
5341
msgstr ""
4986
5342
4987
#: bzrlib/errors.py:802
4988
msgid "File \"%(path)s\" is not in branch %(branch_base)s."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:814
5343
#: bzrlib/errors.py:753
4992
5344
msgid ""
4993
5345
"Unsupported branch format: %(format)s\n"
4994
5346
"Please run 'bzr upgrade'"
4995
5347
msgstr ""
4996
5348
4997
#: bzrlib/errors.py:820
5349
#: bzrlib/errors.py:759
4998
5350
msgid "Unknown %(kind)s format: %(format)r"
4999
5351
msgstr ""
5000
5352
5001
#: bzrlib/errors.py:829
5353
#: bzrlib/errors.py:768
5002
5354
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5003
5355
msgstr ""
5004
5356
5005
#: bzrlib/errors.py:842
5357
#: bzrlib/errors.py:778
5358
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:793
5006
5362
msgid ""
5007
5363
"%(target)s\n"
5008
5364
"is not compatible with\n"
5010
5366
"%(details)s"
5011
5367
msgstr ""
5012
5368
5013
#: bzrlib/errors.py:858
5369
#: bzrlib/errors.py:809
5014
5370
msgid "Revision is not compatible with %(repo_format)s"
5015
5371
msgstr ""
5016
5372
5017
#: bzrlib/errors.py:868
5373
#: bzrlib/errors.py:819
5018
5374
msgid "%(context_info)s%(path)s is already versioned."
5019
5375
msgstr ""
5020
5376
5021
#: bzrlib/errors.py:889
5377
#: bzrlib/errors.py:840
5022
5378
msgid "%(context_info)s%(path)s is not versioned."
5023
5379
msgstr ""
5024
5380
5025
#: bzrlib/errors.py:910
5381
#: bzrlib/errors.py:861
5026
5382
msgid "Path(s) are not versioned: %(paths_as_string)s"
5027
5383
msgstr ""
5028
5384
5029
#: bzrlib/errors.py:921
5385
#: bzrlib/errors.py:872
5030
5386
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5031
5387
msgstr ""
5032
5388
5033
#: bzrlib/errors.py:940
5389
#: bzrlib/errors.py:891
5034
5390
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5035
5391
msgstr ""
5036
5392
5037
#: bzrlib/errors.py:948
5393
#: bzrlib/errors.py:899
5038
5394
msgid ""
5039
5395
"Filename %(filename)r is not valid in your current filesystem encoding "
5040
5396
"%(fs_encoding)s"
5041
5397
msgstr ""
5042
5398
5043
#: bzrlib/errors.py:959
5399
#: bzrlib/errors.py:910
5044
5400
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5045
5401
msgstr ""
5046
5402
5047
#: bzrlib/errors.py:977
5403
#: bzrlib/errors.py:928
5048
5404
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5049
5405
msgstr ""
5050
5406
5051
#: bzrlib/errors.py:1016
5407
#: bzrlib/errors.py:967
5052
5408
msgid "Cannot lock %(lock)s: %(why)s"
5053
5409
msgstr ""
5054
5410
5055
#: bzrlib/errors.py:1026
5411
#: bzrlib/errors.py:977
5056
5412
msgid ""
5057
5413
"A transaction related operation was attempted after the transaction finished."
5058
5414
msgstr ""
5059
5415
5060
#: bzrlib/errors.py:1053
5416
#: bzrlib/errors.py:1004
5061
5417
msgid "Cannot lock: transport is read only: %(transport)s"
5062
5418
msgstr ""
5063
5419
5064
#: bzrlib/errors.py:1061
5420
#: bzrlib/errors.py:1012
5065
5421
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5066
5422
msgstr ""
5067
5423
5068
#: bzrlib/errors.py:1072
5424
#: bzrlib/errors.py:1023
5069
5425
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5070
5426
msgstr ""
5071
5427
5072
#: bzrlib/errors.py:1083
5428
#: bzrlib/errors.py:1034
5073
5429
msgid ""
5074
5430
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5075
5431
"%(holder)r, wanted to break %(target)r"
5076
5432
msgstr ""
5077
5433
5078
#: bzrlib/errors.py:1095
5434
#: bzrlib/errors.py:1046
5079
5435
msgid ""
5080
5436
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5081
5437
"Use 'bzr break-lock' to clear it"
5082
5438
msgstr ""
5083
5439
5084
#: bzrlib/errors.py:1108
5440
#: bzrlib/errors.py:1059
5085
5441
msgid "Lock not held: %(lock)s"
5086
5442
msgstr ""
5087
5443
5088
#: bzrlib/errors.py:1137
5444
#: bzrlib/errors.py:1088
5089
5445
msgid "No changes to commit"
5090
5446
msgstr ""
5091
5447
5092
#: bzrlib/errors.py:1142
5448
#: bzrlib/errors.py:1093
5093
5449
msgid ""
5094
5450
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5095
5451
msgstr ""
5096
5452
5097
#: bzrlib/errors.py:1152
5453
#: bzrlib/errors.py:1103
5098
5454
msgid ""
5099
5455
"Excluding paths during commit is not supported by repository at %(repository)"
5100
5456
"r."
5101
5457
msgstr ""
5102
5458
5103
#: bzrlib/errors.py:1161
5459
#: bzrlib/errors.py:1112
5104
5460
msgid ""
5105
5461
"The specified commit message contains characters unsupported by the current "
5106
5462
"encoding."
5107
5463
msgstr ""
5108
5464
5109
#: bzrlib/errors.py:1167
5465
#: bzrlib/errors.py:1118
5110
5466
msgid "Upgrade URL cannot work with readonly URLs."
5111
5467
msgstr ""
5112
5468
5113
#: bzrlib/errors.py:1172
5469
#: bzrlib/errors.py:1123
5114
5470
msgid "The branch format %(format)s is already at the most recent format."
5115
5471
msgstr ""
5116
5472
5117
#: bzrlib/errors.py:1195
5473
#: bzrlib/errors.py:1146
5118
5474
msgid "Option --change does not accept revision ranges"
5119
5475
msgstr ""
5120
5476
5121
#: bzrlib/errors.py:1200
5477
#: bzrlib/errors.py:1151
5122
5478
msgid "No namespace registered for string: %(spec)r"
5123
5479
msgstr ""
5124
5480
5125
#: bzrlib/errors.py:1219
5481
#: bzrlib/errors.py:1170
5126
5482
msgid ""
5127
5483
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5128
5484
"%(extra)s"
5129
5485
msgstr ""
5130
5486
5131
#: bzrlib/errors.py:1233
5132
msgid "%(branch)s is missing %(object_type)s {%(object_id)s}"
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:1238
5487
#: bzrlib/errors.py:1184
5136
5488
msgid ""
5137
5489
"Operation denied because it would change the main history, which is not "
5138
5490
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5139
5491
msgstr ""
5140
5492
5141
#: bzrlib/errors.py:1249
5493
#: bzrlib/errors.py:1195
5142
5494
msgid ""
5143
5495
"These branches have diverged. Use the missing command to see how.\n"
5144
5496
"Use the merge command to reconcile them."
5145
5497
msgstr ""
5146
5498
5147
#: bzrlib/errors.py:1269
5499
#: bzrlib/errors.py:1215
5148
5500
msgid ""
5149
5501
"Branches have no common ancestor, and no merge base revision was specified."
5150
5502
msgstr ""
5151
5503
5152
#: bzrlib/errors.py:1275
5504
#: bzrlib/errors.py:1221
5153
5505
msgid ""
5154
5506
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5155
5507
msgstr ""
5156
5508
5157
#: bzrlib/errors.py:1281
5509
#: bzrlib/errors.py:1227
5158
5510
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5159
5511
msgstr ""
5160
5512
5161
#: bzrlib/errors.py:1290
5513
#: bzrlib/errors.py:1236
5162
5514
msgid ""
5163
5515
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5164
5516
msgstr ""
5165
5517
5166
#: bzrlib/errors.py:1299
5518
#: bzrlib/errors.py:1245
5167
5519
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5168
5520
msgstr ""
5169
5521
5170
#: bzrlib/errors.py:1319
5522
#: bzrlib/errors.py:1254
5171
5523
msgid "Branch %(branch)s has no commits."
5172
5524
msgstr ""
5173
5525
5174
#: bzrlib/errors.py:1337
5526
#: bzrlib/errors.py:1272
5175
5527
msgid ""
5176
5528
"Bound branch %(branch)s is out of date with master branch %(master)s."
5177
5529
"%(extra_help)s"
5178
5530
msgstr ""
5179
5531
5180
#: bzrlib/errors.py:1349
5532
#: bzrlib/errors.py:1284
5181
5533
msgid ""
5182
5534
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5183
5535
"bound to %(remote)s."
5184
5536
msgstr ""
5185
5537
5186
#: bzrlib/errors.py:1361
5538
#: bzrlib/errors.py:1296
5187
5539
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5188
5540
msgstr ""
5189
5541
5190
#: bzrlib/errors.py:1370
5542
#: bzrlib/errors.py:1305
5191
5543
msgid ""
5192
5544
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5193
5545
"%(error)s"
5194
5546
msgstr ""
5195
5547
5196
#: bzrlib/errors.py:1382
5548
#: bzrlib/errors.py:1317
5197
5549
msgid "Error in processing weave: %(msg)s"
5198
5550
msgstr ""
5199
5551
5200
#: bzrlib/errors.py:1391
5552
#: bzrlib/errors.py:1326
5201
5553
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5202
5554
msgstr ""
5203
5555
5204
#: bzrlib/errors.py:1402
5556
#: bzrlib/errors.py:1337
5205
5557
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5206
5558
msgstr ""
5207
5559
5208
#: bzrlib/errors.py:1412
5560
#: bzrlib/errors.py:1347
5209
5561
msgid "Weave invariant violated: %(what)s"
5210
5562
msgstr ""
5211
5563
5212
#: bzrlib/errors.py:1421
5564
#: bzrlib/errors.py:1356
5213
5565
msgid "Parents are mismatched between two revisions. %(msg)s"
5214
5566
msgstr ""
5215
5567
5216
#: bzrlib/errors.py:1443
5568
#: bzrlib/errors.py:1378
5217
5569
msgid ""
5218
5570
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5219
5571
"%(weave_b)s"
5220
5572
msgstr ""
5221
5573
5222
#: bzrlib/errors.py:1455
5574
#: bzrlib/errors.py:1390
5223
5575
msgid "Versioned file error"
5224
5576
msgstr ""
5225
5577
5226
#: bzrlib/errors.py:1460
5578
#: bzrlib/errors.py:1395
5227
5579
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5228
5580
msgstr ""
5229
5581
5230
#: bzrlib/errors.py:1470
5582
#: bzrlib/errors.py:1405
5231
5583
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5232
5584
msgstr ""
5233
5585
5234
#: bzrlib/errors.py:1480
5586
#: bzrlib/errors.py:1415
5235
5587
msgid "Text did not match its checksum: %(msg)s"
5236
5588
msgstr ""
5237
5589
5238
#: bzrlib/errors.py:1605
5590
#: bzrlib/errors.py:1541
5239
5591
msgid "Export format %(format)r not supported"
5240
5592
msgstr ""
5241
5593
5242
#: bzrlib/errors.py:1614
5594
#: bzrlib/errors.py:1550
5243
5595
msgid "Transport error: %(msg)s %(orig_error)s"
5244
5596
msgstr ""
5245
5597
5246
#: bzrlib/errors.py:1640
5598
#: bzrlib/errors.py:1576
5247
5599
msgid "Generic bzr smart protocol error: %(details)s"
5248
5600
msgstr ""
5249
5601
5250
#: bzrlib/errors.py:1648
5602
#: bzrlib/errors.py:1584
5251
5603
msgid "Received bad protocol version marker: %(marker)r"
5252
5604
msgstr ""
5253
5605
5254
#: bzrlib/errors.py:1679
5606
#: bzrlib/errors.py:1616
5255
5607
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5256
5608
msgstr ""
5257
5609
5258
#: bzrlib/errors.py:1684
5610
#: bzrlib/errors.py:1621
5259
5611
msgid "Connection error: %(msg)s %(orig_error)s"
5260
5612
msgstr ""
5261
5613
5262
#: bzrlib/errors.py:1689
5614
#: bzrlib/errors.py:1626
5263
5615
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5264
5616
msgstr ""
5265
5617
5266
#: bzrlib/errors.py:1710
5618
#: bzrlib/errors.py:1647
5267
5619
msgid "Connection closed: %(msg)s %(orig_error)s"
5268
5620
msgstr ""
5269
5621
5270
#: bzrlib/errors.py:1715
5622
#: bzrlib/errors.py:1652
5623
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:1657
5271
5627
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5272
5628
msgstr ""
5273
5629
5274
#: bzrlib/errors.py:1725
5630
#: bzrlib/errors.py:1667
5275
5631
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5276
5632
msgstr ""
5277
5633
5278
#: bzrlib/errors.py:1740
5634
#: bzrlib/errors.py:1682
5635
msgid "Certificate error: %(error)s"
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:1690
5279
5639
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5280
5640
msgstr ""
5281
5641
5282
#: bzrlib/errors.py:1754
5642
#: bzrlib/errors.py:1704
5283
5643
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5284
5644
msgstr ""
5285
5645
5286
#: bzrlib/errors.py:1762
5646
#: bzrlib/errors.py:1712
5287
5647
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5288
5648
msgstr ""
5289
5649
5290
#: bzrlib/errors.py:1771
5650
#: bzrlib/errors.py:1721
5291
5651
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5292
5652
msgstr ""
5293
5653
5294
#: bzrlib/errors.py:1785
5654
#: bzrlib/errors.py:1735
5295
5655
msgid "Too many redirections"
5296
5656
msgstr ""
5297
5657
5298
#: bzrlib/errors.py:1790
5658
#: bzrlib/errors.py:1740
5299
5659
msgid "Working tree has conflicts."
5300
5660
msgstr ""
5301
5661
5302
#: bzrlib/errors.py:1794
5662
#: bzrlib/errors.py:1744
5303
5663
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5304
5664
msgstr ""
5305
5665
5306
#: bzrlib/errors.py:1803
5666
#: bzrlib/errors.py:1753
5307
5667
msgid ""
5308
5668
"Error(s) parsing config file %(filename)s:\n"
5309
5669
"%(errors)s"
5310
5670
msgstr ""
5311
5671
5312
#: bzrlib/errors.py:1814
5313
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5672
#: bzrlib/errors.py:1763
5673
msgid ""
5674
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5675
"See ``bzr help %(name)s``"
5314
5676
msgstr ""
5315
5677
5316
#: bzrlib/errors.py:1822
5678
#: bzrlib/errors.py:1773
5317
5679
msgid "%(username)r does not seem to contain a reasonable email address"
5318
5680
msgstr ""
5319
5681
5320
#: bzrlib/errors.py:1831
5682
#: bzrlib/errors.py:1782
5321
5683
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5322
5684
msgstr ""
5323
5685
5324
#: bzrlib/errors.py:1839
5686
#: bzrlib/errors.py:1790
5325
5687
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5326
5688
msgstr ""
5327
5689
5328
#: bzrlib/errors.py:1847
5690
#: bzrlib/errors.py:1798
5329
5691
msgid "Unable to import library \"%(library)s\": %(error)s"
5330
5692
msgstr ""
5331
5693
5332
#: bzrlib/errors.py:1855
5694
#: bzrlib/errors.py:1806
5333
5695
msgid "python-gpgme is not installed, it is needed to verify signatures"
5334
5696
msgstr ""
5335
5697
5336
#: bzrlib/errors.py:1863
5698
#: bzrlib/errors.py:1814
5337
5699
msgid ""
5338
5700
"The working tree for %(basedir)s has changed since the last commit, but "
5339
5701
"weave merge requires that it be unchanged"
5340
5702
msgstr ""
5341
5703
5342
#: bzrlib/errors.py:1873
5704
#: bzrlib/errors.py:1824
5343
5705
msgid ""
5344
5706
"Can't reprocess and show base, because reprocessing obscures the "
5345
5707
"relationship of conflicting lines to the base"
5346
5708
msgstr ""
5347
5709
5348
#: bzrlib/errors.py:1879
5710
#: bzrlib/errors.py:1830
5349
5711
msgid "Cycle in graph %(graph)r"
5350
5712
msgstr ""
5351
5713
5352
#: bzrlib/errors.py:1907
5714
#: bzrlib/errors.py:1858
5353
5715
msgid "File %(filename)s is not conflicted."
5354
5716
msgstr ""
5355
5717
5356
#: bzrlib/errors.py:1929
5718
#: bzrlib/errors.py:1880
5357
5719
msgid "No bundle was found in \"%(filename)s\"."
5358
5720
msgstr ""
5359
5721
5360
#: bzrlib/errors.py:1938
5722
#: bzrlib/errors.py:1889
5361
5723
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5362
5724
msgstr ""
5363
5725
5364
#: bzrlib/errors.py:1948
5726
#: bzrlib/errors.py:1899
5365
5727
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5366
5728
msgstr ""
5367
5729
5368
#: bzrlib/errors.py:1961
5730
#: bzrlib/errors.py:1912
5369
5731
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5370
5732
msgstr ""
5371
5733
5372
#: bzrlib/errors.py:1971
5734
#: bzrlib/errors.py:1922
5373
5735
msgid "Key %(key)s is already present in map"
5374
5736
msgstr ""
5375
5737
5376
#: bzrlib/errors.py:1976
5738
#: bzrlib/errors.py:1927
5377
5739
msgid "The prefix %(prefix)s is in the help search path twice."
5378
5740
msgstr ""
5379
5741
5380
#: bzrlib/errors.py:1984
5381
msgid "Tree transform is malformed %(conflicts)r"
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:1986
5742
#: bzrlib/errors.py:1937
5385
5743
msgid ""
5386
5744
"No final name for trans_id %(trans_id)r\n"
5387
5745
"file-id: %(file_id)r\n"
5388
5746
"root trans-id: %(root_trans_id)r\n"
5389
5747
msgstr ""
5390
5748
5391
#: bzrlib/errors.py:2018
5749
#: bzrlib/errors.py:1969
5392
5750
msgid "Attempt to reuse a transform that has already been applied."
5393
5751
msgstr ""
5394
5752
5395
#: bzrlib/errors.py:2023
5753
#: bzrlib/errors.py:1974
5396
5754
msgid "Moving the root directory is not supported at this time"
5397
5755
msgstr ""
5398
5756
5399
#: bzrlib/errors.py:2028
5757
#: bzrlib/errors.py:1979
5400
5758
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5401
5759
msgstr ""
5402
5760
5403
#: bzrlib/errors.py:2039
5761
#: bzrlib/errors.py:1990
5404
5762
msgid ""
5405
5763
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5406
5764
msgstr ""
5407
5765
5408
#: bzrlib/errors.py:2075
5766
#: bzrlib/errors.py:2026
5409
5767
msgid ""
5410
5768
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5411
5769
msgstr ""
5412
5770
5413
#: bzrlib/errors.py:2084
5414
msgid ""
5415
"Can't safely remove modified or unknown files:\n"
5416
"%(changes_as_text)sUse --keep to not delete them, or --force to delete them "
5417
"regardless."
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:2121
5771
#: bzrlib/errors.py:2056
5421
5772
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5422
5773
msgstr ""
5423
5774
5424
#: bzrlib/errors.py:2129
5775
#: bzrlib/errors.py:2064
5425
5776
msgid "Nothing to merge."
5426
5777
msgstr ""
5427
5778
5428
#: bzrlib/errors.py:2134
5779
#: bzrlib/errors.py:2069
5429
5780
msgid "Format %(format)s cannot be initialised by this version of bzr."
5430
5781
msgstr ""
5431
5782
5432
#: bzrlib/errors.py:2143
5783
#: bzrlib/errors.py:2078
5433
5784
msgid ""
5434
5785
"Cannot convert from format %(from_format)s to format %(format)s. "
5435
5786
"%(problem)s"
5436
5787
msgstr ""
5437
5788
5438
#: bzrlib/errors.py:2155
5789
#: bzrlib/errors.py:2090
5439
5790
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5440
5791
msgstr ""
5441
5792
5442
#: bzrlib/errors.py:2163
5793
#: bzrlib/errors.py:2098
5443
5794
msgid "%(exe_name)s could not be found on this machine"
5444
5795
msgstr ""
5445
5796
5446
#: bzrlib/errors.py:2171
5797
#: bzrlib/errors.py:2106
5447
5798
msgid "Diff is not installed on this machine: %(msg)s"
5448
5799
msgstr ""
5449
5800
5450
#: bzrlib/errors.py:2179
5801
#: bzrlib/errors.py:2114
5451
5802
msgid "Diff3 is not installed on this machine."
5452
5803
msgstr ""
5453
5804
5454
#: bzrlib/errors.py:2185
5805
#: bzrlib/errors.py:2120
5455
5806
msgid "The content being inserted is already present."
5456
5807
msgstr ""
5457
5808
5458
#: bzrlib/errors.py:2190
5809
#: bzrlib/errors.py:2125
5459
5810
msgid ""
5460
5811
"This tree contains left-over files from a failed operation.\n"
5461
5812
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5463
5814
" keep, and delete it when you are done."
5464
5815
msgstr ""
5465
5816
5466
#: bzrlib/errors.py:2201
5817
#: bzrlib/errors.py:2136
5467
5818
msgid ""
5468
5819
"This tree contains left-over files from a failed operation.\n"
5469
5820
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5470
5821
" wish to keep, and delete it when you are done."
5471
5822
msgstr ""
5472
5823
5473
#: bzrlib/errors.py:2211
5824
#: bzrlib/errors.py:2146
5474
5825
msgid ""
5475
5826
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5476
5827
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5478
5829
" keep, and delete it when you are done."
5479
5830
msgstr ""
5480
5831
5481
#: bzrlib/errors.py:2222
5832
#: bzrlib/errors.py:2157
5482
5833
msgid ""
5483
5834
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5484
5835
"examine %(pending_deletion)s to see if it contains any files you wish to "
5485
5836
"keep, and delete it when you are done."
5486
5837
msgstr ""
5487
5838
5488
#: bzrlib/errors.py:2232
5839
#: bzrlib/errors.py:2167
5489
5840
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5490
5841
msgstr ""
5491
5842
5492
#: bzrlib/errors.py:2246
5843
#: bzrlib/errors.py:2181
5493
5844
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5494
5845
msgstr ""
5495
5846
5496
#: bzrlib/errors.py:2259
5847
#: bzrlib/errors.py:2194
5497
5848
msgid "Error in merge modified format"
5498
5849
msgstr ""
5499
5850
5500
#: bzrlib/errors.py:2264
5851
#: bzrlib/errors.py:2199
5501
5852
msgid "Format error in conflict listings"
5502
5853
msgstr ""
5503
5854
5504
#: bzrlib/errors.py:2268
5855
#: bzrlib/errors.py:2203
5505
5856
msgid ""
5506
5857
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5507
5858
"Error: %(description)s"
5508
5859
msgstr ""
5509
5860
5510
#: bzrlib/errors.py:2279
5861
#: bzrlib/errors.py:2214
5511
5862
msgid ""
5512
5863
"An error has been detected in the repository %(repo_path)s.\n"
5513
5864
"Please run bzr reconcile on this repository."
5514
5865
msgstr ""
5515
5866
5516
#: bzrlib/errors.py:2290
5867
#: bzrlib/errors.py:2225
5517
5868
msgid ""
5518
5869
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5519
5870
"reason: %(reason)s"
5520
5871
msgstr ""
5521
5872
5522
#: bzrlib/errors.py:2303
5873
#: bzrlib/errors.py:2238
5523
5874
msgid ""
5524
5875
"An inconsistent delta was supplied: %(delta)r\n"
5525
5876
"reason: %(reason)s"
5526
5877
msgstr ""
5527
5878
5528
#: bzrlib/errors.py:2315
5879
#: bzrlib/errors.py:2250
5529
5880
msgid "To use this feature you must upgrade your branch at %(path)s."
5530
5881
msgstr ""
5531
5882
5532
#: bzrlib/errors.py:2324
5883
#: bzrlib/errors.py:2259
5533
5884
msgid "To use this feature you must upgrade your repository at %(path)s."
5534
5885
msgstr ""
5535
5886
5536
#: bzrlib/errors.py:2329
5887
#: bzrlib/errors.py:2264
5537
5888
msgid ""
5538
5889
"To use this feature you must upgrade your branch at %(path)s to a format "
5539
5890
"which supports rich roots."
5540
5891
msgstr ""
5541
5892
5542
#: bzrlib/errors.py:2335
5893
#: bzrlib/errors.py:2270
5543
5894
msgid "Cannot perform local-only commits on unbound branches."
5544
5895
msgstr ""
5545
5896
5546
#: bzrlib/errors.py:2340
5897
#: bzrlib/errors.py:2275
5547
5898
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5548
5899
msgstr ""
5549
5900
5550
#: bzrlib/errors.py:2361
5901
#: bzrlib/errors.py:2296
5551
5902
msgid "Ghost tags not supported by format %(format)r."
5552
5903
msgstr ""
5553
5904
5554
#: bzrlib/errors.py:2369
5905
#: bzrlib/errors.py:2304
5555
5906
msgid "File is binary but should be text."
5556
5907
msgstr ""
5557
5908
5558
#: bzrlib/errors.py:2374
5909
#: bzrlib/errors.py:2309
5559
5910
msgid "The path %(path)s is not permitted on this platform"
5560
5911
msgstr ""
5561
5912
5562
#: bzrlib/errors.py:2383
5913
#: bzrlib/errors.py:2318
5563
5914
msgid ""
5564
5915
"Testament did not match expected value.\n"
5565
5916
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5566
5917
" {%(measured)s}"
5567
5918
msgstr ""
5568
5919
5569
#: bzrlib/errors.py:2395
5920
#: bzrlib/errors.py:2330
5570
5921
msgid "Not a bzr revision-bundle: %(text)r"
5571
5922
msgstr ""
5572
5923
5573
#: bzrlib/errors.py:2404
5924
#: bzrlib/errors.py:2339
5574
5925
msgid "Bad bzr revision-bundle: %(text)r"
5575
5926
msgstr ""
5576
5927
5577
#: bzrlib/errors.py:2413
5928
#: bzrlib/errors.py:2348
5578
5929
msgid "Malformed bzr revision-bundle header: %(text)r"
5579
5930
msgstr ""
5580
5931
5581
#: bzrlib/errors.py:2418
5932
#: bzrlib/errors.py:2353
5582
5933
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5583
5934
msgstr ""
5584
5935
5585
#: bzrlib/errors.py:2423
5936
#: bzrlib/errors.py:2358
5586
5937
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5587
5938
msgstr ""
5588
5939
5589
#: bzrlib/errors.py:2428
5940
#: bzrlib/errors.py:2363
5590
5941
msgid "End of line marker was not \\n in bzr revision-bundle"
5591
5942
msgstr ""
5592
5943
5593
#: bzrlib/errors.py:2438
5944
#: bzrlib/errors.py:2373
5594
5945
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5595
5946
msgstr ""
5596
5947
5597
#: bzrlib/errors.py:2448
5948
#: bzrlib/errors.py:2383
5598
5949
msgid "Root class for inventory serialization errors"
5599
5950
msgstr ""
5600
5951
5601
#: bzrlib/errors.py:2452
5952
#: bzrlib/errors.py:2387
5602
5953
msgid ""
5603
5954
"The inventory was not in the expected format:\n"
5604
5955
" %(msg)s"
5605
5956
msgstr ""
5606
5957
5607
#: bzrlib/errors.py:2461
5958
#: bzrlib/errors.py:2396
5608
5959
msgid "This operation requires rich root data storage"
5609
5960
msgstr ""
5610
5961
5611
#: bzrlib/errors.py:2474
5962
#: bzrlib/errors.py:2409
5612
5963
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5613
5964
msgstr ""
5614
5965
5615
#: bzrlib/errors.py:2483
5966
#: bzrlib/errors.py:2418
5616
5967
msgid ""
5617
5968
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5618
5969
"variable."
5619
5970
msgstr ""
5620
5971
5621
#: bzrlib/errors.py:2490
5972
#: bzrlib/errors.py:2425
5622
5973
msgid ""
5623
5974
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5624
5975
"ghost at {%(ghost_revision_id)s}"
5625
5976
msgstr ""
5626
5977
5627
#: bzrlib/errors.py:2500
5978
#: bzrlib/errors.py:2435
5628
5979
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5629
5980
msgstr ""
5630
5981
5631
#: bzrlib/errors.py:2551
5982
#: bzrlib/errors.py:2486
5632
5983
msgid ""
5633
5984
"A merge directive must provide either a bundle or a public branch location."
5634
5985
msgstr ""
5635
5986
5636
#: bzrlib/errors.py:2558
5987
#: bzrlib/errors.py:2493
5637
5988
msgid "Bad merge directive payload %(start)r"
5638
5989
msgstr ""
5639
5990
5640
#: bzrlib/errors.py:2568
5991
#: bzrlib/errors.py:2503
5641
5992
msgid "Preview patch does not match requested changes."
5642
5993
msgstr ""
5643
5994
5644
#: bzrlib/errors.py:2574
5995
#: bzrlib/errors.py:2509
5645
5996
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5646
5997
msgstr ""
5647
5998
5648
#: bzrlib/errors.py:2584
5999
#: bzrlib/errors.py:2519
5649
6000
msgid ""
5650
6001
"Your branch does not have all of the revisions required in order to merge "
5651
6002
"this merge directive and the target location specified in the merge "
5652
6003
"directive is not a branch: %(location)s."
5653
6004
msgstr ""
5654
6005
5655
#: bzrlib/errors.py:2596
6006
#: bzrlib/errors.py:2531
5656
6007
msgid "Unsupported entry kind %(kind)s"
5657
6008
msgstr ""
5658
6009
5659
#: bzrlib/errors.py:2604
6010
#: bzrlib/errors.py:2539
5660
6011
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5661
6012
msgstr ""
5662
6013
5663
#: bzrlib/errors.py:2614
6014
#: bzrlib/errors.py:2549
5664
6015
msgid "Subsume target %(other_tree)s needs to be upgraded."
5665
6016
msgstr ""
5666
6017
5667
#: bzrlib/errors.py:2633
6018
#: bzrlib/errors.py:2568
5668
6019
msgid "No such tag: %(tag_name)s"
5669
6020
msgstr ""
5670
6021
5671
#: bzrlib/errors.py:2641
6022
#: bzrlib/errors.py:2576
5672
6023
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5673
6024
msgstr ""
5674
6025
5675
#: bzrlib/errors.py:2650
6026
#: bzrlib/errors.py:2585
5676
6027
msgid "Tag %(tag_name)s already exists."
5677
6028
msgstr ""
5678
6029
5679
#: bzrlib/errors.py:2658
6030
#: bzrlib/errors.py:2593
5680
6031
msgid ""
5681
6032
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
5682
6033
"\" for more information on this feature."
5683
6034
msgstr ""
5684
6035
5685
#: bzrlib/errors.py:2668
6036
#: bzrlib/errors.py:2603
5686
6037
msgid ""
5687
6038
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5688
6039
msgstr ""
5689
6040
5690
#: bzrlib/errors.py:2678
6041
#: bzrlib/errors.py:2613
5691
6042
msgid ""
5692
6043
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5693
6044
msgstr ""
5694
6045
5695
#: bzrlib/errors.py:2688
6046
#: bzrlib/errors.py:2623
5696
6047
msgid "Invalid line in bugs property: '%(line)s'"
5697
6048
msgstr ""
5698
6049
5699
#: bzrlib/errors.py:2696
6050
#: bzrlib/errors.py:2631
5700
6051
msgid "Invalid bug status: '%(status)s'"
5701
6052
msgstr ""
5702
6053
5703
#: bzrlib/errors.py:2704
6054
#: bzrlib/errors.py:2639
5704
6055
msgid "Could not understand response from smart server: %(response_tuple)r"
5705
6056
msgstr ""
5706
6057
5707
#: bzrlib/errors.py:2743
6058
#: bzrlib/errors.py:2678
5708
6059
msgid "Server sent an unexpected error: %(error_tuple)r"
5709
6060
msgstr ""
5710
6061
5711
#: bzrlib/errors.py:2762
6062
#: bzrlib/errors.py:2697
5712
6063
msgid "Unrecognised container format: %(container_format)r"
5713
6064
msgstr ""
5714
6065
5715
#: bzrlib/errors.py:2770
6066
#: bzrlib/errors.py:2705
5716
6067
msgid "Unexpected end of container stream"
5717
6068
msgstr ""
5718
6069
5719
#: bzrlib/errors.py:2775
6070
#: bzrlib/errors.py:2710
5720
6071
msgid "Unknown record type: %(record_type)r"
5721
6072
msgstr ""
5722
6073
5723
#: bzrlib/errors.py:2783
6074
#: bzrlib/errors.py:2718
5724
6075
msgid "Invalid record: %(reason)s"
5725
6076
msgstr ""
5726
6077
5727
#: bzrlib/errors.py:2791
6078
#: bzrlib/errors.py:2726
5728
6079
msgid "Container has data after end marker: %(excess)r"
5729
6080
msgstr ""
5730
6081
5731
#: bzrlib/errors.py:2799
6082
#: bzrlib/errors.py:2734
5732
6083
msgid "Container has multiple records with the same name: %(name)s"
5733
6084
msgstr ""
5734
6085
5735
#: bzrlib/errors.py:2812
6086
#: bzrlib/errors.py:2747
5736
6087
msgid "Corrupt or incompatible data stream: %(reason)s"
5737
6088
msgstr ""
5738
6089
5739
#: bzrlib/errors.py:2820
6090
#: bzrlib/errors.py:2755
5740
6091
msgid "SMTP error: %(error)s"
5741
6092
msgstr ""
5742
6093
5743
#: bzrlib/errors.py:2828
6094
#: bzrlib/errors.py:2763
5744
6095
msgid "No message supplied."
5745
6096
msgstr ""
5746
6097
5747
#: bzrlib/errors.py:2833
6098
#: bzrlib/errors.py:2768
5748
6099
msgid "No mail-to address (--mail-to) or output (-o) specified."
5749
6100
msgstr ""
5750
6101
5751
#: bzrlib/errors.py:2838
6102
#: bzrlib/errors.py:2773
5752
6103
msgid "Unknown mail client: %(mail_client)s"
5753
6104
msgstr ""
5754
6105
5755
#: bzrlib/errors.py:2846
6106
#: bzrlib/errors.py:2781
5756
6107
msgid ""
5757
6108
"Unable to find mail client with the following names: "
5758
6109
"%(mail_command_list_string)s"
5759
6110
msgstr ""
5760
6111
5761
#: bzrlib/errors.py:2856
6112
#: bzrlib/errors.py:2791
5762
6113
msgid "SMTP connection to %(host)s refused"
5763
6114
msgstr ""
5764
6115
5765
#: bzrlib/errors.py:2865
6116
#: bzrlib/errors.py:2800
5766
6117
msgid "Please specify smtp_server. No server at default %(host)s."
5767
6118
msgstr ""
5768
6119
5769
#: bzrlib/errors.py:2879
6120
#: bzrlib/errors.py:2814
5770
6121
msgid ""
5771
6122
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5772
6123
"reconfigure."
5773
6124
msgstr ""
5774
6125
5775
#: bzrlib/errors.py:2891
6126
#: bzrlib/errors.py:2826
5776
6127
msgid "'%(display_url)s' is already a branch."
5777
6128
msgstr ""
5778
6129
5779
#: bzrlib/errors.py:2896
6130
#: bzrlib/errors.py:2831
5780
6131
msgid "'%(display_url)s' is already a tree."
5781
6132
msgstr ""
5782
6133
5783
#: bzrlib/errors.py:2901
6134
#: bzrlib/errors.py:2836
5784
6135
msgid "'%(display_url)s' is already a checkout."
5785
6136
msgstr ""
5786
6137
5787
#: bzrlib/errors.py:2906
6138
#: bzrlib/errors.py:2841
5788
6139
msgid "'%(display_url)s' is already a lightweight checkout."
5789
6140
msgstr ""
5790
6141
5791
#: bzrlib/errors.py:2911
6142
#: bzrlib/errors.py:2846
5792
6143
msgid "'%(display_url)s' is already using a shared repository."
5793
6144
msgstr ""
5794
6145
5795
#: bzrlib/errors.py:2916
6146
#: bzrlib/errors.py:2851
5796
6147
msgid "'%(display_url)s' is already standalone."
5797
6148
msgstr ""
5798
6149
5799
#: bzrlib/errors.py:2921
6150
#: bzrlib/errors.py:2856
5800
6151
msgid "Shared repository '%(display_url)s' already creates working trees."
5801
6152
msgstr ""
5802
6153
5803
#: bzrlib/errors.py:2927
6154
#: bzrlib/errors.py:2862
5804
6155
msgid ""
5805
6156
"Shared repository '%(display_url)s' already doesn't create working trees."
5806
6157
msgstr ""
5807
6158
5808
#: bzrlib/errors.py:2933
6159
#: bzrlib/errors.py:2868
5809
6160
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5810
6161
msgstr ""
5811
6162
5812
#: bzrlib/errors.py:2938
6163
#: bzrlib/errors.py:2873
5813
6164
msgid "No location could be found to bind to at %(display_url)s."
5814
6165
msgstr ""
5815
6166
5816
#: bzrlib/errors.py:2943
6167
#: bzrlib/errors.py:2878
5817
6168
msgid ""
5818
6169
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
5819
6170
"%(more)s"
5820
6171
msgstr ""
5821
6172
5822
#: bzrlib/errors.py:2962
6173
#: bzrlib/errors.py:2897
5823
6174
msgid ""
5824
6175
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
5825
6176
"%(more)s"
5826
6177
msgstr ""
5827
6178
5828
#: bzrlib/errors.py:2968
6179
#: bzrlib/errors.py:2903
5829
6180
msgid "Variable {%(name)s} is not available."
5830
6181
msgstr ""
5831
6182
5832
#: bzrlib/errors.py:2976
6183
#: bzrlib/errors.py:2911
5833
6184
msgid "No template specified."
5834
6185
msgstr ""
5835
6186
5836
#: bzrlib/errors.py:2981
6187
#: bzrlib/errors.py:2916
5837
6188
msgid "Unable to create symlink %(path_str)son this platform"
5838
6189
msgstr ""
5839
6190
5840
#: bzrlib/errors.py:2996
6191
#: bzrlib/errors.py:2931
5841
6192
msgid ""
5842
6193
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
5843
6194
"\", \"local\"."
5844
6195
msgstr ""
5845
6196
5846
#: bzrlib/errors.py:3030
6197
#: bzrlib/errors.py:2965
5847
6198
msgid ""
5848
6199
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5849
6200
msgstr ""
5850
6201
5851
#: bzrlib/errors.py:3042
6202
#: bzrlib/errors.py:2977
5852
6203
msgid "The \"%(config_id)s\" configuration does not exist."
5853
6204
msgstr ""
5854
6205
5855
#: bzrlib/errors.py:3050
6206
#: bzrlib/errors.py:2985
5856
6207
msgid "The \"%(option_name)s\" configuration option does not exist."
5857
6208
msgstr ""
5858
6209
5859
#: bzrlib/errors.py:3058
6210
#: bzrlib/errors.py:2993
5860
6211
msgid "The alias \"%(alias_name)s\" does not exist."
5861
6212
msgstr ""
5862
6213
5863
#: bzrlib/errors.py:3072
6214
#: bzrlib/errors.py:3007
5864
6215
msgid "\"%(alias_name)s\" is not a valid location alias."
5865
6216
msgstr ""
5866
6217
5867
#: bzrlib/errors.py:3080
6218
#: bzrlib/errors.py:3015
5868
6219
msgid "No %(alias_name)s location assigned."
5869
6220
msgstr ""
5870
6221
5871
#: bzrlib/errors.py:3088
6222
#: bzrlib/errors.py:3023
5872
6223
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5873
6224
msgstr ""
5874
6225
5875
#: bzrlib/errors.py:3098
6226
#: bzrlib/errors.py:3033
5876
6227
msgid "Unknown rules detected: %(unknowns_str)s."
5877
6228
msgstr ""
5878
6229
5879
#: bzrlib/errors.py:3111
5880
msgid ""
5881
"Hook '%(hook_name)s' during %(hook_stage)s failed:\n"
5882
"%(traceback_text)s%(exc_value)s"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:3134
6230
#: bzrlib/errors.py:3044
5886
6231
msgid "Tip change rejected: %(msg)s"
5887
6232
msgstr ""
5888
6233
5889
#: bzrlib/errors.py:3142
6234
#: bzrlib/errors.py:3052
5890
6235
msgid "Shelf corrupt."
5891
6236
msgstr ""
5892
6237
5893
#: bzrlib/errors.py:3147
6238
#: bzrlib/errors.py:3057
5894
6239
msgid "Corruption while decompressing repository file%(orig_error)s"
5895
6240
msgstr ""
5896
6241
5897
#: bzrlib/errors.py:3159
6242
#: bzrlib/errors.py:3069
5898
6243
msgid "No changes are shelved with id \"%(shelf_id)d\"."
5899
6244
msgstr ""
5900
6245
5901
#: bzrlib/errors.py:3167
6246
#: bzrlib/errors.py:3077
5902
6247
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
5903
6248
msgstr ""
5904
6249
5905
#: bzrlib/errors.py:3175
6250
#: bzrlib/errors.py:3085
5906
6251
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
5907
6252
msgstr ""
5908
6253
5909
#: bzrlib/errors.py:3183
6254
#: bzrlib/errors.py:3093
5910
6255
msgid "The user aborted the operation."
5911
6256
msgstr ""
5912
6257
5913
#: bzrlib/errors.py:3188
6258
#: bzrlib/errors.py:3098
5914
6259
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
5915
6260
msgstr ""
5916
6261
5917
#: bzrlib/errors.py:3198
6262
#: bzrlib/errors.py:3108
5918
6263
msgid "No such view: %(view_name)s."
5919
6264
msgstr ""
5920
6265
5921
#: bzrlib/errors.py:3208
6266
#: bzrlib/errors.py:3118
5922
6267
msgid ""
5923
6268
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
5924
6269
"to a later format."
5925
6270
msgstr ""
5926
6271
5927
#: bzrlib/errors.py:3217
6272
#: bzrlib/errors.py:3127
5928
6273
msgid ""
5929
6274
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
5930
6275
msgstr ""
5931
6276
5932
#: bzrlib/errors.py:3284
6277
#: bzrlib/errors.py:3194
5933
6278
msgid "%(bzrdir)r does not support co-located branches."
5934
6279
msgstr ""
5935
6280
5936
#: bzrlib/errors.py:3290
6281
#: bzrlib/errors.py:3200
5937
6282
msgid ""
5938
6283
"Unable to determine your name.\n"
5939
6284
"Please, set your name with the 'whoami' command.\n"
5940
6285
"E.g. bzr whoami \"Your Name <name@example.com>\""
5941
6286
msgstr ""
5942
6287
5943
#: bzrlib/errors.py:3299
6288
#: bzrlib/errors.py:3209
5944
6289
msgid "Invalid pattern(s) found. %(msg)s"
5945
6290
msgstr ""
5946
6291
5947
#: bzrlib/errors.py:3307
6292
#: bzrlib/errors.py:3217
5948
6293
msgid ""
5949
6294
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
5950
6295
"unbind` to fix."
5951
6296
msgstr ""
5952
6297
5953
#: bzrlib/errors.py:3318
6298
#: bzrlib/errors.py:3228
5954
6299
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
5955
6300
msgstr ""
5956
6301
5957
#: bzrlib/errors.py:3327
6302
#: bzrlib/errors.py:3237
5958
6303
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
5959
6304
msgstr ""
5960
6305
5961
#: bzrlib/errors.py:3336
6306
#: bzrlib/errors.py:3246
5962
6307
msgid ""
5963
6308
"No compatible object available for operations from %(source)r to %(target)r."
5964
6309
msgstr ""
5965
6310
5966
#: bzrlib/errors.py:3346
6311
#: bzrlib/errors.py:3256
5967
6312
msgid ""
5968
6313
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
5969
6314
"%(arguments)s."
5970
6315
msgstr ""
5971
6316
5972
#: bzrlib/export_pot.py:123 bzrlib/export_pot.py:129
5973
#, python-format
5974
msgid "%r is not found in bzrlib/option.py"
5975
msgstr ""
5976
5977
#: bzrlib/export_pot.py:185
6317
#: bzrlib/errors.py:3266
6318
msgid ""
6319
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6320
"format %(format)r"
6321
msgstr ""
6322
6323
#: bzrlib/errors.py:3278
6324
msgid ""
6325
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6326
"plugin."
6327
msgstr ""
6328
6329
#: bzrlib/errors.py:3291
6330
msgid "Binary files section encountered."
6331
msgstr ""
6332
6333
#: bzrlib/errors.py:3299
6334
msgid ""
6335
"Malformed patch header. %(desc)s\n"
6336
"%(line)r"
6337
msgstr ""
6338
6339
#: bzrlib/errors.py:3308
6340
msgid ""
6341
"Malformed hunk header. %(desc)s\n"
6342
"%(line)r"
6343
msgstr ""
6344
6345
#: bzrlib/errors.py:3317
6346
msgid ""
6347
"Malformed line. %(desc)s\n"
6348
"%(line)r"
6349
msgstr ""
6350
6351
#: bzrlib/errors.py:3327
6352
msgid ""
6353
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6354
"but patch says it should be \"%(patch_line)s\""
6355
msgstr ""
6356
6357
#: bzrlib/errors.py:3338
6358
msgid "The feature %(feature)s has already been registered."
6359
msgstr ""
6360
6361
#: bzrlib/export_pot.py:252
5978
6362
#, python-format
5979
6363
msgid "Exporting messages from builtin command: %s"
5980
6364
msgstr ""
5981
6365
5982
#: bzrlib/export_pot.py:201
6366
#: bzrlib/export_pot.py:271
5983
6367
msgid "Exporting messages from plugin command: {0} in {1}"
5984
6368
msgstr ""
5985
6369
5986
#: bzrlib/export_pot.py:226
6370
#: bzrlib/export_pot.py:292
5987
6371
#, python-format
5988
6372
msgid "Exporting message from error: %s"
5989
6373
msgstr ""
5990
6374
5991
#: bzrlib/fetch.py:97
6375
#: bzrlib/fetch.py:98
5992
6376
msgid "Finding revisions"
5993
6377
msgstr ""
5994
6378
5995
#: bzrlib/fetch.py:102
6379
#: bzrlib/fetch.py:103
5996
6380
msgid "Fetching revisions"
5997
6381
msgstr ""
5998
6382
6383
#: bzrlib/foreign.py:262
6384
msgid "Push into a different VCS without any custom bzr metadata."
6385
msgstr ""
6386
6387
#: bzrlib/foreign.py:264
6388
msgid ""
6389
"This will afterwards rebase the local branch on the remote\n"
6390
"branch unless the --no-rebase option is used, in which case \n"
6391
"the two branches will be out of sync after the push. "
6392
msgstr ""
6393
6394
# help of 'no-rebase' option of 'dpush' command
6395
#: bzrlib/foreign.py:277
6396
msgid "Do not rebase after push."
6397
msgstr ""
6398
5999
6399
#: bzrlib/foreign.py:311
6000
6400
#, python-format
6001
6401
msgid "Using saved location: %s\n"
6007
6407
"regular push."
6008
6408
msgstr ""
6009
6409
6010
#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
6410
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6011
6411
msgid "{0} commits with valid signatures"
6012
6412
msgstr ""
6013
6413
6014
#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
6414
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6015
6415
msgid "{0} commit with unknown key"
6016
6416
msgid_plural "{0} commits with unknown keys"
6017
6417
msgstr[0] ""
6018
6418
msgstr[1] ""
6019
6419
6020
#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
6420
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6021
6421
msgid "{0} commit not valid"
6022
6422
msgid_plural "{0} commits not valid"
6023
6423
msgstr[0] ""
6024
6424
msgstr[1] ""
6025
6425
6026
#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
6426
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6027
6427
msgid "{0} commit not signed"
6028
6428
msgid_plural "{0} commits not signed"
6029
6429
msgstr[0] ""
6030
6430
msgstr[1] ""
6031
6431
6032
#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
6432
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6033
6433
msgid "{0} commit with key now expired"
6034
6434
msgid_plural "{0} commits with key now expired"
6035
6435
msgstr[0] ""
6036
6436
msgstr[1] ""
6037
6437
6038
#: bzrlib/gpg.py:336
6438
#: bzrlib/gpg.py:343
6039
6439
msgid "No GnuPG key results for pattern: {0}"
6040
6440
msgstr ""
6041
6441
6042
#: bzrlib/gpg.py:379
6442
#: bzrlib/gpg.py:386
6043
6443
msgid "{0} signed {1} commit"
6044
6444
msgid_plural "{0} signed {1} commits"
6045
6445
msgstr[0] ""
6046
6446
msgstr[1] ""
6047
6447
6048
#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
6448
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6049
6449
msgid "{0} commit by author {1}"
6050
6450
msgid_plural "{0} commits by author {1}"
6051
6451
msgstr[0] ""
6052
6452
msgstr[1] ""
6053
6453
6054
#: bzrlib/gpg.py:426
6454
#: bzrlib/gpg.py:433
6055
6455
msgid "Unknown key {0} signed {1} commit"
6056
6456
msgid_plural "Unknown key {0} signed {1} commits"
6057
6457
msgstr[0] ""
6058
6458
msgstr[1] ""
6059
6459
6060
#: bzrlib/gpg.py:444
6460
#: bzrlib/gpg.py:452
6061
6461
msgid "{0} commit by author {1} with key {2} now expired"
6062
6462
msgid_plural "{0} commits by author {1} with key {2} now expired"
6063
6463
msgstr[0] ""
6064
6464
msgstr[1] ""
6065
6465
6066
#: bzrlib/groupcompress.py:1758
6466
#: bzrlib/groupcompress.py:1739
6067
6467
#, python-format
6068
6468
msgid "Insert claimed random_id=True, but then inserted %r two times"
6069
6469
msgstr ""
6070
6470
6071
#: bzrlib/knit.py:1764 bzrlib/knit.py:1800
6471
#: bzrlib/hooks.py:331
6472
#, python-format
6473
msgid "Introduced in: %s"
6474
msgstr ""
6475
6476
#: bzrlib/hooks.py:334
6477
#, python-format
6478
msgid "Deprecated in: %s"
6479
msgstr ""
6480
6481
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6072
6482
msgid "Walking content"
6073
6483
msgstr ""
6074
6484
6075
#: bzrlib/knit.py:3467
6485
#: bzrlib/knit.py:3330
6076
6486
msgid "annotating"
6077
6487
msgstr ""
6078
6488
6079
#: bzrlib/lock.py:547
6489
#: bzrlib/lock.py:548
6080
6490
msgid "{0!r} was {1} locked again"
6081
6491
msgstr ""
6082
6492
6083
#: bzrlib/log.py:569
6493
#: bzrlib/lockdir.py:321
6494
#, python-format
6495
msgid "error removing pending lock: %s"
6496
msgstr ""
6497
6498
#: bzrlib/lockdir.py:616
6499
msgid "Unable to obtain"
6500
msgstr ""
6501
6502
#: bzrlib/lockdir.py:618
6503
msgid "Lock owner changed for"
6504
msgstr ""
6505
6506
#: bzrlib/lockdir.py:620
6507
msgid "{0} lock {1} {2}."
6508
msgstr ""
6509
6510
#: bzrlib/lockdir.py:627
6511
#, python-format
6512
msgid "Will continue to try until %s, unless you press Ctrl-C."
6513
msgstr ""
6514
6515
#: bzrlib/lockdir.py:629
6516
msgid "See \"bzr help break-lock\" for more."
6517
msgstr ""
6518
6519
#: bzrlib/lockdir.py:739
6520
#, python-format
6521
msgid ""
6522
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6523
msgstr ""
6524
6525
#: bzrlib/log.py:572
6084
6526
msgid "--exclude-common-ancestry requires two different revisions"
6085
6527
msgstr ""
6086
6528
6087
#: bzrlib/log.py:571
6529
#: bzrlib/log.py:574
6088
6530
#, python-format
6089
6531
msgid "invalid direction %r"
6090
6532
msgstr ""
6091
6533
6092
#: bzrlib/log.py:618
6093
msgid "Start revision not found in left-hand history of end revision."
6094
msgstr ""
6095
6096
#: bzrlib/log.py:664
6534
#: bzrlib/log.py:662
6097
6535
msgid "Start revision not found in history of end revision."
6098
6536
msgstr ""
6099
6537
6538
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6539
msgid "Logging revision 0 is invalid."
6540
msgstr ""
6541
6100
6542
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6101
msgid "Logging revision 0 is invalid."
6102
msgstr ""
6103
6104
#: bzrlib/log.py:1084 bzrlib/log.py:1142
6105
6543
msgid "Start revision must be older than the end revision."
6106
6544
msgstr ""
6107
6545
6108
#: bzrlib/log.py:1828
6546
#: bzrlib/log.py:1827
6109
6547
#, python-format
6110
6548
msgid "unknown log formatter: %r"
6111
6549
msgstr ""
6116
6554
msgstr[0] ""
6117
6555
msgstr[1] ""
6118
6556
6119
#: bzrlib/merge.py:715
6557
#: bzrlib/merge.py:689
6120
6558
msgid "All changes applied successfully."
6121
6559
msgstr ""
6122
6560
6123
#: bzrlib/merge.py:717
6561
#: bzrlib/merge.py:691
6124
6562
#, python-format
6125
6563
msgid "%d conflicts encountered."
6126
6564
msgstr ""
6127
6565
6128
#: bzrlib/merge.py:862 bzrlib/merge.py:1910
6566
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6129
6567
msgid "Preparing file merge"
6130
6568
msgstr ""
6131
6569
6132
#: bzrlib/multiparent.py:424
6570
#: bzrlib/multiparent.py:426
6133
6571
msgid "Importing revisions"
6134
6572
msgstr ""
6135
6573
6136
6574
# help of 'help' option
6137
#: bzrlib/option.py:530
6575
#: bzrlib/option.py:526
6138
6576
msgid "Show help message."
6139
6577
msgstr ""
6140
6578
6579
# help of 'quiet' option
6580
#: bzrlib/option.py:528
6581
msgid "Only display errors and warnings."
6582
msgstr ""
6583
6141
6584
# help of 'usage' option
6142
#: bzrlib/option.py:532
6585
#: bzrlib/option.py:531
6143
6586
msgid "Show usage message and options."
6144
6587
msgstr ""
6145
6588
6146
6589
# help of 'verbose' option
6147
#: bzrlib/option.py:534
6590
#: bzrlib/option.py:533
6148
6591
msgid "Display more information."
6149
6592
msgstr ""
6150
6593
6151
# help of 'quiet' option
6152
#: bzrlib/option.py:537
6153
msgid "Only display errors and warnings."
6154
msgstr ""
6155
6156
# help of 'overwrite' option
6157
#: bzrlib/option.py:542
6158
msgid "Ignore differences between branches and overwrite unconditionally."
6159
msgstr ""
6160
6161
# help of 'message' option
6162
#: bzrlib/option.py:553
6163
msgid "Message string."
6164
msgstr ""
6165
6166
# help of 'null' option
6167
#: bzrlib/option.py:556
6168
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6169
msgstr ""
6170
6171
# help of 'profile' option
6172
#: bzrlib/option.py:559
6173
msgid "Show performance profiling information."
6174
msgstr ""
6175
6176
# help of 'revision' option
6177
#: bzrlib/option.py:563
6178
msgid "See \"help revisionspec\" for details."
6179
msgstr ""
6180
6181
6594
# help of 'change' option
6182
#: bzrlib/option.py:568
6595
#: bzrlib/option.py:541
6183
6596
msgid ""
6184
6597
"Select changes introduced by the specified revision. See also \"help "
6185
6598
"revisionspec\"."
6186
6599
msgstr ""
6187
6600
6188
# help of 'show-ids' option
6189
#: bzrlib/option.py:570
6190
msgid "Show internal object ids."
6191
msgstr ""
6192
6193
# help of 'timezone' option
6194
#: bzrlib/option.py:573
6195
msgid "Display timezone as local, original, or utc."
6601
# help of 'directory' option
6602
#: bzrlib/option.py:543
6603
msgid "Branch to operate on, instead of working directory."
6604
msgstr ""
6605
6606
# help of 'log-format=long' option
6607
#: bzrlib/option.py:545
6608
msgid "Detailed log format."
6609
msgstr ""
6610
6611
# help of 'log-format=gnu-changelog' option
6612
#: bzrlib/option.py:545
6613
msgid "Format used by GNU ChangeLog files."
6614
msgstr ""
6615
6616
# help of 'log-format=line' option
6617
#: bzrlib/option.py:545
6618
msgid "Log format with one line per revision."
6619
msgstr ""
6620
6621
# help of 'log-format=short' option
6622
#: bzrlib/option.py:545
6623
msgid "Moderately short log format."
6196
6624
msgstr ""
6197
6625
6198
6626
# help of 'log-format' option
6199
#: bzrlib/option.py:578
6627
#: bzrlib/option.py:545
6200
6628
msgid "Use specified log format."
6201
6629
msgstr ""
6202
6630
6203
6631
# title of 'log-format' option
6204
#: bzrlib/option.py:580
6632
#: bzrlib/option.py:547
6205
6633
msgid "Log format"
6206
6634
msgstr ""
6207
6635
6208
# help of 'long' option
6209
#: bzrlib/option.py:582
6210
msgid "Use detailed log format. Same as --log-format long"
6211
msgstr ""
6212
6213
# help of 'short' option
6214
#: bzrlib/option.py:584
6215
msgid "Use moderately short log format. Same as --log-format short"
6216
msgstr ""
6217
6218
# help of 'line' option
6219
#: bzrlib/option.py:585
6220
msgid "Use log format with one line per revision. Same as --log-format line"
6636
# help of 'merge-type=lca' option
6637
#: bzrlib/option.py:549
6638
msgid "LCA-newness merge."
6639
msgstr ""
6640
6641
# help of 'merge-type=diff3' option
6642
#: bzrlib/option.py:549
6643
msgid "Merge using external diff3."
6644
msgstr ""
6645
6646
# help of 'merge-type=merge3' option
6647
#: bzrlib/option.py:549
6648
msgid "Native diff3-style merge."
6221
6649
msgstr ""
6222
6650
6223
6651
# help of 'merge-type' option
6224
#: bzrlib/option.py:588
6652
#: bzrlib/option.py:549
6225
6653
msgid "Select a particular merge algorithm."
6226
6654
msgstr ""
6227
6655
6656
# help of 'merge-type=weave' option
6657
#: bzrlib/option.py:549
6658
msgid "Weave-based merge."
6659
msgstr ""
6660
6228
6661
# title of 'merge-type' option
6229
#: bzrlib/option.py:590
6662
#: bzrlib/option.py:551
6230
6663
msgid "Merge algorithm"
6231
6664
msgstr ""
6232
6665
6666
# help of 'message' option
6667
#: bzrlib/option.py:554
6668
msgid "Message string."
6669
msgstr ""
6670
6671
# help of 'null' option
6672
#: bzrlib/option.py:556
6673
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6674
msgstr ""
6675
6676
# help of 'overwrite' option
6677
#: bzrlib/option.py:558
6678
msgid "Ignore differences between branches and overwrite unconditionally."
6679
msgstr ""
6680
6233
6681
# help of 'remember' option
6234
#: bzrlib/option.py:592
6682
#: bzrlib/option.py:560
6235
6683
msgid "Remember the specified location as a default."
6236
6684
msgstr ""
6237
6685
6238
6686
# help of 'reprocess' option
6239
#: bzrlib/option.py:594
6687
#: bzrlib/option.py:562
6240
6688
msgid "Reprocess to reduce spurious conflicts."
6241
6689
msgstr ""
6242
6690
6243
# help of 'dry-run' option
6244
#: bzrlib/option.py:597
6245
msgid "Show what would be done, but don't actually do anything."
6246
msgstr ""
6247
6248
# help of 'name-from-revision' option
6249
#: bzrlib/option.py:598
6250
msgid "The path name in the old tree."
6251
msgstr ""
6252
6253
# help of 'directory' option
6254
#: bzrlib/option.py:600
6255
msgid "Branch to operate on, instead of working directory"
6256
msgstr ""
6257
6258
#: bzrlib/osutils.py:93
6691
# help of 'revision' option
6692
#: bzrlib/option.py:566
6693
msgid "See \"help revisionspec\" for details."
6694
msgstr ""
6695
6696
# help of 'show-ids' option
6697
#: bzrlib/option.py:568
6698
msgid "Show internal object ids."
6699
msgstr ""
6700
6701
# help of 'timezone' option
6702
#: bzrlib/option.py:571
6703
msgid "Display timezone as local, original, or utc."
6704
msgstr ""
6705
6706
#: bzrlib/osutils.py:100
6259
6707
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6260
6708
msgstr ""
6261
6709
6262
#: bzrlib/osutils.py:194
6710
#: bzrlib/osutils.py:220
6263
6711
msgid "lstat/stat of ({0!r}): {1!r}"
6264
6712
msgstr ""
6265
6713
6266
#: bzrlib/osutils.py:929 bzrlib/osutils.py:940
6714
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6267
6715
#, python-format
6268
6716
msgid "sorry, %r not allowed in path"
6269
6717
msgstr ""
6270
6718
6271
#: bzrlib/osutils.py:1158
6719
#: bzrlib/osutils.py:1237
6272
6720
#, python-format
6273
6721
msgid "%r is too short to calculate a relative path"
6274
6722
msgstr ""
6275
6723
6724
#: bzrlib/plugin.py:143
6725
#, python-format
6726
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6727
msgstr ""
6728
6276
6729
# help of 'plugin' option of 'bash-completion' command
6277
#: bzrlib/plugins/bash_completion/bashcomp.py:407
6730
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6278
6731
msgid "Enable completions for the selected plugin (default: all plugins)"
6279
6732
msgstr ""
6280
6733
6281
#: bzrlib/plugins/bash_completion/bashcomp.py:409
6734
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6282
6735
msgid "Generate a shell function for bash command line completion."
6283
6736
msgstr ""
6284
6737
6285
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6738
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6286
6739
msgid ""
6287
6740
"This command generates a shell function which can be used by bash to\n"
6288
6741
"automatically complete the currently typed command when the user presses\n"
6289
6742
"the completion key (usually tab)."
6290
6743
msgstr ""
6291
6744
6292
#: bzrlib/plugins/bash_completion/bashcomp.py:415
6745
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6293
6746
msgid ""
6294
6747
"Commonly used like this:\n"
6295
6748
" eval \"`bzr bash-completion`\""
6296
6749
msgstr ""
6297
6750
6298
6751
# help of 'function-name' option of 'bash-completion' command
6299
#: bzrlib/plugins/bash_completion/bashcomp.py:421
6752
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6300
6753
msgid "Name of the generated function (default: _bzr)"
6301
6754
msgstr ""
6302
6755
6303
6756
# help of 'function-only' option of 'bash-completion' command
6304
#: bzrlib/plugins/bash_completion/bashcomp.py:423
6757
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6305
6758
msgid "Generate only the shell function, don't enable it"
6306
6759
msgstr ""
6307
6760
6308
#: bzrlib/plugins/launchpad/__init__.py:78
6761
#: bzrlib/plugins/launchpad/__init__.py:81
6309
6762
msgid "Register a branch with launchpad.net."
6310
6763
msgstr ""
6311
6764
6312
#: bzrlib/plugins/launchpad/__init__.py:80
6765
#: bzrlib/plugins/launchpad/__init__.py:83
6313
6766
msgid ""
6314
6767
"This command lists a bzr branch in the directory of branches on\n"
6315
6768
"launchpad.net. Registration allows the branch to be associated with\n"
6316
6769
"bugs or specifications."
6317
6770
msgstr ""
6318
6771
6319
#: bzrlib/plugins/launchpad/__init__.py:84
6772
#: bzrlib/plugins/launchpad/__init__.py:87
6320
6773
msgid ""
6321
6774
"Before using this command you must register the project to which the\n"
6322
6775
"branch belongs, and create an account for yourself on launchpad.net."
6323
6776
msgstr ""
6324
6777
6325
#: bzrlib/plugins/launchpad/__init__.py:87
6778
#: bzrlib/plugins/launchpad/__init__.py:90
6326
6779
msgid ""
6327
6780
"arguments:\n"
6328
6781
" public_url: The publicly visible url for the branch to register.\n"
6334
6787
" otherwise error."
6335
6788
msgstr ""
6336
6789
6337
#: bzrlib/plugins/launchpad/__init__.py:96
6790
#: bzrlib/plugins/launchpad/__init__.py:99
6338
6791
msgid ""
6339
6792
"example:\n"
6340
6793
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6342
6795
msgstr ""
6343
6796
6344
6797
# help of 'project' option of 'register-branch' command
6345
#: bzrlib/plugins/launchpad/__init__.py:103
6798
#: bzrlib/plugins/launchpad/__init__.py:106
6346
6799
msgid "Launchpad project short name to associate with the branch."
6347
6800
msgstr ""
6348
6801
6349
6802
# help of 'branch-name' option of 'register-branch' command
6350
#: bzrlib/plugins/launchpad/__init__.py:110
6803
#: bzrlib/plugins/launchpad/__init__.py:113
6351
6804
msgid ""
6352
6805
"Short name for the branch; by default taken from the last component of the "
6353
6806
"url."
6354
6807
msgstr ""
6355
6808
6356
6809
# help of 'branch-title' option of 'register-branch' command
6357
#: bzrlib/plugins/launchpad/__init__.py:114
6810
#: bzrlib/plugins/launchpad/__init__.py:117
6358
6811
msgid "One-sentence description of the branch."
6359
6812
msgstr ""
6360
6813
6361
6814
# help of 'branch-description' option of 'register-branch' command
6362
#: bzrlib/plugins/launchpad/__init__.py:117
6815
#: bzrlib/plugins/launchpad/__init__.py:120
6363
6816
msgid "Longer description of the purpose or contents of the branch."
6364
6817
msgstr ""
6365
6818
6366
6819
# help of 'author' option of 'register-branch' command
6367
#: bzrlib/plugins/launchpad/__init__.py:120
6820
#: bzrlib/plugins/launchpad/__init__.py:123
6368
6821
msgid "Branch author's email address, if not yourself."
6369
6822
msgstr ""
6370
6823
6371
6824
# help of 'link-bug' option of 'register-branch' command
6372
#: bzrlib/plugins/launchpad/__init__.py:123
6825
#: bzrlib/plugins/launchpad/__init__.py:126
6373
6826
msgid "The bug this branch fixes."
6374
6827
msgstr ""
6375
6828
6376
6829
# help of 'dry-run' option of 'register-branch' command
6377
#: bzrlib/plugins/launchpad/__init__.py:126
6830
#: bzrlib/plugins/launchpad/__init__.py:129
6378
6831
msgid "Prepare the request but don't actually send it."
6379
6832
msgstr ""
6380
6833
6381
#: bzrlib/plugins/launchpad/__init__.py:186
6834
#: bzrlib/plugins/launchpad/__init__.py:151
6835
msgid ""
6836
"register-branch requires a public branch url - see bzr help register-branch."
6837
msgstr ""
6838
6839
#: bzrlib/plugins/launchpad/__init__.py:159
6840
msgid "--product is deprecated; please use --project."
6841
msgstr ""
6842
6843
#: bzrlib/plugins/launchpad/__init__.py:191
6382
6844
msgid "Open a Launchpad branch page in your web browser."
6383
6845
msgstr ""
6384
6846
6385
6847
# help of 'dry-run' option of 'launchpad-open' command
6386
#: bzrlib/plugins/launchpad/__init__.py:191
6848
#: bzrlib/plugins/launchpad/__init__.py:196
6387
6849
msgid "Do not actually open the browser. Just say the URL we would use."
6388
6850
msgstr ""
6389
6851
6390
#: bzrlib/plugins/launchpad/__init__.py:236
6852
#: bzrlib/plugins/launchpad/__init__.py:231
6853
#, python-format
6854
msgid "Opening %s in web browser"
6855
msgstr ""
6856
6857
#: bzrlib/plugins/launchpad/__init__.py:241
6391
6858
msgid "Show or set the Launchpad user ID."
6392
6859
msgstr ""
6393
6860
6394
#: bzrlib/plugins/launchpad/__init__.py:238
6861
#: bzrlib/plugins/launchpad/__init__.py:243
6395
6862
msgid ""
6396
6863
"When communicating with Launchpad, some commands need to know your\n"
6397
6864
"Launchpad user ID. This command can be used to set or show the\n"
6398
6865
"user ID that Bazaar will use for such communication."
6399
6866
msgstr ""
6400
6867
6401
#: bzrlib/plugins/launchpad/__init__.py:242
6868
#: bzrlib/plugins/launchpad/__init__.py:247
6402
6869
msgid ""
6403
6870
":Examples:\n"
6404
6871
" Show the Launchpad ID of the current user::"
6405
6872
msgstr ""
6406
6873
6407
#: bzrlib/plugins/launchpad/__init__.py:245
6874
#: bzrlib/plugins/launchpad/__init__.py:250
6408
6875
msgid " bzr launchpad-login"
6409
6876
msgstr ""
6410
6877
6411
#: bzrlib/plugins/launchpad/__init__.py:247
6878
#: bzrlib/plugins/launchpad/__init__.py:252
6412
6879
msgid " Set the Launchpad ID of the current user to 'bob'::"
6413
6880
msgstr ""
6414
6881
6415
#: bzrlib/plugins/launchpad/__init__.py:249
6882
#: bzrlib/plugins/launchpad/__init__.py:254
6416
6883
msgid " bzr launchpad-login bob"
6417
6884
msgstr ""
6418
6885
6419
6886
# help of 'no-check' option of 'launchpad-login' command
6420
#: bzrlib/plugins/launchpad/__init__.py:256
6887
#: bzrlib/plugins/launchpad/__init__.py:261
6421
6888
msgid "Don't check that the user name is valid."
6422
6889
msgstr ""
6423
6890
6424
#: bzrlib/plugins/launchpad/__init__.py:292
6891
#: bzrlib/plugins/launchpad/__init__.py:276
6892
#: bzrlib/plugins/launchpad/__init__.py:287
6893
msgid "Launchpad user ID exists and has SSH keys.\n"
6894
msgstr ""
6895
6896
#: bzrlib/plugins/launchpad/__init__.py:279
6897
msgid "No Launchpad user ID configured.\n"
6898
msgstr ""
6899
6900
#: bzrlib/plugins/launchpad/__init__.py:290
6901
#, python-format
6902
msgid "Launchpad user ID set to '%s'.\n"
6903
msgstr ""
6904
6905
#: bzrlib/plugins/launchpad/__init__.py:298
6425
6906
msgid "Ask Launchpad to mirror a branch now."
6426
6907
msgstr ""
6427
6908
6428
#: bzrlib/plugins/launchpad/__init__.py:312
6909
#: bzrlib/plugins/launchpad/__init__.py:318
6429
6910
msgid "Propose merging a branch on Launchpad."
6430
6911
msgstr ""
6431
6912
6432
#: bzrlib/plugins/launchpad/__init__.py:314
6913
#: bzrlib/plugins/launchpad/__init__.py:320
6433
6914
msgid ""
6434
6915
"This will open your usual editor to provide the initial comment. When it\n"
6435
6916
"has created the proposal, it will open it in your default web browser."
6436
6917
msgstr ""
6437
6918
6438
#: bzrlib/plugins/launchpad/__init__.py:317
6919
#: bzrlib/plugins/launchpad/__init__.py:323
6439
6920
msgid ""
6440
6921
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6441
6922
"is not supplied, the remembered submit branch will be used. If no submit\n"
6442
6923
"branch is remembered, the development focus will be used."
6443
6924
msgstr ""
6444
6925
6445
#: bzrlib/plugins/launchpad/__init__.py:321
6926
#: bzrlib/plugins/launchpad/__init__.py:327
6446
6927
msgid ""
6447
6928
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6448
6929
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6450
6931
"may optionally be followed by '=' and the review type. For example:"
6451
6932
msgstr ""
6452
6933
6453
#: bzrlib/plugins/launchpad/__init__.py:326
6934
#: bzrlib/plugins/launchpad/__init__.py:332
6454
6935
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6455
6936
msgstr ""
6456
6937
6457
#: bzrlib/plugins/launchpad/__init__.py:328
6938
#: bzrlib/plugins/launchpad/__init__.py:334
6458
6939
msgid ""
6459
6940
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6460
6941
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6461
6942
msgstr ""
6462
6943
6463
6944
# help of 'staging' option of 'lp-propose-merge' command
6464
#: bzrlib/plugins/launchpad/__init__.py:333
6945
#: bzrlib/plugins/launchpad/__init__.py:339
6465
6946
msgid "Propose the merge on staging."
6466
6947
msgstr ""
6467
6948
6468
6949
# help of 'message' option of 'lp-propose-merge' command
6469
#: bzrlib/plugins/launchpad/__init__.py:335
6950
#: bzrlib/plugins/launchpad/__init__.py:341
6470
6951
msgid "Commit message."
6471
6952
msgstr ""
6472
6953
6473
6954
# help of 'approve' option of 'lp-propose-merge' command
6474
#: bzrlib/plugins/launchpad/__init__.py:337
6955
#: bzrlib/plugins/launchpad/__init__.py:343
6475
6956
msgid "Mark the proposal as approved immediately."
6476
6957
msgstr ""
6477
6958
6478
6959
# help of 'review' option of 'lp-propose-merge' command
6479
#: bzrlib/plugins/launchpad/__init__.py:339
6960
#: bzrlib/plugins/launchpad/__init__.py:345
6480
6961
msgid "Requested reviewer and optional type."
6481
6962
msgstr ""
6482
6963
6483
#: bzrlib/plugins/launchpad/__init__.py:376
6964
#: bzrlib/plugins/launchpad/__init__.py:382
6484
6965
msgid "Find the proposal to merge this revision."
6485
6966
msgstr ""
6486
6967
6487
#: bzrlib/plugins/launchpad/__init__.py:378
6968
#: bzrlib/plugins/launchpad/__init__.py:384
6488
6969
msgid ""
6489
6970
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6490
6971
"This works only if the selected branch was the merge proposal target, and\n"
6492
6973
"are opened in a web browser."
6493
6974
msgstr ""
6494
6975
6495
#: bzrlib/plugins/launchpad/__init__.py:383
6976
#: bzrlib/plugins/launchpad/__init__.py:389
6496
6977
msgid ""
6497
6978
"Any revision involved in the merge may be specified-- the revision in\n"
6498
6979
"which the merge was performed, or one of the revisions that was merged."
6499
6980
msgstr ""
6500
6981
6501
#: bzrlib/plugins/launchpad/__init__.py:386
6982
#: bzrlib/plugins/launchpad/__init__.py:392
6502
6983
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6503
6984
msgstr ""
6504
6985
6505
#: bzrlib/plugins/launchpad/__init__.py:388
6986
#: bzrlib/plugins/launchpad/__init__.py:394
6506
6987
msgid " bzr lp-find-proposal -r annotate:README:1"
6507
6988
msgstr ""
6508
6989
6509
#: bzrlib/push.py:54
6990
#: bzrlib/plugins/launchpad/__init__.py:409
6991
msgid "No review found."
6992
msgstr ""
6993
6994
#: bzrlib/plugins/launchpad/__init__.py:410
6995
#, python-format
6996
msgid "%d proposals(s) found."
6997
msgstr ""
6998
6999
#: bzrlib/plugins/launchpad/__init__.py:420
7000
msgid "Finding revision-id"
7001
msgstr ""
7002
7003
#: bzrlib/plugins/launchpad/__init__.py:427
7004
msgid "Finding merge"
7005
msgstr ""
7006
7007
#: bzrlib/plugins/launchpad/__init__.py:432
7008
msgid "Finding revno"
7009
msgstr ""
7010
7011
#: bzrlib/plugins/launchpad/__init__.py:437
7012
msgid "Finding Launchpad branch"
7013
msgstr ""
7014
7015
#: bzrlib/plugins/launchpad/__init__.py:440
7016
msgid "Finding proposals"
7017
msgstr ""
7018
7019
#: bzrlib/plugins/launchpad/account.py:66
7020
msgid "Setting ssh/sftp usernames for launchpad.net."
7021
msgstr ""
7022
7023
#: bzrlib/plugins/launchpad/lp_api.py:241
7024
#: bzrlib/plugins/launchpad/lp_api.py:246
7025
#, python-format
7026
msgid "%s is not registered on Launchpad"
7027
msgstr ""
7028
7029
#: bzrlib/plugins/launchpad/lp_api.py:256
7030
#, python-format
7031
msgid "%s has no development focus."
7032
msgstr ""
7033
7034
#: bzrlib/plugins/launchpad/lp_api.py:261
7035
#, python-format
7036
msgid "development focus %s has no branch."
7037
msgstr ""
7038
7039
#: bzrlib/plugins/launchpad/lp_api.py:266
7040
#, python-format
7041
msgid "source package %s has no branch."
7042
msgstr ""
7043
7044
#: bzrlib/plugins/launchpad/lp_api.py:270
7045
#, python-format
7046
msgid "%s has no associated product or source package."
7047
msgstr ""
7048
7049
#: bzrlib/plugins/launchpad/lp_api.py:282
7050
#, python-format
7051
msgid "%s is already up-to-date."
7052
msgstr ""
7053
7054
#: bzrlib/plugins/launchpad/lp_api.py:289
7055
#, python-format
7056
msgid "Pushing to %s"
7057
msgstr ""
7058
7059
#: bzrlib/plugins/launchpad/lp_directory.py:170
7060
msgid ""
7061
"resolution for {0}\n"
7062
" local: {1}\n"
7063
" remote: {2}"
7064
msgstr ""
7065
7066
#: bzrlib/plugins/launchpad/lp_propose.py:149
7067
#, python-format
7068
msgid "There is already a branch merge proposal: %s"
7069
msgstr ""
7070
7071
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7072
msgid "pb parameter to convert() is deprecated"
7073
msgstr ""
7074
7075
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7076
msgid "starting upgrade from format 4 to 5"
7077
msgstr ""
7078
7079
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7080
msgid "note: upgrade may be faster if all store files are ungzipped first"
7081
msgstr ""
7082
7083
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7084
msgid "converting revision"
7085
msgstr ""
7086
7087
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7088
msgid "upgraded to weaves:"
7089
msgstr ""
7090
7091
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7092
#, python-format
7093
msgid "%6d revisions and inventories"
7094
msgstr ""
7095
7096
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7097
#, python-format
7098
msgid "%6d revisions not present"
7099
msgstr ""
7100
7101
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7102
#, python-format
7103
msgid "%6d texts"
7104
msgstr ""
7105
7106
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7107
msgid "writing weave"
7108
msgstr ""
7109
7110
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7111
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7112
msgid "inventory"
7113
msgstr ""
7114
7115
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7116
msgid "write revision"
7117
msgstr ""
7118
7119
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7120
msgid "loading revision"
7121
msgstr ""
7122
7123
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7124
#, python-format
7125
msgid "revision {%s} not present in branch; will be converted as a ghost"
7126
msgstr ""
7127
7128
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7129
msgid "starting upgrade from format 5 to 6"
7130
msgstr ""
7131
7132
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7133
#, python-format
7134
msgid "adding prefixes to %s"
7135
msgstr ""
7136
7137
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7138
msgid "starting upgrade from format 6 to metadir"
7139
msgstr ""
7140
7141
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7142
msgid "Removing ancestry.weave"
7143
msgstr ""
7144
7145
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7146
msgid "Finding branch files"
7147
msgstr ""
7148
7149
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7150
msgid "Upgrading repository"
7151
msgstr ""
7152
7153
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7154
msgid "Upgrading branch"
7155
msgstr ""
7156
7157
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7158
msgid "No working tree."
7159
msgstr ""
7160
7161
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7162
msgid "Upgrading working tree"
7163
msgstr ""
7164
7165
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7166
#, python-format
7167
msgid "Make %s lock"
7168
msgstr ""
7169
7170
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7171
#, python-format
7172
msgid "Moving %s"
7173
msgstr ""
7174
7175
#: bzrlib/push.py:56
6510
7176
msgid "Created new branch."
6511
7177
msgstr ""
6512
7178
6513
#: bzrlib/push.py:96
7179
#: bzrlib/push.py:97
6514
7180
#, python-format
6515
7181
msgid ""
6516
7182
"Target directory %s already contains a .bzr directory, but it is not valid."
6517
7183
msgstr ""
6518
7184
6519
#: bzrlib/push.py:99
7185
#: bzrlib/push.py:101
6520
7186
#, python-format
6521
7187
msgid ""
6522
7188
"Target directory %s already exists, but does not have a .bzr directory. "
6523
7189
"Supply --use-existing-dir to push there anyway."
6524
7190
msgstr ""
6525
7191
6526
#: bzrlib/push.py:120
7192
#: bzrlib/push.py:122
6527
7193
#, python-format
6528
7194
msgid "Too many redirections trying to make %s."
6529
7195
msgstr ""
6530
7196
6531
#: bzrlib/push.py:145
7197
#: bzrlib/push.py:147
6532
7198
msgid ""
6533
7199
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6534
7200
"information."
6535
7201
msgstr ""
6536
7202
6537
#: bzrlib/push.py:149
7203
#: bzrlib/push.py:151
6538
7204
#, python-format
6539
7205
msgid ""
6540
7206
"It is not possible to losslessly push to %s. You may want to use dpush "
6541
7207
"instead."
6542
7208
msgstr ""
6543
7209
6544
#: bzrlib/push.py:155
7210
#: bzrlib/push.py:157
6545
7211
#, python-format
6546
7212
msgid ""
6547
7213
"At %s you have a valid .bzr control directory, but not a branch or "
6549
7215
"directory out of the way and try again."
6550
7216
msgstr ""
6551
7217
6552
#: bzrlib/reconcile.py:96
7218
#: bzrlib/reconcile.py:97
6553
7219
#, python-format
6554
7220
msgid "Reconciling branch %s"
6555
7221
msgstr ""
6556
7222
6557
#: bzrlib/reconcile.py:102
7223
#: bzrlib/reconcile.py:103
6558
7224
#, python-format
6559
7225
msgid "Reconciling repository %s"
6560
7226
msgstr ""
6561
7227
6562
#: bzrlib/reconcile.py:104
7228
#: bzrlib/reconcile.py:105
6563
7229
msgid "Reconciling repository"
6564
7230
msgstr ""
6565
7231
6566
#: bzrlib/reconcile.py:110
7232
#: bzrlib/reconcile.py:111
6567
7233
#, python-format
6568
7234
msgid "%s cannot canonicalize CHKs."
6569
7235
msgstr ""
6570
7236
6571
#: bzrlib/reconcile.py:118
7237
#: bzrlib/reconcile.py:119
6572
7238
msgid "Reconcile aborted: revision index has inconsistent parents."
6573
7239
msgstr ""
6574
7240
6575
#: bzrlib/reconcile.py:120
7241
#: bzrlib/reconcile.py:121
6576
7242
msgid "Run \"bzr check\" for more details."
6577
7243
msgstr ""
6578
7244
6579
#: bzrlib/reconcile.py:122
7245
#: bzrlib/reconcile.py:123
6580
7246
msgid "Reconciliation complete."
6581
7247
msgstr ""
6582
7248
6583
#: bzrlib/reconcile.py:165
7249
#: bzrlib/reconcile.py:166
6584
7250
msgid "Fixing last revision info {0} => {1}"
6585
7251
msgstr ""
6586
7252
6587
#: bzrlib/reconcile.py:172
7253
#: bzrlib/reconcile.py:173
6588
7254
msgid "revision_history ok."
6589
7255
msgstr ""
6590
7256
6591
#: bzrlib/reconcile.py:233
7257
#: bzrlib/reconcile.py:234
6592
7258
msgid "Reading inventory data"
6593
7259
msgstr ""
6594
7260
6595
#: bzrlib/reconcile.py:253 bzrlib/reconcile.py:383
7261
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6596
7262
msgid "Inventory ok."
6597
7263
msgstr ""
6598
7264
6599
#: bzrlib/reconcile.py:255 bzrlib/reconcile.py:385
7265
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
6600
7266
msgid "Backing up inventory"
6601
7267
msgstr ""
6602
7268
6603
#: bzrlib/reconcile.py:257
7269
#: bzrlib/reconcile.py:258
6604
7270
msgid "Backup inventory created."
6605
7271
msgstr ""
6606
7272
6607
#: bzrlib/reconcile.py:273 bzrlib/reconcile.py:404
7273
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
6608
7274
msgid "Writing weave"
6609
7275
msgstr ""
6610
7276
6611
#: bzrlib/reconcile.py:276 bzrlib/reconcile.py:407
7277
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
6612
7278
msgid "Inventory regenerated."
6613
7279
msgstr ""
6614
7280
6615
#: bzrlib/reconcile.py:370 bzrlib/reconcile.py:372 bzrlib/reconcile.py:375
7281
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
6616
7282
msgid "Reading indexes"
6617
7283
msgstr ""
6618
7284
6619
#: bzrlib/reconcile.py:379 bzrlib/reconcile.py:381
7285
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
6620
7286
msgid "Checking unused inventories"
6621
7287
msgstr ""
6622
7288
6623
#: bzrlib/reconcile.py:387
7289
#: bzrlib/reconcile.py:388
6624
7290
msgid "Backup Inventory created"
6625
7291
msgstr ""
6626
7292
6627
#: bzrlib/reconcile.py:445
7293
#: bzrlib/reconcile.py:446
6628
7294
msgid "Fixing text parents"
6629
7295
msgstr ""
6630
7296
6631
#: bzrlib/reconfigure.py:52
7297
#: bzrlib/reconfigure.py:54
6632
7298
msgid "{0} is now stacked on {1}\n"
6633
7299
msgstr ""
6634
7300
6635
#: bzrlib/reconfigure.py:67
7301
#: bzrlib/reconfigure.py:69
6636
7302
#, python-format
6637
7303
msgid "%s is now not stacked\n"
6638
7304
msgstr ""
6639
7305
6640
#: bzrlib/remote.py:1886
7306
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7307
#, python-format
7308
msgid "bzr: ERROR (ignored): %s"
7309
msgstr ""
7310
7311
#: bzrlib/remote.py:2541
6641
7312
msgid "Copying repository content as tarball..."
6642
7313
msgstr ""
6643
7314
6644
#: bzrlib/rename_map.py:68
7315
#: bzrlib/rename_map.py:69
6645
7316
msgid "Calculating hashes"
6646
7317
msgstr ""
6647
7318
6648
#: bzrlib/rename_map.py:106
7319
#: bzrlib/rename_map.py:107
6649
7320
msgid "Determining hash hits"
6650
7321
msgstr ""
6651
7322
6652
#: bzrlib/rename_map.py:241
7323
#: bzrlib/rename_map.py:242
6653
7324
msgid "{0} => {1}"
6654
7325
msgstr ""
6655
7326
6656
#: bzrlib/repository.py:284
6657
#, python-format
6658
msgid "bzr: ERROR (ignored): %s"
6659
msgstr ""
6660
6661
#: bzrlib/repository.py:1806
7327
#: bzrlib/repository.py:1787
6662
7328
msgid "Moving repository to repository.backup"
6663
7329
msgstr ""
6664
7330
6665
#: bzrlib/repository.py:1813
7331
#: bzrlib/repository.py:1794
6666
7332
msgid "Creating new repository"
6667
7333
msgstr ""
6668
7334
6669
#: bzrlib/repository.py:1818
7335
#: bzrlib/repository.py:1799
6670
7336
msgid "Copying content"
6671
7337
msgstr ""
6672
7338
6673
#: bzrlib/repository.py:1822
7339
#: bzrlib/repository.py:1803
6674
7340
msgid "Deleting old repository content"
6675
7341
msgstr ""
6676
7342
6677
#: bzrlib/repository.py:1824
7343
#: bzrlib/repository.py:1805
6678
7344
msgid "repository converted"
6679
7345
msgstr ""
6680
7346
6681
#: bzrlib/revisionspec.py:914
7347
#: bzrlib/revisionspec.py:903
6682
7348
msgid "Using {0} {1}"
6683
7349
msgstr ""
6684
7350
6685
#: bzrlib/send.py:56
7351
#: bzrlib/send.py:58
6686
7352
#, python-format
6687
7353
msgid "Mail client \"%s\" does not support specifying body"
6688
7354
msgstr ""
6689
7355
6690
#: bzrlib/send.py:60
7356
#: bzrlib/send.py:62
6691
7357
msgid "--remember requires a branch to be specified."
6692
7358
msgstr ""
6693
7359
6694
#: bzrlib/send.py:74
7360
#: bzrlib/send.py:77
6695
7361
msgid "No submit branch known or specified"
6696
7362
msgstr ""
6697
7363
6698
#: bzrlib/send.py:77
7364
#: bzrlib/send.py:80
6699
7365
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
6700
7366
msgstr ""
6701
7367
6702
#: bzrlib/send.py:94
7368
#: bzrlib/send.py:98
6703
7369
#, python-format
6704
7370
msgid "No such send format '%s'."
6705
7371
msgstr ""
6706
7372
6707
#: bzrlib/send.py:111
7373
#: bzrlib/send.py:114
6708
7374
msgid "bzr send takes at most two one revision identifiers"
6709
7375
msgstr ""
6710
7376
6711
#: bzrlib/send.py:124
7377
#: bzrlib/send.py:127
6712
7378
msgid "No revisions to submit."
6713
7379
msgstr ""
6714
7380
6715
#: bzrlib/send.py:135
7381
#: bzrlib/send.py:139
6716
7382
msgid ""
6717
7383
"- not supported for merge directives that use more than one output file."
6718
7384
msgstr ""
6719
7385
6720
#: bzrlib/send.py:177
7386
#: bzrlib/send.py:185
6721
7387
msgid "Format 0.9 does not permit bundle with no patch"
6722
7388
msgstr ""
6723
7389
6724
#: bzrlib/shelf_ui.py:45
7390
#: bzrlib/shelf_ui.py:46
6725
7391
#, python-format
6726
7392
msgid "Shelve adding file \"%(path)s\"?"
6727
7393
msgstr ""
6728
7394
6729
#: bzrlib/shelf_ui.py:46
7395
#: bzrlib/shelf_ui.py:47
6730
7396
msgid "Shelve binary changes?"
6731
7397
msgstr ""
6732
7398
6733
#: bzrlib/shelf_ui.py:47
7399
#: bzrlib/shelf_ui.py:48
6734
7400
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
6735
7401
msgstr ""
6736
7402
6737
#: bzrlib/shelf_ui.py:49
7403
#: bzrlib/shelf_ui.py:50
6738
7404
#, python-format
6739
7405
msgid "Shelve removing file \"%(path)s\"?"
6740
7406
msgstr ""
6741
7407
6742
#: bzrlib/shelf_ui.py:50
7408
#: bzrlib/shelf_ui.py:51
6743
7409
#, python-format
6744
7410
msgid "Shelve %d change(s)?"
6745
7411
msgstr ""
6746
7412
6747
#: bzrlib/shelf_ui.py:51
7413
#: bzrlib/shelf_ui.py:52
6748
7414
msgid "Shelve?"
6749
7415
msgstr ""
6750
7416
6751
#: bzrlib/shelf_ui.py:52
7417
#: bzrlib/shelf_ui.py:53
6752
7418
#, python-format
6753
7419
msgid ""
6754
7420
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
6755
7421
msgstr ""
6756
7422
6757
#: bzrlib/shelf_ui.py:54
7423
#: bzrlib/shelf_ui.py:55
6758
7424
#, python-format
6759
7425
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
6760
7426
msgstr ""
6761
7427
6762
#: bzrlib/shelf_ui.py:69
7428
#: bzrlib/shelf_ui.py:70
6763
7429
#, python-format
6764
7430
msgid "Changes shelved with id \"%d\"."
6765
7431
msgstr ""
6766
7432
6767
#: bzrlib/shelf_ui.py:73
7433
#: bzrlib/shelf_ui.py:74
6768
7434
msgid "Selected changes destroyed."
6769
7435
msgstr ""
6770
7436
6771
#: bzrlib/shelf_ui.py:77
7437
#: bzrlib/shelf_ui.py:78
6772
7438
msgid "Selected changes:"
6773
7439
msgstr ""
6774
7440
6775
#: bzrlib/shelf_ui.py:97
7441
#: bzrlib/shelf_ui.py:98
6776
7442
#, python-format
6777
7443
msgid "Delete file \"%(path)s\"?"
6778
7444
msgstr ""
6779
7445
6780
#: bzrlib/shelf_ui.py:98
7446
#: bzrlib/shelf_ui.py:99
6781
7447
msgid "Apply binary changes?"
6782
7448
msgstr ""
6783
7449
6784
#: bzrlib/shelf_ui.py:99
7450
#: bzrlib/shelf_ui.py:100
6785
7451
#, python-format
6786
7452
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
6787
7453
msgstr ""
6788
7454
6789
#: bzrlib/shelf_ui.py:101
7455
#: bzrlib/shelf_ui.py:102
6790
7456
#, python-format
6791
7457
msgid "Add file \"%(path)s\"?"
6792
7458
msgstr ""
6793
7459
6794
#: bzrlib/shelf_ui.py:102
7460
#: bzrlib/shelf_ui.py:103
6795
7461
#, python-format
6796
7462
msgid "Apply %d change(s)?"
6797
7463
msgstr ""
6798
7464
6799
#: bzrlib/shelf_ui.py:103
7465
#: bzrlib/shelf_ui.py:104
6800
7466
msgid "Apply change?"
6801
7467
msgstr ""
6802
7468
6803
#: bzrlib/shelf_ui.py:104
7469
#: bzrlib/shelf_ui.py:105
6804
7470
#, python-format
6805
7471
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
6806
7472
msgstr ""
6807
7473
6808
#: bzrlib/shelf_ui.py:106
7474
#: bzrlib/shelf_ui.py:107
6809
7475
#, python-format
6810
7476
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
6811
7477
msgstr ""
6812
7478
6813
#: bzrlib/shelf_ui.py:265
6814
msgid "You need a controlling terminal."
6815
msgstr ""
6816
6817
#: bzrlib/shelf_ui.py:415
7479
#: bzrlib/shelf_ui.py:402
6818
7480
msgid "No changes are shelved."
6819
7481
msgstr ""
6820
7482
6821
#: bzrlib/shelf_ui.py:473
7483
#: bzrlib/shelf_ui.py:460
6822
7484
#, python-format
6823
7485
msgid "Using changes with id \"%d\"."
6824
7486
msgstr ""
6825
7487
6826
#: bzrlib/shelf_ui.py:477
7488
#: bzrlib/shelf_ui.py:464
6827
7489
#, python-format
6828
7490
msgid "Message: %s"
6829
7491
msgstr ""
6830
7492
6831
#: bzrlib/shelf_ui.py:489
7493
#: bzrlib/shelf_ui.py:476
6832
7494
#, python-format
6833
7495
msgid "Deleted changes with id \"%d\"."
6834
7496
msgstr ""
6835
7497
6836
#: bzrlib/smart/medium.py:565
7498
#: bzrlib/smart/medium.py:714
6837
7499
msgid "HPSS calls: {0} ({1} vfs) {2}"
6838
7500
msgstr ""
6839
7501
6840
#: bzrlib/smart/server.py:355
7502
#: bzrlib/smart/server.py:169
7503
msgid "Requested to stop gracefully"
7504
msgstr ""
7505
7506
#: bzrlib/smart/server.py:179
7507
#, python-format
7508
msgid "Waiting for %d client(s) to finish"
7509
msgstr ""
7510
7511
#: bzrlib/smart/server.py:185
7512
#, python-format
7513
msgid "Still waiting for %d client(s) to finish"
7514
msgstr ""
7515
7516
#: bzrlib/smart/server.py:219
7517
#, python-format
7518
msgid "listening socket error: %s"
7519
msgstr ""
7520
7521
#: bzrlib/smart/server.py:452
6841
7522
#, python-format
6842
7523
msgid "listening on port: %s"
6843
7524
msgstr ""
6844
7525
6845
#: bzrlib/switch.py:67
7526
#: bzrlib/switch.py:73
6846
7527
msgid "Pending merges must be committed or reverted before using switch."
6847
7528
msgstr ""
6848
7529
6849
#: bzrlib/switch.py:94
7530
#: bzrlib/switch.py:100
6850
7531
msgid ""
6851
7532
"Cannot switch as local commits found in the checkout. Commit these to the "
6852
7533
"bound branch or use --force to throw them away."
6853
7534
msgstr ""
6854
7535
6855
#: bzrlib/switch.py:99
7536
#: bzrlib/switch.py:105
6856
7537
#, python-format
6857
7538
msgid ""
6858
7539
"Unable to connect to current master branch %(target)s: %(error)s To switch "
6859
7540
"anyway, use --force."
6860
7541
msgstr ""
6861
7542
6862
#: bzrlib/switch.py:108
7543
#: bzrlib/switch.py:125
6863
7544
msgid "Cannot switch a branch, only a checkout."
6864
7545
msgstr ""
6865
7546
6866
#: bzrlib/switch.py:144
7547
#: bzrlib/switch.py:163
6867
7548
#, python-format
6868
7549
msgid "Tree is up to date at revision %d."
6869
7550
msgstr ""
6870
7551
6871
#: bzrlib/switch.py:150
7552
#: bzrlib/switch.py:169
6872
7553
#, python-format
6873
7554
msgid "Updated to revision %d."
6874
7555
msgstr ""
6875
7556
6876
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7557
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
6877
7558
msgid "Apply phase"
6878
7559
msgstr ""
6879
7560
6880
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7561
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
6881
7562
msgid "removing file"
6882
7563
msgstr ""
6883
7564
6884
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7565
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
6885
7566
msgid "adding file"
6886
7567
msgstr ""
6887
7568
6888
#: bzrlib/transform.py:2587
7569
#: bzrlib/transform.py:2591
6889
7570
msgid "Building tree"
6890
7571
msgstr ""
6891
7572
6892
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7573
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
6893
7574
msgid "Adding file contents"
6894
7575
msgstr ""
6895
7576
6896
#: bzrlib/transform.py:3051
7577
#: bzrlib/transform.py:3028
6897
7578
msgid "Resolution pass"
6898
7579
msgstr ""
6899
7580
6900
#: bzrlib/tree.py:635
7581
#: bzrlib/transport/ftp/_gssapi.py:88
7582
#, python-format
7583
msgid "Authenticated as %s"
7584
msgstr ""
7585
7586
#: bzrlib/tree.py:634
6901
7587
msgid "*** {0} content-filter: {1} => {2!r}"
6902
7588
msgstr ""
6903
7589
6904
#: bzrlib/upgrade.py:76
7590
#: bzrlib/upgrade.py:77
6905
7591
#, python-format
6906
7592
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
6907
7593
msgstr ""
6908
7594
6909
#: bzrlib/upgrade.py:99
7595
#: bzrlib/upgrade.py:100
6910
7596
#, python-format
6911
7597
msgid "cannot upgrade from bzrdir format %s"
6912
7598
msgstr ""
6913
7599
6914
#: bzrlib/upgrade.py:102
7600
#: bzrlib/upgrade.py:103
6915
7601
#, python-format
6916
7602
msgid "starting upgrade of %s"
6917
7603
msgstr ""
6918
7604
6919
#: bzrlib/upgrade.py:109
7605
#: bzrlib/upgrade.py:110
6920
7606
msgid "finished"
6921
7607
msgstr ""
6922
7608
6923
#: bzrlib/upgrade.py:119
7609
#: bzrlib/upgrade.py:120
6924
7610
msgid "Deleting backup.bzr"
6925
7611
msgstr ""
6926
7612
6927
#: bzrlib/upgrade.py:150
7613
#: bzrlib/upgrade.py:151
6928
7614
msgid ""
6929
7615
"\n"
6930
7616
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
6931
7617
msgstr ""
6932
7618
6933
#: bzrlib/upgrade.py:207
7619
#: bzrlib/upgrade.py:208
6934
7620
#, python-format
6935
7621
msgid "Found %d dependent branches - upgrading ..."
6936
7622
msgstr ""
6937
7623
6938
#: bzrlib/upgrade.py:275
7624
#: bzrlib/upgrade.py:276
6939
7625
msgid "Upgrading bzrdirs"
6940
7626
msgstr ""
6941
7627
6942
#: bzrlib/upgrade.py:281
7628
#: bzrlib/upgrade.py:282
6943
7629
#, python-format
6944
7630
msgid "Upgrading %s"
6945
7631
msgstr ""
6946
7632
6947
#: bzrlib/upgrade.py:282
7633
#: bzrlib/upgrade.py:283
6948
7634
msgid "Upgrading {0} {1} ..."
6949
7635
msgstr ""
6950
7636
6951
#: bzrlib/upgrade.py:296
7637
#: bzrlib/upgrade.py:301
6952
7638
msgid "Removing backup ..."
6953
7639
msgstr ""
6954
7640
6955
#: bzrlib/upgrade.py:300
7641
#: bzrlib/upgrade.py:305
6956
7642
msgid "failed to clean-up {0}: {1}"
6957
7643
msgstr ""
6958
7644
6959
#: bzrlib/vf_repository.py:1091
7645
#: bzrlib/vf_repository.py:1090
6960
7646
msgid "inventories"
6961
7647
msgstr ""
6962
7648
6963
#: bzrlib/vf_repository.py:1117
7649
#: bzrlib/vf_repository.py:1116
6964
7650
msgid "texts"
6965
7651
msgstr ""
6966
7652
6967
#: bzrlib/vf_repository.py:1572 bzrlib/vf_repository.py:1581
7653
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
6968
7654
msgid "Calculating text parents"
6969
7655
msgstr ""
6970
7656
6971
#: bzrlib/vf_repository.py:1657
7657
#: bzrlib/vf_repository.py:1706
6972
7658
msgid "Fetch texts"
6973
7659
msgstr ""
6974
7660
6975
#: bzrlib/vf_repository.py:2468
7661
#: bzrlib/vf_repository.py:2535
6976
7662
msgid "loading text store"
6977
7663
msgstr ""
6978
7664
6979
#: bzrlib/vf_repository.py:2474
7665
#: bzrlib/vf_repository.py:2541
6980
7666
msgid "checking text graph"
6981
7667
msgstr ""
6982
7668
6983
#: bzrlib/vf_repository.py:2924 bzrlib/vf_repository.py:2938
6984
#: bzrlib/vf_repository.py:3053
7669
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7670
#: bzrlib/vf_repository.py:3124
6985
7671
msgid "Transferring revisions"
6986
7672
msgstr ""
6987
7673
6988
#: bzrlib/win32utils.py:132
7674
#: bzrlib/win32utils.py:146
6989
7675
msgid "Failed to GetProcessMemoryInfo()"
6990
7676
msgstr ""
6991
7677
6992
#: bzrlib/win32utils.py:153
7678
#: bzrlib/win32utils.py:167
6993
7679
msgid "Cannot debug memory on win32 without ctypes or win32process"
6994
7680
msgstr ""
6995
7681
6996
#: bzrlib/win32utils.py:158
7682
#: bzrlib/win32utils.py:172
6997
7683
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
6998
7684
msgstr ""
6999
7685
7000
#: bzrlib/win32utils.py:166
7686
#: bzrlib/win32utils.py:180
7001
7687
#, python-format
7002
7688
msgid "WorkingSize %8d KiB"
7003
7689
msgstr ""
7004
7690
7005
#: bzrlib/win32utils.py:167
7691
#: bzrlib/win32utils.py:181
7006
7692
#, python-format
7007
7693
msgid "PeakWorking %8d KiB"
7008
7694
msgstr ""
7009
7695
7010
#: bzrlib/win32utils.py:168
7696
#: bzrlib/win32utils.py:182
7011
7697
#, python-format
7012
7698
msgid "PagefileUsage %8d KiB"
7013
7699
msgstr ""
7014
7700
7015
#: bzrlib/win32utils.py:169
7701
#: bzrlib/win32utils.py:183
7016
7702
#, python-format
7017
7703
msgid "PeakPagefileUsage %8d KiB"
7018
7704
msgstr ""
7019
7705
7020
#: bzrlib/win32utils.py:171
7706
#: bzrlib/win32utils.py:185
7021
7707
#, python-format
7022
7708
msgid "PrivateUsage %8d KiB"
7023
7709
msgstr ""
7024
7710
7025
#: bzrlib/win32utils.py:172
7711
#: bzrlib/win32utils.py:186
7026
7712
#, python-format
7027
7713
msgid "PageFaultCount %8d"
7028
7714
msgstr ""
7029
7715
7030
#: bzrlib/workingtree.py:1502
7716
#: bzrlib/workingtree.py:1478
7031
7717
msgid "Rerun update after fixing the conflicts."
7032
7718
msgstr ""
7033
7719
7037
7723
7038
7724
#: dummy/help_topics/basic/detail.txt:1
7039
7725
msgid ""
7040
"Bazaar 2.5.0dev2 -- a free distributed version-control tool\n"
7726
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7041
7727
"http://bazaar.canonical.com/"
7042
7728
msgstr ""
7043
7729
7108
7794
msgstr ""
7109
7795
7110
7796
#: dummy/help_topics/branches/detail.txt:15
7797
#: dummy/help_topics/checkouts/detail.txt:66
7798
#: dummy/help_topics/repositories/detail.txt:36
7111
7799
msgid "Related commands::"
7112
7800
msgstr ""
7113
7801
7390
8078
"BZR_PDB Control whether to launch a debugger on error.\n"
7391
8079
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7392
8080
" breakin debugger.\n"
8081
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8082
"(instead\n"
8083
" of char-based).\n"
7393
8084
"=================== "
7394
8085
"===========================================================\n"
7395
8086
msgstr ""
7533
8224
7534
8225
#: dummy/help_topics/global-options/detail.txt:24
7535
8226
msgid ""
8227
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8228
"for\n"
8229
" the duration of the command. This can be used multiple times "
8230
"if\n"
8231
" several options need to be overridden."
8232
msgstr ""
8233
8234
#: dummy/help_topics/global-options/detail.txt:28
8235
msgid ""
7536
8236
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7537
8237
"information on profiling."
7538
8238
msgstr ""
7539
8239
7540
#: dummy/help_topics/global-options/detail.txt:27
8240
#: dummy/help_topics/global-options/detail.txt:31
7541
8241
msgid ""
7542
8242
"A number of debug flags are also available to assist troubleshooting and\n"
7543
8243
"development. See :doc:`debug-flags-help`.\n"
8384
9084
msgid " bzr commit --fixes <tracker>:<id>"
8385
9085
msgstr ""
8386
9086
8387
#: en/help_topics/bugs.txt:13
9087
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8388
9088
msgid "or::"
8389
9089
msgstr ""
8390
9090
8553
9253
8554
9254
#: en/help_topics/commands.txt:1
8555
9255
msgid ""
8556
"add Add specified files or directories.\n"
8557
"alias Set/unset and display aliases.\n"
8558
"annotate Show the origin of each line in a file.\n"
8559
"bash-completion Generate a shell function for bash command line "
9256
"add Add specified files or directories.\n"
9257
"alias Set/unset and display aliases.\n"
9258
"annotate Show the origin of each line in a file.\n"
9259
"bash-completion Generate a shell function for bash command line "
8560
9260
"completion.\n"
8561
" [bash_completion]\n"
8562
"bd-do Run a command in an exported package, copying the result\n"
8563
" back. [builddeb]\n"
8564
"bind Convert the current branch into a checkout of the "
8565
"supplied\n"
8566
" branch.\n"
8567
"branch Create a new branch that is a copy of an existing "
8568
"branch.\n"
8569
"branch-history Display the development history of a branch. [bzrtools]\n"
8570
"branches Scan a location for branches [bzrtools]\n"
8571
"break-lock Break a dead lock.\n"
8572
"bug-url Print full URL to a specific bug, or open it in your\n"
8573
" browser. [qbzr]\n"
8574
"builddeb Builds a Debian package from a branch. [builddeb]\n"
8575
"cat Write the contents of a file as of a given revision to\n"
8576
" standard output.\n"
8577
"cbranch Create a new checkout, associated with a new repository\n"
8578
" branch. [bzrtools]\n"
8579
"cdiff A color version of bzr's diff [bzrtools]\n"
8580
"check Validate working tree structure, branch consistency and\n"
8581
" repository history.\n"
8582
"checkout Create a new checkout of an existing branch.\n"
8583
"clean-tree Remove unwanted files from working tree.\n"
8584
"commit Commit changes into a new revision.\n"
8585
"config Display, set or remove a configuration option.\n"
8586
"conflict-diff Compare a conflicted file against BASE. [bzrtools]\n"
8587
"conflicts List files with conflicts.\n"
8588
"create-mirror Create a mirror of another branch. [bzrtools]\n"
8589
"deleted List files deleted in the working tree.\n"
8590
"dep3-patch Format the changes in a branch as a DEP-3 patch. "
8591
"[builddeb]\n"
8592
"dh-make Helps you create a new package. [builddeb]\n"
8593
"diff Show differences in the working tree, between revisions "
8594
"or\n"
8595
" branches.\n"
8596
"explorer Desktop application for Bazaar. [explorer]\n"
8597
"export Export current or past revision to a destination "
8598
"directory\n"
8599
" or archive.\n"
8600
"fetch-ghosts Attempt to retrieve ghosts from another branch. "
8601
"[bzrtools]\n"
8602
"graph-ancestry Produce ancestry graphs using dot. [bzrtools]\n"
8603
"heads Show all revisions in a repository not having "
8604
"descendants.\n"
8605
" [bzrtools]\n"
8606
"help Show help on a command or other topic.\n"
8607
"ignore Ignore specified files or patterns.\n"
8608
"ignored List ignored files and the patterns that matched them.\n"
8609
"import Import sources from a directory, tarball or zip file\n"
8610
" [bzrtools]\n"
8611
"import-dsc Import a series of source packages. [builddeb]\n"
8612
"import-upstream Imports an upstream tarball. [builddeb]\n"
8613
"info Show information about a working tree, branch or "
8614
"repository.\n"
8615
"init Make a directory into a versioned branch.\n"
8616
"init-repository Create a shared repository for branches to share storage\n"
8617
" space.\n"
8618
"init-workspace Start a new workspace. [explorer]\n"
8619
"join Combine a tree into its containing tree.\n"
8620
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
8621
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
8622
"launchpad-open Open a Launchpad branch page in your web browser.\n"
8623
" [launchpad]\n"
8624
"link-tree Hardlink matching files to another tree. [bzrtools]\n"
8625
"log Show historical log for a branch or subset of a branch.\n"
8626
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
8627
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
8628
"ls List files in a tree.\n"
8629
"mark-uploaded Mark that this branch has been uploaded, prior to "
8630
"pushing\n"
8631
" it. [builddeb]\n"
8632
"merge Perform a three-way merge.\n"
8633
"merge-package Merges source packaging branch into target packaging "
8634
"branch.\n"
8635
" [builddeb]\n"
8636
"merge-upstream Merges a new upstream version into the current branch.\n"
8637
" [builddeb]\n"
8638
"missing Show unmerged/unpulled revisions between two branches.\n"
8639
"mkdir Create a new versioned directory.\n"
8640
"multi-pull Pull all the branches under a location, e.g. a "
8641
"repository.\n"
8642
" [bzrtools]\n"
8643
"mv Move or rename a file.\n"
8644
"nick Print or set the branch nickname.\n"
8645
"pack Compress the data within a repository.\n"
8646
"patch Apply a named patch to the current tree. [bzrtools]\n"
8647
"plugins List the installed plugins.\n"
8648
"pull Turn this branch into a mirror of another branch.\n"
8649
"push Update a mirror of this branch.\n"
8650
"qadd GUI for adding files or directories. [qbzr]\n"
8651
"qannotate Show the origin of each line in a file. [qbzr]\n"
8652
"qbind Convert the current branch into a checkout of the "
8653
"supplied\n"
8654
" branch. [qbzr]\n"
8655
"qbranch Create a new copy of a branch. [qbzr]\n"
8656
"qbrowse Show inventory or working tree. [qbzr]\n"
8657
"qcat View the contents of a file as of a given revision. "
8658
"[qbzr]\n"
8659
"qcommit GUI for committing revisions. [qbzr]\n"
8660
"qconfig Configure Bazaar and QBzr. [qbzr]\n"
8661
"qconflicts Show conflicts. [qbzr]\n"
8662
"qdiff Show differences in working tree in a GUI window. [qbzr]\n"
8663
"qexport Export current or past revision to a destination "
8664
"directory\n"
8665
" or archive. [qbzr]\n"
8666
"qgetnew Creates a new working tree (either a checkout or full\n"
8667
" branch). [qbzr]\n"
8668
"qgetupdates Fetches external changes into the working tree. [qbzr]\n"
8669
"qinfo Shows information about the current location. [qbzr]\n"
8670
"qinit Initializes a new branch or shared repository. [qbzr]\n"
8671
"qinit-workspace Start a new workspace using a GUI. [explorer]\n"
8672
"qlog Show log of a repository, branch, file, or directory in a "
8673
"Qt\n"
8674
" window. [qbzr]\n"
8675
"qmerge Perform a three-way merge. [qbzr]\n"
8676
"qplugins Show information about installed plugins. [qbzr]\n"
8677
"qpull Turn this branch into a mirror of another branch. [qbzr]\n"
8678
"qpush Update a mirror of this branch. [qbzr]\n"
8679
"qrevert Revert changes files. [qbzr]\n"
8680
"qrun Run arbitrary bzr command. [qbzr]\n"
8681
"qsend Mail or create a merge-directive for submitting changes.\n"
8682
" [qbzr]\n"
8683
"qshelve Shelve selected changes away. [qbzr]\n"
8684
"qswitch Set the branch of a checkout and update. [qbzr]\n"
8685
"qtag Edit tags. [qbzr]\n"
8686
"qunbind Convert the current checkout into a regular branch. "
8687
"[qbzr]\n"
8688
"quncommit Move the tip of a branch to an earlier revision. [qbzr]\n"
8689
"qunshelve Restore shalved changes. [qbzr]\n"
8690
"qupdate Update working tree with latest changes in the branch.\n"
8691
" [qbzr]\n"
8692
"qverify-signatures Shows digital signature statuses for branch commits "
8693
"[qbzr]\n"
8694
"qversion Show version/system information. [qbzr]\n"
8695
"qviewer Simple file viewer. [qbzr]\n"
8696
"reconcile Reconcile bzr metadata in a branch.\n"
8697
"reconfigure Reconfigure the type of a bzr directory.\n"
8698
"register-branch Register a branch with launchpad.net. [launchpad]\n"
8699
"remerge Redo a merge.\n"
8700
"remove Remove files or directories.\n"
8701
"remove-branch Remove a branch.\n"
8702
"remove-tree Remove the working tree from a given branch/checkout.\n"
8703
"renames Show list of renamed files.\n"
8704
"resolve Mark a conflict as resolved.\n"
8705
"revert Revert files to a previous revision.\n"
8706
"revno Show current revision number.\n"
8707
"root Show the tree root directory.\n"
8708
"rspush Upload this branch to another location using rsync.\n"
8709
" [bzrtools]\n"
8710
"send Mail or create a merge-directive for submitting changes.\n"
8711
"serve Run the bzr server.\n"
8712
"shelf1 Perform various operations on your shelved patches. See "
8713
"also\n"
8714
" shelve1. [bzrtools]\n"
8715
"shell Begin an interactive shell tailored for bzr. [bzrtools]\n"
8716
"shelve Temporarily set aside some changes from the current "
8717
"tree.\n"
8718
"shelve1 Temporarily set aside some changes from the current "
8719
"tree.\n"
8720
" [bzrtools]\n"
8721
"sign-my-commits Sign all commits by a given committer.\n"
8722
"split Split a subdirectory of a tree into a separate tree.\n"
8723
"status Display status summary.\n"
8724
"switch Set the branch of a checkout and update.\n"
8725
"tag Create, remove or modify a tag naming a revision.\n"
8726
"tags List tags.\n"
8727
"testament Show testament (signing-form) of a revision.\n"
8728
"trees Scan a location for trees [bzrtools]\n"
8729
"unbind Convert the current checkout into a regular branch.\n"
8730
"uncommit Remove the last committed revision.\n"
8731
"unshelve Restore shelved changes.\n"
8732
"unshelve1 Restore shelved changes. [bzrtools]\n"
8733
"update Update a tree to have the latest code committed to its\n"
8734
" branch.\n"
8735
"upgrade Upgrade a repository, branch or working tree to a newer\n"
8736
" format.\n"
8737
"verify-signatures Verify all commit signatures.\n"
8738
"version Show version of bzr.\n"
8739
"version-info Show version information about this tree.\n"
8740
"view Manage filtered views.\n"
8741
"whoami Show or set bzr user id.\n"
8742
"zap Remove a lightweight checkout, if it can be done safely.\n"
8743
" [bzrtools]\n"
9261
" [bash_completion]\n"
9262
"bind Convert the current branch into a checkout of the "
9263
"supplied\n"
9264
" branch.\n"
9265
"branch Create a new branch that is a copy of an existing branch.\n"
9266
"branches List the branches available at the current location.\n"
9267
"break-lock Break a dead lock.\n"
9268
"cat Write the contents of a file as of a given revision to\n"
9269
" standard output.\n"
9270
"check Validate working tree structure, branch consistency and\n"
9271
" repository history.\n"
9272
"checkout Create a new checkout of an existing branch.\n"
9273
"clean-tree Remove unwanted files from working tree.\n"
9274
"commit Commit changes into a new revision.\n"
9275
"config Display, set or remove a configuration option.\n"
9276
"conflicts List files with conflicts.\n"
9277
"deleted List files deleted in the working tree.\n"
9278
"diff Show differences in the working tree, between revisions "
9279
"or\n"
9280
" branches.\n"
9281
"dpush Push into a different VCS without any custom bzr "
9282
"metadata.\n"
9283
"export Export current or past revision to a destination directory "
9284
"or\n"
9285
" archive.\n"
9286
"help Show help on a command or other topic.\n"
9287
"ignore Ignore specified files or patterns.\n"
9288
"ignored List ignored files and the patterns that matched them.\n"
9289
"info Show information about a working tree, branch or "
9290
"repository.\n"
9291
"init Make a directory into a versioned branch.\n"
9292
"init-repository Create a shared repository for branches to share storage\n"
9293
" space.\n"
9294
"join Combine a tree into its containing tree.\n"
9295
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9296
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9297
"launchpad-open Open a Launchpad branch page in your web browser. "
9298
"[launchpad]\n"
9299
"log Show historical log for a branch or subset of a branch.\n"
9300
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9301
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9302
"ls List files in a tree.\n"
9303
"merge Perform a three-way merge.\n"
9304
"missing Show unmerged/unpulled revisions between two branches.\n"
9305
"mkdir Create a new versioned directory.\n"
9306
"mv Move or rename a file.\n"
9307
"nick Print or set the branch nickname.\n"
9308
"pack Compress the data within a repository.\n"
9309
"plugins List the installed plugins.\n"
9310
"pull Turn this branch into a mirror of another branch.\n"
9311
"push Update a mirror of this branch.\n"
9312
"reconcile Reconcile bzr metadata in a branch.\n"
9313
"reconfigure Reconfigure the type of a bzr directory.\n"
9314
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9315
"remerge Redo a merge.\n"
9316
"remove Remove files or directories.\n"
9317
"remove-branch Remove a branch.\n"
9318
"remove-tree Remove the working tree from a given branch/checkout.\n"
9319
"renames Show list of renamed files.\n"
9320
"resolve Mark a conflict as resolved.\n"
9321
"revert Revert files to a previous revision.\n"
9322
"revno Show current revision number.\n"
9323
"root Show the tree root directory.\n"
9324
"send Mail or create a merge-directive for submitting changes.\n"
9325
"serve Run the bzr server.\n"
9326
"shelve Temporarily set aside some changes from the current tree.\n"
9327
"sign-my-commits Sign all commits by a given committer.\n"
9328
"split Split a subdirectory of a tree into a separate tree.\n"
9329
"status Display status summary.\n"
9330
"switch Set the branch of a checkout and update.\n"
9331
"tag Create, remove or modify a tag naming a revision.\n"
9332
"tags List tags.\n"
9333
"testament Show testament (signing-form) of a revision.\n"
9334
"unbind Convert the current checkout into a regular branch.\n"
9335
"uncommit Remove the last committed revision.\n"
9336
"unshelve Restore shelved changes.\n"
9337
"update Update a working tree to a new revision.\n"
9338
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9339
" format.\n"
9340
"verify-signatures Verify all commit signatures.\n"
9341
"version Show version of bzr.\n"
9342
"version-info Show version information about this tree.\n"
9343
"view Manage filtered views.\n"
9344
"whoami Show or set bzr user id.\n"
8744
9345
msgstr ""
8745
9346
8746
9347
#: en/help_topics/configuration.txt:1
9170
9771
#: en/help_topics/configuration.txt:223
9171
9772
msgid ""
9172
9773
"An ini file has three types of contructs: section headers, section\n"
9173
"variables and comments."
9774
"options and comments."
9174
9775
msgstr ""
9175
9776
9176
9777
#: en/help_topics/configuration.txt:226
9207
9808
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9208
9809
"[ALIASES]. Section headers are case sensitive. The default section provides "
9209
9810
"for\n"
9210
"setting variables which can be overridden with the branch config file."
9811
"setting options which can be overridden with the branch config file."
9211
9812
msgstr ""
9212
9813
9213
9814
#: en/help_topics/configuration.txt:245
9214
9815
msgid ""
9215
"For ``locations.conf``, the variables from the section with the\n"
9816
"For ``locations.conf``, the options from the section with the\n"
9216
9817
"longest matching section header are used to the exclusion of other\n"
9217
9818
"potentially valid section headers. A section header uses the path for\n"
9218
9819
"the branch as the section header. Some examples include::"
9227
9828
#: en/help_topics/configuration.txt:253
9228
9829
msgid ""
9229
9830
"\n"
9230
"Section variables\n"
9231
"^^^^^^^^^^^^^^^^^"
9831
"Section options\n"
9832
"^^^^^^^^^^^^^^^"
9232
9833
msgstr ""
9233
9834
9234
9835
#: en/help_topics/configuration.txt:257
9235
9836
msgid ""
9236
"A section variable resides within a section. A section variable contains a\n"
9237
"variable name, an equals sign and a value. For example::"
9837
"A section option resides within a section. A section option contains an\n"
9838
"option name, an equals sign and a value. For example::"
9238
9839
msgstr ""
9239
9840
9240
9841
#: en/help_topics/configuration.txt:260
9245
9846
9246
9847
#: en/help_topics/configuration.txt:263
9247
9848
msgid ""
9248
"A variable can reference other variables **in the same configuration file** "
9249
"by\n"
9250
"enclosing them in curly brackets::"
9849
"A option can reference other options by enclosing them in curly brackets::"
9251
9850
msgstr ""
9252
9851
9253
#: en/help_topics/configuration.txt:266
9852
#: en/help_topics/configuration.txt:265
9254
9853
msgid ""
9255
9854
" my_branch_name = feature_x\n"
9256
9855
" my_server = bzr+ssh://example.com\n"
9257
9856
" push_location = {my_server}/project/{my_branch_name}"
9258
9857
msgstr ""
9259
9858
9260
#: en/help_topics/configuration.txt:270
9859
#: en/help_topics/configuration.txt:269
9261
9860
msgid ""
9262
"\n"
9263
"Variable policies\n"
9264
"^^^^^^^^^^^^^^^^^"
9861
"Option policies\n"
9862
"^^^^^^^^^^^^^^^"
9265
9863
msgstr ""
9266
9864
9267
#: en/help_topics/configuration.txt:274
9865
#: en/help_topics/configuration.txt:272
9268
9866
msgid ""
9269
"Variables defined in a section affect the named directory or URL plus\n"
9270
"any locations they contain. Policies can be used to change how a\n"
9271
"variable value is interpreted for contained locations. Currently\n"
9867
"Options defined in a section affect the named directory or URL plus\n"
9868
"any locations they contain. Policies can be used to change how an\n"
9869
"option value is interpreted for contained locations. Currently\n"
9272
9870
"there are three policies available:"
9273
9871
msgstr ""
9274
9872
9275
#: en/help_topics/configuration.txt:279
9873
#: en/help_topics/configuration.txt:277
9276
9874
msgid ""
9277
9875
" none:\n"
9278
9876
" the value is interpreted the same for contained locations. This is\n"
9285
9883
" appended to the value."
9286
9884
msgstr ""
9287
9885
9288
#: en/help_topics/configuration.txt:289
9886
#: en/help_topics/configuration.txt:287
9289
9887
msgid ""
9290
"Policies are specified by keys with names of the form \"$var:policy\".\n"
9888
"Policies are specified by keys with names of the form \"<option_name>:policy"
9889
"\".\n"
9291
9890
"For example, to define the push location for a tree of branches, the\n"
9292
9891
"following could be used::"
9293
9892
msgstr ""
9294
9893
9295
#: en/help_topics/configuration.txt:293
9894
#: en/help_topics/configuration.txt:291
9296
9895
msgid ""
9297
9896
" [/top/location]\n"
9298
9897
" push_location = sftp://example.com/location\n"
9299
9898
" push_location:policy = appendpath"
9300
9899
msgstr ""
9301
9900
9302
#: en/help_topics/configuration.txt:297
9901
#: en/help_topics/configuration.txt:295
9303
9902
msgid ""
9304
9903
"With this configuration, the push location for ``/top/location/branch1``\n"
9305
9904
"would be ``sftp://example.com/location/branch1``."
9306
9905
msgstr ""
9307
9906
9308
#: en/help_topics/configuration.txt:300
9907
#: en/help_topics/configuration.txt:298
9908
msgid ""
9909
"Section local options\n"
9910
"^^^^^^^^^^^^^^^^^^^^^"
9911
msgstr ""
9912
9913
#: en/help_topics/configuration.txt:301
9914
msgid ""
9915
"Some options are defined automatically inside a given section and can be\n"
9916
"refered to in this section only. "
9917
msgstr ""
9918
9919
#: en/help_topics/configuration.txt:304
9920
msgid "For example, the ``appendpath`` policy can be used like this::"
9921
msgstr ""
9922
9923
#: en/help_topics/configuration.txt:306
9924
msgid ""
9925
" [/home/vila/src/bzr/bugs]\n"
9926
" mypush = lp:~vila/bzr\n"
9927
" mypush:policy=appendpath"
9928
msgstr ""
9929
9930
#: en/help_topics/configuration.txt:310
9931
msgid "Using ``relpath`` to achieve the same result is done like this::"
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:312
9935
msgid ""
9936
" [/home/vila/src/bzr/bugs]\n"
9937
" mypush = lp:~vila/bzr/{relpath}"
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:315
9941
msgid ""
9942
"In both cases, when used in a directory like\n"
9943
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9947
msgid ""
9948
" $ bzr config mypush\n"
9949
" lp:~vila/bzr/832013-expand-in-stack"
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:321
9953
msgid "Another such option is ``basename`` which can be used like this::"
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:323
9957
msgid ""
9958
" [/home/vila/src/bzr]\n"
9959
" mypush = lp:~vila/bzr/{basename}"
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:326
9963
msgid ""
9964
"When used in a directory like\n"
9965
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9966
msgstr ""
9967
9968
#: en/help_topics/configuration.txt:332
9969
msgid ""
9970
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9971
"itself is defined as the relative path between the section name and the\n"
9972
"location it matches."
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:336
9976
msgid ""
9977
"When an option is local to a Section, it cannot be referred to from option\n"
9978
"values in any other section from the same ``Store`` nor from any other\n"
9979
"``Store``."
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:340
9309
9983
msgid ""
9310
9984
"\n"
9311
9985
"The main configuration file, bazaar.conf\n"
9312
9986
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9313
9987
msgstr ""
9314
9988
9315
#: en/help_topics/configuration.txt:304
9989
#: en/help_topics/configuration.txt:344
9316
9990
msgid ""
9317
9991
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9318
9992
"The default section contains the default\n"
9320
9994
"overriden by providing a branch-specific section in ``locations.conf``."
9321
9995
msgstr ""
9322
9996
9323
#: en/help_topics/configuration.txt:309
9997
#: en/help_topics/configuration.txt:349
9324
9998
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9325
9999
msgstr ""
9326
10000
9327
#: en/help_topics/configuration.txt:311
10001
#: en/help_topics/configuration.txt:351
9328
10002
msgid ""
9329
10003
" [DEFAULT]\n"
9330
10004
" email = John Doe <jdoe@isp.com>\n"
9332
10006
" create_signatures = when-required"
9333
10007
msgstr ""
9334
10008
9335
#: en/help_topics/configuration.txt:316
10009
#: en/help_topics/configuration.txt:356
9336
10010
msgid ""
9337
10011
"\n"
9338
10012
"The branch location configuration file, locations.conf\n"
9339
10013
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9340
10014
msgstr ""
9341
10015
9342
#: en/help_topics/configuration.txt:320
10016
#: en/help_topics/configuration.txt:360
9343
10017
msgid ""
9344
10018
"``locations.conf`` allows one to specify overriding settings for\n"
9345
10019
"a specific branch. The format is almost identical to the default section in\n"
9349
10023
"for. The '?' and '*' wildcards are supported::"
9350
10024
msgstr ""
9351
10025
9352
#: en/help_topics/configuration.txt:326
10026
#: en/help_topics/configuration.txt:366
9353
10027
msgid ""
9354
10028
" [/home/jdoe/branches/nethack]\n"
9355
10029
" email = Nethack Admin <nethack@nethack.com>"
9356
10030
msgstr ""
9357
10031
9358
#: en/help_topics/configuration.txt:329
10032
#: en/help_topics/configuration.txt:369
9359
10033
msgid ""
9360
10034
" [http://hypothetical.site.com/branches/devel-branch]\n"
9361
10035
" create_signatures = always"
9362
10036
msgstr ""
9363
10037
9364
#: en/help_topics/configuration.txt:332
10038
#: en/help_topics/configuration.txt:372
9365
10039
msgid ""
9366
10040
"The authentication configuration file, authentication.conf\n"
9367
10041
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9368
10042
msgstr ""
9369
10043
9370
#: en/help_topics/configuration.txt:335
10044
#: en/help_topics/configuration.txt:375
9371
10045
msgid ""
9372
10046
"``authentication.conf`` allows one to specify credentials for\n"
9373
10047
"remote servers. This can be used for all the supported transports and any "
9375
10049
"of bzr that requires authentication (smtp for example)."
9376
10050
msgstr ""
9377
10051
9378
#: en/help_topics/configuration.txt:339
10052
#: en/help_topics/configuration.txt:379
9379
10053
msgid ""
9380
10054
"The syntax of the file obeys the same rules as the others except for the\n"
9381
"variable policies which don't apply."
10055
"option policies which don't apply."
9382
10056
msgstr ""
9383
10057
9384
#: en/help_topics/configuration.txt:342
10058
#: en/help_topics/configuration.txt:382
9385
10059
msgid ""
9386
10060
"For more information on the possible uses of the authentication "
9387
10061
"configuration\n"
9388
10062
"file see :doc:`authentication-help`."
9389
10063
msgstr ""
9390
10064
9391
#: en/help_topics/configuration.txt:345
10065
#: en/help_topics/configuration.txt:385
9392
10066
msgid ""
9393
10067
"\n"
9394
"Common variable options\n"
9395
"-----------------------"
10068
"Common options\n"
10069
"--------------"
9396
10070
msgstr ""
9397
10071
9398
#: en/help_topics/configuration.txt:349
10072
#: en/help_topics/configuration.txt:389
9399
10073
msgid ""
9400
10074
"debug_flags\n"
9401
10075
"~~~~~~~~~~~"
9402
10076
msgstr ""
9403
10077
9404
#: en/help_topics/configuration.txt:352
10078
#: en/help_topics/configuration.txt:392
9405
10079
msgid ""
9406
10080
"A comma-separated list of debugging options to turn on. The same values\n"
9407
10081
"can be used as with the -D command-line option (see `help global-options`).\n"
9408
10082
"For example::"
9409
10083
msgstr ""
9410
10084
9411
#: en/help_topics/configuration.txt:356
10085
#: en/help_topics/configuration.txt:396
9412
10086
msgid " debug_flags = hpss"
9413
10087
msgstr ""
9414
10088
9415
#: en/help_topics/configuration.txt:360
10089
#: en/help_topics/configuration.txt:400
9416
10090
msgid " debug_flags = hpss,evil"
9417
10091
msgstr ""
9418
10092
9419
#: en/help_topics/configuration.txt:362
10093
#: en/help_topics/configuration.txt:402
9420
10094
msgid ""
9421
10095
"email\n"
9422
10096
"~~~~~"
9423
10097
msgstr ""
9424
10098
9425
#: en/help_topics/configuration.txt:365
10099
#: en/help_topics/configuration.txt:405
9426
10100
msgid ""
9427
10101
"The email address to use when committing a branch. Typically takes the form\n"
9428
10102
"of::"
9429
10103
msgstr ""
9430
10104
9431
#: en/help_topics/configuration.txt:368
10105
#: en/help_topics/configuration.txt:408
9432
10106
msgid " email = Full Name <account@hostname.tld>"
9433
10107
msgstr ""
9434
10108
9435
#: en/help_topics/configuration.txt:370
10109
#: en/help_topics/configuration.txt:410
9436
10110
msgid ""
9437
10111
"editor\n"
9438
10112
"~~~~~~"
9439
10113
msgstr ""
9440
10114
9441
#: en/help_topics/configuration.txt:373
10115
#: en/help_topics/configuration.txt:413
9442
10116
msgid ""
9443
10117
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9444
10118
"a commit message. This setting is trumped by the environment variable\n"
9446
10120
"variables."
9447
10121
msgstr ""
9448
10122
9449
#: en/help_topics/configuration.txt:378
10123
#: en/help_topics/configuration.txt:418
9450
10124
msgid ""
9451
10125
"log_format\n"
9452
10126
"~~~~~~~~~~"
9453
10127
msgstr ""
9454
10128
9455
#: en/help_topics/configuration.txt:381
10129
#: en/help_topics/configuration.txt:421
9456
10130
msgid ""
9457
10131
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9458
10132
"and ``line``. Additional formats may be provided by plugins. The default\n"
9459
10133
"value is ``long``."
9460
10134
msgstr ""
9461
10135
9462
#: en/help_topics/configuration.txt:385
10136
#: en/help_topics/configuration.txt:425
9463
10137
msgid ""
9464
10138
"check_signatures\n"
9465
10139
"~~~~~~~~~~~~~~~~"
9466
10140
msgstr ""
9467
10141
9468
#: en/help_topics/configuration.txt:388
10142
#: en/help_topics/configuration.txt:428
9469
10143
msgid ""
9470
10144
"Reserved for future use. These options will allow a policy for branches to\n"
9471
10145
"require signatures."
9472
10146
msgstr ""
9473
10147
9474
#: en/help_topics/configuration.txt:391
10148
#: en/help_topics/configuration.txt:431
9475
10149
msgid ""
9476
10150
"require\n"
9477
10151
" The gnupg signature for revisions must be present and must be valid."
9478
10152
msgstr ""
9479
10153
9480
#: en/help_topics/configuration.txt:394
10154
#: en/help_topics/configuration.txt:434
9481
10155
msgid ""
9482
10156
"ignore\n"
9483
10157
" Do not check gnupg signatures of revisions."
9484
10158
msgstr ""
9485
10159
9486
#: en/help_topics/configuration.txt:397
10160
#: en/help_topics/configuration.txt:437
9487
10161
msgid ""
9488
10162
"check-available\n"
9489
10163
" (default) If gnupg signatures for revisions are present, check them.\n"
9491
10165
" no signature is present."
9492
10166
msgstr ""
9493
10167
9494
#: en/help_topics/configuration.txt:402
10168
#: en/help_topics/configuration.txt:442
9495
10169
msgid ""
9496
10170
"create_signatures\n"
9497
10171
"~~~~~~~~~~~~~~~~~"
9498
10172
msgstr ""
9499
10173
9500
#: en/help_topics/configuration.txt:405
10174
#: en/help_topics/configuration.txt:445
9501
10175
msgid ""
9502
10176
"Defines the behaviour of signing revisions on commits. By default bzr will "
9503
10177
"not\n"
9504
10178
"sign new commits."
9505
10179
msgstr ""
9506
10180
9507
#: en/help_topics/configuration.txt:408
10181
#: en/help_topics/configuration.txt:448
9508
10182
msgid ""
9509
10183
"always\n"
9510
10184
" Sign every new revision that is committed. If the signing fails then "
9512
10186
" commit will not be made."
9513
10187
msgstr ""
9514
10188
9515
#: en/help_topics/configuration.txt:412
10189
#: en/help_topics/configuration.txt:452
9516
10190
msgid ""
9517
10191
"when-required\n"
9518
10192
" Reserved for future use."
9519
10193
msgstr ""
9520
10194
9521
#: en/help_topics/configuration.txt:415
10195
#: en/help_topics/configuration.txt:455
9522
10196
msgid ""
9523
10197
"never\n"
9524
10198
" Reserved for future use."
9525
10199
msgstr ""
9526
10200
9527
#: en/help_topics/configuration.txt:418
10201
#: en/help_topics/configuration.txt:458
9528
10202
msgid ""
9529
10203
"In future it is planned that ``when-required`` will sign newly\n"
9530
10204
"committed revisions only when the branch requires them. ``never`` will "
9532
10206
"to sign newly committed revisions, even if the branch requires signatures."
9533
10207
msgstr ""
9534
10208
9535
#: en/help_topics/configuration.txt:422
10209
#: en/help_topics/configuration.txt:462
9536
10210
msgid ""
9537
10211
"dirstate.fdatasync\n"
9538
10212
"~~~~~~~~~~~~~~~~~~"
9539
10213
msgstr ""
9540
10214
9541
#: en/help_topics/configuration.txt:425
10215
#: en/help_topics/configuration.txt:465
9542
10216
msgid ""
9543
10217
"If true (default), working tree metadata changes are flushed through the\n"
9544
10218
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9545
10219
"should not be lost if the machine crashes. See also repository.fdatasync."
9546
10220
msgstr ""
9547
10221
9548
#: en/help_topics/configuration.txt:429
10222
#: en/help_topics/configuration.txt:469
9549
10223
msgid ""
9550
10224
"gpg_signing_key\n"
9551
10225
"~~~~~~~~~~~~~~~"
9552
10226
msgstr ""
9553
10227
9554
#: en/help_topics/configuration.txt:432
10228
#: en/help_topics/configuration.txt:472
9555
10229
msgid ""
9556
10230
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9557
10231
"address, key fingerprint or full key ID. When unset or when set to\n"
9558
10232
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9559
10233
msgstr ""
9560
10234
9561
#: en/help_topics/configuration.txt:436
10235
#: en/help_topics/configuration.txt:476
9562
10236
msgid ""
9563
10237
"recurse\n"
9564
10238
"~~~~~~~"
9565
10239
msgstr ""
9566
10240
9567
#: en/help_topics/configuration.txt:439
10241
#: en/help_topics/configuration.txt:479
9568
10242
msgid ""
9569
10243
"Only useful in ``locations.conf``. Defines whether or not the\n"
9570
10244
"configuration for this section applies to subdirectories:"
9571
10245
msgstr ""
9572
10246
9573
#: en/help_topics/configuration.txt:442
10247
#: en/help_topics/configuration.txt:482
9574
10248
msgid ""
9575
10249
"true\n"
9576
10250
" (default) This section applies to subdirectories as well."
9577
10251
msgstr ""
9578
10252
9579
#: en/help_topics/configuration.txt:445
10253
#: en/help_topics/configuration.txt:485
9580
10254
msgid ""
9581
10255
"false\n"
9582
10256
" This section only applies to the branch at this directory and not\n"
9583
10257
" branches below it."
9584
10258
msgstr ""
9585
10259
9586
#: en/help_topics/configuration.txt:449
10260
#: en/help_topics/configuration.txt:489
9587
10261
msgid ""
9588
10262
"gpg_signing_command\n"
9589
10263
"~~~~~~~~~~~~~~~~~~~"
9590
10264
msgstr ""
9591
10265
9592
#: en/help_topics/configuration.txt:452
10266
#: en/help_topics/configuration.txt:492
9593
10267
msgid ""
9594
10268
"(Default: \"gpg\"). Which program should be used to sign and check "
9595
10269
"revisions.\n"
9596
10270
"For example::"
9597
10271
msgstr ""
9598
10272
9599
#: en/help_topics/configuration.txt:455
10273
#: en/help_topics/configuration.txt:495
9600
10274
msgid " gpg_signing_command = /usr/bin/gnpg"
9601
10275
msgstr ""
9602
10276
9603
#: en/help_topics/configuration.txt:457
10277
#: en/help_topics/configuration.txt:497
9604
10278
msgid ""
9605
10279
"The specified command must accept the options \"--clearsign\" and \"-u "
9606
10280
"<email>\"."
9607
10281
msgstr ""
9608
10282
9609
#: en/help_topics/configuration.txt:459
10283
#: en/help_topics/configuration.txt:499
9610
10284
msgid ""
9611
10285
"bzr_remote_path\n"
9612
10286
"~~~~~~~~~~~~~~~"
9613
10287
msgstr ""
9614
10288
9615
#: en/help_topics/configuration.txt:462
10289
#: en/help_topics/configuration.txt:502
9616
10290
msgid ""
9617
10291
"(Default: \"bzr\"). The path to the command that should be used to run the "
9618
10292
"smart\n"
9619
10293
"server for bzr. This value may only be specified in locations.conf, because:"
9620
10294
msgstr ""
9621
10295
9622
#: en/help_topics/configuration.txt:465
10296
#: en/help_topics/configuration.txt:505
9623
10297
msgid ""
9624
10298
"- it's needed before branch.conf is accessible\n"
9625
10299
"- allowing remote branch.conf files to specify commands would be a security\n"
9626
10300
" risk"
9627
10301
msgstr ""
9628
10302
9629
#: en/help_topics/configuration.txt:469
10303
#: en/help_topics/configuration.txt:509
9630
10304
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
9631
10305
msgstr ""
9632
10306
9633
#: en/help_topics/configuration.txt:471
10307
#: en/help_topics/configuration.txt:511
9634
10308
msgid ""
9635
10309
"smtp_server\n"
9636
10310
"~~~~~~~~~~~"
9637
10311
msgstr ""
9638
10312
9639
#: en/help_topics/configuration.txt:474
10313
#: en/help_topics/configuration.txt:514
9640
10314
msgid ""
9641
10315
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
9642
10316
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
9643
10317
msgstr ""
9644
10318
9645
#: en/help_topics/configuration.txt:477
10319
#: en/help_topics/configuration.txt:517
9646
10320
msgid ""
9647
10321
"smtp_username, smtp_password\n"
9648
10322
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9649
10323
msgstr ""
9650
10324
9651
#: en/help_topics/configuration.txt:480
10325
#: en/help_topics/configuration.txt:520
9652
10326
msgid ""
9653
10327
"User and password to authenticate to the SMTP server. If smtp_username\n"
9654
10328
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
9656
10330
"to send mail."
9657
10331
msgstr ""
9658
10332
9659
#: en/help_topics/configuration.txt:485
10333
#: en/help_topics/configuration.txt:525
9660
10334
msgid ""
9661
10335
"locks.steal_dead\n"
9662
10336
"~~~~~~~~~~~~~~~~"
9663
10337
msgstr ""
9664
10338
9665
#: en/help_topics/configuration.txt:488
10339
#: en/help_topics/configuration.txt:528
9666
10340
msgid ""
9667
10341
"If set to true, bzr will automatically break locks held by processes from\n"
9668
10342
"the same machine and user that are no longer alive. Otherwise, it will\n"
9670
10344
"the object is no longer in use."
9671
10345
msgstr ""
9672
10346
9673
#: en/help_topics/configuration.txt:493
10347
#: en/help_topics/configuration.txt:533
9674
10348
msgid ""
9675
10349
"mail_client\n"
9676
10350
"~~~~~~~~~~~"
9677
10351
msgstr ""
9678
10352
9679
#: en/help_topics/configuration.txt:496
10353
#: en/help_topics/configuration.txt:536
9680
10354
msgid ""
9681
10355
"A mail client to use for sending merge requests.\n"
9682
10356
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
9685
10359
"``editor``."
9686
10360
msgstr ""
9687
10361
9688
#: en/help_topics/configuration.txt:501
10362
#: en/help_topics/configuration.txt:541
9689
10363
msgid "Supported values for specific clients:"
9690
10364
msgstr ""
9691
10365
9692
#: en/help_topics/configuration.txt:503
10366
#: en/help_topics/configuration.txt:543
9693
10367
msgid ""
9694
10368
":claws: Use Claws. This skips a dialog for attaching files.\n"
9695
10369
":evolution: Use Evolution.\n"
9700
10374
" this works around some bugs that xdg-email doesn't handle."
9701
10375
msgstr ""
9702
10376
9703
#: en/help_topics/configuration.txt:510
10377
#: en/help_topics/configuration.txt:550
9704
10378
msgid "Supported generic values are:"
9705
10379
msgstr ""
9706
10380
9707
#: en/help_topics/configuration.txt:512
10381
#: en/help_topics/configuration.txt:552
9708
10382
msgid ""
9709
10383
":default: See above.\n"
9710
10384
":editor: Use your editor to compose the merge request. This also uses\n"
9714
10388
":xdg-email: Use xdg-email to run your preferred mail program"
9715
10389
msgstr ""
9716
10390
9717
#: en/help_topics/configuration.txt:519
10391
#: en/help_topics/configuration.txt:559
9718
10392
msgid ""
9719
10393
"repository.fdatasync\n"
9720
10394
"~~~~~~~~~~~~~~~~~~~~"
9721
10395
msgstr ""
9722
10396
9723
#: en/help_topics/configuration.txt:522
10397
#: en/help_topics/configuration.txt:562
9724
10398
msgid ""
9725
10399
"If true (default), repository changes are flushed through the OS buffers\n"
9726
10400
"to physical disk. This is somewhat slower, but means data should not be\n"
9727
10401
"lost if the machine crashes. See also dirstate.fdatasync."
9728
10402
msgstr ""
9729
10403
9730
#: en/help_topics/configuration.txt:526
10404
#: en/help_topics/configuration.txt:566
9731
10405
msgid ""
9732
10406
"submit_branch\n"
9733
10407
"~~~~~~~~~~~~~"
9734
10408
msgstr ""
9735
10409
9736
#: en/help_topics/configuration.txt:529
10410
#: en/help_topics/configuration.txt:569
9737
10411
msgid ""
9738
10412
"The branch you intend to submit your current work to. This is "
9739
10413
"automatically\n"
9742
10416
"should usually be set on a per-branch or per-location basis."
9743
10417
msgstr ""
9744
10418
9745
#: en/help_topics/configuration.txt:533
10419
#: en/help_topics/configuration.txt:573
9746
10420
msgid ""
9747
10421
"public_branch\n"
9748
10422
"~~~~~~~~~~~~~"
9749
10423
msgstr ""
9750
10424
9751
#: en/help_topics/configuration.txt:536
10425
#: en/help_topics/configuration.txt:576
9752
10426
msgid ""
9753
10427
"A publically-accessible version of this branch (implying that this version "
9754
10428
"is\n"
9755
10429
"not publically-accessible). Used (and set) by ``bzr send``."
9756
10430
msgstr ""
9757
10431
9758
#: en/help_topics/configuration.txt:539
10432
#: en/help_topics/configuration.txt:579
9759
10433
msgid ""
9760
10434
"suppress_warnings\n"
9761
10435
"~~~~~~~~~~~~~~~~~"
9762
10436
msgstr ""
9763
10437
9764
#: en/help_topics/configuration.txt:542
10438
#: en/help_topics/configuration.txt:582
9765
10439
msgid ""
9766
10440
"A list of strings, each string represent a warning that can be emitted by\n"
9767
10441
"bzr. Mentioning a warning in this list tells bzr to not emit it."
9768
10442
msgstr ""
9769
10443
9770
#: en/help_topics/configuration.txt:545
10444
#: en/help_topics/configuration.txt:585
9771
10445
msgid "Valid values:"
9772
10446
msgstr ""
9773
10447
9774
#: en/help_topics/configuration.txt:547
10448
#: en/help_topics/configuration.txt:587
9775
10449
msgid ""
9776
10450
"* ``format_deprecation``:\n"
9777
10451
" whether the format deprecation warning is shown on repositories that "
9779
10453
" using deprecated formats."
9780
10454
msgstr ""
9781
10455
9782
#: en/help_topics/configuration.txt:551
10456
#: en/help_topics/configuration.txt:591
9783
10457
msgid ""
9784
10458
"default_format\n"
9785
10459
"~~~~~~~~~~~~~~"
9786
10460
msgstr ""
9787
10461
9788
#: en/help_topics/configuration.txt:554
10462
#: en/help_topics/configuration.txt:594
9789
10463
msgid ""
9790
10464
"A format name for the default format used when creating branches. See "
9791
10465
"``bzr\n"
9792
10466
"help formats`` for possible values."
9793
10467
msgstr ""
9794
10468
9795
#: en/help_topics/configuration.txt:557
10469
#: en/help_topics/configuration.txt:597
9796
10470
msgid ""
9797
10471
"\n"
9798
10472
"Unicode options\n"
9799
10473
"---------------"
9800
10474
msgstr ""
9801
10475
9802
#: en/help_topics/configuration.txt:561
10476
#: en/help_topics/configuration.txt:601
9803
10477
msgid ""
9804
10478
"output_encoding\n"
9805
10479
"~~~~~~~~~~~~~~~"
9806
10480
msgstr ""
9807
10481
9808
#: en/help_topics/configuration.txt:564
10482
#: en/help_topics/configuration.txt:604
9809
10483
msgid ""
9810
10484
"A Python unicode encoding name for text output from bzr, such as log\n"
9811
10485
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
9812
10486
"is the terminal encoding prefered by the operating system."
9813
10487
msgstr ""
9814
10488
9815
#: en/help_topics/configuration.txt:568
10489
#: en/help_topics/configuration.txt:608
9816
10490
msgid ""
9817
10491
"\n"
9818
10492
"Branch type specific options\n"
9819
10493
"----------------------------"
9820
10494
msgstr ""
9821
10495
9822
#: en/help_topics/configuration.txt:572
10496
#: en/help_topics/configuration.txt:612
9823
10497
msgid ""
9824
10498
"These options apply only to branches that use the ``dirstate-tags`` or\n"
9825
10499
"later format. They\n"
9827
10501
"manually set in ``locations.conf`` or ``bazaar.conf``."
9828
10502
msgstr ""
9829
10503
9830
#: en/help_topics/configuration.txt:577
10504
#: en/help_topics/configuration.txt:617
9831
10505
msgid ""
9832
10506
"append_revisions_only\n"
9833
10507
"~~~~~~~~~~~~~~~~~~~~~"
9834
10508
msgstr ""
9835
10509
9836
#: en/help_topics/configuration.txt:580
10510
#: en/help_topics/configuration.txt:620
9837
10511
msgid ""
9838
10512
"If set to \"True\" then revisions can only be appended to the log, not\n"
9839
10513
"removed. A branch with this setting enabled can only pull from another\n"
9843
10517
"compatibility with previous bzr versions (older than 2.2)."
9844
10518
msgstr ""
9845
10519
9846
#: en/help_topics/configuration.txt:587
10520
#: en/help_topics/configuration.txt:627
9847
10521
msgid ""
9848
10522
"parent_location\n"
9849
10523
"~~~~~~~~~~~~~~~"
9850
10524
msgstr ""
9851
10525
9852
#: en/help_topics/configuration.txt:590
10526
#: en/help_topics/configuration.txt:630
9853
10527
msgid ""
9854
10528
"If present, the location of the default branch for pull or merge. This "
9855
10529
"option\n"
9857
10531
"--remember``."
9858
10532
msgstr ""
9859
10533
9860
#: en/help_topics/configuration.txt:594
10534
#: en/help_topics/configuration.txt:634
9861
10535
msgid ""
9862
10536
"push_location\n"
9863
10537
"~~~~~~~~~~~~~"
9864
10538
msgstr ""
9865
10539
9866
#: en/help_topics/configuration.txt:597
10540
#: en/help_topics/configuration.txt:637
9867
10541
msgid ""
9868
10542
"If present, the location of the default branch for push. This option\n"
9869
10543
"is normally set by the first ``push`` or ``push --remember``."
9870
10544
msgstr ""
9871
10545
9872
#: en/help_topics/configuration.txt:600
10546
#: en/help_topics/configuration.txt:640
9873
10547
msgid ""
9874
10548
"push_strict\n"
9875
10549
"~~~~~~~~~~~"
9876
10550
msgstr ""
9877
10551
9878
#: en/help_topics/configuration.txt:603
10552
#: en/help_topics/configuration.txt:643
9879
10553
msgid ""
9880
10554
"If present, defines the ``--strict`` option default value for checking\n"
9881
10555
"uncommitted changes before pushing."
9882
10556
msgstr ""
9883
10557
9884
#: en/help_topics/configuration.txt:606
10558
#: en/help_topics/configuration.txt:646
9885
10559
msgid ""
9886
10560
"dpush_strict\n"
9887
10561
"~~~~~~~~~~~~"
9888
10562
msgstr ""
9889
10563
9890
#: en/help_topics/configuration.txt:609
10564
#: en/help_topics/configuration.txt:649
9891
10565
msgid ""
9892
10566
"If present, defines the ``--strict`` option default value for checking\n"
9893
10567
"uncommitted changes before pushing into a different VCS without any\n"
9894
10568
"custom bzr metadata."
9895
10569
msgstr ""
9896
10570
9897
#: en/help_topics/configuration.txt:613
10571
#: en/help_topics/configuration.txt:653
9898
10572
msgid ""
9899
10573
"bound_location\n"
9900
10574
"~~~~~~~~~~~~~~"
9901
10575
msgstr ""
9902
10576
9903
#: en/help_topics/configuration.txt:616
10577
#: en/help_topics/configuration.txt:656
9904
10578
msgid ""
9905
10579
"The location that commits should go to when acting as a checkout.\n"
9906
10580
"This option is normally set by ``bind``."
9907
10581
msgstr ""
9908
10582
9909
#: en/help_topics/configuration.txt:619
10583
#: en/help_topics/configuration.txt:659
9910
10584
msgid ""
9911
10585
"bound\n"
9912
10586
"~~~~~"
9913
10587
msgstr ""
9914
10588
9915
#: en/help_topics/configuration.txt:622
10589
#: en/help_topics/configuration.txt:662
9916
10590
msgid ""
9917
10591
"If set to \"True\", the branch should act as a checkout, and push each "
9918
10592
"commit to\n"
9919
10593
"the bound_location. This option is normally set by ``bind``/``unbind``."
9920
10594
msgstr ""
9921
10595
9922
#: en/help_topics/configuration.txt:625
10596
#: en/help_topics/configuration.txt:665
9923
10597
msgid ""
9924
10598
"send_strict\n"
9925
10599
"~~~~~~~~~~~"
9926
10600
msgstr ""
9927
10601
9928
#: en/help_topics/configuration.txt:628
10602
#: en/help_topics/configuration.txt:668
9929
10603
msgid ""
9930
10604
"If present, defines the ``--strict`` option default value for checking\n"
9931
10605
"uncommitted changes before sending a merge directive."
9932
10606
msgstr ""
9933
10607
9934
#: en/help_topics/configuration.txt:631
10608
#: en/help_topics/configuration.txt:671
9935
10609
msgid ""
9936
10610
"add.maximum_file_size\n"
9937
10611
"~~~~~~~~~~~~~~~~~~~~~"
9938
10612
msgstr ""
9939
10613
9940
#: en/help_topics/configuration.txt:634
10614
#: en/help_topics/configuration.txt:674
9941
10615
msgid ""
9942
10616
"Defines the maximum file size the command line \"add\" operation will allow\n"
9943
10617
"in recursive mode, with files larger than this value being skipped. You "
9949
10623
"will disable skipping."
9950
10624
msgstr ""
9951
10625
9952
#: en/help_topics/configuration.txt:640
10626
#: en/help_topics/configuration.txt:680
9953
10627
msgid ""
9954
10628
"External Merge Tools\n"
9955
10629
"--------------------"
9956
10630
msgstr ""
9957
10631
9958
#: en/help_topics/configuration.txt:643
10632
#: en/help_topics/configuration.txt:683
9959
10633
msgid ""
9960
10634
"bzr.mergetool.<name>\n"
9961
10635
"~~~~~~~~~~~~~~~~~~~~"
9962
10636
msgstr ""
9963
10637
9964
#: en/help_topics/configuration.txt:646
10638
#: en/help_topics/configuration.txt:686
9965
10639
msgid ""
9966
10640
"Defines an external merge tool called <name> with the given command-line.\n"
9967
10641
"Arguments containing spaces should be quoted using single or double quotes. "
9969
10643
"executable may omit its path if it can be found on the PATH."
9970
10644
msgstr ""
9971
10645
9972
#: en/help_topics/configuration.txt:650
10646
#: en/help_topics/configuration.txt:690
9973
10647
msgid ""
9974
10648
"The following markers can be used in the command-line to substitute "
9975
10649
"filenames\n"
9976
10650
"involved in the merge conflict::"
9977
10651
msgstr ""
9978
10652
9979
#: en/help_topics/configuration.txt:653
10653
#: en/help_topics/configuration.txt:693
9980
10654
msgid ""
9981
10655
" {base} file.BASE\n"
9982
10656
" {this} file.THIS\n"
9987
10661
" succeeds."
9988
10662
msgstr ""
9989
10663
9990
#: en/help_topics/configuration.txt:662
10664
#: en/help_topics/configuration.txt:702
9991
10665
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
9992
10666
msgstr ""
9993
10667
9994
#: en/help_topics/configuration.txt:664
10668
#: en/help_topics/configuration.txt:704
9995
10669
msgid ""
9996
10670
"bzr.default_mergetool\n"
9997
10671
"~~~~~~~~~~~~~~~~~~~~~"
9998
10672
msgstr ""
9999
10673
10000
#: en/help_topics/configuration.txt:667
10674
#: en/help_topics/configuration.txt:707
10001
10675
msgid ""
10002
10676
"Specifies which external merge tool (as defined above) should be selected "
10003
10677
"by\n"
10004
10678
"default in tools such as ``bzr qconflicts``."
10005
10679
msgstr ""
10006
10680
10007
#: en/help_topics/configuration.txt:672
10681
#: en/help_topics/configuration.txt:712
10008
10682
msgid " bzr.default_mergetool = kdiff3\n"
10009
10683
msgstr ""
10010
10684
10133
10807
"--------------"
10134
10808
msgstr ""
10135
10809
10136
#: en/help_topics/conflict-types.txt:63
10810
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10811
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10812
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10813
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10814
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10137
10815
msgid "Typical message::"
10138
10816
msgstr ""
10139
10817
10265
10943
"copy\" has been renamed to THIS or OTHER."
10266
10944
msgstr ""
10267
10945
10268
#: en/help_topics/conflict-types.txt:134
10946
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10269
10947
msgid ""
10270
10948
"To resolve that kind of conflict, you should rebuild FILE from either "
10271
10949
"version\n"
10272
10950
"or a combination of both."
10273
10951
msgstr ""
10274
10952
10275
#: en/help_topics/conflict-types.txt:137
10953
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10954
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10955
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10956
#: en/help_topics/conflict-types.txt:361
10276
10957
msgid "``bzr resolve`` recognizes the following actions:"
10277
10958
msgstr ""
10278
10959
10290
10971
"``.OTHER`` files if they are still present in the working tree."
10291
10972
msgstr ""
10292
10973
10293
#: en/help_topics/conflict-types.txt:146
10974
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10975
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10976
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10977
#: en/help_topics/conflict-types.txt:369
10294
10978
msgid ""
10295
10979
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10296
10980
msgstr ""
10408
11092
"Resolving this issue depends very much on the particular scenario."
10409
11093
msgstr ""
10410
11094
10411
#: en/help_topics/conflict-types.txt:223
11095
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10412
11096
msgid ""
10413
11097
"To resolve that kind of conflict, you should either remove or rename the\n"
10414
11098
"children or the directory or a combination of both."
10797
11481
#: en/help_topics/current-formats.txt:3
10798
11482
msgid ""
10799
11483
":2a:\n"
10800
" (native) (default) First format for bzr 2.0 series. Uses group-\n"
11484
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
10801
11485
" compress storage. Provides rich roots which are a one-way\n"
10802
11486
" transition."
10803
11487
msgstr ""
10804
11488
10805
#: en/help_topics/current-formats.txt:8
10806
msgid ""
10807
":pack-0.92:\n"
10808
" (native) New in 0.92: Pack-based format with data compatible with\n"
10809
" dirstate-tags format repositories. Interoperates with bzr\n"
10810
" repositories before 0.92 but cannot be read by bzr < 0.92."
10811
msgstr ""
10812
10813
#: en/help_topics/current-formats.txt:13
10814
msgid ""
10815
":1.14:\n"
10816
" (native) A working-tree format that supports content filtering."
10817
msgstr ""
10818
10819
#: en/help_topics/current-formats.txt:16
10820
msgid ""
10821
":1.14-rich-root:\n"
10822
" (native) A variant of 1.14 that supports rich-root data (needed\n"
10823
" for bzr-svn and bzr-git)."
10824
msgstr ""
10825
10826
#: en/help_topics/current-formats.txt:20
11489
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
10827
11490
msgid ""
10828
11491
"\n"
10829
11492
"See :doc:`formats-help` for more about storage formats."
10866
11529
"-Dindex Trace major index operations.\n"
10867
11530
"-Dknit Trace knit operations.\n"
10868
11531
"-Dlock Trace when lockdir locks are taken or released.\n"
11532
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11533
" retrying the request.\n"
10869
11534
"-Dprogress Trace progress bar operations.\n"
10870
11535
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
10871
11536
"-Dmerge Emit information for debugging merges.\n"
11028
11693
"to use as a starting point::"
11029
11694
msgstr ""
11030
11695
11031
#: en/help_topics/eol.txt:42
11696
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11697
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11032
11698
msgid ""
11033
11699
" [name *]\n"
11034
11700
" eol = native"
11157
11823
11158
11824
#: en/help_topics/hidden-commands.txt:1
11159
11825
msgid ""
11160
"added List files added in working tree.\n"
11161
"ancestry List all revisions merged into this branch.\n"
11162
"assert-fail Test reporting of assertion failures\n"
11163
"bundle-info Output interesting stats about a bundle\n"
11164
"bundle-revisions Create a merge-directive for submitting changes.\n"
11165
"cat-revision Write out metadata for a revision.\n"
11166
"dpush Push into a different VCS without any custom bzr\n"
11167
" metadata.\n"
11168
"dump-btree Dump the contents of a btree index file to stdout.\n"
11169
"export-pot Export command helps and error messages in po "
11170
"format.\n"
11171
"file-id Print file_id of a particular file or directory.\n"
11172
"file-path Print path of file_ids to a file or directory.\n"
11173
"find-merge-base Find and print a base revision for merging two "
11826
"added List files added in working tree.\n"
11827
"ancestry List all revisions merged into this branch.\n"
11828
"assert-fail Test reporting of assertion failures\n"
11829
"bundle-info Output interesting stats about a bundle\n"
11830
"bundle-revisions Create a merge-directive for submitting changes.\n"
11831
"cat-revision Write out metadata for a revision.\n"
11832
"dump-btree Dump the contents of a btree index file to stdout.\n"
11833
"export-pot Export command helps and error messages in po format.\n"
11834
"file-id Print file_id of a particular file or directory.\n"
11835
"file-path Print path of file_ids to a file or directory.\n"
11836
"find-merge-base Find and print a base revision for merging two "
11174
11837
"branches.\n"
11175
"hooks Show hooks.\n"
11176
"inventory Show inventory of the current working copy or a\n"
11177
" revision.\n"
11178
"is-ignored Check if a path is ignored. [qbzr]\n"
11179
"is-versioned Check if a path is versioned. [qbzr]\n"
11180
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11181
"lookup-revision Lookup the revision-id from a revision-number\n"
11182
"merge-directive Generate a merge directive for auto-merge tools.\n"
11183
"modified List files modified in working tree.\n"
11184
"qcheckout-ala-explorer Checkout a branch. The checkout is always "
11185
"lightweight.\n"
11186
" [explorer]\n"
11187
"qhelp Shows a help window [qbzr]\n"
11188
"qmain The QBzr main application. [qbzr]\n"
11189
"qsubprocess Run some bzr command as subprocess. [qbzr]\n"
11190
"re-sign Create a digital signature for an existing revision.\n"
11191
"reference list, view and set branch locations for nested "
11192
"trees.\n"
11193
"relpath Show path of a file relative to root\n"
11194
"repair-workingtree Reset the working tree state file.\n"
11195
"revision-history Display the list of revision ids on a branch.\n"
11196
"revision-info Show revision number and revision id for a given\n"
11197
" revision identifier.\n"
11198
"rocks Statement of optimism.\n"
11199
"selftest Run internal test suite.\n"
11200
"shell-complete Show appropriate completions for context.\n"
11201
"test-script Run a shell-like test from a file.\n"
11202
"touching-revisions Return revision-ids which affected a particular "
11203
"file.\n"
11204
"unknowns List unknown files.\n"
11205
"wait-until-signalled Test helper for\n"
11206
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11838
"hooks Show hooks.\n"
11839
"inventory Show inventory of the current working copy or a "
11840
"revision.\n"
11841
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11842
"lookup-revision Lookup the revision-id from a revision-number\n"
11843
"merge-directive Generate a merge directive for auto-merge tools.\n"
11844
"modified List files modified in working tree.\n"
11845
"re-sign Create a digital signature for an existing revision.\n"
11846
"reference list, view and set branch locations for nested trees.\n"
11847
"relpath Show path of a file relative to root\n"
11848
"repair-workingtree Reset the working tree state file.\n"
11849
"revision-history Display the list of revision ids on a branch.\n"
11850
"revision-info Show revision number and revision id for a given "
11851
"revision\n"
11852
" identifier.\n"
11853
"rocks Statement of optimism.\n"
11854
"selftest Run internal test suite.\n"
11855
"shell-complete Show appropriate completions for context.\n"
11856
"test-script Run a shell-like test from a file.\n"
11857
"touching-revisions Return revision-ids which affected a particular file.\n"
11858
"unknowns List unknown files.\n"
11859
"wait-until-signalled Test helper for\n"
11860
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11207
11861
msgstr ""
11208
11862
11209
11863
#: en/help_topics/hooks.txt:1
11213
11867
"====="
11214
11868
msgstr ""
11215
11869
11216
#: en/help_topics/hooks.txt:5
11870
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11217
11871
msgid ""
11218
11872
"Introduction\n"
11219
11873
"------------"
11280
11934
"~~~~~~~~~~~~~~~~~~"
11281
11935
msgstr ""
11282
11936
11283
#: en/help_topics/hooks.txt:38
11937
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11938
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11284
11939
msgid "Introduced in: 2.2"
11285
11940
msgstr ""
11286
11941
11298
11953
"~~~~"
11299
11954
msgstr ""
11300
11955
11301
#: en/help_topics/hooks.txt:48
11956
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11957
#: en/help_topics/hooks.txt:304
11302
11958
msgid "Introduced in: 1.8"
11303
11959
msgstr ""
11304
11960
11328
11984
"~~~~~~~~~~~~~~~~~~~~~~"
11329
11985
msgstr ""
11330
11986
11331
#: en/help_topics/hooks.txt:66
11987
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11332
11988
msgid "Introduced in: 1.4"
11333
11989
msgstr ""
11334
11990
11340
11996
"uncommit will all trigger this hook."
11341
11997
msgstr ""
11342
11998
11343
#: en/help_topics/hooks.txt:73
11999
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11344
12000
msgid ""
11345
12001
"post_commit\n"
11346
12002
"~~~~~~~~~~~"
11347
12003
msgstr ""
11348
12004
11349
#: en/help_topics/hooks.txt:76
12005
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12006
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12007
#: en/help_topics/hooks.txt:145
11350
12008
msgid "Introduced in: 0.15"
11351
12009
msgstr ""
11352
12010
11490
12148
11491
12149
#: en/help_topics/hooks.txt:169
11492
12150
msgid ""
11493
"BzrDirHooks\n"
11494
"-----------"
12151
"CommandHooks\n"
12152
"------------"
11495
12153
msgstr ""
11496
12154
11497
12155
#: en/help_topics/hooks.txt:172
11498
12156
msgid ""
11499
"post_repo_init\n"
11500
"~~~~~~~~~~~~~~"
11501
msgstr ""
11502
11503
#: en/help_topics/hooks.txt:177
11504
msgid ""
11505
"Invoked after a repository has been initialized. post_repo_init is\n"
11506
"called with a bzrlib.bzrdir.RepoInitHookParams."
11507
msgstr ""
11508
11509
#: en/help_topics/hooks.txt:180
11510
msgid ""
11511
"pre_open\n"
11512
"~~~~~~~~"
11513
msgstr ""
11514
11515
#: en/help_topics/hooks.txt:183
11516
msgid "Introduced in: 1.14"
11517
msgstr ""
11518
11519
#: en/help_topics/hooks.txt:185
11520
msgid ""
11521
"Invoked before attempting to open a BzrDir with the transport that the\n"
11522
"open will use."
11523
msgstr ""
11524
11525
#: en/help_topics/hooks.txt:188
11526
msgid ""
11527
"CommandHooks\n"
11528
"------------"
11529
msgstr ""
11530
11531
#: en/help_topics/hooks.txt:191
11532
msgid ""
11533
12157
"extend_command\n"
11534
12158
"~~~~~~~~~~~~~~"
11535
12159
msgstr ""
11536
12160
11537
#: en/help_topics/hooks.txt:194
12161
#: en/help_topics/hooks.txt:175
11538
12162
msgid "Introduced in: 1.13"
11539
12163
msgstr ""
11540
12164
11541
#: en/help_topics/hooks.txt:196
12165
#: en/help_topics/hooks.txt:177
11542
12166
msgid ""
11543
12167
"Called after creating a command object to allow modifications such as\n"
11544
12168
"adding or removing options, docs etc. Called with the new\n"
11545
12169
"bzrlib.commands.Command object."
11546
12170
msgstr ""
11547
12171
11548
#: en/help_topics/hooks.txt:200
12172
#: en/help_topics/hooks.txt:181
11549
12173
msgid ""
11550
12174
"get_command\n"
11551
12175
"~~~~~~~~~~~"
11552
12176
msgstr ""
11553
12177
11554
#: en/help_topics/hooks.txt:203
12178
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12179
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11555
12180
msgid "Introduced in: 1.17"
11556
12181
msgstr ""
11557
12182
11558
#: en/help_topics/hooks.txt:205
12183
#: en/help_topics/hooks.txt:186
11559
12184
msgid ""
11560
12185
"Called when creating a single command. Called with (cmd_or_None,\n"
11561
12186
"command_name). get_command should either return the cmd_or_None\n"
11565
12190
"plugin_cmds.register_lazy."
11566
12191
msgstr ""
11567
12192
11568
#: en/help_topics/hooks.txt:212
12193
#: en/help_topics/hooks.txt:193
11569
12194
msgid ""
11570
12195
"get_missing_command\n"
11571
12196
"~~~~~~~~~~~~~~~~~~~"
11572
12197
msgstr ""
11573
12198
11574
#: en/help_topics/hooks.txt:217
12199
#: en/help_topics/hooks.txt:198
11575
12200
msgid ""
11576
12201
"Called when creating a single command if no command could be found.\n"
11577
12202
"Called with (command_name). get_missing_command should either return\n"
11578
12203
"None, or a Command object to be used for the command."
11579
12204
msgstr ""
11580
12205
11581
#: en/help_topics/hooks.txt:221
12206
#: en/help_topics/hooks.txt:202
11582
12207
msgid ""
11583
12208
"list_commands\n"
11584
12209
"~~~~~~~~~~~~~"
11585
12210
msgstr ""
11586
12211
11587
#: en/help_topics/hooks.txt:226
12212
#: en/help_topics/hooks.txt:207
11588
12213
msgid ""
11589
12214
"Called when enumerating commands. Called with a set of cmd_name\n"
11590
12215
"strings for all the commands found so far. This set is safe to mutate\n"
11592
12217
"set of command names."
11593
12218
msgstr ""
11594
12219
11595
#: en/help_topics/hooks.txt:231
12220
#: en/help_topics/hooks.txt:212
11596
12221
msgid ""
11597
12222
"_ConfigHooks\n"
11598
12223
"------------"
11599
12224
msgstr ""
11600
12225
11601
#: en/help_topics/hooks.txt:234
12226
#: en/help_topics/hooks.txt:215
11602
12227
msgid ""
11603
12228
"get\n"
11604
12229
"~~~"
11605
12230
msgstr ""
11606
12231
11607
#: en/help_topics/hooks.txt:237
12232
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12233
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12234
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12235
#: en/help_topics/hooks.txt:443
11608
12236
msgid "Introduced in: 2.4"
11609
12237
msgstr ""
11610
12238
11611
#: en/help_topics/hooks.txt:239
12239
#: en/help_topics/hooks.txt:220
11612
12240
msgid ""
11613
12241
"Invoked when a config option is read. The signature is (stack, name,\n"
11614
12242
"value)."
11615
12243
msgstr ""
11616
12244
11617
#: en/help_topics/hooks.txt:242
12245
#: en/help_topics/hooks.txt:223
11618
12246
msgid ""
11619
12247
"load\n"
11620
12248
"~~~~"
11621
12249
msgstr ""
11622
12250
11623
#: en/help_topics/hooks.txt:247
12251
#: en/help_topics/hooks.txt:228
11624
12252
msgid "Invoked when a config store is loaded. The signature is (store)."
11625
12253
msgstr ""
11626
12254
11627
#: en/help_topics/hooks.txt:249
12255
#: en/help_topics/hooks.txt:230
11628
12256
msgid ""
11629
12257
"remove\n"
11630
12258
"~~~~~~"
11631
12259
msgstr ""
11632
12260
11633
#: en/help_topics/hooks.txt:254
12261
#: en/help_topics/hooks.txt:235
11634
12262
msgid ""
11635
12263
"Invoked when a config option is removed. The signature is (stack,\n"
11636
12264
"name)."
11637
12265
msgstr ""
11638
12266
11639
#: en/help_topics/hooks.txt:257
12267
#: en/help_topics/hooks.txt:238
11640
12268
msgid ""
11641
12269
"save\n"
11642
12270
"~~~~"
11643
12271
msgstr ""
11644
12272
11645
#: en/help_topics/hooks.txt:262
12273
#: en/help_topics/hooks.txt:243
11646
12274
msgid "Invoked when a config store is saved. The signature is (store)."
11647
12275
msgstr ""
11648
12276
12277
#: en/help_topics/hooks.txt:245
12278
msgid ""
12279
"set\n"
12280
"~~~"
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:250
12284
msgid ""
12285
"Invoked when a config option is set. The signature is (stack, name,\n"
12286
"value)."
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:253
12290
msgid ""
12291
"ControlDirHooks\n"
12292
"---------------"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:256
12296
msgid ""
12297
"post_repo_init\n"
12298
"~~~~~~~~~~~~~~"
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:261
12302
msgid ""
12303
"Invoked after a repository has been initialized. post_repo_init is\n"
12304
"called with a bzrlib.controldir.RepoInitHookParams."
12305
msgstr ""
12306
11649
12307
#: en/help_topics/hooks.txt:264
11650
12308
msgid ""
11651
"set\n"
11652
"~~~"
12309
"pre_open\n"
12310
"~~~~~~~~"
12311
msgstr ""
12312
12313
#: en/help_topics/hooks.txt:267
12314
msgid "Introduced in: 1.14"
11653
12315
msgstr ""
11654
12316
11655
12317
#: en/help_topics/hooks.txt:269
11656
12318
msgid ""
11657
"Invoked when a config option is set. The signature is (stack, name,\n"
11658
"value)."
12319
"Invoked before attempting to open a ControlDir with the transport that\n"
12320
"the open will use."
11659
12321
msgstr ""
11660
12322
11661
12323
#: en/help_topics/hooks.txt:272
11670
12332
"~~~~~~~~~~"
11671
12333
msgstr ""
11672
12334
11673
#: en/help_topics/hooks.txt:278
12335
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12336
#: en/help_topics/hooks.txt:521
11674
12337
msgid "Introduced in: 1.15"
11675
12338
msgstr ""
11676
12339
11745
12408
11746
12409
#: en/help_topics/hooks.txt:323
11747
12410
msgid ""
12411
"post_merge\n"
12412
"~~~~~~~~~~"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12416
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12417
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12418
msgid "Introduced in: 2.5"
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:328
12422
msgid ""
12423
"Called after a merge. Receives a Merger object as the single argument.\n"
12424
"The return value is ignored."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:331
12428
msgid ""
12429
"pre_merge\n"
12430
"~~~~~~~~~"
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:336
12434
msgid ""
12435
"Called before a merge. Receives a Merger object as the single\n"
12436
"argument."
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:339
12440
msgid ""
11748
12441
"MergeDirectiveHooks\n"
11749
12442
"-------------------"
11750
12443
msgstr ""
11751
12444
11752
#: en/help_topics/hooks.txt:326
12445
#: en/help_topics/hooks.txt:342
11753
12446
msgid ""
11754
12447
"merge_request_body\n"
11755
12448
"~~~~~~~~~~~~~~~~~~"
11756
12449
msgstr ""
11757
12450
11758
#: en/help_topics/hooks.txt:329
12451
#: en/help_topics/hooks.txt:345
11759
12452
msgid "Introduced in: 1.15.0"
11760
12453
msgstr ""
11761
12454
11762
#: en/help_topics/hooks.txt:331
12455
#: en/help_topics/hooks.txt:347
11763
12456
msgid ""
11764
12457
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
11765
12458
"request. Callbacks must return a body. If more than one callback is\n"
11766
12459
"registered, the output of one callback is provided to the next."
11767
12460
msgstr ""
11768
12461
11769
#: en/help_topics/hooks.txt:335
12462
#: en/help_topics/hooks.txt:351
11770
12463
msgid ""
11771
12464
"MessageEditorHooks\n"
11772
12465
"------------------"
11773
12466
msgstr ""
11774
12467
11775
#: en/help_topics/hooks.txt:338
12468
#: en/help_topics/hooks.txt:354
11776
12469
msgid ""
11777
12470
"commit_message_template\n"
11778
12471
"~~~~~~~~~~~~~~~~~~~~~~~"
11779
12472
msgstr ""
11780
12473
11781
#: en/help_topics/hooks.txt:341
12474
#: en/help_topics/hooks.txt:357
11782
12475
msgid "Introduced in: 1.10"
11783
12476
msgstr ""
11784
12477
11785
#: en/help_topics/hooks.txt:343
12478
#: en/help_topics/hooks.txt:359
11786
12479
msgid ""
11787
12480
"Called when a commit message is being generated.\n"
11788
12481
"commit_message_template is called with the bzrlib.commit.Commit object\n"
11793
12486
"second, and so on."
11794
12487
msgstr ""
11795
12488
11796
#: en/help_topics/hooks.txt:351
12489
#: en/help_topics/hooks.txt:367
11797
12490
msgid ""
11798
12491
"set_commit_message\n"
11799
12492
"~~~~~~~~~~~~~~~~~~"
11800
12493
msgstr ""
11801
12494
11802
#: en/help_topics/hooks.txt:356
12495
#: en/help_topics/hooks.txt:372
11803
12496
msgid ""
11804
12497
"Set a fixed commit message. set_commit_message is called with the\n"
11805
12498
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
11808
12501
"should use the message editor as normal."
11809
12502
msgstr ""
11810
12503
11811
#: en/help_topics/hooks.txt:362
12504
#: en/help_topics/hooks.txt:378
11812
12505
msgid ""
11813
12506
"MutableTreeHooks\n"
11814
12507
"----------------"
11815
12508
msgstr ""
11816
12509
11817
#: en/help_topics/hooks.txt:368
12510
#: en/help_topics/hooks.txt:381
12511
msgid ""
12512
"post_build_tree\n"
12513
"~~~~~~~~~~~~~~~"
12514
msgstr ""
12515
12516
#: en/help_topics/hooks.txt:386
12517
msgid ""
12518
"Called after a completely new tree is built. The hook is called with\n"
12519
"the tree as its only argument."
12520
msgstr ""
12521
12522
#: en/help_topics/hooks.txt:392
11818
12523
msgid "Introduced in: 2.0"
11819
12524
msgstr ""
11820
12525
11821
#: en/help_topics/hooks.txt:370
12526
#: en/help_topics/hooks.txt:394
11822
12527
msgid ""
11823
12528
"Called after a commit is performed on a tree. The hook is called with\n"
11824
12529
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
11826
12531
"that object."
11827
12532
msgstr ""
11828
12533
11829
#: en/help_topics/hooks.txt:375
12534
#: en/help_topics/hooks.txt:399
12535
msgid ""
12536
"post_transform\n"
12537
"~~~~~~~~~~~~~~"
12538
msgstr ""
12539
12540
#: en/help_topics/hooks.txt:404
12541
msgid ""
12542
"Called after a tree transform has been performed on a tree. The hook\n"
12543
"is called with the tree that is being transformed and the transform."
12544
msgstr ""
12545
12546
#: en/help_topics/hooks.txt:407
12547
msgid ""
12548
"pre_transform\n"
12549
"~~~~~~~~~~~~~"
12550
msgstr ""
12551
12552
#: en/help_topics/hooks.txt:412
12553
msgid ""
12554
"Called before a tree transform on this tree. The hook is called with\n"
12555
"the tree that is being transformed and the transform."
12556
msgstr ""
12557
12558
#: en/help_topics/hooks.txt:415
11830
12559
msgid ""
11831
12560
"start_commit\n"
11832
12561
"~~~~~~~~~~~~"
11833
12562
msgstr ""
11834
12563
11835
#: en/help_topics/hooks.txt:380
12564
#: en/help_topics/hooks.txt:420
11836
12565
msgid ""
11837
12566
"Called before a commit is performed on a tree. The start commit hook\n"
11838
12567
"is able to change the tree before the commit takes place. start_commit\n"
11840
12569
"being performed on."
11841
12570
msgstr ""
11842
12571
11843
#: en/help_topics/hooks.txt:385
12572
#: en/help_topics/hooks.txt:425
11844
12573
msgid ""
11845
12574
"SmartClientHooks\n"
11846
12575
"----------------"
11847
12576
msgstr ""
11848
12577
11849
#: en/help_topics/hooks.txt:388
12578
#: en/help_topics/hooks.txt:428
11850
12579
msgid ""
11851
12580
"call\n"
11852
12581
"~~~~"
11853
12582
msgstr ""
11854
12583
11855
#: en/help_topics/hooks.txt:391
12584
#: en/help_topics/hooks.txt:431
11856
12585
msgid "Introduced in: unknown"
11857
12586
msgstr ""
11858
12587
11859
#: en/help_topics/hooks.txt:393
12588
#: en/help_topics/hooks.txt:433
11860
12589
msgid ""
11861
12590
"Called when the smart client is submitting a request to the smart\n"
11862
12591
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
11863
12592
"Streaming request bodies, and responses, are not accessible."
11864
12593
msgstr ""
11865
12594
11866
#: en/help_topics/hooks.txt:397
12595
#: en/help_topics/hooks.txt:437
11867
12596
msgid ""
11868
12597
"SmartServerHooks\n"
11869
12598
"----------------"
11870
12599
msgstr ""
11871
12600
11872
#: en/help_topics/hooks.txt:400
12601
#: en/help_topics/hooks.txt:440
11873
12602
msgid ""
11874
12603
"server_exception\n"
11875
12604
"~~~~~~~~~~~~~~~~"
11876
12605
msgstr ""
11877
12606
11878
#: en/help_topics/hooks.txt:405
12607
#: en/help_topics/hooks.txt:445
11879
12608
msgid ""
11880
12609
"Called by the bzr server when an exception occurs. server_exception is\n"
11881
12610
"called with the sys.exc_info() tuple return true for the hook if the\n"
11883
12612
"normally."
11884
12613
msgstr ""
11885
12614
11886
#: en/help_topics/hooks.txt:410
12615
#: en/help_topics/hooks.txt:450
11887
12616
msgid ""
11888
12617
"server_started\n"
11889
12618
"~~~~~~~~~~~~~~"
11890
12619
msgstr ""
11891
12620
11892
#: en/help_topics/hooks.txt:413
12621
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
11893
12622
msgid "Introduced in: 0.16"
11894
12623
msgstr ""
11895
12624
11896
#: en/help_topics/hooks.txt:415
12625
#: en/help_topics/hooks.txt:455
11897
12626
msgid ""
11898
12627
"Called by the bzr server when it starts serving a directory.\n"
11899
12628
"server_started is called with (backing urls, public url), where\n"
11902
12631
"served."
11903
12632
msgstr ""
11904
12633
11905
#: en/help_topics/hooks.txt:421
12634
#: en/help_topics/hooks.txt:461
11906
12635
msgid ""
11907
12636
"server_started_ex\n"
11908
12637
"~~~~~~~~~~~~~~~~~"
11909
12638
msgstr ""
11910
12639
11911
#: en/help_topics/hooks.txt:426
12640
#: en/help_topics/hooks.txt:466
11912
12641
msgid ""
11913
12642
"Called by the bzr server when it starts serving a directory.\n"
11914
12643
"server_started is called with (backing_urls, server_obj)."
11915
12644
msgstr ""
11916
12645
11917
#: en/help_topics/hooks.txt:429
12646
#: en/help_topics/hooks.txt:469
11918
12647
msgid ""
11919
12648
"server_stopped\n"
11920
12649
"~~~~~~~~~~~~~~"
11921
12650
msgstr ""
11922
12651
11923
#: en/help_topics/hooks.txt:434
12652
#: en/help_topics/hooks.txt:474
11924
12653
msgid ""
11925
12654
"Called by the bzr server when it stops serving a directory.\n"
11926
12655
"server_stopped is called with the same parameters as the\n"
11927
12656
"server_started hook: (backing_urls, public_url)."
11928
12657
msgstr ""
11929
12658
11930
#: en/help_topics/hooks.txt:438
12659
#: en/help_topics/hooks.txt:478
11931
12660
msgid ""
11932
12661
"StatusHooks\n"
11933
12662
"-----------"
11934
12663
msgstr ""
11935
12664
11936
#: en/help_topics/hooks.txt:441
12665
#: en/help_topics/hooks.txt:481
11937
12666
msgid ""
11938
12667
"post_status\n"
11939
12668
"~~~~~~~~~~~"
11940
12669
msgstr ""
11941
12670
11942
#: en/help_topics/hooks.txt:444
12671
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
11943
12672
msgid "Introduced in: 2.3"
11944
12673
msgstr ""
11945
12674
11946
#: en/help_topics/hooks.txt:446
12675
#: en/help_topics/hooks.txt:486
11947
12676
msgid ""
11948
12677
"Called with argument StatusHookParams after Bazaar has displayed the\n"
11949
12678
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
11952
12681
"status command. to_file is the output stream for writing."
11953
12682
msgstr ""
11954
12683
11955
#: en/help_topics/hooks.txt:452
12684
#: en/help_topics/hooks.txt:492
11956
12685
msgid ""
11957
12686
"pre_status\n"
11958
12687
"~~~~~~~~~~"
11959
12688
msgstr ""
11960
12689
11961
#: en/help_topics/hooks.txt:457
12690
#: en/help_topics/hooks.txt:497
11962
12691
msgid ""
11963
12692
"Called with argument StatusHookParams before Bazaar displays the\n"
11964
12693
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
11967
12696
"status command. to_file is the output stream for writing."
11968
12697
msgstr ""
11969
12698
11970
#: en/help_topics/hooks.txt:463
12699
#: en/help_topics/hooks.txt:503
12700
msgid ""
12701
"TransportHooks\n"
12702
"--------------"
12703
msgstr ""
12704
12705
#: en/help_topics/hooks.txt:506
12706
msgid ""
12707
"post_connect\n"
12708
"~~~~~~~~~~~~"
12709
msgstr ""
12710
12711
#: en/help_topics/hooks.txt:511
12712
msgid ""
12713
"Called after a new connection is established or a reconnect occurs.\n"
12714
"The sole argument passed is either the connected transport or smart\n"
12715
"medium instance."
12716
msgstr ""
12717
12718
#: en/help_topics/hooks.txt:515
11971
12719
msgid ""
11972
12720
"RioVersionInfoBuilderHooks\n"
11973
12721
"--------------------------"
11974
12722
msgstr ""
11975
12723
11976
#: en/help_topics/hooks.txt:466
12724
#: en/help_topics/hooks.txt:518
11977
12725
msgid ""
11978
12726
"revision\n"
11979
12727
"~~~~~~~~"
11980
12728
msgstr ""
11981
12729
11982
#: en/help_topics/hooks.txt:471
12730
#: en/help_topics/hooks.txt:523
11983
12731
msgid ""
11984
12732
"Invoked when adding information about a revision to the RIO stanza\n"
11985
12733
"that is printed. revision is called with a revision object and a RIO\n"
12005
12753
12006
12754
#: en/help_topics/location-alias.txt:9
12007
12755
msgid ""
12008
" :parent the parent of this branch\n"
12009
" :submit the submit branch for this branch\n"
12010
" :public the public location of this branch\n"
12011
" :bound the branch this branch is bound to, for bound branches\n"
12012
" :push the saved location used for `bzr push` with no arguments\n"
12013
" :this this branch"
12756
" :bound The branch this branch is bound to, for bound branches.\n"
12757
" :parent The parent of this branch.\n"
12758
" :public The public location of this branch.\n"
12759
" :push The saved location used for `bzr push` with no arguments.\n"
12760
" :submit The submit branch for this branch.\n"
12761
" :this This branch."
12014
12762
msgstr ""
12015
12763
12016
12764
#: en/help_topics/location-alias.txt:16
12018
12766
msgstr ""
12019
12767
12020
12768
#: en/help_topics/location-alias.txt:18
12021
msgid " bzr push :parent"
12769
msgid " bzr push :parent\n"
12022
12770
msgstr ""
12023
12771
12024
12772
#: en/help_topics/log-formats.txt:1
12082
12830
msgstr ""
12083
12831
12084
12832
#: en/help_topics/other-formats.txt:3
12085
msgid "No experimental formats are available."
12833
msgid "Experimental formats are shown below."
12086
12834
msgstr ""
12087
12835
12088
12836
#: en/help_topics/other-formats.txt:5
12089
12837
msgid ""
12838
":development-colo:\n"
12839
" (native) The 2a format with experimental support for colocated\n"
12840
" branches."
12841
msgstr ""
12842
12843
#: en/help_topics/other-formats.txt:9
12844
msgid ""
12090
12845
"\n"
12091
"No deprecated formats are available."
12846
"Deprecated formats are shown below."
12847
msgstr ""
12848
12849
#: en/help_topics/other-formats.txt:12
12850
msgid ""
12851
":pack-0.92:\n"
12852
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12853
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12854
" by bzr < 0.92."
12092
12855
msgstr ""
12093
12856
12094
12857
#: en/help_topics/patterns.txt:1
12226
12989
"\tSelects the last revision of a specified branch.\n"
12227
12990
":tag:\n"
12228
12991
"\tSelects a revision identified by a tag name.\n"
12229
":package:\n"
12230
"\tSelects the revision corresponding to a version of a package.\n"
12231
12992
":revno:\n"
12232
12993
"\tSelects a revision using a number.\n"
12233
12994
":before:\n"
12240
13001
"\tSelects the nth revision from the end."
12241
13002
msgstr ""
12242
13003
13004
#: en/help_topics/revisionspec.txt:53
13005
msgid "In addition, plugins can provide other keywords."
13006
msgstr ""
13007
12243
13008
#: en/help_topics/revisionspec.txt:55
12244
msgid "In addition, plugins can provide other keywords."
13009
msgid "A detailed description of each keyword is given below."
12245
13010
msgstr ""
12246
13011
12247
13012
#: en/help_topics/revisionspec.txt:57
12248
msgid "A detailed description of each keyword is given below."
13013
msgid ":revid:"
12249
13014
msgstr ""
12250
13015
12251
13016
#: en/help_topics/revisionspec.txt:59
12252
msgid ":revid:"
12253
msgstr ""
12254
12255
#: en/help_topics/revisionspec.txt:61
12256
13017
msgid ""
12257
13018
" Supply a specific revision id, that can be used to specify any\n"
12258
13019
" revision id in the ancestry of the branch.\n"
12260
13021
" Examples::"
12261
13022
msgstr ""
12262
13023
13024
#: en/help_topics/revisionspec.txt:64
13025
msgid ""
13026
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13027
msgstr ""
13028
12263
13029
#: en/help_topics/revisionspec.txt:66
12264
msgid ""
12265
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13030
msgid ":submit:"
12266
13031
msgstr ""
12267
13032
12268
13033
#: en/help_topics/revisionspec.txt:68
12269
msgid ":submit:"
12270
msgstr ""
12271
12272
#: en/help_topics/revisionspec.txt:70
12273
13034
msgid ""
12274
13035
" Diffing against this shows all the changes that were made in this "
12275
13036
"branch,\n"
12278
13039
" is specified, the parent branch is used instead."
12279
13040
msgstr ""
12280
13041
12281
#: en/help_topics/revisionspec.txt:75
13042
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12282
13043
msgid ""
12283
13044
" The common ancestor is the last revision that existed in both\n"
12284
13045
" branches. Usually this is the branch point, but it could also be\n"
12285
13046
" a revision that was merged."
12286
13047
msgstr ""
12287
13048
13049
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13050
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13051
#: en/help_topics/revisionspec.txt:153
13052
msgid " Examples::"
13053
msgstr ""
13054
12288
13055
#: en/help_topics/revisionspec.txt:79
12289
msgid " Examples::"
13056
msgid " $ bzr diff -r submit:"
12290
13057
msgstr ""
12291
13058
12292
13059
#: en/help_topics/revisionspec.txt:81
12293
msgid " $ bzr diff -r submit:"
13060
msgid ":ancestor:"
12294
13061
msgstr ""
12295
13062
12296
13063
#: en/help_topics/revisionspec.txt:83
12297
msgid ":ancestor:"
12298
msgstr ""
12299
12300
#: en/help_topics/revisionspec.txt:85
12301
13064
msgid " Supply the path to a branch to select the common ancestor."
12302
13065
msgstr ""
12303
13066
12304
#: en/help_topics/revisionspec.txt:91
13067
#: en/help_topics/revisionspec.txt:89
12305
13068
msgid ""
12306
13069
" This is frequently used with 'diff' to return all of the changes\n"
12307
13070
" that your branch introduces, while excluding the changes that you\n"
12308
13071
" have not merged from the remote branch."
12309
13072
msgstr ""
12310
13073
12311
#: en/help_topics/revisionspec.txt:97
13074
#: en/help_topics/revisionspec.txt:95
12312
13075
msgid ""
12313
13076
" ancestor:/path/to/branch\n"
12314
13077
" $ bzr diff -r ancestor:../../mainline/branch"
12315
13078
msgstr ""
12316
13079
13080
#: en/help_topics/revisionspec.txt:98
13081
msgid ":date:"
13082
msgstr ""
13083
12317
13084
#: en/help_topics/revisionspec.txt:100
12318
msgid ":date:"
12319
msgstr ""
12320
12321
#: en/help_topics/revisionspec.txt:102
12322
13085
msgid ""
12323
13086
" Supply a datestamp to select the first revision that matches the date.\n"
12324
13087
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12326
13089
" at a specified time)."
12327
13090
msgstr ""
12328
13091
13092
#: en/help_topics/revisionspec.txt:105
13093
msgid " One way to display all the changes since yesterday would be::"
13094
msgstr ""
13095
12329
13096
#: en/help_topics/revisionspec.txt:107
12330
msgid " One way to display all the changes since yesterday would be::"
12331
msgstr ""
12332
12333
#: en/help_topics/revisionspec.txt:109
12334
13097
msgid " bzr log -r date:yesterday.."
12335
13098
msgstr ""
12336
13099
12337
#: en/help_topics/revisionspec.txt:113
13100
#: en/help_topics/revisionspec.txt:111
12338
13101
msgid ""
12339
13102
" date:yesterday -> select the first revision since "
12340
13103
"yesterday\n"
12342
13105
" August 14th, 2006 at 5:10pm."
12343
13106
msgstr ""
12344
13107
13108
#: en/help_topics/revisionspec.txt:115
13109
msgid ":branch:"
13110
msgstr ""
13111
12345
13112
#: en/help_topics/revisionspec.txt:117
12346
msgid ":branch:"
12347
msgstr ""
12348
12349
#: en/help_topics/revisionspec.txt:119
12350
13113
msgid " Supply the path to a branch to select its last revision."
12351
13114
msgstr ""
12352
13115
13116
#: en/help_topics/revisionspec.txt:121
13117
msgid " branch:/path/to/branch"
13118
msgstr ""
13119
12353
13120
#: en/help_topics/revisionspec.txt:123
12354
msgid " branch:/path/to/branch"
13121
msgid ":tag:"
12355
13122
msgstr ""
12356
13123
12357
13124
#: en/help_topics/revisionspec.txt:125
12358
msgid ":tag:"
13125
msgid " Tags are stored in the branch and created by the 'tag' command."
12359
13126
msgstr ""
12360
13127
12361
13128
#: en/help_topics/revisionspec.txt:127
12362
msgid " Tags are stored in the branch and created by the 'tag' command."
13129
msgid ":revno:"
12363
13130
msgstr ""
12364
13131
12365
13132
#: en/help_topics/revisionspec.txt:129
12366
msgid ":package:"
12367
msgstr ""
12368
12369
#: en/help_topics/revisionspec.txt:131
12370
msgid ""
12371
" Given a package version number this revision specifier will allow you\n"
12372
" specify the revision corresponding to the upload of that version of\n"
12373
" the package."
12374
msgstr ""
12375
12376
#: en/help_topics/revisionspec.txt:135
12377
msgid ":revno:"
12378
msgstr ""
12379
12380
#: en/help_topics/revisionspec.txt:137
12381
13133
msgid ""
12382
13134
" Use an integer to specify a revision in the history of the branch.\n"
12383
13135
" Optionally a branch can be specified. A negative number will count\n"
12387
13139
" Examples::"
12388
13140
msgstr ""
12389
13141
12390
#: en/help_topics/revisionspec.txt:144
13142
#: en/help_topics/revisionspec.txt:136
12391
13143
msgid ""
12392
13144
" revno:1 -> return the first revision of this branch\n"
12393
13145
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12399
13151
" your history is very long."
12400
13152
msgstr ""
12401
13153
12402
#: en/help_topics/revisionspec.txt:153
13154
#: en/help_topics/revisionspec.txt:145
12403
13155
msgid ":before:"
12404
13156
msgstr ""
12405
13157
12406
#: en/help_topics/revisionspec.txt:155
13158
#: en/help_topics/revisionspec.txt:147
12407
13159
msgid ""
12408
13160
" Supply any revision spec to return the parent of that revision. This "
12409
13161
"is\n"
12412
13164
" of a branch."
12413
13165
msgstr ""
12414
13166
12415
#: en/help_topics/revisionspec.txt:159
13167
#: en/help_topics/revisionspec.txt:151
12416
13168
msgid ""
12417
13169
" It is an error to request the parent of the null revision (before:0)."
12418
13170
msgstr ""
12419
13171
12420
#: en/help_topics/revisionspec.txt:163
13172
#: en/help_topics/revisionspec.txt:155
12421
13173
msgid ""
12422
13174
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12423
13175
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12429
13181
" This is equivalent to: bzr diff -c 1913"
12430
13182
msgstr ""
12431
13183
12432
#: en/help_topics/revisionspec.txt:171
13184
#: en/help_topics/revisionspec.txt:163
12433
13185
msgid ":annotate:"
12434
13186
msgstr ""
12435
13187
12436
#: en/help_topics/revisionspec.txt:173
13188
#: en/help_topics/revisionspec.txt:165
12437
13189
msgid ""
12438
13190
" Select the revision that last modified the specified line. Line is\n"
12439
13191
" specified as path:number. Path is a relative path to the file. "
12442
13194
" committed version of the file."
12443
13195
msgstr ""
12444
13196
12445
#: en/help_topics/revisionspec.txt:178
13197
#: en/help_topics/revisionspec.txt:170
12446
13198
msgid ":mainline:"
12447
13199
msgstr ""
12448
13200
12449
#: en/help_topics/revisionspec.txt:180
13201
#: en/help_topics/revisionspec.txt:172
12450
13202
msgid ""
12451
13203
" Select the revision that merged the specified revision into mainline."
12452
13204
msgstr ""
12453
13205
12454
#: en/help_topics/revisionspec.txt:182
13206
#: en/help_topics/revisionspec.txt:174
12455
13207
msgid ":last:"
12456
13208
msgstr ""
12457
13209
12458
#: en/help_topics/revisionspec.txt:184
13210
#: en/help_topics/revisionspec.txt:176
12459
13211
msgid ""
12460
13212
" Supply a positive number to get the nth revision from the end.\n"
12461
13213
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12462
13214
" Examples::"
12463
13215
msgstr ""
12464
13216
12465
#: en/help_topics/revisionspec.txt:188
13217
#: en/help_topics/revisionspec.txt:180
12466
13218
msgid ""
12467
13219
" last:1 -> return the last revision\n"
12468
13220
" last:3 -> return the revision 2 before the end.\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1