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