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