« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6437.68.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6437.68.1
- Committer: Ross Lagerwall
- Date: 2012-08-07 06:32:51 UTC
- mto: (6437.63.5 2.5)
- mto: This revision was merged to the branch mainline in revision 6558.
- Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore
bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build
bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build
- files added:
- bzrlib/tests/per_branch/test_bound_sftp.py
- files removed:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- files modified:
- INSTALL
added
removed
po/bzr.pot
8
8
msgstr ""
9
9
"Project-Id-Version: bzr\n"
10
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2013-07-27 12:45+0200\n"
11
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
18
18
"Content-Transfer-Encoding: 8bit\n"
19
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
20
21
#: bzrlib/add.py:93
21
#: bzrlib/add.py:95
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr ""
24
24
26
26
msgid "Unstacking"
27
27
msgstr ""
28
28
29
#: bzrlib/branch.py:3012
29
#: bzrlib/branch.py:3205
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr ""
33
33
34
#: bzrlib/branch.py:3014
34
#: bzrlib/branch.py:3207
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] ""
39
39
msgstr[1] ""
40
40
41
#: bzrlib/branch.py:3017
41
#: bzrlib/branch.py:3210
42
42
msgid "No new revisions or tags to push."
43
43
msgstr ""
44
44
45
#: bzrlib/branch.py:3019
45
#: bzrlib/branch.py:3212
46
46
msgid "No new revisions to push."
47
47
msgstr ""
48
48
49
#: bzrlib/branch.py:3039
49
#: bzrlib/branch.py:3232
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3042
53
#: bzrlib/branch.py:3235
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr ""
57
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr ""
62
62
63
#: bzrlib/builtins.py:260
63
#: bzrlib/builtins.py:218
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr ""
67
67
68
#: bzrlib/builtins.py:315
68
#: bzrlib/builtins.py:303
69
69
msgid "Display status summary."
70
70
msgstr ""
71
71
72
#: bzrlib/builtins.py:317
72
#: bzrlib/builtins.py:305
73
73
msgid ""
74
74
"This reports on versioned and unknown files, reporting them\n"
75
75
"grouped by state. Possible states are:"
76
76
msgstr ""
77
77
78
#: bzrlib/builtins.py:320
78
#: bzrlib/builtins.py:308
79
79
msgid ""
80
80
"added\n"
81
81
" Versioned in the working copy but not in the previous revision."
82
82
msgstr ""
83
83
84
#: bzrlib/builtins.py:323
84
#: bzrlib/builtins.py:311
85
85
msgid ""
86
86
"removed\n"
87
87
" Versioned in the previous revision but removed or deleted\n"
88
88
" in the working copy."
89
89
msgstr ""
90
90
91
#: bzrlib/builtins.py:327
91
#: bzrlib/builtins.py:315
92
92
msgid ""
93
93
"renamed\n"
94
94
" Path of this file changed from the previous revision;\n"
96
96
" parent directory was renamed."
97
97
msgstr ""
98
98
99
#: bzrlib/builtins.py:332
99
#: bzrlib/builtins.py:320
100
100
msgid ""
101
101
"modified\n"
102
102
" Text has changed since the previous revision."
103
103
msgstr ""
104
104
105
#: bzrlib/builtins.py:335
105
#: bzrlib/builtins.py:323
106
106
msgid ""
107
107
"kind changed\n"
108
108
" File kind has been changed (e.g. from file to directory)."
109
109
msgstr ""
110
110
111
#: bzrlib/builtins.py:338
111
#: bzrlib/builtins.py:326
112
112
msgid ""
113
113
"unknown\n"
114
114
" Not versioned and not matching an ignore pattern."
115
115
msgstr ""
116
116
117
#: bzrlib/builtins.py:341
117
#: bzrlib/builtins.py:329
118
118
msgid ""
119
119
"Additionally for directories, symlinks and files with a changed\n"
120
120
"executable bit, Bazaar indicates their type using a trailing\n"
122
122
"disabled using the '--no-classify' option."
123
123
msgstr ""
124
124
125
#: bzrlib/builtins.py:346
125
#: bzrlib/builtins.py:334
126
126
msgid ""
127
127
"To see ignored files use 'bzr ignored'. For details on the\n"
128
128
"changes to file texts, use 'bzr diff'."
129
129
msgstr ""
130
130
131
#: bzrlib/builtins.py:349
131
#: bzrlib/builtins.py:337
132
132
msgid ""
133
133
"Note that --short or -S gives status flags for each item, similar\n"
134
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
135
"use bzr status -SV."
136
136
msgstr ""
137
137
138
#: bzrlib/builtins.py:353
138
#: bzrlib/builtins.py:341
139
139
msgid ""
140
140
"If no arguments are specified, the status of the entire working\n"
141
141
"directory is shown. Otherwise, only the status of the specified\n"
143
143
"is reported for everything inside that directory."
144
144
msgstr ""
145
145
146
#: bzrlib/builtins.py:358
146
#: bzrlib/builtins.py:346
147
147
msgid ""
148
148
"Before merges are committed, the pending merge tip revisions are\n"
149
149
"shown. To see all pending merge revisions, use the -v option.\n"
151
151
"the no-pending option or specify a file/directory."
152
152
msgstr ""
153
153
154
#: bzrlib/builtins.py:363
154
#: bzrlib/builtins.py:351
155
155
msgid ""
156
156
"To compare the working directory to a specific revision, pass a\n"
157
157
"single revision to the revision argument."
158
158
msgstr ""
159
159
160
#: bzrlib/builtins.py:366
160
#: bzrlib/builtins.py:354
161
161
msgid ""
162
162
"To see which files have changed in a specific revision, or between\n"
163
163
"two revisions, pass a revision range to the revision argument.\n"
165
165
msgstr ""
166
166
167
167
# help of 'short' option of 'status' command
168
#: bzrlib/builtins.py:375
168
#: bzrlib/builtins.py:363
169
169
msgid "Use short status indicators."
170
170
msgstr ""
171
171
172
172
# help of 'versioned' option of 'status' command
173
#: bzrlib/builtins.py:377
173
#: bzrlib/builtins.py:365
174
174
msgid "Only show versioned files."
175
175
msgstr ""
176
176
177
177
# help of 'no-pending' option of 'status' command
178
#: bzrlib/builtins.py:379
178
#: bzrlib/builtins.py:367
179
179
msgid "Don't show pending merges."
180
180
msgstr ""
181
181
182
182
# help of 'no-classify' option of 'status' command
183
#: bzrlib/builtins.py:382
183
#: bzrlib/builtins.py:370
184
184
msgid "Do not mark object type using indicator."
185
185
msgstr ""
186
186
187
#: bzrlib/builtins.py:397
187
#: bzrlib/builtins.py:385
188
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
189
msgstr ""
190
190
191
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5229
191
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
192
192
msgid "You can only supply one of revision_id or --revision"
193
193
msgstr ""
194
194
195
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5231
195
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
196
196
msgid "You must supply either --revision or a revision_id"
197
197
msgstr ""
198
198
199
#: bzrlib/builtins.py:451
199
#: bzrlib/builtins.py:439
200
200
#, python-format
201
201
msgid "Repository %r does not support access to raw revision texts"
202
202
msgstr ""
203
203
204
#: bzrlib/builtins.py:462
204
#: bzrlib/builtins.py:450
205
205
msgid "The repository {0} contains no revision {1}."
206
206
msgstr ""
207
207
208
#: bzrlib/builtins.py:469
208
#: bzrlib/builtins.py:457
209
209
msgid "You cannot specify a NULL revision."
210
210
msgstr ""
211
211
212
#: bzrlib/builtins.py:561
212
#: bzrlib/builtins.py:549
213
213
msgid "Remove the working tree from a given branch/checkout."
214
214
msgstr ""
215
215
216
#: bzrlib/builtins.py:563
216
#: bzrlib/builtins.py:551
217
217
msgid ""
218
218
"Since a lightweight checkout is little more than a working tree\n"
219
219
"this will refuse to run against one."
220
220
msgstr ""
221
221
222
#: bzrlib/builtins.py:566
222
#: bzrlib/builtins.py:554
223
223
msgid "To re-create the working tree, use \"bzr checkout\"."
224
224
msgstr ""
225
225
226
226
# help of 'force' option of 'remove-tree' command
227
#: bzrlib/builtins.py:572
227
#: bzrlib/builtins.py:560
228
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
229
msgstr ""
230
230
231
#: bzrlib/builtins.py:586
231
#: bzrlib/builtins.py:574
232
232
msgid "No working tree to remove"
233
233
msgstr ""
234
234
235
#: bzrlib/builtins.py:588
235
#: bzrlib/builtins.py:576
236
236
msgid "You cannot remove the working tree of a remote path"
237
237
msgstr ""
238
238
239
#: bzrlib/builtins.py:597
239
#: bzrlib/builtins.py:585
240
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
241
msgstr ""
242
242
243
#: bzrlib/builtins.py:637
243
#: bzrlib/builtins.py:625
244
244
msgid ""
245
245
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
246
246
"instead. Use \"--force\" if you are sure you want to reset the working tree."
247
247
msgstr ""
248
248
249
#: bzrlib/builtins.py:648
249
#: bzrlib/builtins.py:636
250
250
msgid ""
251
251
", the header appears corrupt, try passing -r -1 to set the state to the last "
252
252
"commit"
253
253
msgstr ""
254
254
255
#: bzrlib/builtins.py:652
255
#: bzrlib/builtins.py:640
256
256
msgid "failed to reset the tree state{0}"
257
257
msgstr ""
258
258
259
#: bzrlib/builtins.py:656
259
#: bzrlib/builtins.py:644
260
260
msgid "Show current revision number."
261
261
msgstr ""
262
262
263
#: bzrlib/builtins.py:658
263
#: bzrlib/builtins.py:646
264
264
msgid "This is equal to the number of revisions on this branch."
265
265
msgstr ""
266
266
267
#: bzrlib/builtins.py:671
267
#: bzrlib/builtins.py:659
268
268
msgid "--tree and --revision can not be used together"
269
269
msgstr ""
270
270
271
#: bzrlib/builtins.py:688
272
msgid "Revision numbers only make sense for single revisions, not ranges"
271
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
272
msgid "Tags can only be placed on a single revision, not on a range"
273
273
msgstr ""
274
274
275
275
# help of 'tree' option of 'revno' command
276
#: bzrlib/builtins.py:712
276
#: bzrlib/builtins.py:700
277
277
msgid "Show revno of working tree."
278
278
msgstr ""
279
279
280
#: bzrlib/builtins.py:760
280
#: bzrlib/builtins.py:748
281
281
msgid "Add specified files or directories."
282
282
msgstr ""
283
283
284
#: bzrlib/builtins.py:762
284
#: bzrlib/builtins.py:750
285
285
msgid ""
286
286
"In non-recursive mode, all the named items are added, regardless\n"
287
287
"of whether they were previously ignored. A warning is given if\n"
288
288
"any of the named files are already versioned."
289
289
msgstr ""
290
290
291
#: bzrlib/builtins.py:766
291
#: bzrlib/builtins.py:754
292
292
msgid ""
293
293
"In recursive mode (the default), files are treated the same way\n"
294
294
"but the behaviour for directories is different. Directories that\n"
299
299
"directories. If no names are given '.' is assumed."
300
300
msgstr ""
301
301
302
#: bzrlib/builtins.py:774
302
#: bzrlib/builtins.py:762
303
303
msgid ""
304
304
"A warning will be printed when nested trees are encountered,\n"
305
305
"unless they are explicitly ignored."
306
306
msgstr ""
307
307
308
#: bzrlib/builtins.py:777
308
#: bzrlib/builtins.py:765
309
309
msgid ""
310
310
"Therefore simply saying 'bzr add' will version all files that\n"
311
311
"are currently unknown."
312
312
msgstr ""
313
313
314
#: bzrlib/builtins.py:780
314
#: bzrlib/builtins.py:768
315
315
msgid ""
316
316
"Adding a file whose parent directory is not versioned will\n"
317
317
"implicitly add the parent, and so on up to the root. This means\n"
319
319
"get added when you add a file in the directory."
320
320
msgstr ""
321
321
322
#: bzrlib/builtins.py:785
322
#: bzrlib/builtins.py:773
323
323
msgid ""
324
324
"--dry-run will show which files would be added, but not actually\n"
325
325
"add them."
326
326
msgstr ""
327
327
328
#: bzrlib/builtins.py:788
328
#: bzrlib/builtins.py:776
329
329
msgid ""
330
330
"--file-ids-from will try to use the file ids from the supplied path.\n"
331
331
"It looks up ids trying to find a matching parent directory with the\n"
336
336
"into a subdirectory of this one."
337
337
msgstr ""
338
338
339
#: bzrlib/builtins.py:796
339
#: bzrlib/builtins.py:784
340
340
msgid ""
341
341
"Any files matching patterns in the ignore list will not be added\n"
342
342
"unless they are explicitly mentioned."
343
343
msgstr ""
344
344
345
#: bzrlib/builtins.py:799
345
#: bzrlib/builtins.py:787
346
346
msgid ""
347
347
"In recursive mode, files larger than the configuration option \n"
348
348
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
350
350
msgstr ""
351
351
352
352
# help of 'no-recurse' option of 'add' command
353
#: bzrlib/builtins.py:806
353
#: bzrlib/builtins.py:794
354
354
msgid "Don't recursively add the contents of directories."
355
355
msgstr ""
356
356
357
357
# help of 'file-ids-from' option of 'add' command
358
#: bzrlib/builtins.py:813
358
#: bzrlib/builtins.py:800
359
359
msgid "Lookup file ids from this tree."
360
360
msgstr ""
361
361
362
#: bzrlib/builtins.py:849
362
#: bzrlib/builtins.py:836
363
363
msgid "ignored {0} matching \"{1}\"\n"
364
364
msgstr ""
365
365
366
#: bzrlib/builtins.py:854
366
#: bzrlib/builtins.py:841
367
367
msgid "Create a new versioned directory."
368
368
msgstr ""
369
369
370
#: bzrlib/builtins.py:856
370
#: bzrlib/builtins.py:843
371
371
msgid "This is equivalent to creating the directory and then adding it."
372
372
msgstr ""
373
373
374
374
# help of 'parents' option of 'mkdir' command
375
#: bzrlib/builtins.py:863
375
#: bzrlib/builtins.py:850
376
376
msgid "No error if existing, make parent directories as needed."
377
377
msgstr ""
378
378
379
#: bzrlib/builtins.py:897
379
#: bzrlib/builtins.py:884
380
380
#, python-format
381
381
msgid "added %s\n"
382
382
msgstr ""
383
383
384
#: bzrlib/builtins.py:939
384
#: bzrlib/builtins.py:926
385
385
#, python-format
386
386
msgid "invalid kind %r specified"
387
387
msgstr ""
388
388
389
#: bzrlib/builtins.py:976
389
#: bzrlib/builtins.py:963
390
390
msgid "Move or rename a file."
391
391
msgstr ""
392
392
393
#: bzrlib/builtins.py:978
393
#: bzrlib/builtins.py:965
394
394
msgid " bzr mv SOURCE... DESTINATION"
395
395
msgstr ""
396
396
397
#: bzrlib/builtins.py:980
397
#: bzrlib/builtins.py:967
398
398
msgid ""
399
399
"If the last argument is a versioned directory, all the other names\n"
400
400
"are moved into it. Otherwise, there must be exactly two arguments\n"
401
401
"and the file is changed to a new name."
402
402
msgstr ""
403
403
404
#: bzrlib/builtins.py:984
404
#: bzrlib/builtins.py:971
405
405
msgid ""
406
406
"If OLDNAME does not exist on the filesystem but is versioned and\n"
407
407
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
410
410
"The same is valid when moving many SOURCE files to a DESTINATION."
411
411
msgstr ""
412
412
413
#: bzrlib/builtins.py:990
413
#: bzrlib/builtins.py:977
414
414
msgid "Files cannot be moved between branches."
415
415
msgstr ""
416
416
417
417
# help of 'after' option of 'mv' command
418
#: bzrlib/builtins.py:997
418
#: bzrlib/builtins.py:984
419
419
msgid ""
420
420
"Move only the bzr identifier of the file, because the file has already been "
421
421
"moved."
422
422
msgstr ""
423
423
424
424
# help of 'auto' option of 'mv' command
425
#: bzrlib/builtins.py:999
425
#: bzrlib/builtins.py:986
426
426
msgid "Automatically guess renames."
427
427
msgstr ""
428
428
429
429
# help of 'dry-run' option of 'mv' command
430
#: bzrlib/builtins.py:1000
430
#: bzrlib/builtins.py:987
431
431
msgid "Avoid making changes when guessing renames."
432
432
msgstr ""
433
433
434
#: bzrlib/builtins.py:1009
434
#: bzrlib/builtins.py:996
435
435
msgid "--dry-run requires --auto."
436
436
msgstr ""
437
437
438
#: bzrlib/builtins.py:1013
438
#: bzrlib/builtins.py:1000
439
439
msgid "missing file argument"
440
440
msgstr ""
441
441
442
#: bzrlib/builtins.py:1017
442
#: bzrlib/builtins.py:1004
443
443
msgid "can not move root of branch"
444
444
msgstr ""
445
445
446
#: bzrlib/builtins.py:1023
446
#: bzrlib/builtins.py:1010
447
447
msgid "Only one path may be specified to --auto."
448
448
msgstr ""
449
449
450
#: bzrlib/builtins.py:1026
450
#: bzrlib/builtins.py:1013
451
451
msgid "--after cannot be specified with --auto."
452
452
msgstr ""
453
453
454
#: bzrlib/builtins.py:1062
454
#: bzrlib/builtins.py:1050
455
455
msgid "to mv multiple files the destination must be a versioned directory"
456
456
msgstr ""
457
457
458
#: bzrlib/builtins.py:1114
458
#: bzrlib/builtins.py:1102
459
459
msgid "Turn this branch into a mirror of another branch."
460
460
msgstr ""
461
461
462
#: bzrlib/builtins.py:1116
462
#: bzrlib/builtins.py:1104
463
463
msgid ""
464
464
"By default, this command only works on branches that have not diverged.\n"
465
465
"Branches are considered diverged if the destination branch's most recent \n"
467
467
"parent."
468
468
msgstr ""
469
469
470
#: bzrlib/builtins.py:1121
470
#: bzrlib/builtins.py:1109
471
471
msgid ""
472
472
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
473
473
"from one into the other. Once one branch has merged, the other should\n"
474
474
"be able to pull it again."
475
475
msgstr ""
476
476
477
#: bzrlib/builtins.py:1125
477
#: bzrlib/builtins.py:1113
478
478
msgid ""
479
479
"If you want to replace your local changes and just want your branch to\n"
480
480
"match the remote one, use pull --overwrite. This will work even if the two\n"
481
481
"branches have diverged."
482
482
msgstr ""
483
483
484
#: bzrlib/builtins.py:1129
484
#: bzrlib/builtins.py:1117
485
485
msgid ""
486
486
"If there is no default location set, the first pull will set it (use\n"
487
487
"--no-remember to avoid setting it). After that, you can omit the\n"
489
489
"value will only be saved if the remote location can be accessed."
490
490
msgstr ""
491
491
492
#: bzrlib/builtins.py:1134
492
#: bzrlib/builtins.py:1122
493
493
msgid ""
494
494
"The --verbose option will display the revisions pulled using the log_format\n"
495
495
"configuration option. You can use a different format by overriding it with\n"
496
496
"-Olog_format=<other_format>."
497
497
msgstr ""
498
498
499
#: bzrlib/builtins.py:1138
499
#: bzrlib/builtins.py:1126
500
500
msgid ""
501
501
"Note: The location can be specified either in the form of a branch,\n"
502
502
"or in the form of a path to a file containing a merge directive generated\n"
504
504
msgstr ""
505
505
506
506
# help of 'verbose' option of 'pull' command
507
#: bzrlib/builtins.py:1146
507
#: bzrlib/builtins.py:1134
508
508
msgid "Show logs of pulled revisions."
509
509
msgstr ""
510
510
511
511
# help of 'directory' option of 'pull' command
512
#: bzrlib/builtins.py:1148
512
#: bzrlib/builtins.py:1136
513
513
msgid ""
514
514
"Branch to pull into, rather than the one containing the working directory."
515
515
msgstr ""
516
516
517
517
# help of 'local' option of 'pull' command
518
#: bzrlib/builtins.py:1151
518
#: bzrlib/builtins.py:1139
519
519
msgid ""
520
520
"Perform a local pull in a bound branch. Local pulls are not applied to the "
521
521
"master branch."
522
522
msgstr ""
523
523
524
#: bzrlib/builtins.py:1188
525
msgid "No working tree, ignoring --show-base"
524
#: bzrlib/builtins.py:1168
525
msgid "Need working tree for --show-base."
526
526
msgstr ""
527
527
528
#: bzrlib/builtins.py:1204
528
#: bzrlib/builtins.py:1184
529
529
msgid "No pull location known or specified."
530
530
msgstr ""
531
531
532
#: bzrlib/builtins.py:1210
532
#: bzrlib/builtins.py:1190
533
533
#, python-format
534
534
msgid "Using saved parent location: %s\n"
535
535
msgstr ""
536
536
537
#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423
537
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
538
538
msgid "Cannot use -r with merge directives or bundles"
539
539
msgstr ""
540
540
541
#: bzrlib/builtins.py:1260
541
#: bzrlib/builtins.py:1238
542
542
msgid "Update a mirror of this branch."
543
543
msgstr ""
544
544
545
#: bzrlib/builtins.py:1262
545
#: bzrlib/builtins.py:1240
546
546
msgid ""
547
547
"The target branch will not have its working tree populated because this\n"
548
548
"is both expensive, and is not supported on remote file systems."
549
549
msgstr ""
550
550
551
#: bzrlib/builtins.py:1265
551
#: bzrlib/builtins.py:1243
552
552
msgid ""
553
553
"Some smart servers or protocols *may* put the working tree in place in\n"
554
554
"the future."
555
555
msgstr ""
556
556
557
#: bzrlib/builtins.py:1268
557
#: bzrlib/builtins.py:1246
558
558
msgid ""
559
559
"This command only works on branches that have not diverged. Branches are\n"
560
560
"considered diverged if the destination branch's most recent commit is one\n"
561
561
"that has not been merged (directly or indirectly) by the source branch."
562
562
msgstr ""
563
563
564
#: bzrlib/builtins.py:1272
564
#: bzrlib/builtins.py:1250
565
565
msgid ""
566
566
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
567
567
"the other branch completely, discarding its unmerged changes."
568
568
msgstr ""
569
569
570
#: bzrlib/builtins.py:1275
570
#: bzrlib/builtins.py:1253
571
571
msgid ""
572
572
"If you want to ensure you have the different changes in the other branch,\n"
573
573
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
574
574
"After that you will be able to do a push without '--overwrite'."
575
575
msgstr ""
576
576
577
#: bzrlib/builtins.py:1279
577
#: bzrlib/builtins.py:1257
578
578
msgid ""
579
579
"If there is no default push location set, the first push will set it (use\n"
580
580
"--no-remember to avoid setting it). After that, you can omit the\n"
582
582
"value will only be saved if the remote location can be accessed."
583
583
msgstr ""
584
584
585
#: bzrlib/builtins.py:1284
585
#: bzrlib/builtins.py:1262
586
586
msgid ""
587
587
"The --verbose option will display the revisions pushed using the log_format\n"
588
588
"configuration option. You can use a different format by overriding it with\n"
591
591
592
592
# help of 'directory' option of 'dpush' command
593
593
# help of 'directory' option of 'push' command
594
#: bzrlib/builtins.py:1295 bzrlib/foreign.py:272
594
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
595
595
msgid ""
596
596
"Branch to push from, rather than the one containing the working directory."
597
597
msgstr ""
598
598
599
599
# help of 'use-existing-dir' option of 'push' command
600
#: bzrlib/builtins.py:1298
600
#: bzrlib/builtins.py:1276
601
601
msgid ""
602
602
"By default push will fail if the target directory exists, but does not "
603
603
"already have a control directory. This flag will allow push to proceed."
604
604
msgstr ""
605
605
606
606
# help of 'stacked' option of 'push' command
607
#: bzrlib/builtins.py:1303
607
#: bzrlib/builtins.py:1281
608
608
msgid ""
609
609
"Create a stacked branch that references the public location of the parent "
610
610
"branch."
611
611
msgstr ""
612
612
613
613
# help of 'stacked-on' option of 'push' command
614
#: bzrlib/builtins.py:1306
614
#: bzrlib/builtins.py:1284
615
615
msgid ""
616
616
"Create a stacked branch that refers to another branch for the commit "
617
617
"history. Only the work not present in the referenced branch is included in "
620
620
621
621
# help of 'strict' option of 'dpush' command
622
622
# help of 'strict' option of 'push' command
623
#: bzrlib/builtins.py:1311 bzrlib/foreign.py:279
623
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
624
624
msgid ""
625
625
"Refuse to push if there are uncommitted changes in the working tree, --no-"
626
626
"strict disables the check."
627
627
msgstr ""
628
628
629
629
# help of 'no-tree' option of 'push' command
630
#: bzrlib/builtins.py:1314
630
#: bzrlib/builtins.py:1292
631
631
msgid "Don't populate the working tree, even for protocols that support it."
632
632
msgstr ""
633
633
634
# help of 'overwrite-tags' option of 'pull' command
635
# help of 'overwrite-tags' option of 'push' command
636
#: bzrlib/builtins.py:1317
637
msgid "Overwrite tags only."
638
msgstr ""
639
640
#: bzrlib/builtins.py:1368
634
#: bzrlib/builtins.py:1336
641
635
msgid "Could not determine branch to refer to."
642
636
msgstr ""
643
637
644
#: bzrlib/builtins.py:1377
638
#: bzrlib/builtins.py:1345
645
639
#, python-format
646
640
msgid ""
647
641
"No push location known or specified. To push to the parent branch (at %s), "
648
642
"use 'bzr push :parent'."
649
643
msgstr ""
650
644
651
#: bzrlib/builtins.py:1383 bzrlib/foreign.py:306
645
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
652
646
msgid "No push location known or specified."
653
647
msgstr ""
654
648
655
#: bzrlib/builtins.py:1387
649
#: bzrlib/builtins.py:1355
656
650
#, python-format
657
651
msgid "Using saved push location: %s"
658
652
msgstr ""
659
653
660
#: bzrlib/builtins.py:1397
654
#: bzrlib/builtins.py:1365
661
655
msgid "Create a new branch that is a copy of an existing branch."
662
656
msgstr ""
663
657
664
#: bzrlib/builtins.py:1399
658
#: bzrlib/builtins.py:1367
665
659
msgid ""
666
660
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
667
661
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
672
666
"create ./foo-bar."
673
667
msgstr ""
674
668
675
#: bzrlib/builtins.py:1406
669
#: bzrlib/builtins.py:1374
676
670
msgid ""
677
671
"To retrieve the branch as of a particular revision, supply the --revision\n"
678
672
"parameter, as in \"branch foo/bar -r 5\"."
679
673
msgstr ""
680
674
681
#: bzrlib/builtins.py:1409
675
#: bzrlib/builtins.py:1377
682
676
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
683
677
msgstr ""
684
678
685
679
# help of 'no-tree' option of 'branch' command
686
#: bzrlib/builtins.py:1419
680
#: bzrlib/builtins.py:1387
687
681
msgid "Create a branch without a working-tree."
688
682
msgstr ""
689
683
690
684
# help of 'switch' option of 'branch' command
691
#: bzrlib/builtins.py:1421
685
#: bzrlib/builtins.py:1389
692
686
msgid "Switch the checkout in the current directory to the new branch."
693
687
msgstr ""
694
688
695
689
# help of 'stacked' option of 'branch' command
696
#: bzrlib/builtins.py:1424
690
#: bzrlib/builtins.py:1392
697
691
msgid ""
698
692
"Create a stacked branch referring to the source branch. The new branch will "
699
693
"depend on the availability of the source branch for all operations."
700
694
msgstr ""
701
695
702
696
# help of 'standalone' option of 'branch' command
703
#: bzrlib/builtins.py:1428
697
#: bzrlib/builtins.py:1396
704
698
msgid "Do not use a shared repository, even if available."
705
699
msgstr ""
706
700
707
701
# help of 'use-existing-dir' option of 'branch' command
708
#: bzrlib/builtins.py:1430
702
#: bzrlib/builtins.py:1398
709
703
msgid ""
710
704
"By default branch will fail if the target directory exists, but does not "
711
705
"already have a control directory. This flag will allow branch to proceed."
712
706
msgstr ""
713
707
714
708
# help of 'bind' option of 'branch' command
715
#: bzrlib/builtins.py:1435
709
#: bzrlib/builtins.py:1403
716
710
msgid "Bind new branch to from location."
717
711
msgstr ""
718
712
719
#: bzrlib/builtins.py:1482
713
#: bzrlib/builtins.py:1450
720
714
#, python-format
721
715
msgid "Target directory \"%s\" already exists."
722
716
msgstr ""
723
717
724
#: bzrlib/builtins.py:1494
718
#: bzrlib/builtins.py:1462
725
719
#, python-format
726
720
msgid "Parent of \"%s\" does not exist."
727
721
msgstr ""
728
722
729
#: bzrlib/builtins.py:1513
723
#: bzrlib/builtins.py:1481
730
724
msgid "The branch {0} has no revision {1}."
731
725
msgstr ""
732
726
733
#: bzrlib/builtins.py:1528 bzrlib/push.py:53
727
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
734
728
#, python-format
735
729
msgid "Created new stacked branch referring to %s."
736
730
msgstr ""
737
731
738
#: bzrlib/builtins.py:1532
732
#: bzrlib/builtins.py:1500
739
733
#, python-format
740
734
msgid "Branched %d revision."
741
735
msgid_plural "Branched %d revisions."
742
736
msgstr[0] ""
743
737
msgstr[1] ""
744
738
745
#: bzrlib/builtins.py:1537
739
#: bzrlib/builtins.py:1505
746
740
#, python-format
747
741
msgid "New branch bound to %s"
748
742
msgstr ""
749
743
750
#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283
744
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
751
745
#, python-format
752
746
msgid "Switched to branch: %s"
753
747
msgstr ""
754
748
755
#: bzrlib/builtins.py:1547
749
#: bzrlib/builtins.py:1515
756
750
msgid "List the branches available at the current location."
757
751
msgstr ""
758
752
759
#: bzrlib/builtins.py:1549
753
#: bzrlib/builtins.py:1517
760
754
msgid ""
761
755
"This command will print the names of all the branches at the current\n"
762
756
"location."
763
757
msgstr ""
764
758
765
759
# help of 'recursive' option of 'branches' command
766
#: bzrlib/builtins.py:1556
760
#: bzrlib/builtins.py:1524
767
761
msgid ""
768
762
"Recursively scan for branches rather than just looking in the specified "
769
763
"location."
770
764
msgstr ""
771
765
772
#: bzrlib/builtins.py:1585
766
#: bzrlib/builtins.py:1554
773
767
msgid "(default)"
774
768
msgstr ""
775
769
776
#: bzrlib/builtins.py:1597
770
#: bzrlib/builtins.py:1566
777
771
msgid "Create a new checkout of an existing branch."
778
772
msgstr ""
779
773
780
#: bzrlib/builtins.py:1599
774
#: bzrlib/builtins.py:1568
781
775
msgid ""
782
776
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
783
777
"for\n"
787
781
"location using SFTP."
788
782
msgstr ""
789
783
790
#: bzrlib/builtins.py:1604
784
#: bzrlib/builtins.py:1573
791
785
msgid ""
792
786
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
793
787
"will\n"
799
793
"create ./foo-bar."
800
794
msgstr ""
801
795
802
#: bzrlib/builtins.py:1611
796
#: bzrlib/builtins.py:1580
803
797
msgid ""
804
798
"To retrieve the branch as of a particular revision, supply the --revision\n"
805
799
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
810
804
msgstr ""
811
805
812
806
# help of 'lightweight' option of 'checkout' command
813
#: bzrlib/builtins.py:1621
807
#: bzrlib/builtins.py:1590
814
808
msgid ""
815
809
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
816
810
"the branch for every operation. Normal checkouts can perform common "
820
814
821
815
# help of 'files-from' option of 'branch' command
822
816
# help of 'files-from' option of 'checkout' command
823
#: bzrlib/builtins.py:1628
817
#: bzrlib/builtins.py:1597
824
818
msgid "Get file contents from this tree."
825
819
msgstr ""
826
820
827
821
# help of 'hardlink' option of 'branch' command
828
822
# help of 'hardlink' option of 'checkout' command
829
#: bzrlib/builtins.py:1630
823
#: bzrlib/builtins.py:1599
830
824
msgid "Hard-link working tree files where possible."
831
825
msgstr ""
832
826
833
#: bzrlib/builtins.py:1671
827
#: bzrlib/builtins.py:1640
834
828
msgid ""
835
829
"Show list of renamed files.\n"
836
830
" "
837
831
msgstr ""
838
832
839
#: bzrlib/builtins.py:1699
833
#: bzrlib/builtins.py:1670
840
834
msgid "Update a working tree to a new revision."
841
835
msgstr ""
842
836
843
#: bzrlib/builtins.py:1701
837
#: bzrlib/builtins.py:1672
844
838
msgid ""
845
839
"This will perform a merge of the destination revision (the tip of the\n"
846
840
"branch, or the specified revision) into the working tree, and then make\n"
847
841
"that revision the basis revision for the working tree. "
848
842
msgstr ""
849
843
850
#: bzrlib/builtins.py:1705
844
#: bzrlib/builtins.py:1676
851
845
msgid ""
852
846
"You can use this to visit an older revision, or to update a working tree\n"
853
847
"that is out of date from its branch."
854
848
msgstr ""
855
849
856
#: bzrlib/builtins.py:1708
850
#: bzrlib/builtins.py:1679
857
851
msgid ""
858
852
"If there are any uncommitted changes in the tree, they will be carried\n"
859
853
"across and remain as uncommitted changes after the update. To discard\n"
861
855
"with the changes brought in by the change in basis revision."
862
856
msgstr ""
863
857
864
#: bzrlib/builtins.py:1713
858
#: bzrlib/builtins.py:1684
865
859
msgid ""
866
860
"If the tree's branch is bound to a master branch, bzr will also update\n"
867
861
"the branch from the master."
868
862
msgstr ""
869
863
870
#: bzrlib/builtins.py:1716
864
#: bzrlib/builtins.py:1687
871
865
msgid ""
872
866
"You cannot update just a single file or directory, because each Bazaar\n"
873
867
"working tree has just a single basis revision. If you want to restore a\n"
877
871
"out the old content of that file to a new location."
878
872
msgstr ""
879
873
880
#: bzrlib/builtins.py:1723
874
#: bzrlib/builtins.py:1694
881
875
msgid ""
882
876
"The 'dir' argument, if given, must be the location of the root of a\n"
883
877
"working tree to update. By default, the working tree that contains the \n"
884
878
"current working directory is used."
885
879
msgstr ""
886
880
887
#: bzrlib/builtins.py:1739
881
#: bzrlib/builtins.py:1710
888
882
msgid "bzr update --revision takes exactly one revision"
889
883
msgstr ""
890
884
891
#: bzrlib/builtins.py:1747
885
#: bzrlib/builtins.py:1718
892
886
msgid "bzr update can only update a whole tree, not a file or subdirectory"
893
887
msgstr ""
894
888
895
#: bzrlib/builtins.py:1778
889
#: bzrlib/builtins.py:1749
896
890
msgid "Tree is up to date at revision {0} of branch {1}"
897
891
msgstr ""
898
892
899
#: bzrlib/builtins.py:1794
893
#: bzrlib/builtins.py:1765
900
894
#, python-format
901
895
msgid ""
902
896
"branch has no revision %s\n"
903
897
"bzr update --revision only works for a revision in the branch history"
904
898
msgstr ""
905
899
906
#: bzrlib/builtins.py:1800
900
#: bzrlib/builtins.py:1771
907
901
msgid "Updated to revision {0} of branch {1}"
908
902
msgstr ""
909
903
910
#: bzrlib/builtins.py:1804
904
#: bzrlib/builtins.py:1775
911
905
msgid ""
912
906
"Your local commits will now show as pending merges with 'bzr status', and "
913
907
"can be committed with 'bzr commit'."
914
908
msgstr ""
915
909
916
#: bzrlib/builtins.py:1813
910
#: bzrlib/builtins.py:1784
917
911
msgid "Show information about a working tree, branch or repository."
918
912
msgstr ""
919
913
920
#: bzrlib/builtins.py:1815
914
#: bzrlib/builtins.py:1786
921
915
msgid ""
922
916
"This command will show all known locations and formats associated to the\n"
923
917
"tree, branch or repository."
924
918
msgstr ""
925
919
926
#: bzrlib/builtins.py:1818
920
#: bzrlib/builtins.py:1789
927
921
msgid ""
928
922
"In verbose mode, statistical information is included with each report.\n"
929
923
"To see extended statistic information, use a verbosity level of 2 or\n"
930
924
"higher by specifying the verbose option multiple times, e.g. -vv."
931
925
msgstr ""
932
926
933
#: bzrlib/builtins.py:1822
927
#: bzrlib/builtins.py:1793
934
928
msgid "Branches and working trees will also report any missing revisions."
935
929
msgstr ""
936
930
937
#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883
938
#: bzrlib/builtins.py:6469
931
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
932
#: bzrlib/builtins.py:6442
939
933
msgid ":Examples:"
940
934
msgstr ""
941
935
942
#: bzrlib/builtins.py:1826
936
#: bzrlib/builtins.py:1797
943
937
msgid " Display information on the format and related locations:"
944
938
msgstr ""
945
939
946
#: bzrlib/builtins.py:1828
940
#: bzrlib/builtins.py:1799
947
941
msgid " bzr info"
948
942
msgstr ""
949
943
950
#: bzrlib/builtins.py:1830
944
#: bzrlib/builtins.py:1801
951
945
msgid ""
952
946
" Display the above together with extended format information and\n"
953
947
" basic statistics (like the number of files in the working tree and\n"
954
948
" number of revisions in the branch and repository):"
955
949
msgstr ""
956
950
957
#: bzrlib/builtins.py:1834
951
#: bzrlib/builtins.py:1805
958
952
msgid " bzr info -v"
959
953
msgstr ""
960
954
961
#: bzrlib/builtins.py:1836
955
#: bzrlib/builtins.py:1807
962
956
msgid " Display the above together with number of committers to the branch:"
963
957
msgstr ""
964
958
965
#: bzrlib/builtins.py:1838
959
#: bzrlib/builtins.py:1809
966
960
msgid " bzr info -vv"
967
961
msgstr ""
968
962
969
#: bzrlib/builtins.py:1857
963
#: bzrlib/builtins.py:1828
970
964
msgid "Remove files or directories."
971
965
msgstr ""
972
966
973
#: bzrlib/builtins.py:1859
967
#: bzrlib/builtins.py:1830
974
968
msgid ""
975
969
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
976
970
"delete them if they can easily be recovered using revert otherwise they\n"
977
"will be backed up (adding an extension of the form .~#~). If no options or\n"
971
"will be backed up (adding an extention of the form .~#~). If no options or\n"
978
972
"parameters are given Bazaar will scan for files that are being tracked by\n"
979
973
"Bazaar but missing in your tree and stop tracking them for you."
980
974
msgstr ""
981
975
982
976
# help of 'new' option of 'remove' command
983
#: bzrlib/builtins.py:1867
977
#: bzrlib/builtins.py:1838
984
978
msgid "Only remove files that have never been committed."
985
979
msgstr ""
986
980
987
981
# help of 'file-deletion-strategy' option of 'remove' command
988
#: bzrlib/builtins.py:1869
982
#: bzrlib/builtins.py:1840
989
983
msgid "The file deletion mode to be used."
990
984
msgstr ""
991
985
992
986
# title of 'file-deletion-strategy' option of 'remove' command
993
#: bzrlib/builtins.py:1870
987
#: bzrlib/builtins.py:1841
994
988
msgid "Deletion Strategy"
995
989
msgstr ""
996
990
997
991
# help of 'file-deletion-strategy=safe' option of 'remove' command
998
#: bzrlib/builtins.py:1871
992
#: bzrlib/builtins.py:1842
999
993
msgid "Backup changed files (default)."
1000
994
msgstr ""
1001
995
1002
996
# help of 'file-deletion-strategy=keep' option of 'remove' command
1003
#: bzrlib/builtins.py:1872
997
#: bzrlib/builtins.py:1843
1004
998
msgid "Delete from bzr but leave the working copy."
1005
999
msgstr ""
1006
1000
1007
1001
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
1008
#: bzrlib/builtins.py:1873
1002
#: bzrlib/builtins.py:1844
1009
1003
msgid "Don't backup changed files."
1010
1004
msgstr ""
1011
1005
1012
#: bzrlib/builtins.py:1894
1006
# help of 'file-deletion-strategy=force' option of 'remove' command
1007
#: bzrlib/builtins.py:1845
1008
msgid ""
1009
"Delete all the specified files, even if they can not be recovered and even "
1010
"if they are non-empty directories. (deprecated, use no-backup)"
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1854
1014
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1015
msgstr ""
1016
1017
#: bzrlib/builtins.py:1871
1013
1018
msgid "No matching files."
1014
1019
msgstr ""
1015
1020
1016
#: bzrlib/builtins.py:1955
1021
#: bzrlib/builtins.py:1932
1017
1022
msgid "Reconcile bzr metadata in a branch."
1018
1023
msgstr ""
1019
1024
1020
#: bzrlib/builtins.py:1957
1025
#: bzrlib/builtins.py:1934
1021
1026
msgid ""
1022
1027
"This can correct data mismatches that may have been caused by\n"
1023
1028
"previous ghost operations or bzr upgrades. You should only\n"
1025
1030
"advises you to run it."
1026
1031
msgstr ""
1027
1032
1028
#: bzrlib/builtins.py:1962
1033
#: bzrlib/builtins.py:1939
1029
1034
msgid ""
1030
1035
"If a second branch is provided, cross-branch reconciliation is\n"
1031
1036
"also attempted, which will check that data like the tree root\n"
1033
1038
"correctly in both branches."
1034
1039
msgstr ""
1035
1040
1036
#: bzrlib/builtins.py:1967
1041
#: bzrlib/builtins.py:1944
1037
1042
msgid ""
1038
1043
"At the same time it is run it may recompress data resulting in\n"
1039
1044
"a potential saving in disk space or performance gain."
1040
1045
msgstr ""
1041
1046
1042
#: bzrlib/builtins.py:1970
1047
#: bzrlib/builtins.py:1947
1043
1048
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1044
1049
msgstr ""
1045
1050
1049
1054
# help of 'format=default' option of 'init-repository' command
1050
1055
# help of 'format=2a' option of 'upgrade' command
1051
1056
# help of 'format=default' option of 'upgrade' command
1052
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1057
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1053
1058
msgid ""
1054
1059
"Format for the bzr 2.0 series.\n"
1055
1060
"Uses group-compress storage.\n"
1059
1064
# help of 'format=pack-0.92' option of 'init' command
1060
1065
# help of 'format=pack-0.92' option of 'init-repository' command
1061
1066
# help of 'format=pack-0.92' option of 'upgrade' command
1062
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1067
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1063
1068
msgid ""
1064
1069
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1065
1070
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1068
1073
# help of 'format=development-colo' option of 'init' command
1069
1074
# help of 'format=development-colo' option of 'init-repository' command
1070
1075
# help of 'format=development-colo' option of 'upgrade' command
1071
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1076
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1072
1077
msgid "The 2a format with experimental support for colocated branches.\n"
1073
1078
msgstr ""
1074
1079
1075
#: bzrlib/builtins.py:2038
1080
#: bzrlib/builtins.py:2015
1076
1081
msgid "Make a directory into a versioned branch."
1077
1082
msgstr ""
1078
1083
1079
#: bzrlib/builtins.py:2040
1084
#: bzrlib/builtins.py:2017
1080
1085
msgid ""
1081
1086
"Use this to create an empty branch, or before importing an\n"
1082
1087
"existing project."
1083
1088
msgstr ""
1084
1089
1085
#: bzrlib/builtins.py:2043
1090
#: bzrlib/builtins.py:2020
1086
1091
msgid ""
1087
1092
"If there is a repository in a parent directory of the location, then\n"
1088
1093
"the history of the branch will be stored in the repository. Otherwise\n"
1090
1095
"in the .bzr directory."
1091
1096
msgstr ""
1092
1097
1093
#: bzrlib/builtins.py:2048
1098
#: bzrlib/builtins.py:2025
1094
1099
msgid ""
1095
1100
"If there is already a branch at the location but it has no working tree,\n"
1096
1101
"the tree can be populated with 'bzr checkout'."
1097
1102
msgstr ""
1098
1103
1099
#: bzrlib/builtins.py:2051
1104
#: bzrlib/builtins.py:2028
1100
1105
msgid "Recipe for importing a tree of files::"
1101
1106
msgstr ""
1102
1107
1103
#: bzrlib/builtins.py:2053
1108
#: bzrlib/builtins.py:2030
1104
1109
msgid ""
1105
1110
" cd ~/project\n"
1106
1111
" bzr init\n"
1111
1116
1112
1117
# help of 'create-prefix' option of 'init' command
1113
1118
# help of 'create-prefix' option of 'push' command
1114
#: bzrlib/builtins.py:2064
1119
#: bzrlib/builtins.py:2041
1115
1120
msgid "Create the path leading up to the branch if it does not already exist."
1116
1121
msgstr ""
1117
1122
1118
1123
# help of 'format' option of 'init' command
1119
#: bzrlib/builtins.py:2067
1124
#: bzrlib/builtins.py:2044
1120
1125
msgid "Specify a format for this branch. See \"help formats\"."
1121
1126
msgstr ""
1122
1127
1123
1128
# help of 'append-revisions-only' option of 'init' command
1124
#: bzrlib/builtins.py:2075
1129
#: bzrlib/builtins.py:2052
1125
1130
msgid "Never change revnos or the existing log. Append revisions to it only."
1126
1131
msgstr ""
1127
1132
1128
1133
# help of 'no-tree' option of 'init' command
1129
#: bzrlib/builtins.py:2078
1134
#: bzrlib/builtins.py:2055
1130
1135
msgid "Create a branch without a working tree."
1131
1136
msgstr ""
1132
1137
1133
#: bzrlib/builtins.py:2098 bzrlib/push.py:110
1138
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1134
1139
#, python-format
1135
1140
msgid ""
1136
1141
"Parent directory of %s does not exist.\n"
1137
1142
"You may supply --create-prefix to create all leading parent directories."
1138
1143
msgstr ""
1139
1144
1140
#: bzrlib/builtins.py:2132
1145
#: bzrlib/builtins.py:2109
1141
1146
msgid ""
1142
1147
"This branch format cannot be set to append-revisions-only. Try --default."
1143
1148
msgstr ""
1144
1149
1145
#: bzrlib/builtins.py:2143
1150
#: bzrlib/builtins.py:2120
1146
1151
msgid "Created a {0} (format: {1})\n"
1147
1152
msgstr ""
1148
1153
1149
#: bzrlib/builtins.py:2152
1154
#: bzrlib/builtins.py:2129
1150
1155
#, python-format
1151
1156
msgid "Using shared repository: %s\n"
1152
1157
msgstr ""
1153
1158
1154
#: bzrlib/builtins.py:2156
1159
#: bzrlib/builtins.py:2133
1155
1160
msgid "Create a shared repository for branches to share storage space."
1156
1161
msgstr ""
1157
1162
1158
#: bzrlib/builtins.py:2158
1163
#: bzrlib/builtins.py:2135
1159
1164
msgid ""
1160
1165
"New branches created under the repository directory will store their\n"
1161
1166
"revisions in the repository, not in the branch directory. For branches\n"
1163
1168
"speeds up the creation of new branches."
1164
1169
msgstr ""
1165
1170
1166
#: bzrlib/builtins.py:2163
1171
#: bzrlib/builtins.py:2140
1167
1172
msgid ""
1168
1173
"If the --no-trees option is given then the branches in the repository\n"
1169
1174
"will not have working trees by default. They will still exist as \n"
1173
1178
"branches, such as on a server."
1174
1179
msgstr ""
1175
1180
1176
#: bzrlib/builtins.py:2170
1181
#: bzrlib/builtins.py:2147
1177
1182
msgid ""
1178
1183
":Examples:\n"
1179
1184
" Create a shared repository holding just branches::"
1180
1185
msgstr ""
1181
1186
1182
#: bzrlib/builtins.py:2173
1187
#: bzrlib/builtins.py:2150
1183
1188
msgid ""
1184
1189
" bzr init-repo --no-trees repo\n"
1185
1190
" bzr init repo/trunk"
1186
1191
msgstr ""
1187
1192
1188
#: bzrlib/builtins.py:2176
1193
#: bzrlib/builtins.py:2153
1189
1194
msgid " Make a lightweight checkout elsewhere::"
1190
1195
msgstr ""
1191
1196
1192
#: bzrlib/builtins.py:2178
1197
#: bzrlib/builtins.py:2155
1193
1198
msgid ""
1194
1199
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1195
1200
" cd trunk-checkout\n"
1197
1202
msgstr ""
1198
1203
1199
1204
# help of 'format' option of 'init-repository' command
1200
#: bzrlib/builtins.py:2186
1205
#: bzrlib/builtins.py:2163
1201
1206
msgid ""
1202
1207
"Specify a format for this repository. See \"bzr help formats\" for details."
1203
1208
msgstr ""
1204
1209
1205
1210
# title of 'format' option of 'init-repository' command
1206
#: bzrlib/builtins.py:2190
1211
#: bzrlib/builtins.py:2167
1207
1212
msgid "Repository format"
1208
1213
msgstr ""
1209
1214
1210
1215
# help of 'no-trees' option of 'init-repository' command
1211
#: bzrlib/builtins.py:2192
1216
#: bzrlib/builtins.py:2169
1212
1217
msgid "Branches in the repository will default to not having a working tree."
1213
1218
msgstr ""
1214
1219
1215
#: bzrlib/builtins.py:2218
1220
#: bzrlib/builtins.py:2195
1216
1221
msgid "Show differences in the working tree, between revisions or branches."
1217
1222
msgstr ""
1218
1223
1219
#: bzrlib/builtins.py:2220
1224
#: bzrlib/builtins.py:2197
1220
1225
msgid ""
1221
1226
"If no arguments are given, all changes for the current tree are listed.\n"
1222
1227
"If files are given, only the changes in those files are listed.\n"
1226
1231
"given."
1227
1232
msgstr ""
1228
1233
1229
#: bzrlib/builtins.py:2227
1234
#: bzrlib/builtins.py:2204
1230
1235
msgid ""
1231
1236
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1232
1237
"produces patches suitable for \"patch -p1\"."
1233
1238
msgstr ""
1234
1239
1235
#: bzrlib/builtins.py:2230
1240
#: bzrlib/builtins.py:2207
1236
1241
msgid ""
1237
1242
"Note that when using the -r argument with a range of revisions, the\n"
1238
1243
"differences are computed between the two specified revisions. That\n"
1242
1247
"in the range."
1243
1248
msgstr ""
1244
1249
1245
#: bzrlib/builtins.py:2237
1250
#: bzrlib/builtins.py:2214
1246
1251
msgid ""
1247
1252
":Exit values:\n"
1248
1253
" 1 - changed\n"
1251
1256
" 0 - no change"
1252
1257
msgstr ""
1253
1258
1254
#: bzrlib/builtins.py:2243
1259
#: bzrlib/builtins.py:2220
1255
1260
msgid ""
1256
1261
":Examples:\n"
1257
1262
" Shows the difference in the working tree versus the last commit::"
1258
1263
msgstr ""
1259
1264
1260
#: bzrlib/builtins.py:2246
1265
#: bzrlib/builtins.py:2223
1261
1266
msgid " bzr diff"
1262
1267
msgstr ""
1263
1268
1264
#: bzrlib/builtins.py:2248
1269
#: bzrlib/builtins.py:2225
1265
1270
msgid " Difference between the working tree and revision 1::"
1266
1271
msgstr ""
1267
1272
1268
#: bzrlib/builtins.py:2250
1273
#: bzrlib/builtins.py:2227
1269
1274
msgid " bzr diff -r1"
1270
1275
msgstr ""
1271
1276
1272
#: bzrlib/builtins.py:2252
1277
#: bzrlib/builtins.py:2229
1273
1278
msgid " Difference between revision 3 and revision 1::"
1274
1279
msgstr ""
1275
1280
1276
#: bzrlib/builtins.py:2254
1281
#: bzrlib/builtins.py:2231
1277
1282
msgid " bzr diff -r1..3"
1278
1283
msgstr ""
1279
1284
1280
#: bzrlib/builtins.py:2256
1285
#: bzrlib/builtins.py:2233
1281
1286
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1282
1287
msgstr ""
1283
1288
1284
#: bzrlib/builtins.py:2258
1289
#: bzrlib/builtins.py:2235
1285
1290
msgid " bzr diff -r1..3 xxx"
1286
1291
msgstr ""
1287
1292
1288
#: bzrlib/builtins.py:2260
1293
#: bzrlib/builtins.py:2237
1289
1294
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1290
1295
msgstr ""
1291
1296
1292
#: bzrlib/builtins.py:2262
1297
#: bzrlib/builtins.py:2239
1293
1298
msgid " bzr diff -c2"
1294
1299
msgstr ""
1295
1300
1296
#: bzrlib/builtins.py:2264
1301
#: bzrlib/builtins.py:2241
1297
1302
msgid ""
1298
1303
" To see the changes introduced by revision X::\n"
1299
1304
" \n"
1300
1305
" bzr diff -cX"
1301
1306
msgstr ""
1302
1307
1303
#: bzrlib/builtins.py:2268
1308
#: bzrlib/builtins.py:2245
1304
1309
msgid ""
1305
1310
" Note that in the case of a merge, the -c option shows the changes\n"
1306
1311
" compared to the left hand parent. To see the changes against\n"
1307
1312
" another parent, use::"
1308
1313
msgstr ""
1309
1314
1310
#: bzrlib/builtins.py:2272
1315
#: bzrlib/builtins.py:2249
1311
1316
msgid " bzr diff -r<chosen_parent>..X"
1312
1317
msgstr ""
1313
1318
1314
#: bzrlib/builtins.py:2274
1319
#: bzrlib/builtins.py:2251
1315
1320
msgid ""
1316
1321
" The changes between the current revision and the previous revision\n"
1317
1322
" (equivalent to -c-1 and -r-2..-1)"
1318
1323
msgstr ""
1319
1324
1320
#: bzrlib/builtins.py:2277
1325
#: bzrlib/builtins.py:2254
1321
1326
msgid " bzr diff -r-2.."
1322
1327
msgstr ""
1323
1328
1324
#: bzrlib/builtins.py:2279
1329
#: bzrlib/builtins.py:2256
1325
1330
msgid " Show just the differences for file NEWS::"
1326
1331
msgstr ""
1327
1332
1328
#: bzrlib/builtins.py:2281
1333
#: bzrlib/builtins.py:2258
1329
1334
msgid " bzr diff NEWS"
1330
1335
msgstr ""
1331
1336
1332
#: bzrlib/builtins.py:2283
1337
#: bzrlib/builtins.py:2260
1333
1338
msgid " Show the differences in working tree xxx for file NEWS::"
1334
1339
msgstr ""
1335
1340
1336
#: bzrlib/builtins.py:2285
1341
#: bzrlib/builtins.py:2262
1337
1342
msgid " bzr diff xxx/NEWS"
1338
1343
msgstr ""
1339
1344
1340
#: bzrlib/builtins.py:2287
1345
#: bzrlib/builtins.py:2264
1341
1346
msgid " Show the differences from branch xxx to this working tree:"
1342
1347
msgstr ""
1343
1348
1344
#: bzrlib/builtins.py:2289
1349
#: bzrlib/builtins.py:2266
1345
1350
msgid " bzr diff --old xxx"
1346
1351
msgstr ""
1347
1352
1348
#: bzrlib/builtins.py:2291
1353
#: bzrlib/builtins.py:2268
1349
1354
msgid " Show the differences between two branches for file NEWS::"
1350
1355
msgstr ""
1351
1356
1352
#: bzrlib/builtins.py:2293
1357
#: bzrlib/builtins.py:2270
1353
1358
msgid " bzr diff --old xxx --new yyy NEWS"
1354
1359
msgstr ""
1355
1360
1356
#: bzrlib/builtins.py:2295
1361
#: bzrlib/builtins.py:2272
1357
1362
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1358
1363
msgstr ""
1359
1364
1360
#: bzrlib/builtins.py:2297
1365
#: bzrlib/builtins.py:2274
1361
1366
msgid ""
1362
1367
" bzr diff --prefix old/:new/\n"
1363
1368
" \n"
1367
1372
msgstr ""
1368
1373
1369
1374
# help of 'diff-options' option of 'diff' command
1370
#: bzrlib/builtins.py:2307
1375
#: bzrlib/builtins.py:2284
1371
1376
msgid "Pass these options to the external diff program."
1372
1377
msgstr ""
1373
1378
1374
1379
# help of 'prefix' option of 'diff' command
1375
#: bzrlib/builtins.py:2310
1380
#: bzrlib/builtins.py:2287
1376
1381
msgid ""
1377
1382
"Set prefixes added to old and new filenames, as two values separated by a "
1378
1383
"colon. (eg \"old/:new/\")."
1379
1384
msgstr ""
1380
1385
1381
1386
# help of 'old' option of 'diff' command
1382
#: bzrlib/builtins.py:2313
1387
#: bzrlib/builtins.py:2290
1383
1388
msgid "Branch/tree to compare from."
1384
1389
msgstr ""
1385
1390
1386
1391
# help of 'new' option of 'diff' command
1387
#: bzrlib/builtins.py:2317
1392
#: bzrlib/builtins.py:2294
1388
1393
msgid "Branch/tree to compare to."
1389
1394
msgstr ""
1390
1395
1391
1396
# help of 'using' option of 'diff' command
1392
#: bzrlib/builtins.py:2323
1397
#: bzrlib/builtins.py:2300
1393
1398
msgid "Use this command to compare files."
1394
1399
msgstr ""
1395
1400
1396
1401
# help of 'format' option of 'diff' command
1397
#: bzrlib/builtins.py:2328
1402
#: bzrlib/builtins.py:2305
1398
1403
msgid "Diff format to use."
1399
1404
msgstr ""
1400
1405
1401
1406
# title of 'format' option of 'diff' command
1402
#: bzrlib/builtins.py:2330
1407
#: bzrlib/builtins.py:2307
1403
1408
msgid "Diff format"
1404
1409
msgstr ""
1405
1410
1406
# help of 'context' option of 'diff' command
1407
#: bzrlib/builtins.py:2332
1408
msgid "How many lines of context to show."
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2357
1411
#: bzrlib/builtins.py:2329
1412
1412
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1413
1413
msgstr ""
1414
1414
1415
#: bzrlib/builtins.py:2361
1415
#: bzrlib/builtins.py:2333
1416
1416
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1417
1417
msgstr ""
1418
1418
1419
#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776
1420
#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957
1419
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1420
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1421
1421
msgid "{0} and {1} are mutually exclusive"
1422
1422
msgstr ""
1423
1423
1424
#: bzrlib/builtins.py:2386
1424
#: bzrlib/builtins.py:2358
1425
1425
msgid ""
1426
1426
"List files deleted in the working tree.\n"
1427
1427
" "
1428
1428
msgstr ""
1429
1429
1430
#: bzrlib/builtins.py:2463
1430
#: bzrlib/builtins.py:2436
1431
1431
msgid "Show the tree root directory."
1432
1432
msgstr ""
1433
1433
1434
#: bzrlib/builtins.py:2465
1434
#: bzrlib/builtins.py:2438
1435
1435
msgid ""
1436
1436
"The root is the nearest enclosing directory with a .bzr control\n"
1437
1437
"directory."
1438
1438
msgstr ""
1439
1439
1440
#: bzrlib/builtins.py:2480
1440
#: bzrlib/builtins.py:2453
1441
1441
msgid "The limit argument must be an integer."
1442
1442
msgstr ""
1443
1443
1444
#: bzrlib/builtins.py:2488
1444
#: bzrlib/builtins.py:2461
1445
1445
msgid "The levels argument must be an integer."
1446
1446
msgstr ""
1447
1447
1448
#: bzrlib/builtins.py:2493
1448
#: bzrlib/builtins.py:2466
1449
1449
msgid "Show historical log for a branch or subset of a branch."
1450
1450
msgstr ""
1451
1451
1452
#: bzrlib/builtins.py:2495
1452
#: bzrlib/builtins.py:2468
1453
1453
msgid ""
1454
1454
"log is bzr's default tool for exploring the history of a branch.\n"
1455
1455
"The branch to use is taken from the first parameter. If no parameters\n"
1457
1457
"Here are some simple examples::"
1458
1458
msgstr ""
1459
1459
1460
#: bzrlib/builtins.py:2500
1460
#: bzrlib/builtins.py:2473
1461
1461
msgid ""
1462
1462
" bzr log log the current branch\n"
1463
1463
" bzr log foo.py log a file in its branch\n"
1464
1464
" bzr log http://server/branch log a branch on a server"
1465
1465
msgstr ""
1466
1466
1467
#: bzrlib/builtins.py:2504
1467
#: bzrlib/builtins.py:2477
1468
1468
msgid ""
1469
1469
"The filtering, ordering and information shown for each revision can\n"
1470
1470
"be controlled as explained below. By default, all revisions are\n"
1474
1474
"were merged."
1475
1475
msgstr ""
1476
1476
1477
#: bzrlib/builtins.py:2511
1477
#: bzrlib/builtins.py:2484
1478
1478
msgid ":Output control:"
1479
1479
msgstr ""
1480
1480
1481
#: bzrlib/builtins.py:2513
1481
#: bzrlib/builtins.py:2486
1482
1482
msgid ""
1483
1483
" The log format controls how information about each revision is\n"
1484
1484
" displayed. The standard log formats are called ``long``, ``short``\n"
1486
1486
" for more details on log formats."
1487
1487
msgstr ""
1488
1488
1489
#: bzrlib/builtins.py:2518
1489
#: bzrlib/builtins.py:2491
1490
1490
msgid ""
1491
1491
" The following options can be used to control what information is\n"
1492
1492
" displayed::"
1493
1493
msgstr ""
1494
1494
1495
#: bzrlib/builtins.py:2521
1495
#: bzrlib/builtins.py:2494
1496
1496
msgid ""
1497
1497
" -l N display a maximum of N revisions\n"
1498
1498
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1501
1501
" --show-ids display revision-ids (and file-ids), not just revnos"
1502
1502
msgstr ""
1503
1503
1504
#: bzrlib/builtins.py:2527
1504
#: bzrlib/builtins.py:2500
1505
1505
msgid ""
1506
1506
" Note that the default number of levels to display is a function of the\n"
1507
1507
" log format. If the -n option is not used, the standard log formats show\n"
1508
1508
" just the top level (mainline)."
1509
1509
msgstr ""
1510
1510
1511
#: bzrlib/builtins.py:2531
1511
#: bzrlib/builtins.py:2504
1512
1512
msgid ""
1513
1513
" Status summaries are shown using status flags like A, M, etc. To see\n"
1514
1514
" the changes explained using words like ``added`` and ``modified``\n"
1515
1515
" instead, use the -vv option."
1516
1516
msgstr ""
1517
1517
1518
#: bzrlib/builtins.py:2535
1518
#: bzrlib/builtins.py:2508
1519
1519
msgid ":Ordering control:"
1520
1520
msgstr ""
1521
1521
1522
#: bzrlib/builtins.py:2537
1522
#: bzrlib/builtins.py:2510
1523
1523
msgid ""
1524
1524
" To display revisions from oldest to newest, use the --forward option.\n"
1525
1525
" In most cases, using this option will have little impact on the total\n"
1527
1527
" display revisions like --reverse does when it can."
1528
1528
msgstr ""
1529
1529
1530
#: bzrlib/builtins.py:2542
1530
#: bzrlib/builtins.py:2515
1531
1531
msgid ":Revision filtering:"
1532
1532
msgstr ""
1533
1533
1534
#: bzrlib/builtins.py:2544
1534
#: bzrlib/builtins.py:2517
1535
1535
msgid ""
1536
1536
" The -r option can be used to specify what revision or range of revisions\n"
1537
1537
" to filter against. The various forms are shown below::"
1538
1538
msgstr ""
1539
1539
1540
#: bzrlib/builtins.py:2547
1540
#: bzrlib/builtins.py:2520
1541
1541
msgid ""
1542
1542
" -rX display revision X\n"
1543
1543
" -rX.. display revision X and later\n"
1545
1545
" -rX..Y display from X to Y inclusive"
1546
1546
msgstr ""
1547
1547
1548
#: bzrlib/builtins.py:2552
1548
#: bzrlib/builtins.py:2525
1549
1549
msgid ""
1550
1550
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1551
1551
" Some common examples are given below::"
1552
1552
msgstr ""
1553
1553
1554
#: bzrlib/builtins.py:2555
1554
#: bzrlib/builtins.py:2528
1555
1555
msgid ""
1556
1556
" -r-1 show just the tip\n"
1557
1557
" -r-10.. show the last 10 mainline revisions\n"
1561
1561
" -rdate:yesterday.. show changes since yesterday"
1562
1562
msgstr ""
1563
1563
1564
#: bzrlib/builtins.py:2562
1564
#: bzrlib/builtins.py:2535
1565
1565
msgid ""
1566
1566
" When logging a range of revisions using -rX..Y, log starts at\n"
1567
1567
" revision Y and searches back in history through the primary\n"
1571
1571
" a nested merge revision and the log will be truncated accordingly."
1572
1572
msgstr ""
1573
1573
1574
#: bzrlib/builtins.py:2569
1574
#: bzrlib/builtins.py:2542
1575
1575
msgid ":Path filtering:"
1576
1576
msgstr ""
1577
1577
1578
#: bzrlib/builtins.py:2571
1578
#: bzrlib/builtins.py:2544
1579
1579
msgid ""
1580
1580
" If parameters are given and the first one is not a branch, the log\n"
1581
1581
" will be filtered to show only those revisions that changed the\n"
1582
1582
" nominated files or directories."
1583
1583
msgstr ""
1584
1584
1585
#: bzrlib/builtins.py:2575
1585
#: bzrlib/builtins.py:2548
1586
1586
msgid ""
1587
1587
" Filenames are interpreted within their historical context. To log a\n"
1588
1588
" deleted file, specify a revision range so that the file existed at\n"
1589
1589
" the end or start of the range."
1590
1590
msgstr ""
1591
1591
1592
#: bzrlib/builtins.py:2579
1592
#: bzrlib/builtins.py:2552
1593
1593
msgid ""
1594
1594
" Historical context is also important when interpreting pathnames of\n"
1595
1595
" renamed files/directories. Consider the following example:"
1596
1596
msgstr ""
1597
1597
1598
#: bzrlib/builtins.py:2582
1598
#: bzrlib/builtins.py:2555
1599
1599
msgid ""
1600
1600
" * revision 1: add tutorial.txt\n"
1601
1601
" * revision 2: modify tutorial.txt\n"
1602
1602
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1603
1603
msgstr ""
1604
1604
1605
#: bzrlib/builtins.py:2586
1605
#: bzrlib/builtins.py:2559
1606
1606
msgid " In this case:"
1607
1607
msgstr ""
1608
1608
1609
#: bzrlib/builtins.py:2588
1609
#: bzrlib/builtins.py:2561
1610
1610
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1611
1611
msgstr ""
1612
1612
1613
#: bzrlib/builtins.py:2590
1613
#: bzrlib/builtins.py:2563
1614
1614
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1615
1615
msgstr ""
1616
1616
1617
#: bzrlib/builtins.py:2592
1617
#: bzrlib/builtins.py:2565
1618
1618
msgid ""
1619
1619
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1620
1620
" the original file in revision 2."
1621
1621
msgstr ""
1622
1622
1623
#: bzrlib/builtins.py:2595
1623
#: bzrlib/builtins.py:2568
1624
1624
msgid ""
1625
1625
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1626
1626
" was no file called guide.txt in revision 2."
1627
1627
msgstr ""
1628
1628
1629
#: bzrlib/builtins.py:2598
1629
#: bzrlib/builtins.py:2571
1630
1630
msgid ""
1631
1631
" Renames are always followed by log. By design, there is no need to\n"
1632
1632
" explicitly ask for this (and no way to stop logging a file back\n"
1633
1633
" until it was last renamed)."
1634
1634
msgstr ""
1635
1635
1636
#: bzrlib/builtins.py:2602
1636
#: bzrlib/builtins.py:2575
1637
1637
msgid ":Other filtering:"
1638
1638
msgstr ""
1639
1639
1640
#: bzrlib/builtins.py:2604
1640
#: bzrlib/builtins.py:2577
1641
1641
msgid ""
1642
1642
" The --match option can be used for finding revisions that match a\n"
1643
1643
" regular expression in a commit message, committer, author or bug.\n"
1646
1646
" --match-message can be used to only match a specific field."
1647
1647
msgstr ""
1648
1648
1649
#: bzrlib/builtins.py:2610
1649
#: bzrlib/builtins.py:2583
1650
1650
msgid ":Tips & tricks:"
1651
1651
msgstr ""
1652
1652
1653
#: bzrlib/builtins.py:2612
1653
#: bzrlib/builtins.py:2585
1654
1654
msgid ""
1655
1655
" GUI tools and IDEs are often better at exploring history than command\n"
1656
1656
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1659
1659
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1660
1660
msgstr ""
1661
1661
1662
#: bzrlib/builtins.py:2618
1662
#: bzrlib/builtins.py:2591
1663
1663
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1664
1664
msgstr ""
1665
1665
1666
#: bzrlib/builtins.py:2620
1666
#: bzrlib/builtins.py:2593
1667
1667
msgid ""
1668
1668
" [ALIASES]\n"
1669
1669
" tip = log -r-1\n"
1671
1671
" show = log -v -p"
1672
1672
msgstr ""
1673
1673
1674
#: bzrlib/builtins.py:2625
1674
#: bzrlib/builtins.py:2598
1675
1675
msgid ""
1676
1676
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1677
1677
" will show the last 10 mainline revisions. To see the details of a\n"
1678
1678
" particular revision X, ``bzr show -rX``."
1679
1679
msgstr ""
1680
1680
1681
#: bzrlib/builtins.py:2629
1681
#: bzrlib/builtins.py:2602
1682
1682
msgid ""
1683
1683
" If you are interested in looking deeper into a particular merge X,\n"
1684
1684
" use ``bzr log -n0 -rX``."
1685
1685
msgstr ""
1686
1686
1687
#: bzrlib/builtins.py:2632
1687
#: bzrlib/builtins.py:2605
1688
1688
msgid ""
1689
1689
" ``bzr log -v`` on a branch with lots of history is currently\n"
1690
1690
" very slow. A fix for this issue is currently under development.\n"
1692
1692
" be given when using the -v option."
1693
1693
msgstr ""
1694
1694
1695
#: bzrlib/builtins.py:2637
1695
#: bzrlib/builtins.py:2610
1696
1696
msgid ""
1697
1697
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1698
1698
" used to find revisions matching user names, commit messages, etc.\n"
1700
1700
" a list of words but not others."
1701
1701
msgstr ""
1702
1702
1703
#: bzrlib/builtins.py:2642
1703
#: bzrlib/builtins.py:2615
1704
1704
msgid ""
1705
1705
" When exploring non-mainline history on large projects with deep\n"
1706
1706
" history, the performance of log can be greatly improved by installing\n"
1709
1709
msgstr ""
1710
1710
1711
1711
# help of 'forward' option of 'log' command
1712
#: bzrlib/builtins.py:2651
1712
#: bzrlib/builtins.py:2624
1713
1713
msgid "Show from oldest to newest."
1714
1714
msgstr ""
1715
1715
1716
1716
# help of 'verbose' option of 'log' command
1717
#: bzrlib/builtins.py:2654
1717
#: bzrlib/builtins.py:2627
1718
1718
msgid "Show files changed in each revision."
1719
1719
msgstr ""
1720
1720
1721
1721
# help of 'change' option of 'log' command
1722
#: bzrlib/builtins.py:2660
1722
#: bzrlib/builtins.py:2633
1723
1723
msgid "Show just the specified revision. See also \"help revisionspec\"."
1724
1724
msgstr ""
1725
1725
1726
1726
# help of 'authors' option of 'log' command
1727
#: bzrlib/builtins.py:2664
1727
#: bzrlib/builtins.py:2637
1728
1728
msgid "What names to list as authors - first, all or committer."
1729
1729
msgstr ""
1730
1730
1731
1731
# title of 'authors' option of 'log' command
1732
#: bzrlib/builtins.py:2665
1732
#: bzrlib/builtins.py:2638
1733
1733
msgid "Authors"
1734
1734
msgstr ""
1735
1735
1736
1736
# help of 'levels' option of 'log' command
1737
#: bzrlib/builtins.py:2670
1737
#: bzrlib/builtins.py:2643
1738
1738
msgid "Number of levels to display - 0 for all, 1 for flat."
1739
1739
msgstr ""
1740
1740
1741
1741
# help of 'limit' option of 'log' command
1742
#: bzrlib/builtins.py:2680
1742
#: bzrlib/builtins.py:2653
1743
1743
msgid "Limit the output to the first N revisions."
1744
1744
msgstr ""
1745
1745
1746
1746
# help of 'show-diff' option of 'log' command
1747
#: bzrlib/builtins.py:2685
1747
#: bzrlib/builtins.py:2658
1748
1748
msgid "Show changes made in each revision as a patch."
1749
1749
msgstr ""
1750
1750
1751
1751
# help of 'include-merged' option of 'log' command
1752
#: bzrlib/builtins.py:2687
1752
#: bzrlib/builtins.py:2660
1753
1753
msgid "Show merged revisions like --levels 0 does."
1754
1754
msgstr ""
1755
1755
1756
1756
# help of 'omit-merges' option of 'log' command
1757
#: bzrlib/builtins.py:2691
1757
#: bzrlib/builtins.py:2664
1758
1758
msgid "Do not report commits with more than one parent."
1759
1759
msgstr ""
1760
1760
1761
1761
# help of 'exclude-common-ancestry' option of 'log' command
1762
#: bzrlib/builtins.py:2693
1762
#: bzrlib/builtins.py:2666
1763
1763
msgid ""
1764
1764
"Display only the revisions that are not part of both ancestries (require -"
1765
1765
"rX..Y)."
1766
1766
msgstr ""
1767
1767
1768
1768
# help of 'signatures' option of 'log' command
1769
#: bzrlib/builtins.py:2697
1769
#: bzrlib/builtins.py:2670
1770
1770
msgid "Show digital signature validity."
1771
1771
msgstr ""
1772
1772
1773
1773
# help of 'match' option of 'log' command
1774
#: bzrlib/builtins.py:2700
1774
#: bzrlib/builtins.py:2673
1775
1775
msgid "Show revisions whose properties match this expression."
1776
1776
msgstr ""
1777
1777
1778
1778
# help of 'match-message' option of 'log' command
1779
#: bzrlib/builtins.py:2704
1779
#: bzrlib/builtins.py:2677
1780
1780
msgid "Show revisions whose message matches this expression."
1781
1781
msgstr ""
1782
1782
1783
1783
# help of 'match-committer' option of 'log' command
1784
#: bzrlib/builtins.py:2708
1784
#: bzrlib/builtins.py:2681
1785
1785
msgid "Show revisions whose committer matches this expression."
1786
1786
msgstr ""
1787
1787
1788
1788
# help of 'match-author' option of 'log' command
1789
#: bzrlib/builtins.py:2712
1789
#: bzrlib/builtins.py:2685
1790
1790
msgid "Show revisions whose authors match this expression."
1791
1791
msgstr ""
1792
1792
1793
1793
# help of 'match-bugs' option of 'log' command
1794
#: bzrlib/builtins.py:2716
1794
#: bzrlib/builtins.py:2689
1795
1795
msgid "Show revisions whose bugs match this expression."
1796
1796
msgstr ""
1797
1797
1798
#: bzrlib/builtins.py:2770
1798
#: bzrlib/builtins.py:2743
1799
1799
msgid "--exclude-common-ancestry requires -r with two revisions"
1800
1800
msgstr ""
1801
1801
1802
#: bzrlib/builtins.py:2798
1802
#: bzrlib/builtins.py:2771
1803
1803
#, python-format
1804
1804
msgid "Path unknown at end or start of revision range: %s"
1805
1805
msgstr ""
1806
1806
1807
#: bzrlib/builtins.py:2915
1807
#: bzrlib/builtins.py:2888
1808
1808
#, python-format
1809
1809
msgid "bzr %s doesn't accept two revisions in different branches."
1810
1810
msgstr ""
1811
1811
1812
#: bzrlib/builtins.py:2931
1812
#: bzrlib/builtins.py:2904
1813
1813
#, python-format
1814
1814
msgid "bzr %s --revision takes one or two values."
1815
1815
msgstr ""
1816
1816
1817
#: bzrlib/builtins.py:2976
1817
#: bzrlib/builtins.py:2949
1818
1818
msgid ""
1819
1819
"List files in a tree.\n"
1820
1820
" "
1821
1821
msgstr ""
1822
1822
1823
1823
# help of 'recursive' option of 'ls' command
1824
#: bzrlib/builtins.py:2985
1824
#: bzrlib/builtins.py:2958
1825
1825
msgid "Recurse into subdirectories."
1826
1826
msgstr ""
1827
1827
1828
1828
# help of 'from-root' option of 'ls' command
1829
#: bzrlib/builtins.py:2987
1829
#: bzrlib/builtins.py:2960
1830
1830
msgid "Print paths relative to the root of the branch."
1831
1831
msgstr ""
1832
1832
1833
1833
# help of 'unknown' option of 'ls' command
1834
#: bzrlib/builtins.py:2989
1834
#: bzrlib/builtins.py:2962
1835
1835
msgid "Print unknown files."
1836
1836
msgstr ""
1837
1837
1838
1838
# help of 'versioned' option of 'ls' command
1839
#: bzrlib/builtins.py:2990
1839
#: bzrlib/builtins.py:2963
1840
1840
msgid "Print versioned files."
1841
1841
msgstr ""
1842
1842
1843
1843
# help of 'ignored' option of 'ls' command
1844
#: bzrlib/builtins.py:2993
1844
#: bzrlib/builtins.py:2966
1845
1845
msgid "Print ignored files."
1846
1846
msgstr ""
1847
1847
1848
1848
# help of 'kind' option of 'ls' command
1849
#: bzrlib/builtins.py:2995
1849
#: bzrlib/builtins.py:2968
1850
1850
msgid "List entries of a particular kind: file, directory, symlink."
1851
1851
msgstr ""
1852
1852
1853
#: bzrlib/builtins.py:3008
1853
#: bzrlib/builtins.py:2981
1854
1854
msgid "invalid kind specified"
1855
1855
msgstr ""
1856
1856
1857
#: bzrlib/builtins.py:3011
1857
#: bzrlib/builtins.py:2984
1858
1858
msgid "Cannot set both --verbose and --null"
1859
1859
msgstr ""
1860
1860
1861
#: bzrlib/builtins.py:3020
1861
#: bzrlib/builtins.py:2993
1862
1862
msgid "cannot specify both --from-root and PATH"
1863
1863
msgstr ""
1864
1864
1865
#: bzrlib/builtins.py:3107
1865
#: bzrlib/builtins.py:3080
1866
1866
msgid "Ignore specified files or patterns."
1867
1867
msgstr ""
1868
1868
1869
#: bzrlib/builtins.py:3109
1869
#: bzrlib/builtins.py:3082
1870
1870
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1871
1871
msgstr ""
1872
1872
1873
#: bzrlib/builtins.py:3111
1873
#: bzrlib/builtins.py:3084
1874
1874
msgid ""
1875
1875
"If a .bzrignore file does not exist, the ignore command\n"
1876
1876
"will create one and add the specified files or patterns to the newly\n"
1879
1879
"the use of the ignore command will require an explicit add command."
1880
1880
msgstr ""
1881
1881
1882
#: bzrlib/builtins.py:3117
1882
#: bzrlib/builtins.py:3090
1883
1883
msgid ""
1884
1884
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1885
1885
"After adding, editing or deleting that file either indirectly by\n"
1887
1887
"it."
1888
1888
msgstr ""
1889
1889
1890
#: bzrlib/builtins.py:3122
1890
#: bzrlib/builtins.py:3095
1891
1891
msgid ""
1892
1892
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1893
1893
"the global ignore file can be found in the application data directory as\n"
1896
1896
"can be edited directly using an editor."
1897
1897
msgstr ""
1898
1898
1899
#: bzrlib/builtins.py:3128
1899
#: bzrlib/builtins.py:3101
1900
1900
msgid ""
1901
1901
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1902
1902
"precedence over regular ignores. Such exceptions are used to specify\n"
1903
1903
"files that should be versioned which would otherwise be ignored."
1904
1904
msgstr ""
1905
1905
1906
#: bzrlib/builtins.py:3132
1906
#: bzrlib/builtins.py:3105
1907
1907
msgid ""
1908
1908
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1909
1909
"precedence over the '!' exception patterns."
1910
1910
msgstr ""
1911
1911
1912
#: bzrlib/builtins.py:3135
1912
#: bzrlib/builtins.py:3108
1913
1913
msgid ""
1914
1914
":Notes: \n"
1915
1915
" \n"
1917
1917
" the shell on Unix."
1918
1918
msgstr ""
1919
1919
1920
#: bzrlib/builtins.py:3140
1920
#: bzrlib/builtins.py:3113
1921
1921
msgid ""
1922
1922
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1923
1923
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1924
1924
msgstr ""
1925
1925
1926
#: bzrlib/builtins.py:3143
1926
#: bzrlib/builtins.py:3116
1927
1927
msgid ""
1928
1928
":Examples:\n"
1929
1929
" Ignore the top level Makefile::"
1930
1930
msgstr ""
1931
1931
1932
#: bzrlib/builtins.py:3146
1932
#: bzrlib/builtins.py:3119
1933
1933
msgid " bzr ignore ./Makefile"
1934
1934
msgstr ""
1935
1935
1936
#: bzrlib/builtins.py:3148
1936
#: bzrlib/builtins.py:3121
1937
1937
msgid " Ignore .class files in all directories...::"
1938
1938
msgstr ""
1939
1939
1940
#: bzrlib/builtins.py:3150
1940
#: bzrlib/builtins.py:3123
1941
1941
msgid " bzr ignore \"*.class\""
1942
1942
msgstr ""
1943
1943
1944
#: bzrlib/builtins.py:3152
1944
#: bzrlib/builtins.py:3125
1945
1945
msgid " ...but do not ignore \"special.class\"::"
1946
1946
msgstr ""
1947
1947
1948
#: bzrlib/builtins.py:3154
1948
#: bzrlib/builtins.py:3127
1949
1949
msgid " bzr ignore \"!special.class\""
1950
1950
msgstr ""
1951
1951
1952
#: bzrlib/builtins.py:3156
1952
#: bzrlib/builtins.py:3129
1953
1953
msgid " Ignore files whose name begins with the \"#\" character::"
1954
1954
msgstr ""
1955
1955
1956
#: bzrlib/builtins.py:3158
1956
#: bzrlib/builtins.py:3131
1957
1957
msgid " bzr ignore \"RE:^#\""
1958
1958
msgstr ""
1959
1959
1960
#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164
1960
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1961
1961
msgid " Ignore .o files under the lib directory::"
1962
1962
msgstr ""
1963
1963
1964
#: bzrlib/builtins.py:3162
1964
#: bzrlib/builtins.py:3135
1965
1965
msgid " bzr ignore \"lib/**/*.o\""
1966
1966
msgstr ""
1967
1967
1968
#: bzrlib/builtins.py:3166
1968
#: bzrlib/builtins.py:3139
1969
1969
msgid " bzr ignore \"RE:lib/.*\\.o\""
1970
1970
msgstr ""
1971
1971
1972
#: bzrlib/builtins.py:3168
1972
#: bzrlib/builtins.py:3141
1973
1973
msgid " Ignore everything but the \"debian\" toplevel directory::"
1974
1974
msgstr ""
1975
1975
1976
#: bzrlib/builtins.py:3170
1976
#: bzrlib/builtins.py:3143
1977
1977
msgid ""
1978
1978
" bzr ignore \"RE:(?!debian/).*\"\n"
1979
1979
" \n"
1986
1986
msgstr ""
1987
1987
1988
1988
# help of 'default-rules' option of 'ignore' command
1989
#: bzrlib/builtins.py:3184
1989
#: bzrlib/builtins.py:3157
1990
1990
msgid "Display the default ignore rules that bzr uses."
1991
1991
msgstr ""
1992
1992
1993
#: bzrlib/builtins.py:3196
1993
#: bzrlib/builtins.py:3169
1994
1994
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1995
1995
msgstr ""
1996
1996
1997
#: bzrlib/builtins.py:3207
1997
#: bzrlib/builtins.py:3180
1998
1998
#, python-format
1999
1999
msgid "Invalid ignore pattern found. %s"
2000
2000
msgid_plural "Invalid ignore patterns found. %s"
2001
2001
msgstr[0] ""
2002
2002
msgstr[1] ""
2003
2003
2004
#: bzrlib/builtins.py:3216
2004
#: bzrlib/builtins.py:3189
2005
2005
msgid "NAME_PATTERN should not be an absolute path"
2006
2006
msgstr ""
2007
2007
2008
#: bzrlib/builtins.py:3229
2008
#: bzrlib/builtins.py:3202
2009
2009
#, python-format
2010
2010
msgid ""
2011
2011
"Warning: the following files are version controlled and match your ignore "
2015
2015
"them.\n"
2016
2016
msgstr ""
2017
2017
2018
#: bzrlib/builtins.py:3236
2018
#: bzrlib/builtins.py:3209
2019
2019
msgid "List ignored files and the patterns that matched them."
2020
2020
msgstr ""
2021
2021
2022
#: bzrlib/builtins.py:3238
2022
#: bzrlib/builtins.py:3211
2023
2023
msgid ""
2024
2024
"List all the ignored files and the ignore pattern that caused the file to\n"
2025
2025
"be ignored."
2026
2026
msgstr ""
2027
2027
2028
#: bzrlib/builtins.py:3241
2028
#: bzrlib/builtins.py:3214
2029
2029
msgid "Alternatively, to list just the files::"
2030
2030
msgstr ""
2031
2031
2032
#: bzrlib/builtins.py:3243
2032
#: bzrlib/builtins.py:3216
2033
2033
msgid " bzr ls --ignored"
2034
2034
msgstr ""
2035
2035
2036
#: bzrlib/builtins.py:3277
2036
#: bzrlib/builtins.py:3250
2037
2037
#, python-format
2038
2038
msgid "not a valid revision-number: %r"
2039
2039
msgstr ""
2040
2040
2041
#: bzrlib/builtins.py:3284
2041
#: bzrlib/builtins.py:3257
2042
2042
msgid "Export current or past revision to a destination directory or archive."
2043
2043
msgstr ""
2044
2044
2045
#: bzrlib/builtins.py:3286
2045
#: bzrlib/builtins.py:3259
2046
2046
msgid "If no revision is specified this exports the last committed revision."
2047
2047
msgstr ""
2048
2048
2049
#: bzrlib/builtins.py:3288
2049
#: bzrlib/builtins.py:3261
2050
2050
msgid ""
2051
2051
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2052
2052
"given, try to find the format with the extension. If no extension\n"
2053
2053
"is found exports to a directory (equivalent to --format=dir)."
2054
2054
msgstr ""
2055
2055
2056
#: bzrlib/builtins.py:3292
2056
#: bzrlib/builtins.py:3265
2057
2057
msgid ""
2058
2058
"If root is supplied, it will be used as the root directory inside\n"
2059
2059
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2060
2060
"to the exported filename. The root option has no effect for 'dir' format."
2061
2061
msgstr ""
2062
2062
2063
#: bzrlib/builtins.py:3296
2063
#: bzrlib/builtins.py:3269
2064
2064
msgid ""
2065
2065
"If branch is omitted then the branch containing the current working\n"
2066
2066
"directory will be used."
2067
2067
msgstr ""
2068
2068
2069
#: bzrlib/builtins.py:3299
2069
#: bzrlib/builtins.py:3272
2070
2070
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2071
2071
msgstr ""
2072
2072
2073
#: bzrlib/builtins.py:3301
2073
#: bzrlib/builtins.py:3274
2074
2074
msgid ""
2075
2075
" ================= =========================\n"
2076
2076
" Supported formats Autodetected by extension\n"
2084
2084
msgstr ""
2085
2085
2086
2086
# help of 'format' option of 'export' command
2087
#: bzrlib/builtins.py:3315
2087
#: bzrlib/builtins.py:3288
2088
2088
msgid "Type of file to export to."
2089
2089
msgstr ""
2090
2090
2091
2091
# help of 'filters' option of 'export' command
2092
#: bzrlib/builtins.py:3318
2092
#: bzrlib/builtins.py:3291
2093
2093
msgid "Apply content filters to export the convenient form."
2094
2094
msgstr ""
2095
2095
2096
2096
# help of 'root' option of 'export' command
2097
#: bzrlib/builtins.py:3322
2097
#: bzrlib/builtins.py:3295
2098
2098
msgid "Name of the root directory inside the exported file."
2099
2099
msgstr ""
2100
2100
2101
2101
# help of 'per-file-timestamps' option of 'export' command
2102
#: bzrlib/builtins.py:3324
2102
#: bzrlib/builtins.py:3297
2103
2103
msgid ""
2104
2104
"Set modification time of files to that of the last revision in which it was "
2105
2105
"changed."
2106
2106
msgstr ""
2107
2107
2108
2108
# help of 'uncommitted' option of 'export' command
2109
#: bzrlib/builtins.py:3327
2109
#: bzrlib/builtins.py:3300
2110
2110
msgid "Export the working tree contents rather than that of the last revision."
2111
2111
msgstr ""
2112
2112
2113
#: bzrlib/builtins.py:3346
2113
#: bzrlib/builtins.py:3319
2114
2114
msgid "--uncommitted requires a working tree"
2115
2115
msgstr ""
2116
2116
2117
#: bzrlib/builtins.py:3355
2117
#: bzrlib/builtins.py:3328
2118
2118
#, python-format
2119
2119
msgid "Unsupported export format: %s"
2120
2120
msgstr ""
2121
2121
2122
#: bzrlib/builtins.py:3359
2122
#: bzrlib/builtins.py:3332
2123
2123
msgid "Write the contents of a file as of a given revision to standard output."
2124
2124
msgstr ""
2125
2125
2126
#: bzrlib/builtins.py:3361
2126
#: bzrlib/builtins.py:3334
2127
2127
msgid "If no revision is nominated, the last revision is used."
2128
2128
msgstr ""
2129
2129
2130
#: bzrlib/builtins.py:3363
2130
#: bzrlib/builtins.py:3336
2131
2131
msgid ""
2132
2132
"Note: Take care to redirect standard output when using this command on a\n"
2133
2133
"binary file."
2134
2134
msgstr ""
2135
2135
2136
2136
# help of 'name-from-revision' option of 'cat' command
2137
#: bzrlib/builtins.py:3369
2137
#: bzrlib/builtins.py:3342
2138
2138
msgid "The path name in the old tree."
2139
2139
msgstr ""
2140
2140
2141
2141
# help of 'filters' option of 'cat' command
2142
#: bzrlib/builtins.py:3370
2142
#: bzrlib/builtins.py:3343
2143
2143
msgid "Apply content filters to display the convenience form."
2144
2144
msgstr ""
2145
2145
2146
#: bzrlib/builtins.py:3381
2146
#: bzrlib/builtins.py:3354
2147
2147
msgid "bzr cat --revision takes exactly one revision specifier"
2148
2148
msgstr ""
2149
2149
2150
#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418
2150
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2151
2151
msgid "{0!r} is not present in revision {1}"
2152
2152
msgstr ""
2153
2153
2154
#: bzrlib/builtins.py:3441
2154
#: bzrlib/builtins.py:3414
2155
2155
msgid "Commit changes into a new revision."
2156
2156
msgstr ""
2157
2157
2158
#: bzrlib/builtins.py:3443
2158
#: bzrlib/builtins.py:3416
2159
2159
msgid ""
2160
2160
"An explanatory message needs to be given for each commit. This is\n"
2161
2161
"often done by using the --message option (getting the message from the\n"
2165
2165
"boilerplate text loaded into the editor, use the --show-diff option."
2166
2166
msgstr ""
2167
2167
2168
#: bzrlib/builtins.py:3450
2168
#: bzrlib/builtins.py:3423
2169
2169
msgid ""
2170
2170
"By default, the entire tree is committed and the person doing the\n"
2171
2171
"commit is assumed to be the author. These defaults can be overridden\n"
2172
2172
"as explained below."
2173
2173
msgstr ""
2174
2174
2175
#: bzrlib/builtins.py:3454
2175
#: bzrlib/builtins.py:3427
2176
2176
msgid ":Selective commits:"
2177
2177
msgstr ""
2178
2178
2179
#: bzrlib/builtins.py:3456
2179
#: bzrlib/builtins.py:3429
2180
2180
msgid ""
2181
2181
" If selected files are specified, only changes to those files are\n"
2182
2182
" committed. If a directory is specified then the directory and\n"
2183
2183
" everything within it is committed."
2184
2184
msgstr ""
2185
2185
2186
#: bzrlib/builtins.py:3460
2186
#: bzrlib/builtins.py:3433
2187
2187
msgid ""
2188
2188
" When excludes are given, they take precedence over selected files.\n"
2189
2189
" For example, to commit only changes within foo, but not changes\n"
2190
2190
" within foo/bar::"
2191
2191
msgstr ""
2192
2192
2193
#: bzrlib/builtins.py:3464
2193
#: bzrlib/builtins.py:3437
2194
2194
msgid " bzr commit foo -x foo/bar"
2195
2195
msgstr ""
2196
2196
2197
#: bzrlib/builtins.py:3466
2197
#: bzrlib/builtins.py:3439
2198
2198
msgid " A selective commit after a merge is not yet supported."
2199
2199
msgstr ""
2200
2200
2201
#: bzrlib/builtins.py:3468
2201
#: bzrlib/builtins.py:3441
2202
2202
msgid ":Custom authors:"
2203
2203
msgstr ""
2204
2204
2205
#: bzrlib/builtins.py:3470
2205
#: bzrlib/builtins.py:3443
2206
2206
msgid ""
2207
2207
" If the author of the change is not the same person as the committer,\n"
2208
2208
" you can specify the author's name using the --author option. The\n"
2212
2212
" author."
2213
2213
msgstr ""
2214
2214
2215
#: bzrlib/builtins.py:3477
2215
#: bzrlib/builtins.py:3450
2216
2216
msgid ":Checks:"
2217
2217
msgstr ""
2218
2218
2219
#: bzrlib/builtins.py:3479
2219
#: bzrlib/builtins.py:3452
2220
2220
msgid ""
2221
2221
" A common mistake is to forget to add a new file or directory before\n"
2222
2222
" running the commit command. The --strict option checks for unknown\n"
2225
2225
" for details."
2226
2226
msgstr ""
2227
2227
2228
#: bzrlib/builtins.py:3485
2228
#: bzrlib/builtins.py:3458
2229
2229
msgid ":Things to note:"
2230
2230
msgstr ""
2231
2231
2232
#: bzrlib/builtins.py:3487
2232
#: bzrlib/builtins.py:3460
2233
2233
msgid ""
2234
2234
" If you accidentially commit the wrong changes or make a spelling\n"
2235
2235
" mistake in the commit message say, you can use the uncommit command\n"
2236
2236
" to undo it. See ``bzr help uncommit`` for details."
2237
2237
msgstr ""
2238
2238
2239
#: bzrlib/builtins.py:3491
2239
#: bzrlib/builtins.py:3464
2240
2240
msgid ""
2241
2241
" Hooks can also be configured to run after a commit. This allows you\n"
2242
2242
" to trigger updates to external systems like bug trackers. The --fixes\n"
2245
2245
msgstr ""
2246
2246
2247
2247
# help of 'exclude' option of 'commit' command
2248
#: bzrlib/builtins.py:3501
2248
#: bzrlib/builtins.py:3474
2249
2249
msgid "Do not consider changes made to a given path."
2250
2250
msgstr ""
2251
2251
2252
2252
# help of 'message' option of 'commit' command
2253
#: bzrlib/builtins.py:3504
2253
#: bzrlib/builtins.py:3477
2254
2254
msgid "Description of the new revision."
2255
2255
msgstr ""
2256
2256
2257
2257
# help of 'unchanged' option of 'commit' command
2258
#: bzrlib/builtins.py:3507
2258
#: bzrlib/builtins.py:3480
2259
2259
msgid "Commit even if nothing has changed."
2260
2260
msgstr ""
2261
2261
2262
2262
# help of 'file' option of 'commit' command
2263
#: bzrlib/builtins.py:3511
2263
#: bzrlib/builtins.py:3484
2264
2264
msgid "Take commit message from this file."
2265
2265
msgstr ""
2266
2266
2267
2267
# help of 'strict' option of 'commit' command
2268
#: bzrlib/builtins.py:3513
2268
#: bzrlib/builtins.py:3486
2269
2269
msgid "Refuse to commit if there are unknown files in the working tree."
2270
2270
msgstr ""
2271
2271
2272
2272
# help of 'commit-time' option of 'commit' command
2273
#: bzrlib/builtins.py:3516
2273
#: bzrlib/builtins.py:3489
2274
2274
msgid ""
2275
2275
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2276
2276
"08:00:00 +0100'."
2277
2277
msgstr ""
2278
2278
2279
2279
# help of 'fixes' option of 'commit' command
2280
#: bzrlib/builtins.py:3519
2280
#: bzrlib/builtins.py:3492
2281
2281
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2282
2282
msgstr ""
2283
2283
2284
2284
# help of 'author' option of 'commit' command
2285
#: bzrlib/builtins.py:3522
2285
#: bzrlib/builtins.py:3495
2286
2286
msgid "Set the author's name, if it's different from the committer."
2287
2287
msgstr ""
2288
2288
2289
2289
# help of 'local' option of 'commit' command
2290
#: bzrlib/builtins.py:3525
2290
#: bzrlib/builtins.py:3498
2291
2291
msgid ""
2292
2292
"Perform a local commit in a bound branch. Local commits are not pushed to "
2293
2293
"the master branch until a normal commit is performed."
2294
2294
msgstr ""
2295
2295
2296
2296
# help of 'show-diff' option of 'commit' command
2297
#: bzrlib/builtins.py:3531
2297
#: bzrlib/builtins.py:3504
2298
2298
msgid ""
2299
2299
"When no message is supplied, show the diff along with the status summary in "
2300
2300
"the message editor."
2301
2301
msgstr ""
2302
2302
2303
2303
# help of 'lossy' option of 'commit' command
2304
#: bzrlib/builtins.py:3534
2304
#: bzrlib/builtins.py:3507
2305
2305
msgid ""
2306
2306
"When committing to a foreign version control system do not push data that "
2307
2307
"can not be natively represented."
2308
2308
msgstr ""
2309
2309
2310
#: bzrlib/builtins.py:3552
2310
#: bzrlib/builtins.py:3525
2311
2311
#, python-format
2312
2312
msgid ""
2313
2313
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2315
2315
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2316
2316
msgstr ""
2317
2317
2318
#: bzrlib/builtins.py:3561
2318
#: bzrlib/builtins.py:3534
2319
2319
#, python-format
2320
2320
msgid ""
2321
2321
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2323
2323
"Commit refused."
2324
2324
msgstr ""
2325
2325
2326
#: bzrlib/builtins.py:3543
2327
#, python-format
2328
msgid "Unrecognized bug %s. Commit refused."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3546
2332
#, python-format
2333
msgid ""
2334
"%s\n"
2335
"Commit refused."
2336
msgstr ""
2337
2326
2338
#: bzrlib/builtins.py:3570
2327
#, python-format
2328
msgid "Unrecognized bug %s. Commit refused."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3573
2332
#, python-format
2333
msgid ""
2334
"%s\n"
2335
"Commit refused."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3597
2339
2339
msgid "Could not parse --commit-time: "
2340
2340
msgstr ""
2341
2341
2342
#: bzrlib/builtins.py:3637
2342
#: bzrlib/builtins.py:3610
2343
2343
msgid "please specify either --message or --file"
2344
2344
msgstr ""
2345
2345
2346
#: bzrlib/builtins.py:3666
2346
#: bzrlib/builtins.py:3639
2347
2347
msgid "please specify a commit message with either --message or --file"
2348
2348
msgstr ""
2349
2349
2350
#: bzrlib/builtins.py:3669
2350
#: bzrlib/builtins.py:3642
2351
2351
msgid ""
2352
2352
"Empty commit message specified. Please specify a commit message with either "
2353
2353
"--message or --file or leave a blank message with --message \"\"."
2354
2354
msgstr ""
2355
2355
2356
#: bzrlib/builtins.py:3689
2356
#: bzrlib/builtins.py:3662
2357
2357
msgid ""
2358
2358
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2359
2359
"--unchanged to force an empty commit."
2360
2360
msgstr ""
2361
2361
2362
#: bzrlib/builtins.py:3693
2362
#: bzrlib/builtins.py:3666
2363
2363
msgid ""
2364
2364
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2365
2365
"resolve FILE\" to resolve."
2366
2366
msgstr ""
2367
2367
2368
#: bzrlib/builtins.py:3697
2368
#: bzrlib/builtins.py:3670
2369
2369
msgid "Commit refused because there are unknown files in the working tree."
2370
2370
msgstr ""
2371
2371
2372
#: bzrlib/builtins.py:3700
2372
#: bzrlib/builtins.py:3673
2373
2373
msgid ""
2374
2374
"\n"
2375
2375
"To commit to master branch, run update and then commit.\n"
2376
2376
"You can also pass --local to commit to continue working disconnected."
2377
2377
msgstr ""
2378
2378
2379
#: bzrlib/builtins.py:3708
2379
#: bzrlib/builtins.py:3681
2380
2380
msgid ""
2381
2381
"Validate working tree structure, branch consistency and repository history."
2382
2382
msgstr ""
2383
2383
2384
#: bzrlib/builtins.py:3710
2384
#: bzrlib/builtins.py:3683
2385
2385
msgid ""
2386
2386
"This command checks various invariants about branch and repository storage\n"
2387
2387
"to detect data corruption or bzr bugs."
2388
2388
msgstr ""
2389
2389
2390
#: bzrlib/builtins.py:3713
2390
#: bzrlib/builtins.py:3686
2391
2391
msgid ""
2392
2392
"The working tree and branch checks will only give output if a problem is\n"
2393
2393
"detected. The output fields of the repository check are:"
2394
2394
msgstr ""
2395
2395
2396
#: bzrlib/builtins.py:3716
2396
#: bzrlib/builtins.py:3689
2397
2397
msgid ""
2398
2398
"revisions\n"
2399
2399
" This is just the number of revisions checked. It doesn't\n"
2400
2400
" indicate a problem."
2401
2401
msgstr ""
2402
2402
2403
#: bzrlib/builtins.py:3720
2403
#: bzrlib/builtins.py:3693
2404
2404
msgid ""
2405
2405
"versionedfiles\n"
2406
2406
" This is just the number of versionedfiles checked. It\n"
2407
2407
" doesn't indicate a problem."
2408
2408
msgstr ""
2409
2409
2410
#: bzrlib/builtins.py:3724
2410
#: bzrlib/builtins.py:3697
2411
2411
msgid ""
2412
2412
"unreferenced ancestors\n"
2413
2413
" Texts that are ancestors of other texts, but\n"
2415
2415
" subtle problem that Bazaar can work around."
2416
2416
msgstr ""
2417
2417
2418
#: bzrlib/builtins.py:3729
2418
#: bzrlib/builtins.py:3702
2419
2419
msgid ""
2420
2420
"unique file texts\n"
2421
2421
" This is the total number of unique file contents\n"
2422
2422
" seen in the checked revisions. It does not indicate a problem."
2423
2423
msgstr ""
2424
2424
2425
#: bzrlib/builtins.py:3733
2425
#: bzrlib/builtins.py:3706
2426
2426
msgid ""
2427
2427
"repeated file texts\n"
2428
2428
" This is the total number of repeated texts seen\n"
2431
2431
" indicate a problem."
2432
2432
msgstr ""
2433
2433
2434
#: bzrlib/builtins.py:3739
2434
#: bzrlib/builtins.py:3712
2435
2435
msgid ""
2436
2436
"If no restrictions are specified, all Bazaar data that is found at the "
2437
2437
"given\n"
2438
2438
"location will be checked."
2439
2439
msgstr ""
2440
2440
2441
#: bzrlib/builtins.py:3744
2441
#: bzrlib/builtins.py:3717
2442
2442
msgid " Check the tree and branch at 'foo'::"
2443
2443
msgstr ""
2444
2444
2445
#: bzrlib/builtins.py:3746
2445
#: bzrlib/builtins.py:3719
2446
2446
msgid " bzr check --tree --branch foo"
2447
2447
msgstr ""
2448
2448
2449
#: bzrlib/builtins.py:3748
2449
#: bzrlib/builtins.py:3721
2450
2450
msgid " Check only the repository at 'bar'::"
2451
2451
msgstr ""
2452
2452
2453
#: bzrlib/builtins.py:3750
2453
#: bzrlib/builtins.py:3723
2454
2454
msgid " bzr check --repo bar"
2455
2455
msgstr ""
2456
2456
2457
#: bzrlib/builtins.py:3752
2457
#: bzrlib/builtins.py:3725
2458
2458
msgid " Check everything at 'baz'::"
2459
2459
msgstr ""
2460
2460
2461
#: bzrlib/builtins.py:3754
2461
#: bzrlib/builtins.py:3727
2462
2462
msgid " bzr check baz"
2463
2463
msgstr ""
2464
2464
2465
2465
# help of 'branch' option of 'check' command
2466
#: bzrlib/builtins.py:3760
2466
#: bzrlib/builtins.py:3733
2467
2467
msgid "Check the branch related to the current directory."
2468
2468
msgstr ""
2469
2469
2470
2470
# help of 'repo' option of 'check' command
2471
#: bzrlib/builtins.py:3762
2471
#: bzrlib/builtins.py:3735
2472
2472
msgid "Check the repository related to the current directory."
2473
2473
msgstr ""
2474
2474
2475
2475
# help of 'tree' option of 'check' command
2476
#: bzrlib/builtins.py:3764
2476
#: bzrlib/builtins.py:3737
2477
2477
msgid "Check the working tree related to the current directory."
2478
2478
msgstr ""
2479
2479
2480
#: bzrlib/builtins.py:3778
2480
#: bzrlib/builtins.py:3751
2481
2481
msgid "Upgrade a repository, branch or working tree to a newer format."
2482
2482
msgstr ""
2483
2483
2484
#: bzrlib/builtins.py:3780
2484
#: bzrlib/builtins.py:3753
2485
2485
msgid ""
2486
2486
"When the default format has changed after a major new release of\n"
2487
2487
"Bazaar, you may be informed during certain operations that you\n"
2490
2490
"with older repositories or with older versions of Bazaar."
2491
2491
msgstr ""
2492
2492
2493
#: bzrlib/builtins.py:3786
2493
#: bzrlib/builtins.py:3759
2494
2494
msgid ""
2495
2495
"If you wish to upgrade to a particular format rather than the\n"
2496
2496
"current default, that can be specified using the --format option.\n"
2500
2500
"2.x default) so downgrading is not always possible."
2501
2501
msgstr ""
2502
2502
2503
#: bzrlib/builtins.py:3793
2503
#: bzrlib/builtins.py:3766
2504
2504
msgid ""
2505
2505
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2506
2506
"process (where # is a number). By default, this is left there on\n"
2511
2511
"afterwards."
2512
2512
msgstr ""
2513
2513
2514
#: bzrlib/builtins.py:3801
2514
#: bzrlib/builtins.py:3774
2515
2515
msgid ""
2516
2516
"If the location given is a shared repository, dependent branches\n"
2517
2517
"are also converted provided the repository converts successfully.\n"
2519
2519
"tried."
2520
2520
msgstr ""
2521
2521
2522
#: bzrlib/builtins.py:3806
2522
#: bzrlib/builtins.py:3779
2523
2523
msgid ""
2524
2524
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2525
2525
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2526
2526
msgstr ""
2527
2527
2528
2528
# help of 'format' option of 'upgrade' command
2529
#: bzrlib/builtins.py:3814
2529
#: bzrlib/builtins.py:3787
2530
2530
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2531
2531
msgstr ""
2532
2532
2533
2533
# title of 'format' option of 'init' command
2534
2534
# title of 'format' option of 'upgrade' command
2535
#: bzrlib/builtins.py:3818
2535
#: bzrlib/builtins.py:3791
2536
2536
msgid "Branch format"
2537
2537
msgstr ""
2538
2538
2539
2539
# help of 'clean' option of 'upgrade' command
2540
#: bzrlib/builtins.py:3820
2540
#: bzrlib/builtins.py:3793
2541
2541
msgid "Remove the backup.bzr directory if successful."
2542
2542
msgstr ""
2543
2543
2544
2544
# help of 'dry-run' option of 'add' command
2545
2545
# help of 'dry-run' option of 'upgrade' command
2546
#: bzrlib/builtins.py:3822
2546
#: bzrlib/builtins.py:3795
2547
2547
msgid "Show what would be done, but don't actually do anything."
2548
2548
msgstr ""
2549
2549
2550
#: bzrlib/builtins.py:3837
2550
#: bzrlib/builtins.py:3810
2551
2551
msgid "Show or set bzr user id."
2552
2552
msgstr ""
2553
2553
2554
#: bzrlib/builtins.py:3839
2554
#: bzrlib/builtins.py:3812
2555
2555
msgid ""
2556
2556
":Examples:\n"
2557
2557
" Show the email of the current user::"
2558
2558
msgstr ""
2559
2559
2560
#: bzrlib/builtins.py:3842
2560
#: bzrlib/builtins.py:3815
2561
2561
msgid " bzr whoami --email"
2562
2562
msgstr ""
2563
2563
2564
#: bzrlib/builtins.py:3844
2564
#: bzrlib/builtins.py:3817
2565
2565
msgid " Set the current user::"
2566
2566
msgstr ""
2567
2567
2568
#: bzrlib/builtins.py:3846
2568
#: bzrlib/builtins.py:3819
2569
2569
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2570
2570
msgstr ""
2571
2571
2572
2572
# help of 'email' option of 'whoami' command
2573
#: bzrlib/builtins.py:3850
2573
#: bzrlib/builtins.py:3823
2574
2574
msgid "Display email address only."
2575
2575
msgstr ""
2576
2576
2577
2577
# help of 'branch' option of 'whoami' command
2578
#: bzrlib/builtins.py:3852
2578
#: bzrlib/builtins.py:3825
2579
2579
msgid "Set identity for the current branch instead of globally."
2580
2580
msgstr ""
2581
2581
2582
#: bzrlib/builtins.py:3878
2582
#: bzrlib/builtins.py:3851
2583
2583
msgid "--email can only be used to display existing identity"
2584
2584
msgstr ""
2585
2585
2586
#: bzrlib/builtins.py:3902
2586
#: bzrlib/builtins.py:3873
2587
2587
msgid "Print or set the branch nickname."
2588
2588
msgstr ""
2589
2589
2590
#: bzrlib/builtins.py:3904
2590
#: bzrlib/builtins.py:3875
2591
2591
msgid ""
2592
"If unset, the colocated branch name is used for colocated branches, and\n"
2593
"the branch directory name is used for other branches. To print the\n"
2594
"current nickname, execute with no argument."
2592
"If unset, the tree root directory name is used as the nickname.\n"
2593
"To print the current nickname, execute with no argument."
2595
2594
msgstr ""
2596
2595
2597
#: bzrlib/builtins.py:3908
2596
#: bzrlib/builtins.py:3878
2598
2597
msgid ""
2599
2598
"Bound branches use the nickname of its master branch unless it is set\n"
2600
2599
"locally."
2601
2600
msgstr ""
2602
2601
2603
#: bzrlib/builtins.py:3928
2602
#: bzrlib/builtins.py:3898
2604
2603
msgid "Set/unset and display aliases."
2605
2604
msgstr ""
2606
2605
2607
#: bzrlib/builtins.py:3930
2606
#: bzrlib/builtins.py:3900
2608
2607
msgid ""
2609
2608
":Examples:\n"
2610
2609
" Show the current aliases::"
2611
2610
msgstr ""
2612
2611
2613
#: bzrlib/builtins.py:3933
2612
#: bzrlib/builtins.py:3903
2614
2613
msgid " bzr alias"
2615
2614
msgstr ""
2616
2615
2617
#: bzrlib/builtins.py:3935
2616
#: bzrlib/builtins.py:3905
2618
2617
msgid " Show the alias specified for 'll'::"
2619
2618
msgstr ""
2620
2619
2621
#: bzrlib/builtins.py:3937
2620
#: bzrlib/builtins.py:3907
2622
2621
msgid " bzr alias ll"
2623
2622
msgstr ""
2624
2623
2625
#: bzrlib/builtins.py:3939
2624
#: bzrlib/builtins.py:3909
2626
2625
msgid " Set an alias for 'll'::"
2627
2626
msgstr ""
2628
2627
2629
#: bzrlib/builtins.py:3941
2628
#: bzrlib/builtins.py:3911
2630
2629
msgid " bzr alias ll=\"log --line -r-10..-1\""
2631
2630
msgstr ""
2632
2631
2633
#: bzrlib/builtins.py:3943
2632
#: bzrlib/builtins.py:3913
2634
2633
msgid " To remove an alias for 'll'::"
2635
2634
msgstr ""
2636
2635
2637
#: bzrlib/builtins.py:3945
2636
#: bzrlib/builtins.py:3915
2638
2637
msgid " bzr alias --remove ll"
2639
2638
msgstr ""
2640
2639
2641
2640
# help of 'remove' option of 'alias' command
2642
#: bzrlib/builtins.py:3950
2641
#: bzrlib/builtins.py:3920
2643
2642
msgid "Remove the alias."
2644
2643
msgstr ""
2645
2644
2646
#: bzrlib/builtins.py:3968
2645
#: bzrlib/builtins.py:3938
2647
2646
msgid "bzr alias --remove expects an alias to remove."
2648
2647
msgstr ""
2649
2648
2650
#: bzrlib/builtins.py:4149
2649
#: bzrlib/builtins.py:4119
2651
2650
msgid "subunit not available. subunit needs to be installed to use --subunit."
2652
2651
msgstr ""
2653
2652
2654
#: bzrlib/builtins.py:4166
2653
#: bzrlib/builtins.py:4136
2655
2654
msgid ""
2656
2655
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2657
2656
msgstr ""
2658
2657
2659
#: bzrlib/builtins.py:4213
2658
#: bzrlib/builtins.py:4183
2660
2659
msgid "Show version of bzr."
2661
2660
msgstr ""
2662
2661
2663
2662
# help of 'short' option of 'version' command
2664
#: bzrlib/builtins.py:4217
2663
#: bzrlib/builtins.py:4187
2665
2664
msgid "Print just the version number."
2666
2665
msgstr ""
2667
2666
2668
#: bzrlib/builtins.py:4236
2667
#: bzrlib/builtins.py:4206
2669
2668
msgid "It sure does!\n"
2670
2669
msgstr ""
2671
2670
2672
#: bzrlib/builtins.py:4260
2671
#: bzrlib/builtins.py:4230
2673
2672
#, python-format
2674
2673
msgid "merge base is revision %s\n"
2675
2674
msgstr ""
2676
2675
2677
#: bzrlib/builtins.py:4264
2676
#: bzrlib/builtins.py:4234
2678
2677
msgid "Perform a three-way merge."
2679
2678
msgstr ""
2680
2679
2681
#: bzrlib/builtins.py:4266
2680
#: bzrlib/builtins.py:4236
2682
2681
msgid ""
2683
2682
"The source of the merge can be specified either in the form of a branch,\n"
2684
2683
"or in the form of a path to a file containing a merge directive generated\n"
2689
2688
"the current working tree."
2690
2689
msgstr ""
2691
2690
2692
#: bzrlib/builtins.py:4274
2691
#: bzrlib/builtins.py:4244
2693
2692
msgid ""
2694
2693
"When merging from a branch, by default bzr will try to merge in all new\n"
2695
2694
"work from the other branch, automatically determining an appropriate base\n"
2696
2695
"revision. If this fails, you may need to give an explicit base."
2697
2696
msgstr ""
2698
2697
2699
#: bzrlib/builtins.py:4278
2698
#: bzrlib/builtins.py:4248
2700
2699
msgid ""
2701
2700
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2702
2701
"try to merge in all new work up to and including revision OTHER."
2703
2702
msgstr ""
2704
2703
2705
#: bzrlib/builtins.py:4281
2704
#: bzrlib/builtins.py:4251
2706
2705
msgid ""
2707
2706
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2708
2707
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2713
2712
"changes from the other branch is not stored in the commit."
2714
2713
msgstr ""
2715
2714
2716
#: bzrlib/builtins.py:4289
2715
#: bzrlib/builtins.py:4259
2717
2716
msgid "Revision numbers are always relative to the source branch."
2718
2717
msgstr ""
2719
2718
2720
#: bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2719
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2721
2720
msgid ""
2722
2721
"Merge will do its best to combine the changes in two branches, but there\n"
2723
2722
"are some kinds of problems only a human can fix. When it encounters those,\n"
2725
2724
"before you can commit."
2726
2725
msgstr ""
2727
2726
2728
#: bzrlib/builtins.py:4296
2727
#: bzrlib/builtins.py:4266
2729
2728
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2730
2729
msgstr ""
2731
2730
2732
#: bzrlib/builtins.py:4298
2731
#: bzrlib/builtins.py:4268
2733
2732
msgid ""
2734
2733
"If there is no default branch set, the first merge will set it (use\n"
2735
2734
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2737
2736
"only be saved if the remote location can be accessed."
2738
2737
msgstr ""
2739
2738
2740
#: bzrlib/builtins.py:4303
2739
#: bzrlib/builtins.py:4273
2741
2740
msgid ""
2742
2741
"The results of the merge are placed into the destination working\n"
2743
2742
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2744
2743
"committed to record the result of the merge."
2745
2744
msgstr ""
2746
2745
2747
#: bzrlib/builtins.py:4307
2746
#: bzrlib/builtins.py:4277
2748
2747
msgid ""
2749
2748
"merge refuses to run if there are any uncommitted changes, unless\n"
2750
2749
"--force is given. If --force is given, then the changes from the source \n"
2753
2752
"merge revision which has more than two parents."
2754
2753
msgstr ""
2755
2754
2756
#: bzrlib/builtins.py:4313
2755
#: bzrlib/builtins.py:4283
2757
2756
msgid ""
2758
2757
"If one would like to merge changes from the working tree of the other\n"
2759
2758
"branch without merging any committed revisions, the --uncommitted option\n"
2760
2759
"can be given."
2761
2760
msgstr ""
2762
2761
2763
#: bzrlib/builtins.py:4317
2762
#: bzrlib/builtins.py:4287
2764
2763
msgid ""
2765
2764
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2766
2765
"you to apply each diff hunk and file change, similar to \"shelve\"."
2767
2766
msgstr ""
2768
2767
2769
#: bzrlib/builtins.py:4320
2768
#: bzrlib/builtins.py:4290
2770
2769
msgid ""
2771
2770
":Examples:\n"
2772
2771
" To merge all new revisions from bzr.dev::"
2773
2772
msgstr ""
2774
2773
2775
#: bzrlib/builtins.py:4323
2774
#: bzrlib/builtins.py:4293
2776
2775
msgid " bzr merge ../bzr.dev"
2777
2776
msgstr ""
2778
2777
2779
#: bzrlib/builtins.py:4325
2778
#: bzrlib/builtins.py:4295
2780
2779
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2781
2780
msgstr ""
2782
2781
2783
#: bzrlib/builtins.py:4327
2782
#: bzrlib/builtins.py:4297
2784
2783
msgid " bzr merge -r 82 ../bzr.dev"
2785
2784
msgstr ""
2786
2785
2787
#: bzrlib/builtins.py:4329
2786
#: bzrlib/builtins.py:4299
2788
2787
msgid " To merge the changes introduced by 82, without previous changes::"
2789
2788
msgstr ""
2790
2789
2791
#: bzrlib/builtins.py:4331
2790
#: bzrlib/builtins.py:4301
2792
2791
msgid " bzr merge -r 81..82 ../bzr.dev"
2793
2792
msgstr ""
2794
2793
2795
#: bzrlib/builtins.py:4333
2794
#: bzrlib/builtins.py:4303
2796
2795
msgid " To apply a merge directive contained in /tmp/merge::"
2797
2796
msgstr ""
2798
2797
2799
#: bzrlib/builtins.py:4335
2798
#: bzrlib/builtins.py:4305
2800
2799
msgid " bzr merge /tmp/merge"
2801
2800
msgstr ""
2802
2801
2803
#: bzrlib/builtins.py:4337
2802
#: bzrlib/builtins.py:4307
2804
2803
msgid ""
2805
2804
" To create a merge revision with three parents from two branches\n"
2806
2805
" feature1a and feature1b:"
2807
2806
msgstr ""
2808
2807
2809
#: bzrlib/builtins.py:4340
2808
#: bzrlib/builtins.py:4310
2810
2809
msgid ""
2811
2810
" bzr merge ../feature1a\n"
2812
2811
" bzr merge ../feature1b --force\n"
2814
2813
msgstr ""
2815
2814
2816
2815
# help of 'force' option of 'merge' command
2817
#: bzrlib/builtins.py:4352
2816
#: bzrlib/builtins.py:4322
2818
2817
msgid "Merge even if the destination tree has uncommitted changes."
2819
2818
msgstr ""
2820
2819
2821
2820
# help of 'uncommitted' option of 'merge' command
2822
#: bzrlib/builtins.py:4358
2821
#: bzrlib/builtins.py:4328
2823
2822
msgid ""
2824
2823
"Apply uncommitted changes from a working copy, instead of branch changes."
2825
2824
msgstr ""
2826
2825
2827
2826
# help of 'pull' option of 'merge' command
2828
#: bzrlib/builtins.py:4360
2827
#: bzrlib/builtins.py:4330
2829
2828
msgid ""
2830
2829
"If the destination is already completely merged into the source, pull from "
2831
2830
"the source rather than merging. When this happens, you do not need to "
2833
2832
msgstr ""
2834
2833
2835
2834
# help of 'directory' option of 'merge' command
2836
#: bzrlib/builtins.py:4365
2835
#: bzrlib/builtins.py:4335
2837
2836
msgid ""
2838
2837
"Branch to merge into, rather than the one containing the working directory."
2839
2838
msgstr ""
2840
2839
2841
2840
# help of 'preview' option of 'merge' command
2842
#: bzrlib/builtins.py:4367
2841
#: bzrlib/builtins.py:4337
2843
2842
msgid "Instead of merging, show a diff of the merge."
2844
2843
msgstr ""
2845
2844
2846
2845
# help of 'interactive' option of 'merge' command
2847
#: bzrlib/builtins.py:4369
2846
#: bzrlib/builtins.py:4339
2848
2847
msgid "Select changes interactively."
2849
2848
msgstr ""
2850
2849
2851
#: bzrlib/builtins.py:4391
2850
#: bzrlib/builtins.py:4361
2852
2851
msgid ""
2853
2852
"Merging into empty branches not currently supported, https://bugs.launchpad."
2854
2853
"net/bzr/+bug/308562"
2855
2854
msgstr ""
2856
2855
2857
#: bzrlib/builtins.py:4418
2856
#: bzrlib/builtins.py:4388
2858
2857
msgid "Cannot use --uncommitted with bundles or merge directives."
2859
2858
msgstr ""
2860
2859
2861
#: bzrlib/builtins.py:4429
2860
#: bzrlib/builtins.py:4399
2862
2861
msgid "Cannot use --uncommitted and --revision at the same time."
2863
2862
msgstr ""
2864
2863
2865
#: bzrlib/builtins.py:4449
2864
#: bzrlib/builtins.py:4419
2866
2865
msgid "merger: "
2867
2866
msgstr ""
2868
2867
2869
#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
2868
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2870
2869
msgid "Nothing to do."
2871
2870
msgstr ""
2872
2871
2873
#: bzrlib/builtins.py:4455
2872
#: bzrlib/builtins.py:4425
2874
2873
msgid "Cannot pull individual files"
2875
2874
msgstr ""
2876
2875
2877
#: bzrlib/builtins.py:4463
2876
#: bzrlib/builtins.py:4433
2878
2877
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2879
2878
msgstr ""
2880
2879
2881
#: bzrlib/builtins.py:4521
2880
#: bzrlib/builtins.py:4491
2882
2881
#, python-format
2883
2882
msgid "Show-base is not supported for this merge type. %s"
2884
2883
msgstr ""
2885
2884
2886
#: bzrlib/builtins.py:4530
2885
#: bzrlib/builtins.py:4500
2887
2886
#, python-format
2888
2887
msgid "Conflict reduction is not supported for merge type %s."
2889
2888
msgstr ""
2890
2889
2891
#: bzrlib/builtins.py:4534
2890
#: bzrlib/builtins.py:4504
2892
2891
msgid "Cannot do conflict reduction and show base."
2893
2892
msgstr ""
2894
2893
2895
#: bzrlib/builtins.py:4645
2894
#: bzrlib/builtins.py:4615
2896
2895
msgid "No location specified or remembered"
2897
2896
msgstr ""
2898
2897
2899
#: bzrlib/builtins.py:4647
2898
#: bzrlib/builtins.py:4617
2900
2899
msgid "{0} remembered {1} location {2}"
2901
2900
msgstr ""
2902
2901
2903
#: bzrlib/builtins.py:4653
2902
#: bzrlib/builtins.py:4623
2904
2903
msgid "Redo a merge."
2905
2904
msgstr ""
2906
2905
2907
#: bzrlib/builtins.py:4655
2906
#: bzrlib/builtins.py:4625
2908
2907
msgid ""
2909
2908
"Use this if you want to try a different merge technique while resolving\n"
2910
2909
"conflicts. Some merge techniques are better than others, and remerge\n"
2911
2910
"lets you try different ones on different files."
2912
2911
msgstr ""
2913
2912
2914
#: bzrlib/builtins.py:4659
2913
#: bzrlib/builtins.py:4629
2915
2914
msgid ""
2916
2915
"The options for remerge have the same meaning and defaults as the ones for\n"
2917
2916
"merge. The difference is that remerge can (only) be run when there is a\n"
2918
2917
"pending merge, and it lets you specify particular files."
2919
2918
msgstr ""
2920
2919
2921
#: bzrlib/builtins.py:4663
2920
#: bzrlib/builtins.py:4633
2922
2921
msgid ""
2923
2922
":Examples:\n"
2924
2923
" Re-do the merge of all conflicted files, and show the base text in\n"
2925
2924
" conflict regions, in addition to the usual THIS and OTHER texts::"
2926
2925
msgstr ""
2927
2926
2928
#: bzrlib/builtins.py:4667
2927
#: bzrlib/builtins.py:4637
2929
2928
msgid " bzr remerge --show-base"
2930
2929
msgstr ""
2931
2930
2932
#: bzrlib/builtins.py:4669
2931
#: bzrlib/builtins.py:4639
2933
2932
msgid ""
2934
2933
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2935
2934
" additional processing to reduce the size of conflict regions::"
2936
2935
msgstr ""
2937
2936
2938
#: bzrlib/builtins.py:4672
2937
#: bzrlib/builtins.py:4642
2939
2938
msgid " bzr remerge --merge-type weave --reprocess foobar"
2940
2939
msgstr ""
2941
2940
2943
2942
# help of 'show-base' option of 'pull' command
2944
2943
# help of 'show-base' option of 'remerge' command
2945
2944
# help of 'show-base' option of 'update' command
2946
#: bzrlib/builtins.py:4679
2945
#: bzrlib/builtins.py:4649
2947
2946
msgid "Show base revision text in conflicts."
2948
2947
msgstr ""
2949
2948
2950
#: bzrlib/builtins.py:4691
2949
#: bzrlib/builtins.py:4661
2951
2950
msgid ""
2952
2951
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2953
2952
"merges."
2954
2953
msgstr ""
2955
2954
2956
#: bzrlib/builtins.py:4749
2957
msgid ""
2958
"Set files in the working tree back to the contents of a previous revision."
2955
#: bzrlib/builtins.py:4717
2956
msgid "Revert files to a previous revision."
2959
2957
msgstr ""
2960
2958
2961
#: bzrlib/builtins.py:4751
2959
#: bzrlib/builtins.py:4719
2962
2960
msgid ""
2963
2961
"Giving a list of files will revert only those files. Otherwise, all files\n"
2964
2962
"will be reverted. If the revision is not specified with '--revision', the\n"
2965
"working tree basis revision is used. A revert operation affects only the\n"
2966
"working tree, not any revision history like the branch and repository or\n"
2967
"the working tree basis revision."
2963
"last committed revision is used."
2968
2964
msgstr ""
2969
2965
2970
#: bzrlib/builtins.py:4757
2966
#: bzrlib/builtins.py:4723
2971
2967
msgid ""
2972
2968
"To remove only some changes, without reverting to a prior version, use\n"
2973
2969
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2974
2970
"will remove the changes introduced by the second last commit (-2), without\n"
2975
2971
"affecting the changes introduced by the last commit (-1). To remove\n"
2976
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2977
"To update the branch to a specific revision or the latest revision and\n"
2978
"update the working tree accordingly while preserving local changes, see the\n"
2979
"update command."
2972
"certain changes on a hunk-by-hunk basis, see the shelve command."
2980
2973
msgstr ""
2981
2974
2982
#: bzrlib/builtins.py:4766
2975
#: bzrlib/builtins.py:4729
2983
2976
msgid ""
2984
"Uncommitted changes to files that are reverted will be discarded.\n"
2985
"Howver, by default, any files that have been manually changed will be\n"
2986
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2987
"files have '.~#~' appended to their name, where # is a number."
2977
"By default, any files that have been manually changed will be backed up\n"
2978
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2979
"'.~#~' appended to their name, where # is a number."
2988
2980
msgstr ""
2989
2981
2990
#: bzrlib/builtins.py:4771
2982
#: bzrlib/builtins.py:4733
2991
2983
msgid ""
2992
2984
"When you provide files, you can use their current pathname or the pathname\n"
2993
2985
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2995
2987
"reverted."
2996
2988
msgstr ""
2997
2989
2998
#: bzrlib/builtins.py:4776
2990
#: bzrlib/builtins.py:4738
2999
2991
msgid ""
3000
2992
"If you have newly added files since the target revision, they will be\n"
3001
2993
"removed. If the files to be removed have been changed, backups will be\n"
3003
2995
"deleted."
3004
2996
msgstr ""
3005
2997
3006
#: bzrlib/builtins.py:4781
2998
#: bzrlib/builtins.py:4743
3007
2999
msgid ""
3008
3000
"The working tree contains a list of revisions that have been merged but\n"
3009
3001
"not yet committed. These revisions will be included as additional parents\n"
3015
3007
"reverting any files."
3016
3008
msgstr ""
3017
3009
3018
#: bzrlib/builtins.py:4790
3010
#: bzrlib/builtins.py:4752
3019
3011
msgid ""
3020
3012
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3021
3013
"changes from a branch in a single revision. To do this, perform the merge\n"
3030
3022
msgstr ""
3031
3023
3032
3024
# help of 'no-backup' option of 'revert' command
3033
#: bzrlib/builtins.py:4804
3025
#: bzrlib/builtins.py:4766
3034
3026
msgid "Do not save backups of reverted files."
3035
3027
msgstr ""
3036
3028
3037
3029
# help of 'forget-merges' option of 'revert' command
3038
#: bzrlib/builtins.py:4806
3030
#: bzrlib/builtins.py:4768
3039
3031
msgid "Remove pending merge marker, without changing any files."
3040
3032
msgstr ""
3041
3033
3042
#: bzrlib/builtins.py:4837
3034
#: bzrlib/builtins.py:4799
3043
3035
msgid ""
3044
3036
"Show help on a command or other topic.\n"
3045
3037
" "
3046
3038
msgstr ""
3047
3039
3048
3040
# help of 'long' option of 'help' command
3049
#: bzrlib/builtins.py:4842
3041
#: bzrlib/builtins.py:4804
3050
3042
msgid "Show help on all commands."
3051
3043
msgstr ""
3052
3044
3053
#: bzrlib/builtins.py:4871
3045
#: bzrlib/builtins.py:4833
3054
3046
msgid "Show unmerged/unpulled revisions between two branches."
3055
3047
msgstr ""
3056
3048
3057
#: bzrlib/builtins.py:4873
3049
#: bzrlib/builtins.py:4835
3058
3050
msgid "OTHER_BRANCH may be local or remote."
3059
3051
msgstr ""
3060
3052
3061
#: bzrlib/builtins.py:4875
3053
#: bzrlib/builtins.py:4837
3062
3054
msgid ""
3063
3055
"To filter on a range of revisions, you can use the command -r begin..end\n"
3064
3056
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3069
3061
" 0 - no missing revisions"
3070
3062
msgstr ""
3071
3063
3072
#: bzrlib/builtins.py:4885
3064
#: bzrlib/builtins.py:4847
3073
3065
msgid ""
3074
3066
" Determine the missing revisions between this and the branch at the\n"
3075
3067
" remembered pull location::"
3076
3068
msgstr ""
3077
3069
3078
#: bzrlib/builtins.py:4888
3070
#: bzrlib/builtins.py:4850
3079
3071
msgid " bzr missing"
3080
3072
msgstr ""
3081
3073
3082
#: bzrlib/builtins.py:4890
3074
#: bzrlib/builtins.py:4852
3083
3075
msgid " Determine the missing revisions between this and another branch::"
3084
3076
msgstr ""
3085
3077
3086
#: bzrlib/builtins.py:4892
3078
#: bzrlib/builtins.py:4854
3087
3079
msgid " bzr missing http://server/branch"
3088
3080
msgstr ""
3089
3081
3090
#: bzrlib/builtins.py:4894
3082
#: bzrlib/builtins.py:4856
3091
3083
msgid ""
3092
3084
" Determine the missing revisions up to a specific revision on the other\n"
3093
3085
" branch::"
3094
3086
msgstr ""
3095
3087
3096
#: bzrlib/builtins.py:4897
3088
#: bzrlib/builtins.py:4859
3097
3089
msgid " bzr missing -r ..-10"
3098
3090
msgstr ""
3099
3091
3100
#: bzrlib/builtins.py:4899
3092
#: bzrlib/builtins.py:4861
3101
3093
msgid ""
3102
3094
" Determine the missing revisions up to a specific revision on this\n"
3103
3095
" branch::"
3104
3096
msgstr ""
3105
3097
3106
#: bzrlib/builtins.py:4902
3098
#: bzrlib/builtins.py:4864
3107
3099
msgid " bzr missing --my-revision ..-10"
3108
3100
msgstr ""
3109
3101
3110
3102
# help of 'reverse' option of 'missing' command
3111
#: bzrlib/builtins.py:4909
3103
#: bzrlib/builtins.py:4871
3112
3104
msgid "Reverse the order of revisions."
3113
3105
msgstr ""
3114
3106
3115
3107
# help of 'mine-only' option of 'missing' command
3116
#: bzrlib/builtins.py:4911
3108
#: bzrlib/builtins.py:4873
3117
3109
msgid "Display changes in the local branch only."
3118
3110
msgstr ""
3119
3111
3120
3112
# help of 'this' option of 'missing' command
3121
#: bzrlib/builtins.py:4912
3113
#: bzrlib/builtins.py:4874
3122
3114
msgid "Same as --mine-only."
3123
3115
msgstr ""
3124
3116
3125
3117
# help of 'theirs-only' option of 'missing' command
3126
#: bzrlib/builtins.py:4914
3118
#: bzrlib/builtins.py:4876
3127
3119
msgid "Display changes in the remote branch only."
3128
3120
msgstr ""
3129
3121
3130
3122
# help of 'other' option of 'missing' command
3131
#: bzrlib/builtins.py:4915
3123
#: bzrlib/builtins.py:4877
3132
3124
msgid "Same as --theirs-only."
3133
3125
msgstr ""
3134
3126
3135
3127
# help of 'revision' option of 'missing' command
3136
#: bzrlib/builtins.py:4920
3128
#: bzrlib/builtins.py:4882
3137
3129
msgid ""
3138
3130
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3139
3131
"details."
3140
3132
msgstr ""
3141
3133
3142
3134
# help of 'my-revision' option of 'missing' command
3143
#: bzrlib/builtins.py:4924
3135
#: bzrlib/builtins.py:4886
3144
3136
msgid ""
3145
3137
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3146
3138
"details."
3147
3139
msgstr ""
3148
3140
3149
3141
# help of 'include-merged' option of 'missing' command
3150
#: bzrlib/builtins.py:4927
3142
#: bzrlib/builtins.py:4889
3151
3143
msgid "Show all revisions in addition to the mainline ones."
3152
3144
msgstr ""
3153
3145
3154
#: bzrlib/builtins.py:4981
3146
#: bzrlib/builtins.py:4943
3155
3147
msgid "No peer location known or specified."
3156
3148
msgstr ""
3157
3149
3158
#: bzrlib/builtins.py:4985
3150
#: bzrlib/builtins.py:4947
3159
3151
msgid "Using saved parent location: {0}\n"
3160
3152
msgstr ""
3161
3153
3162
#: bzrlib/builtins.py:5018
3154
#: bzrlib/builtins.py:4980
3163
3155
#, python-format
3164
3156
msgid "You have %d extra revision:\n"
3165
3157
msgid_plural "You have %d extra revisions:\n"
3166
3158
msgstr[0] ""
3167
3159
msgstr[1] ""
3168
3160
3169
#: bzrlib/builtins.py:5038
3161
#: bzrlib/builtins.py:4996
3170
3162
#, python-format
3171
3163
msgid "You are missing %d revision:\n"
3172
3164
msgid_plural "You are missing %d revisions:\n"
3173
3165
msgstr[0] ""
3174
3166
msgstr[1] ""
3175
3167
3176
#: bzrlib/builtins.py:5053
3168
#: bzrlib/builtins.py:5008
3177
3169
msgid "This branch has no new revisions.\n"
3178
3170
msgstr ""
3179
3171
3180
#: bzrlib/builtins.py:5056
3172
#: bzrlib/builtins.py:5011
3181
3173
msgid "Other branch has no new revisions.\n"
3182
3174
msgstr ""
3183
3175
3184
#: bzrlib/builtins.py:5061
3176
#: bzrlib/builtins.py:5016
3185
3177
msgid "Branches are up to date.\n"
3186
3178
msgstr ""
3187
3179
3188
#: bzrlib/builtins.py:5072
3180
#: bzrlib/builtins.py:5027
3189
3181
msgid "Compress the data within a repository."
3190
3182
msgstr ""
3191
3183
3192
#: bzrlib/builtins.py:5074
3184
#: bzrlib/builtins.py:5029
3193
3185
msgid ""
3194
3186
"This operation compresses the data within a bazaar repository. As\n"
3195
3187
"bazaar supports automatic packing of repository, this operation is\n"
3196
3188
"normally not required to be done manually."
3197
3189
msgstr ""
3198
3190
3199
#: bzrlib/builtins.py:5078
3191
#: bzrlib/builtins.py:5033
3200
3192
msgid ""
3201
3193
"During the pack operation, bazaar takes a backup of existing repository\n"
3202
3194
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3205
3197
"used."
3206
3198
msgstr ""
3207
3199
3208
#: bzrlib/builtins.py:5084
3200
#: bzrlib/builtins.py:5039
3209
3201
msgid ""
3210
3202
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3211
3203
"during or immediately after repacking, you may be left with a state\n"
3214
3206
msgstr ""
3215
3207
3216
3208
# help of 'clean-obsolete-packs' option of 'pack' command
3217
#: bzrlib/builtins.py:5093
3209
#: bzrlib/builtins.py:5048
3218
3210
msgid "Delete obsolete packs to save disk space."
3219
3211
msgstr ""
3220
3212
3221
#: bzrlib/builtins.py:5107
3213
#: bzrlib/builtins.py:5062
3222
3214
msgid "List the installed plugins."
3223
3215
msgstr ""
3224
3216
3225
#: bzrlib/builtins.py:5109
3217
#: bzrlib/builtins.py:5064
3226
3218
msgid ""
3227
3219
"This command displays the list of installed plugins including\n"
3228
3220
"version of plugin and a short description of each."
3229
3221
msgstr ""
3230
3222
3231
#: bzrlib/builtins.py:5112
3223
#: bzrlib/builtins.py:5067
3232
3224
msgid "--verbose shows the path where each plugin is located."
3233
3225
msgstr ""
3234
3226
3235
#: bzrlib/builtins.py:5114
3227
#: bzrlib/builtins.py:5069
3236
3228
msgid ""
3237
3229
"A plugin is an external component for Bazaar that extends the\n"
3238
3230
"revision control system, by adding or replacing code in Bazaar.\n"
3241
3233
"customizing log output."
3242
3234
msgstr ""
3243
3235
3244
#: bzrlib/builtins.py:5120
3236
#: bzrlib/builtins.py:5075
3245
3237
msgid ""
3246
3238
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3247
3239
"for further information on plugins including where to find them and how to\n"
3249
3241
"plugins using the Python programming language."
3250
3242
msgstr ""
3251
3243
3252
#: bzrlib/builtins.py:5136
3244
#: bzrlib/builtins.py:5091
3253
3245
msgid "Show testament (signing-form) of a revision."
3254
3246
msgstr ""
3255
3247
3256
3248
# help of 'long' option of 'testament' command
3257
#: bzrlib/builtins.py:5139
3249
#: bzrlib/builtins.py:5094
3258
3250
msgid "Produce long-format testament."
3259
3251
msgstr ""
3260
3252
3261
3253
# help of 'strict' option of 'testament' command
3262
#: bzrlib/builtins.py:5141
3254
#: bzrlib/builtins.py:5096
3263
3255
msgid "Produce a strict-format testament."
3264
3256
msgstr ""
3265
3257
3266
#: bzrlib/builtins.py:5168
3258
#: bzrlib/builtins.py:5122
3267
3259
msgid "Show the origin of each line in a file."
3268
3260
msgstr ""
3269
3261
3270
#: bzrlib/builtins.py:5170
3262
#: bzrlib/builtins.py:5124
3271
3263
msgid ""
3272
3264
"This prints out the given file with an annotation on the left side\n"
3273
3265
"indicating which revision, author and date introduced the change."
3274
3266
msgstr ""
3275
3267
3276
#: bzrlib/builtins.py:5173
3268
#: bzrlib/builtins.py:5127
3277
3269
msgid ""
3278
3270
"If the origin is the same for a run of consecutive lines, it is\n"
3279
3271
"shown only at the top, unless the --all option is given."
3280
3272
msgstr ""
3281
3273
3282
3274
# help of 'all' option of 'annotate' command
3283
#: bzrlib/builtins.py:5181
3275
#: bzrlib/builtins.py:5135
3284
3276
msgid "Show annotations on all lines."
3285
3277
msgstr ""
3286
3278
3287
3279
# help of 'long' option of 'annotate' command
3288
#: bzrlib/builtins.py:5182
3280
#: bzrlib/builtins.py:5136
3289
3281
msgid "Show commit date in annotations."
3290
3282
msgstr ""
3291
3283
3292
#: bzrlib/builtins.py:5269
3284
#: bzrlib/builtins.py:5223
3293
3285
msgid "Cannot sign a range of non-revision-history revisions"
3294
3286
msgstr ""
3295
3287
3296
#: bzrlib/builtins.py:5281
3288
#: bzrlib/builtins.py:5235
3297
3289
msgid "Please supply either one revision, or a range."
3298
3290
msgstr ""
3299
3291
3300
#: bzrlib/builtins.py:5285
3292
#: bzrlib/builtins.py:5239
3301
3293
msgid ""
3302
3294
"Convert the current branch into a checkout of the supplied branch.\n"
3303
3295
"If no branch is supplied, rebind to the last bound location."
3304
3296
msgstr ""
3305
3297
3306
#: bzrlib/builtins.py:5288
3298
#: bzrlib/builtins.py:5242
3307
3299
msgid ""
3308
3300
"Once converted into a checkout, commits must succeed on the master branch\n"
3309
3301
"before they will be applied to the local branch."
3310
3302
msgstr ""
3311
3303
3312
#: bzrlib/builtins.py:5291
3304
#: bzrlib/builtins.py:5245
3313
3305
msgid ""
3314
3306
"Bound branches use the nickname of its master branch unless it is set\n"
3315
3307
"locally, in which case binding will update the local nickname to be\n"
3316
3308
"that of the master."
3317
3309
msgstr ""
3318
3310
3319
#: bzrlib/builtins.py:5306
3311
#: bzrlib/builtins.py:5260
3320
3312
msgid "No location supplied. This format does not remember old locations."
3321
3313
msgstr ""
3322
3314
3323
#: bzrlib/builtins.py:5312
3315
#: bzrlib/builtins.py:5265
3324
3316
msgid "Branch is already bound"
3325
3317
msgstr ""
3326
3318
3327
#: bzrlib/builtins.py:5315
3319
#: bzrlib/builtins.py:5267
3328
3320
msgid "No location supplied and no previous location known"
3329
3321
msgstr ""
3330
3322
3331
#: bzrlib/builtins.py:5321
3323
#: bzrlib/builtins.py:5273
3332
3324
msgid "These branches have diverged. Try merging, and then bind again."
3333
3325
msgstr ""
3334
3326
3335
#: bzrlib/builtins.py:5328
3327
#: bzrlib/builtins.py:5280
3336
3328
msgid "Convert the current checkout into a regular branch."
3337
3329
msgstr ""
3338
3330
3339
#: bzrlib/builtins.py:5330
3331
#: bzrlib/builtins.py:5282
3340
3332
msgid ""
3341
3333
"After unbinding, the local branch is considered independent and subsequent\n"
3342
3334
"commits will be local only."
3343
3335
msgstr ""
3344
3336
3345
#: bzrlib/builtins.py:5341
3337
#: bzrlib/builtins.py:5293
3346
3338
msgid "Local branch is not bound"
3347
3339
msgstr ""
3348
3340
3349
#: bzrlib/builtins.py:5345
3341
#: bzrlib/builtins.py:5297
3350
3342
msgid "Remove the last committed revision."
3351
3343
msgstr ""
3352
3344
3353
#: bzrlib/builtins.py:5347
3345
#: bzrlib/builtins.py:5299
3354
3346
msgid ""
3355
3347
"--verbose will print out what is being removed.\n"
3356
3348
"--dry-run will go through all the motions, but not actually\n"
3357
3349
"remove anything."
3358
3350
msgstr ""
3359
3351
3360
#: bzrlib/builtins.py:5351
3352
#: bzrlib/builtins.py:5303
3361
3353
msgid ""
3362
3354
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3363
3355
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3364
3356
"branch at revision 15."
3365
3357
msgstr ""
3366
3358
3367
#: bzrlib/builtins.py:5355
3359
#: bzrlib/builtins.py:5307
3368
3360
msgid ""
3369
3361
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3370
3362
"it may make is to restore any pending merges that were present before\n"
3372
3364
msgstr ""
3373
3365
3374
3366
# help of 'dry-run' option of 'uncommit' command
3375
#: bzrlib/builtins.py:5366
3367
#: bzrlib/builtins.py:5318
3376
3368
msgid "Don't actually make changes."
3377
3369
msgstr ""
3378
3370
3379
3371
# help of 'force' option of 'uncommit' command
3380
#: bzrlib/builtins.py:5367
3372
#: bzrlib/builtins.py:5319
3381
3373
msgid "Say yes to all questions."
3382
3374
msgstr ""
3383
3375
3384
3376
# help of 'keep-tags' option of 'uncommit' command
3385
#: bzrlib/builtins.py:5369
3377
#: bzrlib/builtins.py:5321
3386
3378
msgid "Keep tags that point to removed revisions."
3387
3379
msgstr ""
3388
3380
3389
3381
# help of 'local' option of 'uncommit' command
3390
#: bzrlib/builtins.py:5371
3382
#: bzrlib/builtins.py:5323
3391
3383
msgid "Only remove the commits from the local branch when in a checkout."
3392
3384
msgstr ""
3393
3385
3394
#: bzrlib/builtins.py:5420
3386
#: bzrlib/builtins.py:5372
3395
3387
msgid "No revisions to uncommit.\n"
3396
3388
msgstr ""
3397
3389
3398
#: bzrlib/builtins.py:5435
3390
#: bzrlib/builtins.py:5387
3399
3391
msgid "Dry-run, pretending to remove the above revisions.\n"
3400
3392
msgstr ""
3401
3393
3402
#: bzrlib/builtins.py:5438
3394
#: bzrlib/builtins.py:5390
3403
3395
msgid "The above revision(s) will be removed.\n"
3404
3396
msgstr ""
3405
3397
3406
#: bzrlib/builtins.py:5442
3398
#: bzrlib/builtins.py:5394
3407
3399
msgid "Uncommit these revisions"
3408
3400
msgstr ""
3409
3401
3410
#: bzrlib/builtins.py:5445
3402
#: bzrlib/builtins.py:5397
3411
3403
msgid "Canceled\n"
3412
3404
msgstr ""
3413
3405
3414
#: bzrlib/builtins.py:5452
3406
#: bzrlib/builtins.py:5404
3415
3407
#, python-format
3416
3408
msgid ""
3417
3409
"You can restore the old tip by running:\n"
3418
3410
" bzr pull . -r revid:%s\n"
3419
3411
msgstr ""
3420
3412
3421
#: bzrlib/builtins.py:5457
3413
#: bzrlib/builtins.py:5409
3422
3414
msgid "Break a dead lock."
3423
3415
msgstr ""
3424
3416
3425
#: bzrlib/builtins.py:5459
3417
#: bzrlib/builtins.py:5411
3426
3418
msgid ""
3427
3419
"This command breaks a lock on a repository, branch, working directory or\n"
3428
3420
"config file."
3429
3421
msgstr ""
3430
3422
3431
#: bzrlib/builtins.py:5462
3423
#: bzrlib/builtins.py:5414
3432
3424
msgid ""
3433
3425
"CAUTION: Locks should only be broken when you are sure that the process\n"
3434
3426
"holding the lock has been stopped."
3435
3427
msgstr ""
3436
3428
3437
#: bzrlib/builtins.py:5465
3429
#: bzrlib/builtins.py:5417
3438
3430
msgid ""
3439
3431
"You can get information on what locks are open via the 'bzr info\n"
3440
3432
"[location]' command."
3441
3433
msgstr ""
3442
3434
3443
#: bzrlib/builtins.py:5468
3435
#: bzrlib/builtins.py:5420
3444
3436
msgid ""
3445
3437
":Examples:\n"
3446
3438
" bzr break-lock\n"
3449
3441
msgstr ""
3450
3442
3451
3443
# help of 'config' option of 'break-lock' command
3452
#: bzrlib/builtins.py:5477
3444
#: bzrlib/builtins.py:5429
3453
3445
msgid "LOCATION is the directory where the config lock is."
3454
3446
msgstr ""
3455
3447
3456
3448
# help of 'force' option of 'break-lock' command
3457
#: bzrlib/builtins.py:5479
3449
#: bzrlib/builtins.py:5431
3458
3450
msgid "Do not ask for confirmation before breaking the lock."
3459
3451
msgstr ""
3460
3452
3461
3453
# help of 'protocol=bzr' option of 'serve' command
3462
#: bzrlib/builtins.py:5514
3454
#: bzrlib/builtins.py:5466
3463
3455
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3464
3456
msgstr ""
3465
3457
3466
#: bzrlib/builtins.py:5515
3458
#: bzrlib/builtins.py:5467
3467
3459
msgid "Run the bzr server."
3468
3460
msgstr ""
3469
3461
3470
3462
# help of 'inet' option of 'serve' command
3471
#: bzrlib/builtins.py:5521
3463
#: bzrlib/builtins.py:5473
3472
3464
msgid "Serve on stdin/out for use from inetd or sshd."
3473
3465
msgstr ""
3474
3466
3475
3467
# title of 'protocol' option of 'serve' command
3476
#: bzrlib/builtins.py:5522
3468
#: bzrlib/builtins.py:5474
3477
3469
msgid "protocol"
3478
3470
msgstr ""
3479
3471
3480
3472
# help of 'protocol' option of 'serve' command
3481
#: bzrlib/builtins.py:5523
3473
#: bzrlib/builtins.py:5475
3482
3474
msgid "Protocol to serve."
3483
3475
msgstr ""
3484
3476
3485
# help of 'listen' option of 'serve' command
3486
#: bzrlib/builtins.py:5527
3487
msgid "Listen for connections on nominated address."
3488
msgstr ""
3489
3490
3477
# help of 'port' option of 'serve' command
3491
#: bzrlib/builtins.py:5529
3478
#: bzrlib/builtins.py:5479
3492
3479
msgid ""
3493
"Listen for connections on nominated port. Passing 0 as the port number will "
3494
"result in a dynamically allocated port. The default port depends on the "
3495
"protocol."
3480
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3481
"Passing 0 as the port number will result in a dynamically allocated port. "
3482
"The default port depends on the protocol."
3496
3483
msgstr ""
3497
3484
3498
3485
# help of 'directory' option of 'serve' command
3499
#: bzrlib/builtins.py:5534
3486
#: bzrlib/builtins.py:5485
3500
3487
msgid "Serve contents of this directory."
3501
3488
msgstr ""
3502
3489
3503
3490
# help of 'allow-writes' option of 'serve' command
3504
#: bzrlib/builtins.py:5536
3491
#: bzrlib/builtins.py:5487
3505
3492
msgid ""
3506
3493
"By default the server is a readonly server. Supplying --allow-writes "
3507
3494
"enables write access to the contents of the served directory and below. "
3511
3498
msgstr ""
3512
3499
3513
3500
# help of 'client-timeout' option of 'serve' command
3514
#: bzrlib/builtins.py:5545
3501
#: bzrlib/builtins.py:5496
3515
3502
msgid "Override the default idle client timeout (5min)."
3516
3503
msgstr ""
3517
3504
3518
#: bzrlib/builtins.py:5563
3505
#: bzrlib/builtins.py:5546
3519
3506
msgid "Combine a tree into its containing tree."
3520
3507
msgstr ""
3521
3508
3522
#: bzrlib/builtins.py:5565
3509
#: bzrlib/builtins.py:5548
3523
3510
msgid "This command requires the target tree to be in a rich-root format."
3524
3511
msgstr ""
3525
3512
3526
#: bzrlib/builtins.py:5567
3513
#: bzrlib/builtins.py:5550
3527
3514
msgid ""
3528
3515
"The TREE argument should be an independent tree, inside another tree, but\n"
3529
3516
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3530
3517
"running \"bzr branch\" with the target inside a tree.)"
3531
3518
msgstr ""
3532
3519
3533
#: bzrlib/builtins.py:5571
3520
#: bzrlib/builtins.py:5554
3534
3521
msgid ""
3535
3522
"The result is a combined tree, with the subtree no longer an independent\n"
3536
3523
"part. This is marked as a merge of the subtree into the containing tree,\n"
3537
3524
"and all history is preserved."
3538
3525
msgstr ""
3539
3526
3540
#: bzrlib/builtins.py:5589
3527
#: bzrlib/builtins.py:5572
3541
3528
#, python-format
3542
3529
msgid ""
3543
3530
"Can't join trees because %s doesn't support rich root data.\n"
3544
3531
"You can use bzr upgrade on the repository."
3545
3532
msgstr ""
3546
3533
3547
#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605
3534
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3548
3535
msgid "Cannot join {0}. {1}"
3549
3536
msgstr ""
3550
3537
3551
#: bzrlib/builtins.py:5609
3538
#: bzrlib/builtins.py:5592
3552
3539
msgid "Split a subdirectory of a tree into a separate tree."
3553
3540
msgstr ""
3554
3541
3555
#: bzrlib/builtins.py:5611
3542
#: bzrlib/builtins.py:5594
3556
3543
msgid ""
3557
3544
"This command will produce a target tree in a format that supports\n"
3558
3545
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3559
3546
"converted into earlier formats like 'dirstate-tags'."
3560
3547
msgstr ""
3561
3548
3562
#: bzrlib/builtins.py:5615
3549
#: bzrlib/builtins.py:5598
3563
3550
msgid ""
3564
3551
"The TREE argument should be a subdirectory of a working tree. That\n"
3565
3552
"subdirectory will be converted into an independent tree, with its own\n"
3566
3553
"branch. Commits in the top-level tree will not apply to the new subtree."
3567
3554
msgstr ""
3568
3555
3569
#: bzrlib/builtins.py:5695
3556
#: bzrlib/builtins.py:5678
3570
3557
msgid "No submit branch specified or known"
3571
3558
msgstr ""
3572
3559
3573
#: bzrlib/builtins.py:5704 bzrlib/send.py:109
3560
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3574
3561
msgid "No public branch specified or known"
3575
3562
msgstr ""
3576
3563
3577
#: bzrlib/builtins.py:5709
3564
#: bzrlib/builtins.py:5691
3578
3565
msgid "bzr merge-directive takes at most two one revision identifiers"
3579
3566
msgstr ""
3580
3567
3581
#: bzrlib/builtins.py:5718
3568
#: bzrlib/builtins.py:5700
3582
3569
msgid "No revisions to bundle."
3583
3570
msgstr ""
3584
3571
3585
#: bzrlib/builtins.py:5737
3572
#: bzrlib/builtins.py:5719
3586
3573
msgid "Mail or create a merge-directive for submitting changes."
3587
3574
msgstr ""
3588
3575
3589
#: bzrlib/builtins.py:5739
3576
#: bzrlib/builtins.py:5721
3590
3577
msgid "A merge directive provides many things needed for requesting merges:"
3591
3578
msgstr ""
3592
3579
3593
#: bzrlib/builtins.py:5741
3580
#: bzrlib/builtins.py:5723
3594
3581
msgid "* A machine-readable description of the merge to perform"
3595
3582
msgstr ""
3596
3583
3597
#: bzrlib/builtins.py:5743
3584
#: bzrlib/builtins.py:5725
3598
3585
msgid "* An optional patch that is a preview of the changes requested"
3599
3586
msgstr ""
3600
3587
3601
#: bzrlib/builtins.py:5745
3588
#: bzrlib/builtins.py:5727
3602
3589
msgid ""
3603
3590
"* An optional bundle of revision data, so that the changes can be applied\n"
3604
3591
" directly from the merge directive, without retrieving data from a\n"
3605
3592
" branch."
3606
3593
msgstr ""
3607
3594
3608
#: bzrlib/builtins.py:5749
3595
#: bzrlib/builtins.py:5731
3609
3596
msgid ""
3610
3597
"`bzr send` creates a compact data set that, when applied using bzr\n"
3611
3598
"merge, has the same effect as merging from the source branch. "
3612
3599
msgstr ""
3613
3600
3614
#: bzrlib/builtins.py:5752
3601
#: bzrlib/builtins.py:5734
3615
3602
msgid ""
3616
3603
"By default the merge directive is self-contained and can be applied to any\n"
3617
3604
"branch containing submit_branch in its ancestory without needing access to\n"
3618
3605
"the source branch."
3619
3606
msgstr ""
3620
3607
3621
#: bzrlib/builtins.py:5756
3608
#: bzrlib/builtins.py:5738
3622
3609
msgid ""
3623
3610
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3624
3611
"revisions, but only a structured request to merge from the\n"
3627
3614
"included if known, so that people can check it later."
3628
3615
msgstr ""
3629
3616
3630
#: bzrlib/builtins.py:5762
3617
#: bzrlib/builtins.py:5744
3631
3618
msgid ""
3632
3619
"The submit branch defaults to the parent of the source branch, but can be\n"
3633
3620
"overridden. Both submit branch and public branch will be remembered in\n"
3636
3623
"be changed using --from."
3637
3624
msgstr ""
3638
3625
3639
#: bzrlib/builtins.py:5768
3626
#: bzrlib/builtins.py:5750
3640
3627
msgid ""
3641
3628
"Both the submit branch and the public branch follow the usual behavior with\n"
3642
3629
"respect to --remember: If there is no default location set, the first send\n"
3645
3632
"--remember. The value will only be saved if the location can be accessed."
3646
3633
msgstr ""
3647
3634
3648
#: bzrlib/builtins.py:5774
3635
#: bzrlib/builtins.py:5756
3649
3636
msgid ""
3650
3637
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3651
3638
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3653
3640
"in the merge directive."
3654
3641
msgstr ""
3655
3642
3656
#: bzrlib/builtins.py:5779
3643
#: bzrlib/builtins.py:5761
3657
3644
msgid ""
3658
3645
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3659
3646
"given, in which case it is sent to a file."
3660
3647
msgstr ""
3661
3648
3662
#: bzrlib/builtins.py:5782
3649
#: bzrlib/builtins.py:5764
3663
3650
msgid ""
3664
3651
"Mail is sent using your preferred mail program. This should be transparent\n"
3665
3652
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3666
3653
"If the preferred client can't be found (or used), your editor will be used."
3667
3654
msgstr ""
3668
3655
3669
#: bzrlib/builtins.py:5786
3656
#: bzrlib/builtins.py:5768
3670
3657
msgid ""
3671
3658
"To use a specific mail program, set the mail_client configuration option.\n"
3672
3659
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3678
3665
"supported clients."
3679
3666
msgstr ""
3680
3667
3681
#: bzrlib/builtins.py:5793
3668
#: bzrlib/builtins.py:5775
3682
3669
msgid ""
3683
3670
"If mail is being sent, a to address is required. This can be supplied\n"
3684
3671
"either on the commandline, by setting the submit_to configuration\n"
3686
3673
"in the submit branch."
3687
3674
msgstr ""
3688
3675
3689
#: bzrlib/builtins.py:5798
3676
#: bzrlib/builtins.py:5780
3690
3677
msgid ""
3691
3678
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3692
3679
"and\n"
3696
3683
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3697
3684
msgstr ""
3698
3685
3699
#: bzrlib/builtins.py:5804
3686
#: bzrlib/builtins.py:5786
3700
3687
msgid ""
3701
3688
"The merge directives created by bzr send may be applied using bzr merge or\n"
3702
3689
"bzr pull by specifying a file containing a merge directive as the location."
3703
3690
msgstr ""
3704
3691
3705
#: bzrlib/builtins.py:5807
3692
#: bzrlib/builtins.py:5789
3706
3693
msgid ""
3707
3694
"bzr send makes extensive use of public locations to map local locations "
3708
3695
"into\n"
3711
3698
msgstr ""
3712
3699
3713
3700
# help of 'output' option of 'send' command
3714
#: bzrlib/builtins.py:5831
3701
#: bzrlib/builtins.py:5813
3715
3702
msgid "Write merge directive to this file or directory; use - for stdout."
3716
3703
msgstr ""
3717
3704
3718
3705
# help of 'strict' option of 'send' command
3719
#: bzrlib/builtins.py:5835
3706
#: bzrlib/builtins.py:5817
3720
3707
msgid ""
3721
3708
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3722
3709
"strict disables the check."
3723
3710
msgstr ""
3724
3711
3725
3712
# help of 'mail-to' option of 'send' command
3726
#: bzrlib/builtins.py:5837
3713
#: bzrlib/builtins.py:5819
3727
3714
msgid "Mail the request to this address."
3728
3715
msgstr ""
3729
3716
3730
3717
# help of 'body' option of 'send' command
3731
#: bzrlib/builtins.py:5841
3718
#: bzrlib/builtins.py:5823
3732
3719
msgid "Body for the email."
3733
3720
msgstr ""
3734
3721
3735
3722
# help of 'no-bundle' option of 'send' command
3736
#: bzrlib/builtins.py:5894
3723
#: bzrlib/builtins.py:5876
3737
3724
msgid "Do not include a bundle in the merge directive."
3738
3725
msgstr ""
3739
3726
3740
3727
# help of 'no-patch' option of 'send' command
3741
#: bzrlib/builtins.py:5895
3728
#: bzrlib/builtins.py:5877
3742
3729
msgid "Do not include a preview patch in the merge directive."
3743
3730
msgstr ""
3744
3731
3745
3732
# help of 'remember' option of 'send' command
3746
#: bzrlib/builtins.py:5898
3733
#: bzrlib/builtins.py:5880
3747
3734
msgid "Remember submit and public branch."
3748
3735
msgstr ""
3749
3736
3750
3737
# help of 'from' option of 'send' command
3751
#: bzrlib/builtins.py:5900
3738
#: bzrlib/builtins.py:5882
3752
3739
msgid ""
3753
3740
"Branch to generate the submission from, rather than the one containing the "
3754
3741
"working directory."
3756
3743
3757
3744
# title of 'format' option of 'send' command
3758
3745
# title of 'format' option of 'version-info' command
3759
#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76
3746
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3760
3747
msgid "format"
3761
3748
msgstr ""
3762
3749
3763
3750
# help of 'format' option of 'send' command
3764
#: bzrlib/builtins.py:5911
3751
#: bzrlib/builtins.py:5893
3765
3752
msgid "Use the specified output format."
3766
3753
msgstr ""
3767
3754
3768
#: bzrlib/builtins.py:5933
3755
#: bzrlib/builtins.py:5915
3769
3756
msgid "Create, remove or modify a tag naming a revision."
3770
3757
msgstr ""
3771
3758
3772
#: bzrlib/builtins.py:5935
3759
#: bzrlib/builtins.py:5917
3773
3760
msgid ""
3774
3761
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3775
3762
"(--revision) option can be given -rtag:X, where X is any previously\n"
3776
3763
"created tag."
3777
3764
msgstr ""
3778
3765
3779
#: bzrlib/builtins.py:5939
3766
#: bzrlib/builtins.py:5921
3780
3767
msgid ""
3781
3768
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3782
3769
"along when you branch, push, pull or merge."
3783
3770
msgstr ""
3784
3771
3785
#: bzrlib/builtins.py:5942
3772
#: bzrlib/builtins.py:5924
3786
3773
msgid ""
3787
3774
"It is an error to give a tag name that already exists unless you pass\n"
3788
3775
"--force, in which case the tag is moved to point to the new revision."
3789
3776
msgstr ""
3790
3777
3791
#: bzrlib/builtins.py:5945
3778
#: bzrlib/builtins.py:5927
3792
3779
msgid ""
3793
3780
"To rename a tag (change the name but keep it on the same revsion), run "
3794
3781
"``bzr\n"
3795
3782
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3796
3783
msgstr ""
3797
3784
3798
#: bzrlib/builtins.py:5948
3785
#: bzrlib/builtins.py:5930
3799
3786
msgid ""
3800
3787
"If no tag name is specified it will be determined through the \n"
3801
3788
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3804
3791
msgstr ""
3805
3792
3806
3793
# help of 'delete' option of 'tag' command
3807
#: bzrlib/builtins.py:5958
3794
#: bzrlib/builtins.py:5940
3808
3795
msgid "Delete this tag rather than placing it."
3809
3796
msgstr ""
3810
3797
3811
3798
# help of 'directory' option of 'tag' command
3812
#: bzrlib/builtins.py:5961
3799
#: bzrlib/builtins.py:5943
3813
3800
msgid "Branch in which to place the tag."
3814
3801
msgstr ""
3815
3802
3816
3803
# help of 'force' option of 'tag' command
3817
#: bzrlib/builtins.py:5963
3804
#: bzrlib/builtins.py:5945
3818
3805
msgid "Replace existing tags."
3819
3806
msgstr ""
3820
3807
3821
#: bzrlib/builtins.py:5978
3808
#: bzrlib/builtins.py:5960
3822
3809
msgid "No tag specified to delete."
3823
3810
msgstr ""
3824
3811
3825
#: bzrlib/builtins.py:5980
3812
#: bzrlib/builtins.py:5962
3826
3813
#, python-format
3827
3814
msgid "Deleted tag %s."
3828
3815
msgstr ""
3829
3816
3830
#: bzrlib/builtins.py:5985
3831
msgid "Tags can only be placed on a single revision, not on a range"
3832
msgstr ""
3833
3834
#: bzrlib/builtins.py:5994
3817
#: bzrlib/builtins.py:5976
3835
3818
msgid "Please specify a tag name."
3836
3819
msgstr ""
3837
3820
3838
#: bzrlib/builtins.py:6002
3821
#: bzrlib/builtins.py:5984
3839
3822
#, python-format
3840
3823
msgid "Tag %s already exists for that revision."
3841
3824
msgstr ""
3842
3825
3843
#: bzrlib/builtins.py:6006
3826
#: bzrlib/builtins.py:5988
3844
3827
#, python-format
3845
3828
msgid "Created tag %s."
3846
3829
msgstr ""
3847
3830
3848
#: bzrlib/builtins.py:6008
3831
#: bzrlib/builtins.py:5990
3849
3832
#, python-format
3850
3833
msgid "Updated tag %s."
3851
3834
msgstr ""
3852
3835
3853
#: bzrlib/builtins.py:6012
3836
#: bzrlib/builtins.py:5994
3854
3837
msgid "List tags."
3855
3838
msgstr ""
3856
3839
3857
#: bzrlib/builtins.py:6014
3840
#: bzrlib/builtins.py:5996
3858
3841
msgid ""
3859
3842
"This command shows a table of tag names and the revisions they reference."
3860
3843
msgstr ""
3861
3844
3862
3845
# help of 'directory' option of 'tags' command
3863
#: bzrlib/builtins.py:6020
3846
#: bzrlib/builtins.py:6002
3864
3847
msgid "Branch whose tags should be displayed."
3865
3848
msgstr ""
3866
3849
3867
3850
# help of 'sort' option of 'tags' command
3868
#: bzrlib/builtins.py:6022
3851
#: bzrlib/builtins.py:6004
3869
3852
msgid "Sort tags by different criteria."
3870
3853
msgstr ""
3871
3854
3872
3855
# title of 'sort' option of 'tags' command
3873
#: bzrlib/builtins.py:6022
3856
#: bzrlib/builtins.py:6004
3874
3857
msgid "Sorting"
3875
3858
msgstr ""
3876
3859
3877
#: bzrlib/builtins.py:6091
3860
#: bzrlib/builtins.py:6073
3878
3861
msgid "Reconfigure the type of a bzr directory."
3879
3862
msgstr ""
3880
3863
3881
#: bzrlib/builtins.py:6093
3864
#: bzrlib/builtins.py:6075
3882
3865
msgid "A target configuration must be specified."
3883
3866
msgstr ""
3884
3867
3885
#: bzrlib/builtins.py:6095
3868
#: bzrlib/builtins.py:6077
3886
3869
msgid ""
3887
3870
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3888
3871
"The order of preference is\n"
3894
3877
msgstr ""
3895
3878
3896
3879
# title of 'tree_type' option of 'reconfigure' command
3897
#: bzrlib/builtins.py:6109
3880
#: bzrlib/builtins.py:6091
3898
3881
msgid "Tree type"
3899
3882
msgstr ""
3900
3883
3901
3884
# help of 'tree_type' option of 'reconfigure' command
3902
#: bzrlib/builtins.py:6110
3885
#: bzrlib/builtins.py:6092
3903
3886
msgid "The relation between branch and tree."
3904
3887
msgstr ""
3905
3888
3906
3889
# help of 'tree_type=branch' option of 'reconfigure' command
3907
#: bzrlib/builtins.py:6112
3890
#: bzrlib/builtins.py:6094
3908
3891
msgid "Reconfigure to be an unbound branch with no working tree."
3909
3892
msgstr ""
3910
3893
3911
3894
# help of 'tree_type=tree' option of 'reconfigure' command
3912
#: bzrlib/builtins.py:6113
3895
#: bzrlib/builtins.py:6095
3913
3896
msgid "Reconfigure to be an unbound branch with a working tree."
3914
3897
msgstr ""
3915
3898
3916
3899
# help of 'tree_type=checkout' option of 'reconfigure' command
3917
#: bzrlib/builtins.py:6114
3900
#: bzrlib/builtins.py:6096
3918
3901
msgid "Reconfigure to be a bound branch with a working tree."
3919
3902
msgstr ""
3920
3903
3921
3904
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3922
#: bzrlib/builtins.py:6115
3905
#: bzrlib/builtins.py:6097
3923
3906
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3924
3907
msgstr ""
3925
3908
3926
3909
# title of 'repository_type' option of 'reconfigure' command
3927
#: bzrlib/builtins.py:6120
3910
#: bzrlib/builtins.py:6102
3928
3911
msgid "Repository type"
3929
3912
msgstr ""
3930
3913
3931
3914
# help of 'repository_type' option of 'reconfigure' command
3932
#: bzrlib/builtins.py:6121
3915
#: bzrlib/builtins.py:6103
3933
3916
msgid "Location fo the repository."
3934
3917
msgstr ""
3935
3918
3936
3919
# help of 'repository_type=standalone' option of 'reconfigure' command
3937
#: bzrlib/builtins.py:6123
3920
#: bzrlib/builtins.py:6105
3938
3921
msgid ""
3939
3922
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3940
3923
msgstr ""
3941
3924
3942
3925
# help of 'repository_type=use-shared' option of 'reconfigure' command
3943
#: bzrlib/builtins.py:6125
3926
#: bzrlib/builtins.py:6107
3944
3927
msgid "Reconfigure to use a shared repository."
3945
3928
msgstr ""
3946
3929
3947
3930
# title of 'repository_trees' option of 'reconfigure' command
3948
#: bzrlib/builtins.py:6129
3931
#: bzrlib/builtins.py:6111
3949
3932
msgid "Trees in Repository"
3950
3933
msgstr ""
3951
3934
3952
3935
# help of 'repository_trees' option of 'reconfigure' command
3953
#: bzrlib/builtins.py:6130
3936
#: bzrlib/builtins.py:6112
3954
3937
msgid "Whether new branches in the repository have trees."
3955
3938
msgstr ""
3956
3939
3957
3940
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3958
#: bzrlib/builtins.py:6132
3941
#: bzrlib/builtins.py:6114
3959
3942
msgid "Reconfigure repository to create working trees on branches by default."
3960
3943
msgstr ""
3961
3944
3962
3945
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3963
#: bzrlib/builtins.py:6134
3946
#: bzrlib/builtins.py:6116
3964
3947
msgid ""
3965
3948
"Reconfigure repository to not create working trees on branches by default."
3966
3949
msgstr ""
3967
3950
3968
3951
# help of 'bind-to' option of 'reconfigure' command
3969
#: bzrlib/builtins.py:6137
3952
#: bzrlib/builtins.py:6119
3970
3953
msgid "Branch to bind checkout to."
3971
3954
msgstr ""
3972
3955
3973
3956
# help of 'force' option of 'reconfigure' command
3974
#: bzrlib/builtins.py:6139
3957
#: bzrlib/builtins.py:6121
3975
3958
msgid "Perform reconfiguration even if local changes will be lost."
3976
3959
msgstr ""
3977
3960
3978
3961
# help of 'stacked-on' option of 'reconfigure' command
3979
#: bzrlib/builtins.py:6142
3962
#: bzrlib/builtins.py:6124
3980
3963
msgid "Reconfigure a branch to be stacked on another branch."
3981
3964
msgstr ""
3982
3965
3983
3966
# help of 'unstacked' option of 'reconfigure' command
3984
#: bzrlib/builtins.py:6146
3967
#: bzrlib/builtins.py:6128
3985
3968
msgid ""
3986
3969
"Reconfigure a branch to be unstacked. This may require copying substantial "
3987
3970
"data into it."
3988
3971
msgstr ""
3989
3972
3990
#: bzrlib/builtins.py:6156
3973
#: bzrlib/builtins.py:6138
3991
3974
msgid "Can't use both --stacked-on and --unstacked"
3992
3975
msgstr ""
3993
3976
3994
#: bzrlib/builtins.py:6170
3977
#: bzrlib/builtins.py:6152
3995
3978
msgid "No target configuration specified"
3996
3979
msgstr ""
3997
3980
3998
#: bzrlib/builtins.py:6205
3981
#: bzrlib/builtins.py:6187
3999
3982
msgid "Set the branch of a checkout and update."
4000
3983
msgstr ""
4001
3984
4002
#: bzrlib/builtins.py:6207
3985
#: bzrlib/builtins.py:6189
4003
3986
msgid ""
4004
3987
"For lightweight checkouts, this changes the branch being referenced.\n"
4005
3988
"For heavyweight checkouts, this checks that there are no local commits\n"
4007
3990
"of the new location and binds to it."
4008
3991
msgstr ""
4009
3992
4010
#: bzrlib/builtins.py:6212
3993
#: bzrlib/builtins.py:6194
4011
3994
msgid ""
4012
3995
"In both cases, the working tree is updated and uncommitted changes\n"
4013
3996
"are merged. The user can commit or revert these as they desire."
4014
3997
msgstr ""
4015
3998
4016
#: bzrlib/builtins.py:6215
3999
#: bzrlib/builtins.py:6197
4017
4000
msgid "Pending merges need to be committed or reverted before using switch."
4018
4001
msgstr ""
4019
4002
4020
#: bzrlib/builtins.py:6217
4003
#: bzrlib/builtins.py:6199
4021
4004
msgid ""
4022
4005
"The path to the branch to switch to can be specified relative to the parent\n"
4023
4006
"directory of the current branch. For example, if you are currently in a\n"
4025
4008
"/path/to/newbranch."
4026
4009
msgstr ""
4027
4010
4028
#: bzrlib/builtins.py:6222
4011
#: bzrlib/builtins.py:6204
4029
4012
msgid ""
4030
4013
"Bound branches use the nickname of its master branch unless it is set\n"
4031
4014
"locally, in which case switching will update the local nickname to be\n"
4033
4016
msgstr ""
4034
4017
4035
4018
# help of 'force' option of 'switch' command
4036
#: bzrlib/builtins.py:6230
4019
#: bzrlib/builtins.py:6212
4037
4020
msgid "Switch even if local commits will be lost."
4038
4021
msgstr ""
4039
4022
4040
4023
# help of 'create-branch' option of 'switch' command
4041
#: bzrlib/builtins.py:6233
4024
#: bzrlib/builtins.py:6215
4042
4025
msgid "Create the target branch from this one before switching to it."
4043
4026
msgstr ""
4044
4027
4045
# help of 'store' option of 'switch' command
4046
#: bzrlib/builtins.py:6236
4047
msgid "Store and restore uncommitted changes in the branch."
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6250
4028
#: bzrlib/builtins.py:6229
4051
4029
msgid "You must supply either a revision or a location"
4052
4030
msgstr ""
4053
4031
4054
#: bzrlib/builtins.py:6263
4032
#: bzrlib/builtins.py:6242
4055
4033
msgid "cannot create branch without source branch"
4056
4034
msgstr ""
4057
4035
4058
#: bzrlib/builtins.py:6289
4036
#: bzrlib/builtins.py:6262
4059
4037
msgid "Manage filtered views."
4060
4038
msgstr ""
4061
4039
4062
#: bzrlib/builtins.py:6291
4040
#: bzrlib/builtins.py:6264
4063
4041
msgid ""
4064
4042
"Views provide a mask over the tree so that users can focus on\n"
4065
4043
"a subset of a tree when doing their work. After creating a view,\n"
4069
4047
"must be within the current view."
4070
4048
msgstr ""
4071
4049
4072
#: bzrlib/builtins.py:6298
4050
#: bzrlib/builtins.py:6271
4073
4051
msgid ""
4074
4052
"In most cases, a view has a short life-span: it is created to make\n"
4075
4053
"a selected change and is deleted once that change is committed.\n"
4077
4055
"and switch between them."
4078
4056
msgstr ""
4079
4057
4080
#: bzrlib/builtins.py:6303
4058
#: bzrlib/builtins.py:6276
4081
4059
msgid ""
4082
4060
"To disable the current view without deleting it, you can switch to\n"
4083
4061
"the pseudo view called ``off``. This can be useful when you need\n"
4085
4063
"want to switch back to your view after that."
4086
4064
msgstr ""
4087
4065
4088
#: bzrlib/builtins.py:6308
4066
#: bzrlib/builtins.py:6281
4089
4067
msgid ""
4090
4068
":Examples:\n"
4091
4069
" To define the current view::"
4092
4070
msgstr ""
4093
4071
4094
#: bzrlib/builtins.py:6311
4072
#: bzrlib/builtins.py:6284
4095
4073
msgid " bzr view file1 dir1 ..."
4096
4074
msgstr ""
4097
4075
4098
#: bzrlib/builtins.py:6313
4076
#: bzrlib/builtins.py:6286
4099
4077
msgid " To list the current view::"
4100
4078
msgstr ""
4101
4079
4102
#: bzrlib/builtins.py:6315
4080
#: bzrlib/builtins.py:6288
4103
4081
msgid " bzr view"
4104
4082
msgstr ""
4105
4083
4106
#: bzrlib/builtins.py:6317
4084
#: bzrlib/builtins.py:6290
4107
4085
msgid " To delete the current view::"
4108
4086
msgstr ""
4109
4087
4110
#: bzrlib/builtins.py:6319
4088
#: bzrlib/builtins.py:6292
4111
4089
msgid " bzr view --delete"
4112
4090
msgstr ""
4113
4091
4114
#: bzrlib/builtins.py:6321
4092
#: bzrlib/builtins.py:6294
4115
4093
msgid " To disable the current view without deleting it::"
4116
4094
msgstr ""
4117
4095
4118
#: bzrlib/builtins.py:6323
4096
#: bzrlib/builtins.py:6296
4119
4097
msgid " bzr view --switch off"
4120
4098
msgstr ""
4121
4099
4122
#: bzrlib/builtins.py:6325
4100
#: bzrlib/builtins.py:6298
4123
4101
msgid " To define a named view and switch to it::"
4124
4102
msgstr ""
4125
4103
4126
#: bzrlib/builtins.py:6327
4104
#: bzrlib/builtins.py:6300
4127
4105
msgid " bzr view --name view-name file1 dir1 ..."
4128
4106
msgstr ""
4129
4107
4130
#: bzrlib/builtins.py:6329
4108
#: bzrlib/builtins.py:6302
4131
4109
msgid " To list a named view::"
4132
4110
msgstr ""
4133
4111
4134
#: bzrlib/builtins.py:6331
4112
#: bzrlib/builtins.py:6304
4135
4113
msgid " bzr view --name view-name"
4136
4114
msgstr ""
4137
4115
4138
#: bzrlib/builtins.py:6333
4116
#: bzrlib/builtins.py:6306
4139
4117
msgid " To delete a named view::"
4140
4118
msgstr ""
4141
4119
4142
#: bzrlib/builtins.py:6335
4120
#: bzrlib/builtins.py:6308
4143
4121
msgid " bzr view --name view-name --delete"
4144
4122
msgstr ""
4145
4123
4146
#: bzrlib/builtins.py:6337
4124
#: bzrlib/builtins.py:6310
4147
4125
msgid " To switch to a named view::"
4148
4126
msgstr ""
4149
4127
4150
#: bzrlib/builtins.py:6339
4128
#: bzrlib/builtins.py:6312
4151
4129
msgid " bzr view --switch view-name"
4152
4130
msgstr ""
4153
4131
4154
#: bzrlib/builtins.py:6341
4132
#: bzrlib/builtins.py:6314
4155
4133
msgid " To list all views defined::"
4156
4134
msgstr ""
4157
4135
4158
#: bzrlib/builtins.py:6343
4136
#: bzrlib/builtins.py:6316
4159
4137
msgid " bzr view --all"
4160
4138
msgstr ""
4161
4139
4162
#: bzrlib/builtins.py:6345
4140
#: bzrlib/builtins.py:6318
4163
4141
msgid " To delete all views::"
4164
4142
msgstr ""
4165
4143
4166
#: bzrlib/builtins.py:6347
4144
#: bzrlib/builtins.py:6320
4167
4145
msgid " bzr view --delete --all"
4168
4146
msgstr ""
4169
4147
4170
4148
# help of 'all' option of 'view' command
4171
#: bzrlib/builtins.py:6354
4149
#: bzrlib/builtins.py:6327
4172
4150
msgid "Apply list or delete action to all views."
4173
4151
msgstr ""
4174
4152
4175
4153
# help of 'delete' option of 'view' command
4176
#: bzrlib/builtins.py:6357
4154
#: bzrlib/builtins.py:6330
4177
4155
msgid "Delete the view."
4178
4156
msgstr ""
4179
4157
4180
4158
# help of 'name' option of 'view' command
4181
#: bzrlib/builtins.py:6360
4159
#: bzrlib/builtins.py:6333
4182
4160
msgid "Name of the view to define, list or delete."
4183
4161
msgstr ""
4184
4162
4185
4163
# help of 'switch' option of 'view' command
4186
#: bzrlib/builtins.py:6364
4164
#: bzrlib/builtins.py:6337
4187
4165
msgid "Name of the view to switch to."
4188
4166
msgstr ""
4189
4167
4190
#: bzrlib/builtins.py:6383
4168
#: bzrlib/builtins.py:6356
4191
4169
msgid "Both --delete and a file list specified"
4192
4170
msgstr ""
4193
4171
4194
#: bzrlib/builtins.py:6386
4172
#: bzrlib/builtins.py:6359
4195
4173
msgid "Both --delete and --switch specified"
4196
4174
msgstr ""
4197
4175
4198
#: bzrlib/builtins.py:6389
4176
#: bzrlib/builtins.py:6362
4199
4177
msgid "Deleted all views.\n"
4200
4178
msgstr ""
4201
4179
4202
#: bzrlib/builtins.py:6391
4180
#: bzrlib/builtins.py:6364
4203
4181
msgid "No current view to delete"
4204
4182
msgstr ""
4205
4183
4206
#: bzrlib/builtins.py:6394
4184
#: bzrlib/builtins.py:6367
4207
4185
#, python-format
4208
4186
msgid "Deleted '%s' view.\n"
4209
4187
msgstr ""
4210
4188
4211
#: bzrlib/builtins.py:6398
4189
#: bzrlib/builtins.py:6371
4212
4190
msgid "Both --switch and a file list specified"
4213
4191
msgstr ""
4214
4192
4215
#: bzrlib/builtins.py:6401
4193
#: bzrlib/builtins.py:6374
4216
4194
msgid "Both --switch and --all specified"
4217
4195
msgstr ""
4218
4196
4219
#: bzrlib/builtins.py:6404
4197
#: bzrlib/builtins.py:6377
4220
4198
msgid "No current view to disable"
4221
4199
msgstr ""
4222
4200
4223
#: bzrlib/builtins.py:6406
4201
#: bzrlib/builtins.py:6379
4224
4202
#, python-format
4225
4203
msgid "Disabled '%s' view.\n"
4226
4204
msgstr ""
4227
4205
4228
#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432
4206
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4229
4207
msgid "Using '{0}' view: {1}\n"
4230
4208
msgstr ""
4231
4209
4232
#: bzrlib/builtins.py:6413
4210
#: bzrlib/builtins.py:6386
4233
4211
msgid "Views defined:\n"
4234
4212
msgstr ""
4235
4213
4236
#: bzrlib/builtins.py:6422
4214
#: bzrlib/builtins.py:6395
4237
4215
msgid "No views defined.\n"
4238
4216
msgstr ""
4239
4217
4240
#: bzrlib/builtins.py:6429
4218
#: bzrlib/builtins.py:6402
4241
4219
msgid "Cannot change the 'off' pseudo view"
4242
4220
msgstr ""
4243
4221
4244
#: bzrlib/builtins.py:6437
4222
#: bzrlib/builtins.py:6410
4245
4223
msgid "No current view.\n"
4246
4224
msgstr ""
4247
4225
4248
#: bzrlib/builtins.py:6440
4226
#: bzrlib/builtins.py:6413
4249
4227
msgid "'{0}' view is: {1}\n"
4250
4228
msgstr ""
4251
4229
4252
#: bzrlib/builtins.py:6460
4230
#: bzrlib/builtins.py:6433
4253
4231
msgid " <no hooks installed>\n"
4254
4232
msgstr ""
4255
4233
4256
#: bzrlib/builtins.py:6464
4234
#: bzrlib/builtins.py:6437
4257
4235
msgid "Remove a branch."
4258
4236
msgstr ""
4259
4237
4260
#: bzrlib/builtins.py:6466
4238
#: bzrlib/builtins.py:6439
4261
4239
msgid ""
4262
4240
"This will remove the branch from the specified location but \n"
4263
4241
"will keep any working tree or repository in place."
4264
4242
msgstr ""
4265
4243
4266
#: bzrlib/builtins.py:6471
4244
#: bzrlib/builtins.py:6444
4267
4245
msgid " Remove the branch at repo/trunk::"
4268
4246
msgstr ""
4269
4247
4270
#: bzrlib/builtins.py:6473
4248
#: bzrlib/builtins.py:6446
4271
4249
msgid " bzr remove-branch repo/trunk"
4272
4250
msgstr ""
4273
4251
4274
# help of 'force' option of 'remove-branch' command
4275
#: bzrlib/builtins.py:6480
4276
msgid "Remove branch even if it is the active branch."
4277
msgstr ""
4278
4279
#: bzrlib/builtins.py:6494
4280
msgid "Branch is active. Use --force to remove it."
4281
msgstr ""
4282
4283
4252
# help of 'writer=plain' option of 'shelve' command
4284
#: bzrlib/builtins.py:6498
4253
#: bzrlib/builtins.py:6461
4285
4254
msgid "Plaintext diff output."
4286
4255
msgstr ""
4287
4256
4288
#: bzrlib/builtins.py:6499
4257
#: bzrlib/builtins.py:6462
4289
4258
msgid "Temporarily set aside some changes from the current tree."
4290
4259
msgstr ""
4291
4260
4292
#: bzrlib/builtins.py:6501
4261
#: bzrlib/builtins.py:6464
4293
4262
msgid ""
4294
4263
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4295
4264
"ie. out of the way, until a later time when you can bring them back from\n"
4298
4267
"will they survive its deletion."
4299
4268
msgstr ""
4300
4269
4301
#: bzrlib/builtins.py:6507
4270
#: bzrlib/builtins.py:6470
4302
4271
msgid "If shelve --list is specified, previously-shelved changes are listed."
4303
4272
msgstr ""
4304
4273
4305
#: bzrlib/builtins.py:6509
4274
#: bzrlib/builtins.py:6472
4306
4275
msgid ""
4307
4276
"Shelve is intended to help separate several sets of changes that have\n"
4308
4277
"been inappropriately mingled. If you just want to get rid of all changes\n"
4310
4279
"shelve all text changes at once, use shelve --all."
4311
4280
msgstr ""
4312
4281
4313
#: bzrlib/builtins.py:6514
4282
#: bzrlib/builtins.py:6477
4314
4283
msgid ""
4315
4284
"If filenames are specified, only the changes to those files will be\n"
4316
4285
"shelved. Other files will be left untouched."
4317
4286
msgstr ""
4318
4287
4319
#: bzrlib/builtins.py:6517
4288
#: bzrlib/builtins.py:6480
4320
4289
msgid ""
4321
4290
"If a revision is specified, changes since that revision will be shelved."
4322
4291
msgstr ""
4323
4292
4324
#: bzrlib/builtins.py:6519
4293
#: bzrlib/builtins.py:6482
4325
4294
msgid ""
4326
4295
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4327
4296
"restore the most recently shelved changes."
4328
4297
msgstr ""
4329
4298
4330
#: bzrlib/builtins.py:6522
4299
#: bzrlib/builtins.py:6485
4331
4300
msgid ""
4332
4301
"For complicated changes, it is possible to edit the changes in a separate\n"
4333
4302
"editor program to decide what the file remaining in the working copy\n"
4334
4303
"should look like. To do this, add the configuration option"
4335
4304
msgstr ""
4336
4305
4337
#: bzrlib/builtins.py:6526
4306
#: bzrlib/builtins.py:6489
4338
4307
msgid " change_editor = PROGRAM @new_path @old_path"
4339
4308
msgstr ""
4340
4309
4341
#: bzrlib/builtins.py:6528
4310
#: bzrlib/builtins.py:6491
4342
4311
msgid ""
4343
4312
"where @new_path is replaced with the path of the new version of the \n"
4344
4313
"file and @old_path is replaced with the path of the old version of \n"
4348
4317
msgstr ""
4349
4318
4350
4319
# help of 'all' option of 'shelve' command
4351
#: bzrlib/builtins.py:6540
4320
#: bzrlib/builtins.py:6503
4352
4321
msgid "Shelve all changes."
4353
4322
msgstr ""
4354
4323
4355
4324
# help of 'writer' option of 'shelve' command
4356
#: bzrlib/builtins.py:6542
4325
#: bzrlib/builtins.py:6505
4357
4326
msgid "Method to use for writing diffs."
4358
4327
msgstr ""
4359
4328
4360
4329
# title of 'writer' option of 'shelve' command
4361
#: bzrlib/builtins.py:6542
4330
#: bzrlib/builtins.py:6505
4362
4331
msgid "writer"
4363
4332
msgstr ""
4364
4333
4365
4334
# help of 'list' option of 'shelve' command
4366
#: bzrlib/builtins.py:6546
4335
#: bzrlib/builtins.py:6509
4367
4336
msgid "List shelved changes."
4368
4337
msgstr ""
4369
4338
4370
4339
# help of 'destroy' option of 'shelve' command
4371
#: bzrlib/builtins.py:6548
4340
#: bzrlib/builtins.py:6511
4372
4341
msgid "Destroy removed changes instead of shelving them."
4373
4342
msgstr ""
4374
4343
4375
#: bzrlib/builtins.py:6577
4344
#: bzrlib/builtins.py:6540
4376
4345
msgid "No shelved changes."
4377
4346
msgstr ""
4378
4347
4379
#: bzrlib/builtins.py:6588
4348
#: bzrlib/builtins.py:6551
4380
4349
msgid "Restore shelved changes."
4381
4350
msgstr ""
4382
4351
4383
#: bzrlib/builtins.py:6590
4352
#: bzrlib/builtins.py:6553
4384
4353
msgid ""
4385
4354
"By default, the most recently shelved changes are restored. However if you\n"
4386
4355
"specify a shelf by id those changes will be restored instead. This works\n"
4388
4357
msgstr ""
4389
4358
4390
4359
# help of 'action' option of 'unshelve' command
4391
#: bzrlib/builtins.py:6599
4360
#: bzrlib/builtins.py:6562
4392
4361
msgid "The action to perform."
4393
4362
msgstr ""
4394
4363
4395
4364
# title of 'action' option of 'resolve' command
4396
4365
# title of 'action' option of 'unshelve' command
4397
#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694
4366
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4398
4367
msgid "action"
4399
4368
msgstr ""
4400
4369
4401
4370
# help of 'action=apply' option of 'unshelve' command
4402
#: bzrlib/builtins.py:6601
4371
#: bzrlib/builtins.py:6564
4403
4372
msgid "Apply changes and remove from the shelf."
4404
4373
msgstr ""
4405
4374
4406
4375
# help of 'action=dry-run' option of 'unshelve' command
4407
#: bzrlib/builtins.py:6602
4376
#: bzrlib/builtins.py:6565
4408
4377
msgid "Show changes, but do not apply or remove them."
4409
4378
msgstr ""
4410
4379
4411
4380
# help of 'action=preview' option of 'unshelve' command
4412
#: bzrlib/builtins.py:6603
4381
#: bzrlib/builtins.py:6566
4413
4382
msgid ""
4414
4383
"Instead of unshelving the changes, show the diff that would result from "
4415
4384
"unshelving."
4416
4385
msgstr ""
4417
4386
4418
4387
# help of 'action=delete-only' option of 'unshelve' command
4419
#: bzrlib/builtins.py:6605
4388
#: bzrlib/builtins.py:6568
4420
4389
msgid "Delete changes without applying them."
4421
4390
msgstr ""
4422
4391
4423
4392
# help of 'action=keep' option of 'unshelve' command
4424
#: bzrlib/builtins.py:6606
4393
#: bzrlib/builtins.py:6569
4425
4394
msgid "Apply changes but don't delete them."
4426
4395
msgstr ""
4427
4396
4428
#: bzrlib/builtins.py:6621
4397
#: bzrlib/builtins.py:6584
4429
4398
msgid "Remove unwanted files from working tree."
4430
4399
msgstr ""
4431
4400
4432
#: bzrlib/builtins.py:6623
4401
#: bzrlib/builtins.py:6586
4433
4402
msgid ""
4434
4403
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4435
4404
"files are never deleted."
4436
4405
msgstr ""
4437
4406
4438
#: bzrlib/builtins.py:6626
4407
#: bzrlib/builtins.py:6589
4439
4408
msgid ""
4440
4409
"Another class is 'detritus', which includes files emitted by bzr during\n"
4441
4410
"normal operations and selftests. (The value of these files decreases with\n"
4442
4411
"time.)"
4443
4412
msgstr ""
4444
4413
4445
#: bzrlib/builtins.py:6630
4414
#: bzrlib/builtins.py:6593
4446
4415
msgid ""
4447
4416
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4448
4417
"flags are respected, and may be combined."
4449
4418
msgstr ""
4450
4419
4451
#: bzrlib/builtins.py:6633
4420
#: bzrlib/builtins.py:6596
4452
4421
msgid "To check what clean-tree will do, use --dry-run."
4453
4422
msgstr ""
4454
4423
4455
4424
# help of 'ignored' option of 'clean-tree' command
4456
#: bzrlib/builtins.py:6636
4425
#: bzrlib/builtins.py:6599
4457
4426
msgid "Delete all ignored files."
4458
4427
msgstr ""
4459
4428
4460
4429
# help of 'detritus' option of 'clean-tree' command
4461
#: bzrlib/builtins.py:6637
4430
#: bzrlib/builtins.py:6600
4462
4431
msgid ""
4463
4432
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4464
4433
msgstr ""
4465
4434
4466
4435
# help of 'unknown' option of 'clean-tree' command
4467
#: bzrlib/builtins.py:6640
4436
#: bzrlib/builtins.py:6603
4468
4437
msgid "Delete files unknown to bzr (default)."
4469
4438
msgstr ""
4470
4439
4471
4440
# help of 'dry-run' option of 'clean-tree' command
4472
#: bzrlib/builtins.py:6641
4441
#: bzrlib/builtins.py:6604
4473
4442
msgid "Show files to delete instead of deleting them."
4474
4443
msgstr ""
4475
4444
4476
4445
# help of 'force' option of 'clean-tree' command
4477
#: bzrlib/builtins.py:6643
4446
#: bzrlib/builtins.py:6606
4478
4447
msgid "Do not prompt before deleting."
4479
4448
msgstr ""
4480
4449
4534
4503
msgstr[0] ""
4535
4504
msgstr[1] ""
4536
4505
4537
#: bzrlib/bzrdir.py:487
4506
#: bzrlib/bzrdir.py:490
4538
4507
msgid ""
4539
4508
"making backup of {0}\n"
4540
4509
" to {1}"
4541
4510
msgstr ""
4542
4511
4543
#: bzrlib/bzrdir.py:510
4512
#: bzrlib/bzrdir.py:513
4544
4513
msgid "renamed {0} to {1}"
4545
4514
msgstr ""
4546
4515
4547
#: bzrlib/bzrdir.py:1639
4516
#: bzrlib/bzrdir.py:1652
4548
4517
#, python-format
4549
4518
msgid ""
4550
4519
"Source repository format does not support stacking, using format:\n"
4551
4520
" %s"
4552
4521
msgstr ""
4553
4522
4554
#: bzrlib/bzrdir.py:1659
4523
#: bzrlib/bzrdir.py:1672
4555
4524
#, python-format
4556
4525
msgid ""
4557
4526
"Source branch format does not support stacking, using format:\n"
4558
4527
" %s"
4559
4528
msgstr ""
4560
4529
4561
#: bzrlib/bzrdir.py:1805
4530
#: bzrlib/bzrdir.py:1818
4562
4531
msgid "starting repository conversion"
4563
4532
msgstr ""
4564
4533
4565
#: bzrlib/bzrdir.py:2026
4534
#: bzrlib/bzrdir.py:2039
4566
4535
msgid "Using default stacking branch {0} at {1}"
4567
4536
msgstr ""
4568
4537
4748
4717
"supported formats or in a custom format based on a template."
4749
4718
msgstr ""
4750
4719
4751
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4752
#: en/help_topics/configuration.txt:738
4720
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4721
#: en/help_topics/configuration.txt:710
4753
4722
msgid "For example::"
4754
4723
msgstr ""
4755
4724
4874
4843
msgid ":See also: %s"
4875
4844
msgstr ""
4876
4845
4877
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4846
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4878
4847
msgid "Only ASCII permitted in option names"
4879
4848
msgstr ""
4880
4849
4881
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4850
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4882
4851
msgid "command {0!r} needs one or more {1}"
4883
4852
msgstr ""
4884
4853
4885
#: bzrlib/commands.py:868
4854
#: bzrlib/commands.py:858
4886
4855
msgid "command {0!r} requires argument {1}"
4887
4856
msgstr ""
4888
4857
4889
#: bzrlib/commands.py:875
4858
#: bzrlib/commands.py:865
4890
4859
msgid "extra argument to command {0}: {1}"
4891
4860
msgstr ""
4892
4861
4893
#: bzrlib/commands.py:952
4862
#: bzrlib/commands.py:962
4894
4863
#, python-format
4895
4864
msgid "Profile data written to \"%s\"."
4896
4865
msgstr ""
4933
4902
msgid "renamed"
4934
4903
msgstr ""
4935
4904
4936
#: bzrlib/commit.py:976
4905
#: bzrlib/commit.py:977
4937
4906
msgid "unchanged"
4938
4907
msgstr ""
4939
4908
4940
#: bzrlib/commit.py:998
4909
#: bzrlib/commit.py:999
4941
4910
msgid "{0} [{1}] - Stage"
4942
4911
msgstr ""
4943
4912
4944
#: bzrlib/commit.py:1001
4913
#: bzrlib/commit.py:1002
4945
4914
#, python-format
4946
4915
msgid "%s - Stage"
4947
4916
msgstr ""
4948
4917
4949
#: bzrlib/commit_signature_commands.py:34
4918
#: bzrlib/commit_signature_commands.py:36
4950
4919
msgid "Sign all commits by a given committer."
4951
4920
msgstr ""
4952
4921
4953
#: bzrlib/commit_signature_commands.py:36
4922
#: bzrlib/commit_signature_commands.py:38
4954
4923
msgid ""
4955
4924
"If location is not specified the local tree is used.\n"
4956
4925
"If committer is not specified the default committer is used."
4957
4926
msgstr ""
4958
4927
4959
#: bzrlib/commit_signature_commands.py:39
4928
#: bzrlib/commit_signature_commands.py:41
4960
4929
msgid "This does not sign commits that already have signatures."
4961
4930
msgstr ""
4962
4931
4963
4932
# help of 'dry-run' option of 'sign-my-commits' command
4964
#: bzrlib/commit_signature_commands.py:47
4933
#: bzrlib/commit_signature_commands.py:49
4965
4934
msgid ""
4966
4935
"Don't actually sign anything, just print the revisions that would be signed."
4967
4936
msgstr ""
4968
4937
4969
#: bzrlib/commit_signature_commands.py:98
4970
#, python-format
4971
msgid "Signed %d revision.\n"
4972
msgid_plural "Signed %d revisions.\n"
4973
msgstr[0] ""
4974
msgstr[1] ""
4975
4976
4938
#: bzrlib/commit_signature_commands.py:103
4977
4939
msgid "Verify all commit signatures."
4978
4940
msgstr ""
4988
4950
"verification."
4989
4951
msgstr ""
4990
4952
4991
#: bzrlib/commit_signature_commands.py:148
4953
#: bzrlib/commit_signature_commands.py:147
4992
4954
msgid "Cannot verify a range of non-revision-history revisions"
4993
4955
msgstr ""
4994
4956
4995
#: bzrlib/commit_signature_commands.py:166
4957
#: bzrlib/commit_signature_commands.py:168
4996
4958
msgid "All commits signed with verifiable keys"
4997
4959
msgstr ""
4998
4960
4999
#: bzrlib/config.py:438
4961
#: bzrlib/config.py:475
5000
4962
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5001
4963
msgstr ""
5002
4964
5003
#: bzrlib/config.py:2468
4965
#: bzrlib/config.py:2485
5004
4966
msgid "{0} is not an SI unit."
5005
4967
msgstr ""
5006
4968
5007
#: bzrlib/config.py:2989
4969
#: bzrlib/config.py:2949
5008
4970
msgid ""
5009
4971
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5010
4972
"will be saved."
5011
4973
msgstr ""
5012
4974
5013
#: bzrlib/config.py:3134
4975
#: bzrlib/config.py:3093
5014
4976
#, python-format
5015
4977
msgid "Invalid '%s', should be of the form 'name=value'"
5016
4978
msgstr ""
5017
4979
5018
#: bzrlib/config.py:4089
4980
#: bzrlib/config.py:3962
5019
4981
msgid "Display, set or remove a configuration option."
5020
4982
msgstr ""
5021
4983
5022
#: bzrlib/config.py:4091
5023
msgid "Display the active value for option NAME."
4984
#: bzrlib/config.py:3964
4985
msgid "Display the active value for a given option."
5024
4986
msgstr ""
5025
4987
5026
#: bzrlib/config.py:4093
4988
#: bzrlib/config.py:3966
5027
4989
msgid ""
5028
4990
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5029
"matching options are displayed mentioning their scope and without resolving\n"
5030
"option references in the value). The active value that bzr will take into\n"
5031
"account is the first one displayed for each option."
5032
msgstr ""
5033
5034
#: bzrlib/config.py:4098
5035
msgid ""
5036
"If NAME is not given, --all .* is implied (all options are displayed for "
5037
"the\n"
5038
"current scope)."
5039
msgstr ""
5040
5041
#: bzrlib/config.py:4101
5042
msgid ""
5043
"Setting a value is achieved by using NAME=value without spaces. The value\n"
4991
"matching options are displayed mentioning their scope. The active value\n"
4992
"that bzr will take into account is the first one displayed for each option."
4993
msgstr ""
4994
4995
#: bzrlib/config.py:3970
4996
msgid "If no NAME is given, --all .* is implied."
4997
msgstr ""
4998
4999
#: bzrlib/config.py:3972
5000
msgid ""
5001
"Setting a value is achieved by using name=value without spaces. The value\n"
5044
5002
"is set in the most relevant scope and can be checked by displaying the\n"
5045
5003
"option again."
5046
5004
msgstr ""
5047
5005
5048
#: bzrlib/config.py:4105
5049
msgid "Removing a value is achieved by using --remove NAME."
5050
msgstr ""
5051
5052
5006
# help of 'scope' option of 'config' command
5053
#: bzrlib/config.py:4115
5007
#: bzrlib/config.py:3984
5054
5008
msgid "Reduce the scope to the specified configuration file."
5055
5009
msgstr ""
5056
5010
5057
5011
# help of 'all' option of 'config' command
5058
#: bzrlib/config.py:4119
5012
#: bzrlib/config.py:3988
5059
5013
msgid "Display all the defined values for the matching options."
5060
5014
msgstr ""
5061
5015
5062
5016
# help of 'remove' option of 'config' command
5063
#: bzrlib/config.py:4121
5017
#: bzrlib/config.py:3990
5064
5018
msgid "Remove the option from the configuration file."
5065
5019
msgstr ""
5066
5020
5146
5100
msgstr[0] ""
5147
5101
msgstr[1] ""
5148
5102
5149
#: bzrlib/controldir.py:712
5103
#: bzrlib/controldir.py:710
5150
5104
msgid "{0} is{1} redirected to {2}"
5151
5105
msgstr ""
5152
5106
5153
#: bzrlib/diff.py:400
5107
#: bzrlib/diff.py:399
5154
5108
#, python-format
5155
5109
msgid "*** Ignoring files outside view. View is %s"
5156
5110
msgstr ""
5363
5317
msgstr ""
5364
5318
5365
5319
#: bzrlib/errors.py:715
5366
msgid "Invalid branch name: %(name)s"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:724
5370
5320
msgid "Parent branch already exists: \"%(path)s\"."
5371
5321
msgstr ""
5372
5322
5373
#: bzrlib/errors.py:730
5323
#: bzrlib/errors.py:721
5374
5324
msgid ""
5375
5325
"Directory contains a branch, but no working tree (use bzr checkout if you "
5376
5326
"wish to build a working tree): \"%(path)s\""
5377
5327
msgstr ""
5378
5328
5379
#: bzrlib/errors.py:735
5329
#: bzrlib/errors.py:726
5380
5330
msgid ""
5381
5331
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5382
5332
msgstr ""
5383
5333
5384
#: bzrlib/errors.py:745
5334
#: bzrlib/errors.py:736
5385
5335
msgid ""
5386
5336
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5387
5337
msgstr ""
5388
5338
5389
#: bzrlib/errors.py:755
5339
#: bzrlib/errors.py:746
5390
5340
msgid "No repository present: \"%(path)s\""
5391
5341
msgstr ""
5392
5342
5393
#: bzrlib/errors.py:762
5343
#: bzrlib/errors.py:753
5394
5344
msgid ""
5395
5345
"Unsupported branch format: %(format)s\n"
5396
5346
"Please run 'bzr upgrade'"
5397
5347
msgstr ""
5398
5348
5349
#: bzrlib/errors.py:759
5350
msgid "Unknown %(kind)s format: %(format)r"
5351
msgstr ""
5352
5399
5353
#: bzrlib/errors.py:768
5400
msgid "Unknown %(kind)s format: %(format)r"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:777
5404
5354
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5405
5355
msgstr ""
5406
5356
5407
#: bzrlib/errors.py:787
5357
#: bzrlib/errors.py:778
5408
5358
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5409
5359
msgstr ""
5410
5360
5411
#: bzrlib/errors.py:802
5361
#: bzrlib/errors.py:793
5412
5362
msgid ""
5413
5363
"%(target)s\n"
5414
5364
"is not compatible with\n"
5416
5366
"%(details)s"
5417
5367
msgstr ""
5418
5368
5419
#: bzrlib/errors.py:818
5369
#: bzrlib/errors.py:809
5420
5370
msgid "Revision is not compatible with %(repo_format)s"
5421
5371
msgstr ""
5422
5372
5423
#: bzrlib/errors.py:828
5373
#: bzrlib/errors.py:819
5424
5374
msgid "%(context_info)s%(path)s is already versioned."
5425
5375
msgstr ""
5426
5376
5427
#: bzrlib/errors.py:849
5377
#: bzrlib/errors.py:840
5428
5378
msgid "%(context_info)s%(path)s is not versioned."
5429
5379
msgstr ""
5430
5380
5431
#: bzrlib/errors.py:870
5381
#: bzrlib/errors.py:861
5432
5382
msgid "Path(s) are not versioned: %(paths_as_string)s"
5433
5383
msgstr ""
5434
5384
5435
#: bzrlib/errors.py:881
5385
#: bzrlib/errors.py:872
5436
5386
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5437
5387
msgstr ""
5438
5388
5439
#: bzrlib/errors.py:900
5389
#: bzrlib/errors.py:891
5440
5390
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5441
5391
msgstr ""
5442
5392
5443
#: bzrlib/errors.py:908
5393
#: bzrlib/errors.py:899
5444
5394
msgid ""
5445
5395
"Filename %(filename)r is not valid in your current filesystem encoding "
5446
5396
"%(fs_encoding)s"
5447
5397
msgstr ""
5448
5398
5449
#: bzrlib/errors.py:919
5399
#: bzrlib/errors.py:910
5450
5400
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5451
5401
msgstr ""
5452
5402
5453
#: bzrlib/errors.py:937
5403
#: bzrlib/errors.py:928
5454
5404
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5455
5405
msgstr ""
5456
5406
5457
#: bzrlib/errors.py:976
5407
#: bzrlib/errors.py:967
5458
5408
msgid "Cannot lock %(lock)s: %(why)s"
5459
5409
msgstr ""
5460
5410
5461
#: bzrlib/errors.py:986
5411
#: bzrlib/errors.py:977
5462
5412
msgid ""
5463
5413
"A transaction related operation was attempted after the transaction finished."
5464
5414
msgstr ""
5465
5415
5466
#: bzrlib/errors.py:1013
5416
#: bzrlib/errors.py:1004
5467
5417
msgid "Cannot lock: transport is read only: %(transport)s"
5468
5418
msgstr ""
5469
5419
5470
#: bzrlib/errors.py:1021
5420
#: bzrlib/errors.py:1012
5471
5421
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5472
5422
msgstr ""
5473
5423
5474
#: bzrlib/errors.py:1032
5424
#: bzrlib/errors.py:1023
5475
5425
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5476
5426
msgstr ""
5477
5427
5478
#: bzrlib/errors.py:1043
5428
#: bzrlib/errors.py:1034
5479
5429
msgid ""
5480
5430
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5481
5431
"%(holder)r, wanted to break %(target)r"
5482
5432
msgstr ""
5483
5433
5484
#: bzrlib/errors.py:1055
5434
#: bzrlib/errors.py:1046
5485
5435
msgid ""
5486
5436
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5487
5437
"Use 'bzr break-lock' to clear it"
5488
5438
msgstr ""
5489
5439
5490
#: bzrlib/errors.py:1068
5440
#: bzrlib/errors.py:1059
5491
5441
msgid "Lock not held: %(lock)s"
5492
5442
msgstr ""
5493
5443
5494
#: bzrlib/errors.py:1097
5444
#: bzrlib/errors.py:1088
5495
5445
msgid "No changes to commit"
5496
5446
msgstr ""
5497
5447
5498
#: bzrlib/errors.py:1102
5448
#: bzrlib/errors.py:1093
5499
5449
msgid ""
5500
5450
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5501
5451
msgstr ""
5502
5452
5503
#: bzrlib/errors.py:1112
5453
#: bzrlib/errors.py:1103
5504
5454
msgid ""
5505
5455
"Excluding paths during commit is not supported by repository at %(repository)"
5506
5456
"r."
5507
5457
msgstr ""
5508
5458
5509
#: bzrlib/errors.py:1121
5459
#: bzrlib/errors.py:1112
5510
5460
msgid ""
5511
5461
"The specified commit message contains characters unsupported by the current "
5512
5462
"encoding."
5513
5463
msgstr ""
5514
5464
5515
#: bzrlib/errors.py:1127
5465
#: bzrlib/errors.py:1118
5516
5466
msgid "Upgrade URL cannot work with readonly URLs."
5517
5467
msgstr ""
5518
5468
5519
#: bzrlib/errors.py:1132
5469
#: bzrlib/errors.py:1123
5520
5470
msgid "The branch format %(format)s is already at the most recent format."
5521
5471
msgstr ""
5522
5472
5523
#: bzrlib/errors.py:1155
5473
#: bzrlib/errors.py:1146
5524
5474
msgid "Option --change does not accept revision ranges"
5525
5475
msgstr ""
5526
5476
5527
#: bzrlib/errors.py:1160
5477
#: bzrlib/errors.py:1151
5528
5478
msgid "No namespace registered for string: %(spec)r"
5529
5479
msgstr ""
5530
5480
5531
#: bzrlib/errors.py:1179
5481
#: bzrlib/errors.py:1170
5532
5482
msgid ""
5533
5483
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5534
5484
"%(extra)s"
5535
5485
msgstr ""
5536
5486
5537
#: bzrlib/errors.py:1193
5487
#: bzrlib/errors.py:1184
5538
5488
msgid ""
5539
5489
"Operation denied because it would change the main history, which is not "
5540
5490
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5541
5491
msgstr ""
5542
5492
5543
#: bzrlib/errors.py:1204
5493
#: bzrlib/errors.py:1195
5544
5494
msgid ""
5545
5495
"These branches have diverged. Use the missing command to see how.\n"
5546
5496
"Use the merge command to reconcile them."
5547
5497
msgstr ""
5548
5498
5549
#: bzrlib/errors.py:1224
5499
#: bzrlib/errors.py:1215
5550
5500
msgid ""
5551
5501
"Branches have no common ancestor, and no merge base revision was specified."
5552
5502
msgstr ""
5553
5503
5554
#: bzrlib/errors.py:1230
5504
#: bzrlib/errors.py:1221
5555
5505
msgid ""
5556
5506
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5557
5507
msgstr ""
5558
5508
5509
#: bzrlib/errors.py:1227
5510
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5511
msgstr ""
5512
5559
5513
#: bzrlib/errors.py:1236
5560
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5514
msgid ""
5515
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5561
5516
msgstr ""
5562
5517
5563
5518
#: bzrlib/errors.py:1245
5564
msgid ""
5565
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5519
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5566
5520
msgstr ""
5567
5521
5568
5522
#: bzrlib/errors.py:1254
5569
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:1263
5573
5523
msgid "Branch %(branch)s has no commits."
5574
5524
msgstr ""
5575
5525
5576
#: bzrlib/errors.py:1281
5526
#: bzrlib/errors.py:1272
5577
5527
msgid ""
5578
5528
"Bound branch %(branch)s is out of date with master branch %(master)s."
5579
5529
"%(extra_help)s"
5580
5530
msgstr ""
5581
5531
5582
#: bzrlib/errors.py:1293
5532
#: bzrlib/errors.py:1284
5583
5533
msgid ""
5584
5534
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5585
5535
"bound to %(remote)s."
5586
5536
msgstr ""
5587
5537
5538
#: bzrlib/errors.py:1296
5539
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5540
msgstr ""
5541
5588
5542
#: bzrlib/errors.py:1305
5589
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:1314
5593
5543
msgid ""
5594
5544
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5595
5545
"%(error)s"
5596
5546
msgstr ""
5597
5547
5548
#: bzrlib/errors.py:1317
5549
msgid "Error in processing weave: %(msg)s"
5550
msgstr ""
5551
5598
5552
#: bzrlib/errors.py:1326
5599
msgid "Error in processing weave: %(msg)s"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:1335
5603
5553
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5604
5554
msgstr ""
5605
5555
5606
#: bzrlib/errors.py:1346
5556
#: bzrlib/errors.py:1337
5607
5557
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5608
5558
msgstr ""
5609
5559
5560
#: bzrlib/errors.py:1347
5561
msgid "Weave invariant violated: %(what)s"
5562
msgstr ""
5563
5610
5564
#: bzrlib/errors.py:1356
5611
msgid "Weave invariant violated: %(what)s"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:1365
5615
5565
msgid "Parents are mismatched between two revisions. %(msg)s"
5616
5566
msgstr ""
5617
5567
5618
#: bzrlib/errors.py:1387
5568
#: bzrlib/errors.py:1378
5619
5569
msgid ""
5620
5570
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5621
5571
"%(weave_b)s"
5622
5572
msgstr ""
5623
5573
5624
#: bzrlib/errors.py:1399
5574
#: bzrlib/errors.py:1390
5625
5575
msgid "Versioned file error"
5626
5576
msgstr ""
5627
5577
5628
#: bzrlib/errors.py:1404
5578
#: bzrlib/errors.py:1395
5629
5579
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5630
5580
msgstr ""
5631
5581
5632
#: bzrlib/errors.py:1414
5582
#: bzrlib/errors.py:1405
5633
5583
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5634
5584
msgstr ""
5635
5585
5636
#: bzrlib/errors.py:1424
5586
#: bzrlib/errors.py:1415
5637
5587
msgid "Text did not match its checksum: %(msg)s"
5638
5588
msgstr ""
5639
5589
5590
#: bzrlib/errors.py:1541
5591
msgid "Export format %(format)r not supported"
5592
msgstr ""
5593
5640
5594
#: bzrlib/errors.py:1550
5641
msgid "Export format %(format)r not supported"
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:1559
5645
5595
msgid "Transport error: %(msg)s %(orig_error)s"
5646
5596
msgstr ""
5647
5597
5648
#: bzrlib/errors.py:1585
5598
#: bzrlib/errors.py:1576
5649
5599
msgid "Generic bzr smart protocol error: %(details)s"
5650
5600
msgstr ""
5651
5601
5652
#: bzrlib/errors.py:1593
5602
#: bzrlib/errors.py:1584
5653
5603
msgid "Received bad protocol version marker: %(marker)r"
5654
5604
msgstr ""
5655
5605
5656
#: bzrlib/errors.py:1625
5606
#: bzrlib/errors.py:1616
5657
5607
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5658
5608
msgstr ""
5659
5609
5660
#: bzrlib/errors.py:1630
5610
#: bzrlib/errors.py:1621
5661
5611
msgid "Connection error: %(msg)s %(orig_error)s"
5662
5612
msgstr ""
5663
5613
5664
#: bzrlib/errors.py:1635
5614
#: bzrlib/errors.py:1626
5665
5615
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5666
5616
msgstr ""
5667
5617
5668
#: bzrlib/errors.py:1656
5618
#: bzrlib/errors.py:1647
5669
5619
msgid "Connection closed: %(msg)s %(orig_error)s"
5670
5620
msgstr ""
5671
5621
5672
#: bzrlib/errors.py:1661
5622
#: bzrlib/errors.py:1652
5673
5623
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5674
5624
msgstr ""
5675
5625
5676
#: bzrlib/errors.py:1666
5626
#: bzrlib/errors.py:1657
5677
5627
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5678
5628
msgstr ""
5679
5629
5680
#: bzrlib/errors.py:1676
5630
#: bzrlib/errors.py:1667
5681
5631
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5682
5632
msgstr ""
5683
5633
5684
#: bzrlib/errors.py:1691
5634
#: bzrlib/errors.py:1682
5685
5635
msgid "Certificate error: %(error)s"
5686
5636
msgstr ""
5687
5637
5688
#: bzrlib/errors.py:1699
5638
#: bzrlib/errors.py:1690
5689
5639
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5690
5640
msgstr ""
5691
5641
5692
#: bzrlib/errors.py:1713
5642
#: bzrlib/errors.py:1704
5693
5643
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5694
5644
msgstr ""
5695
5645
5646
#: bzrlib/errors.py:1712
5647
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5648
msgstr ""
5649
5696
5650
#: bzrlib/errors.py:1721
5697
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:1730
5701
5651
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5702
5652
msgstr ""
5703
5653
5704
#: bzrlib/errors.py:1744
5654
#: bzrlib/errors.py:1735
5705
5655
msgid "Too many redirections"
5706
5656
msgstr ""
5707
5657
5708
#: bzrlib/errors.py:1749
5658
#: bzrlib/errors.py:1740
5709
5659
msgid "Working tree has conflicts."
5710
5660
msgstr ""
5711
5661
5662
#: bzrlib/errors.py:1744
5663
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5664
msgstr ""
5665
5712
5666
#: bzrlib/errors.py:1753
5713
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:1762
5717
5667
msgid ""
5718
5668
"Error(s) parsing config file %(filename)s:\n"
5719
5669
"%(errors)s"
5720
5670
msgstr ""
5721
5671
5722
#: bzrlib/errors.py:1772
5672
#: bzrlib/errors.py:1763
5723
5673
msgid ""
5724
5674
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5725
5675
"See ``bzr help %(name)s``"
5726
5676
msgstr ""
5727
5677
5678
#: bzrlib/errors.py:1773
5679
msgid "%(username)r does not seem to contain a reasonable email address"
5680
msgstr ""
5681
5728
5682
#: bzrlib/errors.py:1782
5729
msgid "%(username)r does not seem to contain a reasonable email address"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:1791
5733
5683
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5734
5684
msgstr ""
5735
5685
5736
#: bzrlib/errors.py:1799
5686
#: bzrlib/errors.py:1790
5737
5687
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5738
5688
msgstr ""
5739
5689
5740
#: bzrlib/errors.py:1807
5690
#: bzrlib/errors.py:1798
5741
5691
msgid "Unable to import library \"%(library)s\": %(error)s"
5742
5692
msgstr ""
5743
5693
5744
#: bzrlib/errors.py:1815
5694
#: bzrlib/errors.py:1806
5745
5695
msgid "python-gpgme is not installed, it is needed to verify signatures"
5746
5696
msgstr ""
5747
5697
5748
#: bzrlib/errors.py:1823
5698
#: bzrlib/errors.py:1814
5749
5699
msgid ""
5750
5700
"The working tree for %(basedir)s has changed since the last commit, but "
5751
5701
"weave merge requires that it be unchanged"
5752
5702
msgstr ""
5753
5703
5754
#: bzrlib/errors.py:1833
5704
#: bzrlib/errors.py:1824
5755
5705
msgid ""
5756
5706
"Can't reprocess and show base, because reprocessing obscures the "
5757
5707
"relationship of conflicting lines to the base"
5758
5708
msgstr ""
5759
5709
5760
#: bzrlib/errors.py:1839
5710
#: bzrlib/errors.py:1830
5761
5711
msgid "Cycle in graph %(graph)r"
5762
5712
msgstr ""
5763
5713
5764
#: bzrlib/errors.py:1867
5714
#: bzrlib/errors.py:1858
5765
5715
msgid "File %(filename)s is not conflicted."
5766
5716
msgstr ""
5767
5717
5718
#: bzrlib/errors.py:1880
5719
msgid "No bundle was found in \"%(filename)s\"."
5720
msgstr ""
5721
5768
5722
#: bzrlib/errors.py:1889
5769
msgid "No bundle was found in \"%(filename)s\"."
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:1898
5773
5723
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5774
5724
msgstr ""
5775
5725
5776
#: bzrlib/errors.py:1908
5726
#: bzrlib/errors.py:1899
5777
5727
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5778
5728
msgstr ""
5779
5729
5780
#: bzrlib/errors.py:1921
5730
#: bzrlib/errors.py:1912
5781
5731
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5782
5732
msgstr ""
5783
5733
5784
#: bzrlib/errors.py:1931
5734
#: bzrlib/errors.py:1922
5785
5735
msgid "Key %(key)s is already present in map"
5786
5736
msgstr ""
5787
5737
5788
#: bzrlib/errors.py:1936
5738
#: bzrlib/errors.py:1927
5789
5739
msgid "The prefix %(prefix)s is in the help search path twice."
5790
5740
msgstr ""
5791
5741
5792
#: bzrlib/errors.py:1946
5742
#: bzrlib/errors.py:1937
5793
5743
msgid ""
5794
5744
"No final name for trans_id %(trans_id)r\n"
5795
5745
"file-id: %(file_id)r\n"
5796
5746
"root trans-id: %(root_trans_id)r\n"
5797
5747
msgstr ""
5798
5748
5799
#: bzrlib/errors.py:1978
5749
#: bzrlib/errors.py:1969
5800
5750
msgid "Attempt to reuse a transform that has already been applied."
5801
5751
msgstr ""
5802
5752
5803
#: bzrlib/errors.py:1983
5753
#: bzrlib/errors.py:1974
5804
5754
msgid "Moving the root directory is not supported at this time"
5805
5755
msgstr ""
5806
5756
5807
#: bzrlib/errors.py:1988
5757
#: bzrlib/errors.py:1979
5808
5758
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5809
5759
msgstr ""
5810
5760
5811
#: bzrlib/errors.py:1999
5761
#: bzrlib/errors.py:1990
5812
5762
msgid ""
5813
5763
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5814
5764
msgstr ""
5815
5765
5816
#: bzrlib/errors.py:2035
5766
#: bzrlib/errors.py:2026
5817
5767
msgid ""
5818
5768
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5819
5769
msgstr ""
5820
5770
5821
#: bzrlib/errors.py:2065
5771
#: bzrlib/errors.py:2056
5822
5772
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5823
5773
msgstr ""
5824
5774
5825
#: bzrlib/errors.py:2073
5775
#: bzrlib/errors.py:2064
5826
5776
msgid "Nothing to merge."
5827
5777
msgstr ""
5828
5778
5779
#: bzrlib/errors.py:2069
5780
msgid "Format %(format)s cannot be initialised by this version of bzr."
5781
msgstr ""
5782
5829
5783
#: bzrlib/errors.py:2078
5830
msgid "Format %(format)s cannot be initialised by this version of bzr."
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2087
5834
5784
msgid ""
5835
5785
"Cannot convert from format %(from_format)s to format %(format)s. "
5836
5786
"%(problem)s"
5837
5787
msgstr ""
5838
5788
5839
#: bzrlib/errors.py:2099
5789
#: bzrlib/errors.py:2090
5840
5790
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5841
5791
msgstr ""
5842
5792
5843
#: bzrlib/errors.py:2107
5793
#: bzrlib/errors.py:2098
5844
5794
msgid "%(exe_name)s could not be found on this machine"
5845
5795
msgstr ""
5846
5796
5847
#: bzrlib/errors.py:2115
5797
#: bzrlib/errors.py:2106
5848
5798
msgid "Diff is not installed on this machine: %(msg)s"
5849
5799
msgstr ""
5850
5800
5851
#: bzrlib/errors.py:2123
5801
#: bzrlib/errors.py:2114
5852
5802
msgid "Diff3 is not installed on this machine."
5853
5803
msgstr ""
5854
5804
5855
#: bzrlib/errors.py:2129
5805
#: bzrlib/errors.py:2120
5856
5806
msgid "The content being inserted is already present."
5857
5807
msgstr ""
5858
5808
5859
#: bzrlib/errors.py:2134
5809
#: bzrlib/errors.py:2125
5860
5810
msgid ""
5861
5811
"This tree contains left-over files from a failed operation.\n"
5862
5812
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5864
5814
" keep, and delete it when you are done."
5865
5815
msgstr ""
5866
5816
5867
#: bzrlib/errors.py:2145
5817
#: bzrlib/errors.py:2136
5868
5818
msgid ""
5869
5819
"This tree contains left-over files from a failed operation.\n"
5870
5820
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5871
5821
" wish to keep, and delete it when you are done."
5872
5822
msgstr ""
5873
5823
5874
#: bzrlib/errors.py:2155
5824
#: bzrlib/errors.py:2146
5875
5825
msgid ""
5876
5826
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5877
5827
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5879
5829
" keep, and delete it when you are done."
5880
5830
msgstr ""
5881
5831
5882
#: bzrlib/errors.py:2166
5832
#: bzrlib/errors.py:2157
5883
5833
msgid ""
5884
5834
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5885
5835
"examine %(pending_deletion)s to see if it contains any files you wish to "
5886
5836
"keep, and delete it when you are done."
5887
5837
msgstr ""
5888
5838
5889
#: bzrlib/errors.py:2176
5839
#: bzrlib/errors.py:2167
5890
5840
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5891
5841
msgstr ""
5892
5842
5893
#: bzrlib/errors.py:2190
5843
#: bzrlib/errors.py:2181
5894
5844
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5895
5845
msgstr ""
5896
5846
5897
#: bzrlib/errors.py:2203
5847
#: bzrlib/errors.py:2194
5898
5848
msgid "Error in merge modified format"
5899
5849
msgstr ""
5900
5850
5901
#: bzrlib/errors.py:2208
5851
#: bzrlib/errors.py:2199
5902
5852
msgid "Format error in conflict listings"
5903
5853
msgstr ""
5904
5854
5905
#: bzrlib/errors.py:2212
5855
#: bzrlib/errors.py:2203
5906
5856
msgid ""
5907
5857
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5908
5858
"Error: %(description)s"
5909
5859
msgstr ""
5910
5860
5911
#: bzrlib/errors.py:2223
5861
#: bzrlib/errors.py:2214
5912
5862
msgid ""
5913
5863
"An error has been detected in the repository %(repo_path)s.\n"
5914
5864
"Please run bzr reconcile on this repository."
5915
5865
msgstr ""
5916
5866
5917
#: bzrlib/errors.py:2234
5867
#: bzrlib/errors.py:2225
5918
5868
msgid ""
5919
5869
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5920
5870
"reason: %(reason)s"
5921
5871
msgstr ""
5922
5872
5923
#: bzrlib/errors.py:2247
5873
#: bzrlib/errors.py:2238
5924
5874
msgid ""
5925
5875
"An inconsistent delta was supplied: %(delta)r\n"
5926
5876
"reason: %(reason)s"
5927
5877
msgstr ""
5928
5878
5879
#: bzrlib/errors.py:2250
5880
msgid "To use this feature you must upgrade your branch at %(path)s."
5881
msgstr ""
5882
5929
5883
#: bzrlib/errors.py:2259
5930
msgid "To use this feature you must upgrade your branch at %(path)s."
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2268
5934
5884
msgid "To use this feature you must upgrade your repository at %(path)s."
5935
5885
msgstr ""
5936
5886
5937
#: bzrlib/errors.py:2273
5887
#: bzrlib/errors.py:2264
5938
5888
msgid ""
5939
5889
"To use this feature you must upgrade your branch at %(path)s to a format "
5940
5890
"which supports rich roots."
5941
5891
msgstr ""
5942
5892
5943
#: bzrlib/errors.py:2279
5893
#: bzrlib/errors.py:2270
5944
5894
msgid "Cannot perform local-only commits on unbound branches."
5945
5895
msgstr ""
5946
5896
5947
#: bzrlib/errors.py:2284
5897
#: bzrlib/errors.py:2275
5948
5898
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5949
5899
msgstr ""
5950
5900
5951
#: bzrlib/errors.py:2305
5901
#: bzrlib/errors.py:2296
5952
5902
msgid "Ghost tags not supported by format %(format)r."
5953
5903
msgstr ""
5954
5904
5955
#: bzrlib/errors.py:2313
5905
#: bzrlib/errors.py:2304
5956
5906
msgid "File is binary but should be text."
5957
5907
msgstr ""
5958
5908
5909
#: bzrlib/errors.py:2309
5910
msgid "The path %(path)s is not permitted on this platform"
5911
msgstr ""
5912
5959
5913
#: bzrlib/errors.py:2318
5960
msgid "The path %(path)s is not permitted on this platform"
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2327
5964
5914
msgid ""
5965
5915
"Testament did not match expected value.\n"
5966
5916
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5967
5917
" {%(measured)s}"
5968
5918
msgstr ""
5969
5919
5920
#: bzrlib/errors.py:2330
5921
msgid "Not a bzr revision-bundle: %(text)r"
5922
msgstr ""
5923
5970
5924
#: bzrlib/errors.py:2339
5971
msgid "Not a bzr revision-bundle: %(text)r"
5925
msgid "Bad bzr revision-bundle: %(text)r"
5972
5926
msgstr ""
5973
5927
5974
5928
#: bzrlib/errors.py:2348
5975
msgid "Bad bzr revision-bundle: %(text)r"
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2357
5979
5929
msgid "Malformed bzr revision-bundle header: %(text)r"
5980
5930
msgstr ""
5981
5931
5982
#: bzrlib/errors.py:2362
5932
#: bzrlib/errors.py:2353
5983
5933
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5984
5934
msgstr ""
5985
5935
5986
#: bzrlib/errors.py:2367
5936
#: bzrlib/errors.py:2358
5987
5937
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5988
5938
msgstr ""
5989
5939
5990
#: bzrlib/errors.py:2372
5940
#: bzrlib/errors.py:2363
5991
5941
msgid "End of line marker was not \\n in bzr revision-bundle"
5992
5942
msgstr ""
5993
5943
5994
#: bzrlib/errors.py:2382
5944
#: bzrlib/errors.py:2373
5995
5945
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5996
5946
msgstr ""
5997
5947
5998
#: bzrlib/errors.py:2392
5948
#: bzrlib/errors.py:2383
5999
5949
msgid "Root class for inventory serialization errors"
6000
5950
msgstr ""
6001
5951
6002
#: bzrlib/errors.py:2396
5952
#: bzrlib/errors.py:2387
6003
5953
msgid ""
6004
5954
"The inventory was not in the expected format:\n"
6005
5955
" %(msg)s"
6006
5956
msgstr ""
6007
5957
6008
#: bzrlib/errors.py:2405
5958
#: bzrlib/errors.py:2396
6009
5959
msgid "This operation requires rich root data storage"
6010
5960
msgstr ""
6011
5961
5962
#: bzrlib/errors.py:2409
5963
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5964
msgstr ""
5965
6012
5966
#: bzrlib/errors.py:2418
6013
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:2427
6017
5967
msgid ""
6018
5968
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6019
5969
"variable."
6020
5970
msgstr ""
6021
5971
6022
#: bzrlib/errors.py:2434
5972
#: bzrlib/errors.py:2425
6023
5973
msgid ""
6024
5974
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6025
5975
"ghost at {%(ghost_revision_id)s}"
6026
5976
msgstr ""
6027
5977
6028
#: bzrlib/errors.py:2444
5978
#: bzrlib/errors.py:2435
6029
5979
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6030
5980
msgstr ""
6031
5981
6032
#: bzrlib/errors.py:2495
5982
#: bzrlib/errors.py:2486
6033
5983
msgid ""
6034
5984
"A merge directive must provide either a bundle or a public branch location."
6035
5985
msgstr ""
6036
5986
6037
#: bzrlib/errors.py:2502
5987
#: bzrlib/errors.py:2493
6038
5988
msgid "Bad merge directive payload %(start)r"
6039
5989
msgstr ""
6040
5990
6041
#: bzrlib/errors.py:2512
5991
#: bzrlib/errors.py:2503
6042
5992
msgid "Preview patch does not match requested changes."
6043
5993
msgstr ""
6044
5994
6045
#: bzrlib/errors.py:2518
5995
#: bzrlib/errors.py:2509
6046
5996
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6047
5997
msgstr ""
6048
5998
6049
#: bzrlib/errors.py:2528
5999
#: bzrlib/errors.py:2519
6050
6000
msgid ""
6051
6001
"Your branch does not have all of the revisions required in order to merge "
6052
6002
"this merge directive and the target location specified in the merge "
6053
6003
"directive is not a branch: %(location)s."
6054
6004
msgstr ""
6055
6005
6056
#: bzrlib/errors.py:2540
6006
#: bzrlib/errors.py:2531
6057
6007
msgid "Unsupported entry kind %(kind)s"
6058
6008
msgstr ""
6059
6009
6060
#: bzrlib/errors.py:2548
6010
#: bzrlib/errors.py:2539
6061
6011
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6062
6012
msgstr ""
6063
6013
6064
#: bzrlib/errors.py:2558
6014
#: bzrlib/errors.py:2549
6065
6015
msgid "Subsume target %(other_tree)s needs to be upgraded."
6066
6016
msgstr ""
6067
6017
6068
#: bzrlib/errors.py:2577
6018
#: bzrlib/errors.py:2568
6069
6019
msgid "No such tag: %(tag_name)s"
6070
6020
msgstr ""
6071
6021
6022
#: bzrlib/errors.py:2576
6023
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6024
msgstr ""
6025
6072
6026
#: bzrlib/errors.py:2585
6073
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6074
msgstr ""
6075
6076
#: bzrlib/errors.py:2594
6077
6027
msgid "Tag %(tag_name)s already exists."
6078
6028
msgstr ""
6079
6029
6080
#: bzrlib/errors.py:2602
6030
#: bzrlib/errors.py:2593
6081
6031
msgid ""
6082
6032
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6083
6033
"\" for more information on this feature."
6084
6034
msgstr ""
6085
6035
6086
#: bzrlib/errors.py:2612
6036
#: bzrlib/errors.py:2603
6087
6037
msgid ""
6088
6038
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6089
6039
msgstr ""
6090
6040
6091
#: bzrlib/errors.py:2622
6041
#: bzrlib/errors.py:2613
6092
6042
msgid ""
6093
6043
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6094
6044
msgstr ""
6095
6045
6096
#: bzrlib/errors.py:2632
6046
#: bzrlib/errors.py:2623
6097
6047
msgid "Invalid line in bugs property: '%(line)s'"
6098
6048
msgstr ""
6099
6049
6100
#: bzrlib/errors.py:2640
6050
#: bzrlib/errors.py:2631
6101
6051
msgid "Invalid bug status: '%(status)s'"
6102
6052
msgstr ""
6103
6053
6104
#: bzrlib/errors.py:2648
6054
#: bzrlib/errors.py:2639
6105
6055
msgid "Could not understand response from smart server: %(response_tuple)r"
6106
6056
msgstr ""
6107
6057
6108
#: bzrlib/errors.py:2687
6058
#: bzrlib/errors.py:2678
6109
6059
msgid "Server sent an unexpected error: %(error_tuple)r"
6110
6060
msgstr ""
6111
6061
6112
#: bzrlib/errors.py:2706
6062
#: bzrlib/errors.py:2697
6113
6063
msgid "Unrecognised container format: %(container_format)r"
6114
6064
msgstr ""
6115
6065
6116
#: bzrlib/errors.py:2714
6066
#: bzrlib/errors.py:2705
6117
6067
msgid "Unexpected end of container stream"
6118
6068
msgstr ""
6119
6069
6120
#: bzrlib/errors.py:2719
6070
#: bzrlib/errors.py:2710
6121
6071
msgid "Unknown record type: %(record_type)r"
6122
6072
msgstr ""
6123
6073
6124
#: bzrlib/errors.py:2727
6074
#: bzrlib/errors.py:2718
6125
6075
msgid "Invalid record: %(reason)s"
6126
6076
msgstr ""
6127
6077
6128
#: bzrlib/errors.py:2735
6078
#: bzrlib/errors.py:2726
6129
6079
msgid "Container has data after end marker: %(excess)r"
6130
6080
msgstr ""
6131
6081
6132
#: bzrlib/errors.py:2743
6082
#: bzrlib/errors.py:2734
6133
6083
msgid "Container has multiple records with the same name: %(name)s"
6134
6084
msgstr ""
6135
6085
6136
#: bzrlib/errors.py:2756
6086
#: bzrlib/errors.py:2747
6137
6087
msgid "Corrupt or incompatible data stream: %(reason)s"
6138
6088
msgstr ""
6139
6089
6140
#: bzrlib/errors.py:2764
6090
#: bzrlib/errors.py:2755
6141
6091
msgid "SMTP error: %(error)s"
6142
6092
msgstr ""
6143
6093
6144
#: bzrlib/errors.py:2772
6094
#: bzrlib/errors.py:2763
6145
6095
msgid "No message supplied."
6146
6096
msgstr ""
6147
6097
6148
#: bzrlib/errors.py:2777
6098
#: bzrlib/errors.py:2768
6149
6099
msgid "No mail-to address (--mail-to) or output (-o) specified."
6150
6100
msgstr ""
6151
6101
6152
#: bzrlib/errors.py:2782
6102
#: bzrlib/errors.py:2773
6103
msgid "Unknown mail client: %(mail_client)s"
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:2781
6153
6107
msgid ""
6154
6108
"Unable to find mail client with the following names: "
6155
6109
"%(mail_command_list_string)s"
6156
6110
msgstr ""
6157
6111
6158
#: bzrlib/errors.py:2792
6112
#: bzrlib/errors.py:2791
6159
6113
msgid "SMTP connection to %(host)s refused"
6160
6114
msgstr ""
6161
6115
6162
#: bzrlib/errors.py:2801
6116
#: bzrlib/errors.py:2800
6163
6117
msgid "Please specify smtp_server. No server at default %(host)s."
6164
6118
msgstr ""
6165
6119
6166
#: bzrlib/errors.py:2815
6120
#: bzrlib/errors.py:2814
6167
6121
msgid ""
6168
6122
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6169
6123
"reconfigure."
6170
6124
msgstr ""
6171
6125
6172
#: bzrlib/errors.py:2827
6126
#: bzrlib/errors.py:2826
6173
6127
msgid "'%(display_url)s' is already a branch."
6174
6128
msgstr ""
6175
6129
6176
#: bzrlib/errors.py:2832
6130
#: bzrlib/errors.py:2831
6177
6131
msgid "'%(display_url)s' is already a tree."
6178
6132
msgstr ""
6179
6133
6180
#: bzrlib/errors.py:2837
6134
#: bzrlib/errors.py:2836
6181
6135
msgid "'%(display_url)s' is already a checkout."
6182
6136
msgstr ""
6183
6137
6184
#: bzrlib/errors.py:2842
6138
#: bzrlib/errors.py:2841
6185
6139
msgid "'%(display_url)s' is already a lightweight checkout."
6186
6140
msgstr ""
6187
6141
6188
#: bzrlib/errors.py:2847
6142
#: bzrlib/errors.py:2846
6189
6143
msgid "'%(display_url)s' is already using a shared repository."
6190
6144
msgstr ""
6191
6145
6192
#: bzrlib/errors.py:2852
6146
#: bzrlib/errors.py:2851
6193
6147
msgid "'%(display_url)s' is already standalone."
6194
6148
msgstr ""
6195
6149
6196
#: bzrlib/errors.py:2857
6150
#: bzrlib/errors.py:2856
6197
6151
msgid "Shared repository '%(display_url)s' already creates working trees."
6198
6152
msgstr ""
6199
6153
6200
#: bzrlib/errors.py:2863
6154
#: bzrlib/errors.py:2862
6201
6155
msgid ""
6202
6156
"Shared repository '%(display_url)s' already doesn't create working trees."
6203
6157
msgstr ""
6204
6158
6205
#: bzrlib/errors.py:2869
6159
#: bzrlib/errors.py:2868
6206
6160
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6207
6161
msgstr ""
6208
6162
6209
#: bzrlib/errors.py:2874
6163
#: bzrlib/errors.py:2873
6210
6164
msgid "No location could be found to bind to at %(display_url)s."
6211
6165
msgstr ""
6212
6166
6213
#: bzrlib/errors.py:2879
6167
#: bzrlib/errors.py:2878
6214
6168
msgid ""
6215
6169
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6216
6170
"%(more)s"
6217
6171
msgstr ""
6218
6172
6219
#: bzrlib/errors.py:2898
6220
msgid ""
6221
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6222
msgstr ""
6223
6224
#: bzrlib/errors.py:2913
6173
#: bzrlib/errors.py:2897
6225
6174
msgid ""
6226
6175
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6227
6176
"%(more)s"
6228
6177
msgstr ""
6229
6178
6230
#: bzrlib/errors.py:2919
6179
#: bzrlib/errors.py:2903
6231
6180
msgid "Variable {%(name)s} is not available."
6232
6181
msgstr ""
6233
6182
6234
#: bzrlib/errors.py:2927
6183
#: bzrlib/errors.py:2911
6235
6184
msgid "No template specified."
6236
6185
msgstr ""
6237
6186
6238
#: bzrlib/errors.py:2932
6187
#: bzrlib/errors.py:2916
6239
6188
msgid "Unable to create symlink %(path_str)son this platform"
6240
6189
msgstr ""
6241
6190
6242
#: bzrlib/errors.py:2947
6191
#: bzrlib/errors.py:2931
6243
6192
msgid ""
6244
6193
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6245
6194
"\", \"local\"."
6246
6195
msgstr ""
6247
6196
6248
#: bzrlib/errors.py:2981
6197
#: bzrlib/errors.py:2965
6249
6198
msgid ""
6250
6199
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6251
6200
msgstr ""
6252
6201
6253
#: bzrlib/errors.py:2993
6202
#: bzrlib/errors.py:2977
6254
6203
msgid "The \"%(config_id)s\" configuration does not exist."
6255
6204
msgstr ""
6256
6205
6257
#: bzrlib/errors.py:3001
6206
#: bzrlib/errors.py:2985
6258
6207
msgid "The \"%(option_name)s\" configuration option does not exist."
6259
6208
msgstr ""
6260
6209
6261
#: bzrlib/errors.py:3009
6210
#: bzrlib/errors.py:2993
6262
6211
msgid "The alias \"%(alias_name)s\" does not exist."
6263
6212
msgstr ""
6264
6213
6265
#: bzrlib/errors.py:3023
6214
#: bzrlib/errors.py:3007
6266
6215
msgid "\"%(alias_name)s\" is not a valid location alias."
6267
6216
msgstr ""
6268
6217
6269
#: bzrlib/errors.py:3031
6218
#: bzrlib/errors.py:3015
6270
6219
msgid "No %(alias_name)s location assigned."
6271
6220
msgstr ""
6272
6221
6273
#: bzrlib/errors.py:3039
6222
#: bzrlib/errors.py:3023
6274
6223
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6275
6224
msgstr ""
6276
6225
6277
#: bzrlib/errors.py:3049
6226
#: bzrlib/errors.py:3033
6278
6227
msgid "Unknown rules detected: %(unknowns_str)s."
6279
6228
msgstr ""
6280
6229
6281
#: bzrlib/errors.py:3060
6230
#: bzrlib/errors.py:3044
6282
6231
msgid "Tip change rejected: %(msg)s"
6283
6232
msgstr ""
6284
6233
6285
#: bzrlib/errors.py:3068
6234
#: bzrlib/errors.py:3052
6286
6235
msgid "Shelf corrupt."
6287
6236
msgstr ""
6288
6237
6289
#: bzrlib/errors.py:3073
6238
#: bzrlib/errors.py:3057
6290
6239
msgid "Corruption while decompressing repository file%(orig_error)s"
6291
6240
msgstr ""
6292
6241
6293
#: bzrlib/errors.py:3085
6242
#: bzrlib/errors.py:3069
6294
6243
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6295
6244
msgstr ""
6296
6245
6297
#: bzrlib/errors.py:3093
6246
#: bzrlib/errors.py:3077
6298
6247
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6299
6248
msgstr ""
6300
6249
6301
#: bzrlib/errors.py:3101
6250
#: bzrlib/errors.py:3085
6302
6251
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6303
6252
msgstr ""
6304
6253
6305
#: bzrlib/errors.py:3109
6254
#: bzrlib/errors.py:3093
6306
6255
msgid "The user aborted the operation."
6307
6256
msgstr ""
6308
6257
6309
#: bzrlib/errors.py:3114
6258
#: bzrlib/errors.py:3098
6310
6259
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6311
6260
msgstr ""
6312
6261
6313
#: bzrlib/errors.py:3124
6262
#: bzrlib/errors.py:3108
6314
6263
msgid "No such view: %(view_name)s."
6315
6264
msgstr ""
6316
6265
6317
#: bzrlib/errors.py:3134
6266
#: bzrlib/errors.py:3118
6318
6267
msgid ""
6319
6268
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6320
6269
"to a later format."
6321
6270
msgstr ""
6322
6271
6323
#: bzrlib/errors.py:3143
6272
#: bzrlib/errors.py:3127
6324
6273
msgid ""
6325
6274
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6326
6275
msgstr ""
6327
6276
6328
#: bzrlib/errors.py:3210
6277
#: bzrlib/errors.py:3194
6329
6278
msgid "%(bzrdir)r does not support co-located branches."
6330
6279
msgstr ""
6331
6280
6332
#: bzrlib/errors.py:3216
6281
#: bzrlib/errors.py:3200
6333
6282
msgid ""
6334
6283
"Unable to determine your name.\n"
6335
6284
"Please, set your name with the 'whoami' command.\n"
6336
6285
"E.g. bzr whoami \"Your Name <name@example.com>\""
6337
6286
msgstr ""
6338
6287
6339
#: bzrlib/errors.py:3225
6288
#: bzrlib/errors.py:3209
6340
6289
msgid "Invalid pattern(s) found. %(msg)s"
6341
6290
msgstr ""
6342
6291
6343
#: bzrlib/errors.py:3233
6292
#: bzrlib/errors.py:3217
6344
6293
msgid ""
6345
6294
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6346
6295
"unbind` to fix."
6347
6296
msgstr ""
6348
6297
6349
#: bzrlib/errors.py:3244
6298
#: bzrlib/errors.py:3228
6350
6299
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6351
6300
msgstr ""
6352
6301
6353
#: bzrlib/errors.py:3253
6302
#: bzrlib/errors.py:3237
6354
6303
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6355
6304
msgstr ""
6356
6305
6357
#: bzrlib/errors.py:3262
6306
#: bzrlib/errors.py:3246
6358
6307
msgid ""
6359
6308
"No compatible object available for operations from %(source)r to %(target)r."
6360
6309
msgstr ""
6361
6310
6362
#: bzrlib/errors.py:3272
6311
#: bzrlib/errors.py:3256
6363
6312
msgid ""
6364
6313
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6365
6314
"%(arguments)s."
6366
6315
msgstr ""
6367
6316
6368
#: bzrlib/errors.py:3282
6317
#: bzrlib/errors.py:3266
6369
6318
msgid ""
6370
6319
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6371
6320
"format %(format)r"
6372
6321
msgstr ""
6373
6322
6374
#: bzrlib/errors.py:3294
6323
#: bzrlib/errors.py:3278
6375
6324
msgid ""
6376
6325
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6377
6326
"plugin."
6378
6327
msgstr ""
6379
6328
6380
#: bzrlib/errors.py:3307
6329
#: bzrlib/errors.py:3291
6381
6330
msgid "Binary files section encountered."
6382
6331
msgstr ""
6383
6332
6384
#: bzrlib/errors.py:3315
6333
#: bzrlib/errors.py:3299
6385
6334
msgid ""
6386
6335
"Malformed patch header. %(desc)s\n"
6387
6336
"%(line)r"
6388
6337
msgstr ""
6389
6338
6390
#: bzrlib/errors.py:3324
6339
#: bzrlib/errors.py:3308
6391
6340
msgid ""
6392
6341
"Malformed hunk header. %(desc)s\n"
6393
6342
"%(line)r"
6394
6343
msgstr ""
6395
6344
6396
#: bzrlib/errors.py:3333
6345
#: bzrlib/errors.py:3317
6397
6346
msgid ""
6398
6347
"Malformed line. %(desc)s\n"
6399
6348
"%(line)r"
6400
6349
msgstr ""
6401
6350
6402
#: bzrlib/errors.py:3343
6351
#: bzrlib/errors.py:3327
6403
6352
msgid ""
6404
6353
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6405
6354
"but patch says it should be \"%(patch_line)s\""
6406
6355
msgstr ""
6407
6356
6408
#: bzrlib/errors.py:3354
6357
#: bzrlib/errors.py:3338
6409
6358
msgid "The feature %(feature)s has already been registered."
6410
6359
msgstr ""
6411
6360
6412
#: bzrlib/errors.py:3362
6413
msgid ""
6414
"Cannot store uncommitted changes because this branch already stores "
6415
"uncommitted changes."
6416
msgstr ""
6417
6418
6361
#: bzrlib/export_pot.py:252
6419
6362
#, python-format
6420
6363
msgid "Exporting messages from builtin command: %s"
6464
6407
"regular push."
6465
6408
msgstr ""
6466
6409
6467
#: bzrlib/gpg.py:366
6468
msgid "No GnuPG key results for pattern: {0}"
6469
msgstr ""
6470
6471
#: bzrlib/gpg.py:439
6410
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6472
6411
msgid "{0} commits with valid signatures"
6473
6412
msgstr ""
6474
6413
6475
#: bzrlib/gpg.py:445
6414
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6476
6415
msgid "{0} commit with unknown key"
6477
6416
msgid_plural "{0} commits with unknown keys"
6478
6417
msgstr[0] ""
6479
6418
msgstr[1] ""
6480
6419
6481
#: bzrlib/gpg.py:453
6420
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6482
6421
msgid "{0} commit not valid"
6483
6422
msgid_plural "{0} commits not valid"
6484
6423
msgstr[0] ""
6485
6424
msgstr[1] ""
6486
6425
6487
#: bzrlib/gpg.py:461
6426
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6488
6427
msgid "{0} commit not signed"
6489
6428
msgid_plural "{0} commits not signed"
6490
6429
msgstr[0] ""
6491
6430
msgstr[1] ""
6492
6431
6493
#: bzrlib/gpg.py:469
6432
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6494
6433
msgid "{0} commit with key now expired"
6495
6434
msgid_plural "{0} commits with key now expired"
6496
6435
msgstr[0] ""
6497
6436
msgstr[1] ""
6498
6437
6499
#: bzrlib/gpg.py:489
6500
msgid "{0} commit by author {1} with key {2} now expired"
6501
msgid_plural "{0} commits by author {1} with key {2} now expired"
6502
msgstr[0] ""
6503
msgstr[1] ""
6438
#: bzrlib/gpg.py:343
6439
msgid "No GnuPG key results for pattern: {0}"
6440
msgstr ""
6504
6441
6505
#: bzrlib/gpg.py:505
6442
#: bzrlib/gpg.py:386
6506
6443
msgid "{0} signed {1} commit"
6507
6444
msgid_plural "{0} signed {1} commits"
6508
6445
msgstr[0] ""
6509
6446
msgstr[1] ""
6510
6447
6511
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6448
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6512
6449
msgid "{0} commit by author {1}"
6513
6450
msgid_plural "{0} commits by author {1}"
6514
6451
msgstr[0] ""
6515
6452
msgstr[1] ""
6516
6453
6517
#: bzrlib/gpg.py:554
6454
#: bzrlib/gpg.py:433
6518
6455
msgid "Unknown key {0} signed {1} commit"
6519
6456
msgid_plural "Unknown key {0} signed {1} commits"
6520
6457
msgstr[0] ""
6521
6458
msgstr[1] ""
6522
6459
6460
#: bzrlib/gpg.py:452
6461
msgid "{0} commit by author {1} with key {2} now expired"
6462
msgid_plural "{0} commits by author {1} with key {2} now expired"
6463
msgstr[0] ""
6464
msgstr[1] ""
6465
6523
6466
#: bzrlib/groupcompress.py:1739
6524
6467
#, python-format
6525
6468
msgid "Insert claimed random_id=True, but then inserted %r two times"
6526
6469
msgstr ""
6527
6470
6528
#: bzrlib/hooks.py:313
6471
#: bzrlib/hooks.py:331
6529
6472
#, python-format
6530
6473
msgid "Introduced in: %s"
6531
6474
msgstr ""
6532
6475
6533
#: bzrlib/hooks.py:316
6476
#: bzrlib/hooks.py:334
6534
6477
#, python-format
6535
6478
msgid "Deprecated in: %s"
6536
6479
msgstr ""
6543
6486
msgid "annotating"
6544
6487
msgstr ""
6545
6488
6546
#: bzrlib/lock.py:549
6489
#: bzrlib/lock.py:548
6547
6490
msgid "{0!r} was {1} locked again"
6548
6491
msgstr ""
6549
6492
6579
6522
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6580
6523
msgstr ""
6581
6524
6582
#: bzrlib/log.py:563
6525
#: bzrlib/log.py:572
6583
6526
msgid "--exclude-common-ancestry requires two different revisions"
6584
6527
msgstr ""
6585
6528
6586
#: bzrlib/log.py:565
6529
#: bzrlib/log.py:574
6587
6530
#, python-format
6588
6531
msgid "invalid direction %r"
6589
6532
msgstr ""
6590
6533
6591
#: bzrlib/log.py:653
6534
#: bzrlib/log.py:662
6592
6535
msgid "Start revision not found in history of end revision."
6593
6536
msgstr ""
6594
6537
6595
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6538
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6596
6539
msgid "Logging revision 0 is invalid."
6597
6540
msgstr ""
6598
6541
6599
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6542
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6600
6543
msgid "Start revision must be older than the end revision."
6601
6544
msgstr ""
6602
6545
6603
#: bzrlib/log.py:1818
6546
#: bzrlib/log.py:1827
6604
6547
#, python-format
6605
6548
msgid "unknown log formatter: %r"
6606
6549
msgstr ""
6607
6550
6608
#: bzrlib/log.py:2114
6551
#: bzrlib/log.py:2123
6609
6552
msgid "fixes bug"
6610
6553
msgid_plural "fixes bugs"
6611
6554
msgstr[0] ""
6620
6563
msgid "%d conflicts encountered."
6621
6564
msgstr ""
6622
6565
6623
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6566
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6624
6567
msgid "Preparing file merge"
6625
6568
msgstr ""
6626
6569
6768
6711
msgid "lstat/stat of ({0!r}): {1!r}"
6769
6712
msgstr ""
6770
6713
6771
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6714
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6772
6715
#, python-format
6773
6716
msgid "sorry, %r not allowed in path"
6774
6717
msgstr ""
6775
6718
6776
#: bzrlib/osutils.py:1259
6719
#: bzrlib/osutils.py:1237
6777
6720
#, python-format
6778
6721
msgid "%r is too short to calculate a relative path"
6779
6722
msgstr ""
6815
6758
msgid "Generate only the shell function, don't enable it"
6816
6759
msgstr ""
6817
6760
6818
#: bzrlib/plugins/grep/cmds.py:77
6819
msgid "Print lines matching PATTERN for specified files and revisions."
6820
msgstr ""
6821
6822
#: bzrlib/plugins/grep/cmds.py:79
6823
msgid ""
6824
"This command searches the specified files and revisions for a given\n"
6825
"pattern. The pattern is specified as a Python regular expressions[1]."
6826
msgstr ""
6827
6828
#: bzrlib/plugins/grep/cmds.py:82
6829
msgid ""
6830
"If the file name is not specified, the revisions starting with the\n"
6831
"current directory are searched recursively. If the revision number is\n"
6832
"not specified, the working copy is searched. To search the last committed\n"
6833
"revision, use the '-r -1' or '-r last:1' option."
6834
msgstr ""
6835
6836
#: bzrlib/plugins/grep/cmds.py:87
6837
msgid ""
6838
"Unversioned files are not searched unless explicitly specified on the\n"
6839
"command line. Unversioned directores are not searched."
6840
msgstr ""
6841
6842
#: bzrlib/plugins/grep/cmds.py:90
6843
msgid ""
6844
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6845
"format. If a revision is explicitly searched, the output is shown as\n"
6846
"'filepath~N:string', where N is the revision number."
6847
msgstr ""
6848
6849
#: bzrlib/plugins/grep/cmds.py:94
6850
msgid ""
6851
"--include and --exclude options can be used to search only (or exclude\n"
6852
"from search) files with base name matches the specified Unix style GLOB\n"
6853
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6854
"to quote wildcard or backslash character literally. Note that the glob\n"
6855
"pattern is not a regular expression."
6856
msgstr ""
6857
6858
#: bzrlib/plugins/grep/cmds.py:100
6859
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6860
msgstr ""
6861
6862
# help of 'color' option of 'grep' command
6863
#: bzrlib/plugins/grep/cmds.py:109
6864
msgid "Show match in color. WHEN is never, always or auto."
6865
msgstr ""
6866
6867
# help of 'diff' option of 'grep' command
6868
#: bzrlib/plugins/grep/cmds.py:111
6869
msgid "Grep for pattern in changeset for each revision."
6870
msgstr ""
6871
6872
# help of 'exclude' option of 'grep' command
6873
#: bzrlib/plugins/grep/cmds.py:113
6874
msgid "Skip files whose base name matches GLOB."
6875
msgstr ""
6876
6877
# help of 'include' option of 'grep' command
6878
#: bzrlib/plugins/grep/cmds.py:115
6879
msgid "Search only files whose base name matches GLOB."
6880
msgstr ""
6881
6882
# help of 'files-with-matches' option of 'grep' command
6883
#: bzrlib/plugins/grep/cmds.py:117
6884
msgid "Print only the name of each input file in which PATTERN is found."
6885
msgstr ""
6886
6887
# help of 'files-without-match' option of 'grep' command
6888
#: bzrlib/plugins/grep/cmds.py:120
6889
msgid "Print only the name of each input file in which PATTERN is not found."
6890
msgstr ""
6891
6892
# help of 'fixed-string' option of 'grep' command
6893
#: bzrlib/plugins/grep/cmds.py:123
6894
msgid "Interpret PATTERN is a single fixed string (not regex)."
6895
msgstr ""
6896
6897
# help of 'from-root' option of 'grep' command
6898
#: bzrlib/plugins/grep/cmds.py:125
6899
msgid ""
6900
"Search for pattern starting from the root of the branch. (implies --"
6901
"recursive)"
6902
msgstr ""
6903
6904
# help of 'ignore-case' option of 'grep' command
6905
#: bzrlib/plugins/grep/cmds.py:128
6906
msgid "ignore case distinctions while matching."
6907
msgstr ""
6908
6909
# help of 'levels' option of 'grep' command
6910
#: bzrlib/plugins/grep/cmds.py:130
6911
msgid ""
6912
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6913
msgstr ""
6914
6915
# help of 'line-number' option of 'grep' command
6916
#: bzrlib/plugins/grep/cmds.py:135
6917
msgid "show 1-based line number."
6918
msgstr ""
6919
6920
# help of 'no-recursive' option of 'grep' command
6921
#: bzrlib/plugins/grep/cmds.py:137
6922
msgid "Don't recurse into subdirectories. (default is --recursive)"
6923
msgstr ""
6924
6925
# help of 'null' option of 'grep' command
6926
#: bzrlib/plugins/grep/cmds.py:139
6927
msgid ""
6928
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6929
"newline."
6930
msgstr ""
6931
6932
#: bzrlib/plugins/launchpad/account.py:66
6933
msgid "Setting ssh/sftp usernames for launchpad.net."
6934
msgstr ""
6935
6936
#: bzrlib/plugins/launchpad/cmds.py:43
6761
#: bzrlib/plugins/launchpad/__init__.py:81
6937
6762
msgid "Register a branch with launchpad.net."
6938
6763
msgstr ""
6939
6764
6940
#: bzrlib/plugins/launchpad/cmds.py:45
6765
#: bzrlib/plugins/launchpad/__init__.py:83
6941
6766
msgid ""
6942
6767
"This command lists a bzr branch in the directory of branches on\n"
6943
6768
"launchpad.net. Registration allows the branch to be associated with\n"
6944
6769
"bugs or specifications."
6945
6770
msgstr ""
6946
6771
6947
#: bzrlib/plugins/launchpad/cmds.py:49
6772
#: bzrlib/plugins/launchpad/__init__.py:87
6948
6773
msgid ""
6949
6774
"Before using this command you must register the project to which the\n"
6950
6775
"branch belongs, and create an account for yourself on launchpad.net."
6951
6776
msgstr ""
6952
6777
6953
#: bzrlib/plugins/launchpad/cmds.py:52
6778
#: bzrlib/plugins/launchpad/__init__.py:90
6954
6779
msgid ""
6955
6780
"arguments:\n"
6956
6781
" public_url: The publicly visible url for the branch to register.\n"
6962
6787
" otherwise error."
6963
6788
msgstr ""
6964
6789
6965
#: bzrlib/plugins/launchpad/cmds.py:61
6790
#: bzrlib/plugins/launchpad/__init__.py:99
6966
6791
msgid ""
6967
6792
"example:\n"
6968
6793
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6970
6795
msgstr ""
6971
6796
6972
6797
# help of 'project' option of 'register-branch' command
6973
#: bzrlib/plugins/launchpad/cmds.py:68
6798
#: bzrlib/plugins/launchpad/__init__.py:106
6974
6799
msgid "Launchpad project short name to associate with the branch."
6975
6800
msgstr ""
6976
6801
6977
6802
# help of 'branch-name' option of 'register-branch' command
6978
#: bzrlib/plugins/launchpad/cmds.py:75
6803
#: bzrlib/plugins/launchpad/__init__.py:113
6979
6804
msgid ""
6980
6805
"Short name for the branch; by default taken from the last component of the "
6981
6806
"url."
6982
6807
msgstr ""
6983
6808
6984
6809
# help of 'branch-title' option of 'register-branch' command
6985
#: bzrlib/plugins/launchpad/cmds.py:79
6810
#: bzrlib/plugins/launchpad/__init__.py:117
6986
6811
msgid "One-sentence description of the branch."
6987
6812
msgstr ""
6988
6813
6989
6814
# help of 'branch-description' option of 'register-branch' command
6990
#: bzrlib/plugins/launchpad/cmds.py:82
6815
#: bzrlib/plugins/launchpad/__init__.py:120
6991
6816
msgid "Longer description of the purpose or contents of the branch."
6992
6817
msgstr ""
6993
6818
6994
6819
# help of 'author' option of 'register-branch' command
6995
#: bzrlib/plugins/launchpad/cmds.py:85
6820
#: bzrlib/plugins/launchpad/__init__.py:123
6996
6821
msgid "Branch author's email address, if not yourself."
6997
6822
msgstr ""
6998
6823
6999
6824
# help of 'link-bug' option of 'register-branch' command
7000
#: bzrlib/plugins/launchpad/cmds.py:88
6825
#: bzrlib/plugins/launchpad/__init__.py:126
7001
6826
msgid "The bug this branch fixes."
7002
6827
msgstr ""
7003
6828
7004
6829
# help of 'dry-run' option of 'register-branch' command
7005
#: bzrlib/plugins/launchpad/cmds.py:91
6830
#: bzrlib/plugins/launchpad/__init__.py:129
7006
6831
msgid "Prepare the request but don't actually send it."
7007
6832
msgstr ""
7008
6833
7009
#: bzrlib/plugins/launchpad/cmds.py:113
6834
#: bzrlib/plugins/launchpad/__init__.py:151
7010
6835
msgid ""
7011
6836
"register-branch requires a public branch url - see bzr help register-branch."
7012
6837
msgstr ""
7013
6838
7014
#: bzrlib/plugins/launchpad/cmds.py:121
6839
#: bzrlib/plugins/launchpad/__init__.py:159
7015
6840
msgid "--product is deprecated; please use --project."
7016
6841
msgstr ""
7017
6842
7018
#: bzrlib/plugins/launchpad/cmds.py:151
6843
#: bzrlib/plugins/launchpad/__init__.py:191
7019
6844
msgid "Open a Launchpad branch page in your web browser."
7020
6845
msgstr ""
7021
6846
7022
6847
# help of 'dry-run' option of 'launchpad-open' command
7023
#: bzrlib/plugins/launchpad/cmds.py:156
6848
#: bzrlib/plugins/launchpad/__init__.py:196
7024
6849
msgid "Do not actually open the browser. Just say the URL we would use."
7025
6850
msgstr ""
7026
6851
7027
#: bzrlib/plugins/launchpad/cmds.py:191
6852
#: bzrlib/plugins/launchpad/__init__.py:231
7028
6853
#, python-format
7029
6854
msgid "Opening %s in web browser"
7030
6855
msgstr ""
7031
6856
7032
#: bzrlib/plugins/launchpad/cmds.py:199
6857
#: bzrlib/plugins/launchpad/__init__.py:241
7033
6858
msgid "Show or set the Launchpad user ID."
7034
6859
msgstr ""
7035
6860
7036
#: bzrlib/plugins/launchpad/cmds.py:201
6861
#: bzrlib/plugins/launchpad/__init__.py:243
7037
6862
msgid ""
7038
6863
"When communicating with Launchpad, some commands need to know your\n"
7039
6864
"Launchpad user ID. This command can be used to set or show the\n"
7040
6865
"user ID that Bazaar will use for such communication."
7041
6866
msgstr ""
7042
6867
7043
#: bzrlib/plugins/launchpad/cmds.py:205
6868
#: bzrlib/plugins/launchpad/__init__.py:247
7044
6869
msgid ""
7045
6870
":Examples:\n"
7046
6871
" Show the Launchpad ID of the current user::"
7047
6872
msgstr ""
7048
6873
7049
#: bzrlib/plugins/launchpad/cmds.py:208
6874
#: bzrlib/plugins/launchpad/__init__.py:250
7050
6875
msgid " bzr launchpad-login"
7051
6876
msgstr ""
7052
6877
7053
#: bzrlib/plugins/launchpad/cmds.py:210
6878
#: bzrlib/plugins/launchpad/__init__.py:252
7054
6879
msgid " Set the Launchpad ID of the current user to 'bob'::"
7055
6880
msgstr ""
7056
6881
7057
#: bzrlib/plugins/launchpad/cmds.py:212
6882
#: bzrlib/plugins/launchpad/__init__.py:254
7058
6883
msgid " bzr launchpad-login bob"
7059
6884
msgstr ""
7060
6885
7061
6886
# help of 'no-check' option of 'launchpad-login' command
7062
#: bzrlib/plugins/launchpad/cmds.py:219
6887
#: bzrlib/plugins/launchpad/__init__.py:261
7063
6888
msgid "Don't check that the user name is valid."
7064
6889
msgstr ""
7065
6890
7066
#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245
6891
#: bzrlib/plugins/launchpad/__init__.py:276
6892
#: bzrlib/plugins/launchpad/__init__.py:287
7067
6893
msgid "Launchpad user ID exists and has SSH keys.\n"
7068
6894
msgstr ""
7069
6895
7070
#: bzrlib/plugins/launchpad/cmds.py:237
6896
#: bzrlib/plugins/launchpad/__init__.py:279
7071
6897
msgid "No Launchpad user ID configured.\n"
7072
6898
msgstr ""
7073
6899
7074
#: bzrlib/plugins/launchpad/cmds.py:248
6900
#: bzrlib/plugins/launchpad/__init__.py:290
7075
6901
#, python-format
7076
6902
msgid "Launchpad user ID set to '%s'.\n"
7077
6903
msgstr ""
7078
6904
7079
#: bzrlib/plugins/launchpad/cmds.py:254
6905
#: bzrlib/plugins/launchpad/__init__.py:298
7080
6906
msgid "Ask Launchpad to mirror a branch now."
7081
6907
msgstr ""
7082
6908
7083
#: bzrlib/plugins/launchpad/cmds.py:271
6909
#: bzrlib/plugins/launchpad/__init__.py:318
7084
6910
msgid "Propose merging a branch on Launchpad."
7085
6911
msgstr ""
7086
6912
7087
#: bzrlib/plugins/launchpad/cmds.py:273
6913
#: bzrlib/plugins/launchpad/__init__.py:320
7088
6914
msgid ""
7089
6915
"This will open your usual editor to provide the initial comment. When it\n"
7090
6916
"has created the proposal, it will open it in your default web browser."
7091
6917
msgstr ""
7092
6918
7093
#: bzrlib/plugins/launchpad/cmds.py:276
6919
#: bzrlib/plugins/launchpad/__init__.py:323
7094
6920
msgid ""
7095
6921
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7096
6922
"is not supplied, the remembered submit branch will be used. If no submit\n"
7097
6923
"branch is remembered, the development focus will be used."
7098
6924
msgstr ""
7099
6925
7100
#: bzrlib/plugins/launchpad/cmds.py:280
6926
#: bzrlib/plugins/launchpad/__init__.py:327
7101
6927
msgid ""
7102
6928
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7103
6929
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7105
6931
"may optionally be followed by '=' and the review type. For example:"
7106
6932
msgstr ""
7107
6933
7108
#: bzrlib/plugins/launchpad/cmds.py:285
6934
#: bzrlib/plugins/launchpad/__init__.py:332
7109
6935
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7110
6936
msgstr ""
7111
6937
7112
#: bzrlib/plugins/launchpad/cmds.py:287
6938
#: bzrlib/plugins/launchpad/__init__.py:334
7113
6939
msgid ""
7114
6940
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7115
6941
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7116
6942
msgstr ""
7117
6943
7118
6944
# help of 'staging' option of 'lp-propose-merge' command
7119
#: bzrlib/plugins/launchpad/cmds.py:292
6945
#: bzrlib/plugins/launchpad/__init__.py:339
7120
6946
msgid "Propose the merge on staging."
7121
6947
msgstr ""
7122
6948
7123
6949
# help of 'message' option of 'lp-propose-merge' command
7124
#: bzrlib/plugins/launchpad/cmds.py:294
6950
#: bzrlib/plugins/launchpad/__init__.py:341
7125
6951
msgid "Commit message."
7126
6952
msgstr ""
7127
6953
7128
6954
# help of 'approve' option of 'lp-propose-merge' command
7129
#: bzrlib/plugins/launchpad/cmds.py:296
7130
msgid ""
7131
"Mark the proposal as approved immediately, setting the approved revision to "
7132
"tip."
7133
msgstr ""
7134
7135
# help of 'fixes' option of 'lp-propose-merge' command
7136
#: bzrlib/plugins/launchpad/cmds.py:298
7137
msgid "The bug this proposal fixes."
6955
#: bzrlib/plugins/launchpad/__init__.py:343
6956
msgid "Mark the proposal as approved immediately."
7138
6957
msgstr ""
7139
6958
7140
6959
# help of 'review' option of 'lp-propose-merge' command
7141
#: bzrlib/plugins/launchpad/cmds.py:300
6960
#: bzrlib/plugins/launchpad/__init__.py:345
7142
6961
msgid "Requested reviewer and optional type."
7143
6962
msgstr ""
7144
6963
7145
#: bzrlib/plugins/launchpad/cmds.py:335
6964
#: bzrlib/plugins/launchpad/__init__.py:382
7146
6965
msgid "Find the proposal to merge this revision."
7147
6966
msgstr ""
7148
6967
7149
#: bzrlib/plugins/launchpad/cmds.py:337
6968
#: bzrlib/plugins/launchpad/__init__.py:384
7150
6969
msgid ""
7151
6970
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7152
"This works only if the if the merged_revno was recorded for the merge\n"
7153
"proposal. The proposal(s) are opened in a web browser."
6971
"This works only if the selected branch was the merge proposal target, and\n"
6972
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6973
"are opened in a web browser."
7154
6974
msgstr ""
7155
6975
7156
#: bzrlib/plugins/launchpad/cmds.py:341
6976
#: bzrlib/plugins/launchpad/__init__.py:389
7157
6977
msgid ""
7158
"Only the revision specified is searched for. To find the mainline\n"
7159
"revision that merged it into mainline, use the \"mainline\" revision spec."
6978
"Any revision involved in the merge may be specified-- the revision in\n"
6979
"which the merge was performed, or one of the revisions that was merged."
7160
6980
msgstr ""
7161
6981
7162
#: bzrlib/plugins/launchpad/cmds.py:344
6982
#: bzrlib/plugins/launchpad/__init__.py:392
7163
6983
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7164
6984
msgstr ""
7165
6985
7166
#: bzrlib/plugins/launchpad/cmds.py:346
7167
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
6986
#: bzrlib/plugins/launchpad/__init__.py:394
6987
msgid " bzr lp-find-proposal -r annotate:README:1"
7168
6988
msgstr ""
7169
6989
7170
#: bzrlib/plugins/launchpad/cmds.py:365
6990
#: bzrlib/plugins/launchpad/__init__.py:409
7171
6991
msgid "No review found."
7172
6992
msgstr ""
7173
6993
7174
#: bzrlib/plugins/launchpad/cmds.py:366
6994
#: bzrlib/plugins/launchpad/__init__.py:410
7175
6995
#, python-format
7176
6996
msgid "%d proposals(s) found."
7177
6997
msgstr ""
7178
6998
7179
#: bzrlib/plugins/launchpad/cmds.py:378
6999
#: bzrlib/plugins/launchpad/__init__.py:420
7000
msgid "Finding revision-id"
7001
msgstr ""
7002
7003
#: bzrlib/plugins/launchpad/__init__.py:427
7004
msgid "Finding merge"
7005
msgstr ""
7006
7007
#: bzrlib/plugins/launchpad/__init__.py:432
7008
msgid "Finding revno"
7009
msgstr ""
7010
7011
#: bzrlib/plugins/launchpad/__init__.py:437
7012
msgid "Finding Launchpad branch"
7013
msgstr ""
7014
7015
#: bzrlib/plugins/launchpad/__init__.py:440
7180
7016
msgid "Finding proposals"
7181
7017
msgstr ""
7182
7018
7183
#: bzrlib/plugins/launchpad/lp_api.py:228
7184
#: bzrlib/plugins/launchpad/lp_api.py:233
7019
#: bzrlib/plugins/launchpad/account.py:66
7020
msgid "Setting ssh/sftp usernames for launchpad.net."
7021
msgstr ""
7022
7023
#: bzrlib/plugins/launchpad/lp_api.py:241
7024
#: bzrlib/plugins/launchpad/lp_api.py:246
7185
7025
#, python-format
7186
7026
msgid "%s is not registered on Launchpad"
7187
7027
msgstr ""
7188
7028
7189
#: bzrlib/plugins/launchpad/lp_api.py:243
7029
#: bzrlib/plugins/launchpad/lp_api.py:256
7190
7030
#, python-format
7191
7031
msgid "%s has no development focus."
7192
7032
msgstr ""
7193
7033
7194
#: bzrlib/plugins/launchpad/lp_api.py:248
7034
#: bzrlib/plugins/launchpad/lp_api.py:261
7195
7035
#, python-format
7196
7036
msgid "development focus %s has no branch."
7197
7037
msgstr ""
7198
7038
7199
#: bzrlib/plugins/launchpad/lp_api.py:253
7039
#: bzrlib/plugins/launchpad/lp_api.py:266
7200
7040
#, python-format
7201
7041
msgid "source package %s has no branch."
7202
7042
msgstr ""
7203
7043
7204
#: bzrlib/plugins/launchpad/lp_api.py:257
7044
#: bzrlib/plugins/launchpad/lp_api.py:270
7205
7045
#, python-format
7206
7046
msgid "%s has no associated product or source package."
7207
7047
msgstr ""
7208
7048
7209
#: bzrlib/plugins/launchpad/lp_api.py:269
7049
#: bzrlib/plugins/launchpad/lp_api.py:282
7210
7050
#, python-format
7211
7051
msgid "%s is already up-to-date."
7212
7052
msgstr ""
7213
7053
7214
#: bzrlib/plugins/launchpad/lp_api.py:276
7054
#: bzrlib/plugins/launchpad/lp_api.py:289
7215
7055
#, python-format
7216
7056
msgid "Pushing to %s"
7217
7057
msgstr ""
7223
7063
" remote: {2}"
7224
7064
msgstr ""
7225
7065
7226
#: bzrlib/plugins/launchpad/lp_propose.py:159
7066
#: bzrlib/plugins/launchpad/lp_propose.py:149
7227
7067
#, python-format
7228
7068
msgid "There is already a branch merge proposal: %s"
7229
7069
msgstr ""
7230
7070
7231
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7071
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7232
7072
msgid "pb parameter to convert() is deprecated"
7233
7073
msgstr ""
7234
7074
7235
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7075
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7236
7076
msgid "starting upgrade from format 4 to 5"
7237
7077
msgstr ""
7238
7078
7239
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7079
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7240
7080
msgid "note: upgrade may be faster if all store files are ungzipped first"
7241
7081
msgstr ""
7242
7082
7243
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7083
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7244
7084
msgid "converting revision"
7245
7085
msgstr ""
7246
7086
7087
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7088
msgid "upgraded to weaves:"
7089
msgstr ""
7090
7247
7091
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7248
msgid "upgraded to weaves:"
7249
msgstr ""
7250
7251
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7252
7092
#, python-format
7253
7093
msgid "%6d revisions and inventories"
7254
7094
msgstr ""
7255
7095
7256
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7096
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7257
7097
#, python-format
7258
7098
msgid "%6d revisions not present"
7259
7099
msgstr ""
7260
7100
7261
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7101
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7262
7102
#, python-format
7263
7103
msgid "%6d texts"
7264
7104
msgstr ""
7265
7105
7266
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7106
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7267
7107
msgid "writing weave"
7268
7108
msgstr ""
7269
7109
7270
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7271
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7110
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7111
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7272
7112
msgid "inventory"
7273
7113
msgstr ""
7274
7114
7275
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7115
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7276
7116
msgid "write revision"
7277
7117
msgstr ""
7278
7118
7279
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7119
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7280
7120
msgid "loading revision"
7281
7121
msgstr ""
7282
7122
7283
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7123
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7284
7124
#, python-format
7285
7125
msgid "revision {%s} not present in branch; will be converted as a ghost"
7286
7126
msgstr ""
7287
7127
7288
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7128
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7289
7129
msgid "starting upgrade from format 5 to 6"
7290
7130
msgstr ""
7291
7131
7292
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7132
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7293
7133
#, python-format
7294
7134
msgid "adding prefixes to %s"
7295
7135
msgstr ""
7296
7136
7297
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7137
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7298
7138
msgid "starting upgrade from format 6 to metadir"
7299
7139
msgstr ""
7300
7140
7301
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7141
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7302
7142
msgid "Removing ancestry.weave"
7303
7143
msgstr ""
7304
7144
7305
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7145
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7306
7146
msgid "Finding branch files"
7307
7147
msgstr ""
7308
7148
7309
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7149
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7310
7150
msgid "Upgrading repository"
7311
7151
msgstr ""
7312
7152
7313
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7153
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7314
7154
msgid "Upgrading branch"
7315
7155
msgstr ""
7316
7156
7317
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7157
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7318
7158
msgid "No working tree."
7319
7159
msgstr ""
7320
7160
7321
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7161
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7322
7162
msgid "Upgrading working tree"
7323
7163
msgstr ""
7324
7164
7325
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7165
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7326
7166
#, python-format
7327
7167
msgid "Make %s lock"
7328
7168
msgstr ""
7329
7169
7330
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7170
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7331
7171
#, python-format
7332
7172
msgid "Moving %s"
7333
7173
msgstr ""
7354
7194
msgid "Too many redirections trying to make %s."
7355
7195
msgstr ""
7356
7196
7357
#: bzrlib/push.py:148
7197
#: bzrlib/push.py:147
7358
7198
msgid ""
7359
7199
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7360
7200
"information."
7361
7201
msgstr ""
7362
7202
7363
#: bzrlib/push.py:152
7203
#: bzrlib/push.py:151
7364
7204
#, python-format
7365
7205
msgid ""
7366
7206
"It is not possible to losslessly push to %s. You may want to use dpush "
7367
7207
"instead."
7368
7208
msgstr ""
7369
7209
7370
#: bzrlib/push.py:158
7210
#: bzrlib/push.py:157
7371
7211
#, python-format
7372
7212
msgid ""
7373
7213
"At %s you have a valid .bzr control directory, but not a branch or "
7468
7308
msgid "bzr: ERROR (ignored): %s"
7469
7309
msgstr ""
7470
7310
7471
#: bzrlib/remote.py:2534
7311
#: bzrlib/remote.py:2541
7472
7312
msgid "Copying repository content as tarball..."
7473
7313
msgstr ""
7474
7314
7484
7324
msgid "{0} => {1}"
7485
7325
msgstr ""
7486
7326
7487
#: bzrlib/repository.py:1738
7327
#: bzrlib/repository.py:1787
7488
7328
msgid "Moving repository to repository.backup"
7489
7329
msgstr ""
7490
7330
7491
#: bzrlib/repository.py:1745
7331
#: bzrlib/repository.py:1794
7492
7332
msgid "Creating new repository"
7493
7333
msgstr ""
7494
7334
7495
#: bzrlib/repository.py:1750
7335
#: bzrlib/repository.py:1799
7496
7336
msgid "Copying content"
7497
7337
msgstr ""
7498
7338
7499
#: bzrlib/repository.py:1754
7339
#: bzrlib/repository.py:1803
7500
7340
msgid "Deleting old repository content"
7501
7341
msgstr ""
7502
7342
7503
#: bzrlib/repository.py:1756
7343
#: bzrlib/repository.py:1805
7504
7344
msgid "repository converted"
7505
7345
msgstr ""
7506
7346
7508
7348
msgid "Using {0} {1}"
7509
7349
msgstr ""
7510
7350
7511
#: bzrlib/send.py:59
7351
#: bzrlib/send.py:58
7512
7352
#, python-format
7513
7353
msgid "Mail client \"%s\" does not support specifying body"
7514
7354
msgstr ""
7515
7355
7516
#: bzrlib/send.py:63
7356
#: bzrlib/send.py:62
7517
7357
msgid "--remember requires a branch to be specified."
7518
7358
msgstr ""
7519
7359
7520
#: bzrlib/send.py:78
7360
#: bzrlib/send.py:77
7521
7361
msgid "No submit branch known or specified"
7522
7362
msgstr ""
7523
7363
7524
#: bzrlib/send.py:81
7364
#: bzrlib/send.py:80
7525
7365
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7526
7366
msgstr ""
7527
7367
7528
#: bzrlib/send.py:99
7368
#: bzrlib/send.py:98
7529
7369
#, python-format
7530
7370
msgid "No such send format '%s'."
7531
7371
msgstr ""
7532
7372
7533
#: bzrlib/send.py:115
7373
#: bzrlib/send.py:114
7534
7374
msgid "bzr send takes at most two one revision identifiers"
7535
7375
msgstr ""
7536
7376
7537
#: bzrlib/send.py:128
7377
#: bzrlib/send.py:127
7538
7378
msgid "No revisions to submit."
7539
7379
msgstr ""
7540
7380
7541
#: bzrlib/send.py:140
7381
#: bzrlib/send.py:139
7542
7382
msgid ""
7543
7383
"- not supported for merge directives that use more than one output file."
7544
7384
msgstr ""
7545
7385
7546
#: bzrlib/send.py:186
7386
#: bzrlib/send.py:185
7547
7387
msgid "Format 0.9 does not permit bundle with no patch"
7548
7388
msgstr ""
7549
7389
7659
7499
msgid "HPSS calls: {0} ({1} vfs) {2}"
7660
7500
msgstr ""
7661
7501
7662
#: bzrlib/smart/ping.py:32
7663
msgid "Pings a Bazaar smart server."
7664
msgstr ""
7665
7666
#: bzrlib/smart/ping.py:34
7667
msgid ""
7668
"This command sends a 'hello' request to the given location using the bzr\n"
7669
"smart protocol, and reports the response."
7670
msgstr ""
7671
7672
7502
#: bzrlib/smart/server.py:169
7673
7503
msgid "Requested to stop gracefully"
7674
7504
msgstr ""
7693
7523
msgid "listening on port: %s"
7694
7524
msgstr ""
7695
7525
7696
#: bzrlib/switch.py:84
7526
#: bzrlib/switch.py:73
7697
7527
msgid "Pending merges must be committed or reverted before using switch."
7698
7528
msgstr ""
7699
7529
7700
#: bzrlib/switch.py:111
7530
#: bzrlib/switch.py:100
7701
7531
msgid ""
7702
7532
"Cannot switch as local commits found in the checkout. Commit these to the "
7703
7533
"bound branch or use --force to throw them away."
7704
7534
msgstr ""
7705
7535
7706
#: bzrlib/switch.py:116
7536
#: bzrlib/switch.py:105
7707
7537
#, python-format
7708
7538
msgid ""
7709
7539
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7710
7540
"anyway, use --force."
7711
7541
msgstr ""
7712
7542
7713
#: bzrlib/switch.py:140
7543
#: bzrlib/switch.py:125
7714
7544
msgid "Cannot switch a branch, only a checkout."
7715
7545
msgstr ""
7716
7546
7717
#: bzrlib/switch.py:183
7547
#: bzrlib/switch.py:163
7718
7548
#, python-format
7719
7549
msgid "Tree is up to date at revision %d."
7720
7550
msgstr ""
7721
7551
7722
#: bzrlib/switch.py:190
7552
#: bzrlib/switch.py:169
7723
7553
#, python-format
7724
7554
msgid "Updated to revision %d."
7725
7555
msgstr ""
7726
7556
7727
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7557
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7728
7558
msgid "Apply phase"
7729
7559
msgstr ""
7730
7560
7731
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7561
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7732
7562
msgid "removing file"
7733
7563
msgstr ""
7734
7564
7735
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7565
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7736
7566
msgid "adding file"
7737
7567
msgstr ""
7738
7568
7739
#: bzrlib/transform.py:2598
7569
#: bzrlib/transform.py:2591
7740
7570
msgid "Building tree"
7741
7571
msgstr ""
7742
7572
7743
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7573
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7744
7574
msgid "Adding file contents"
7745
7575
msgstr ""
7746
7576
7747
#: bzrlib/transform.py:3017
7577
#: bzrlib/transform.py:3028
7748
7578
msgid "Resolution pass"
7749
7579
msgstr ""
7750
7580
7753
7583
msgid "Authenticated as %s"
7754
7584
msgstr ""
7755
7585
7756
#: bzrlib/tree.py:647
7586
#: bzrlib/tree.py:634
7757
7587
msgid "*** {0} content-filter: {1} => {2!r}"
7758
7588
msgstr ""
7759
7589
7812
7642
msgid "failed to clean-up {0}: {1}"
7813
7643
msgstr ""
7814
7644
7815
#: bzrlib/vf_repository.py:1091
7645
#: bzrlib/vf_repository.py:1090
7816
7646
msgid "inventories"
7817
7647
msgstr ""
7818
7648
7819
#: bzrlib/vf_repository.py:1117
7649
#: bzrlib/vf_repository.py:1116
7820
7650
msgid "texts"
7821
7651
msgstr ""
7822
7652
7823
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7653
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7824
7654
msgid "Calculating text parents"
7825
7655
msgstr ""
7826
7656
7827
#: bzrlib/vf_repository.py:1707
7657
#: bzrlib/vf_repository.py:1706
7828
7658
msgid "Fetch texts"
7829
7659
msgstr ""
7830
7660
7831
#: bzrlib/vf_repository.py:2536
7661
#: bzrlib/vf_repository.py:2535
7832
7662
msgid "loading text store"
7833
7663
msgstr ""
7834
7664
7835
#: bzrlib/vf_repository.py:2542
7665
#: bzrlib/vf_repository.py:2541
7836
7666
msgid "checking text graph"
7837
7667
msgstr ""
7838
7668
7839
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7840
#: bzrlib/vf_repository.py:3127
7669
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7670
#: bzrlib/vf_repository.py:3124
7841
7671
msgid "Transferring revisions"
7842
7672
msgstr ""
7843
7673
7883
7713
msgid "PageFaultCount %8d"
7884
7714
msgstr ""
7885
7715
7886
#: bzrlib/workingtree.py:1516
7716
#: bzrlib/workingtree.py:1478
7887
7717
msgid "Rerun update after fixing the conflicts."
7888
7718
msgstr ""
7889
7719
7893
7723
7894
7724
#: dummy/help_topics/basic/detail.txt:1
7895
7725
msgid ""
7896
"Bazaar 2.6.0 -- a free distributed version-control tool\n"
7726
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7897
7727
"http://bazaar.canonical.com/"
7898
7728
msgstr ""
7899
7729
8211
8041
msgid "How to fix diverged branches"
8212
8042
msgstr ""
8213
8043
8044
#: dummy/help_topics/env-variables/detail.txt:1
8045
msgid "Environment Variables"
8046
msgstr ""
8047
8048
#: dummy/help_topics/env-variables/detail.txt:3
8049
msgid ""
8050
"=================== "
8051
"===========================================================\n"
8052
"BZRPATH Path where bzr is to look for shell plugin external\n"
8053
" commands.\n"
8054
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8055
"EMAIL E-Mail address of the user.\n"
8056
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8057
"EDITOR Editor for editing commit messages.\n"
8058
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8059
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8060
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8061
"BZR_PLUGIN_PATH.\n"
8062
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8063
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8064
"and\n"
8065
" HOME.\n"
8066
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8067
"URLs).\n"
8068
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8069
"sshcorp,\n"
8070
" plink or lsh.\n"
8071
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8072
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8073
"BZR_COLUMNS Override implicit terminal width.\n"
8074
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8075
"(selftest)\n"
8076
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8077
"'text'.\n"
8078
"BZR_PDB Control whether to launch a debugger on error.\n"
8079
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8080
" breakin debugger.\n"
8081
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8082
"(instead\n"
8083
" of char-based).\n"
8084
"=================== "
8085
"===========================================================\n"
8086
msgstr ""
8087
8214
8088
#: dummy/help_topics/env-variables/summary.txt:1
8215
8089
msgid "Environment variable names and values"
8216
8090
msgstr ""
9210
9084
msgid " bzr commit --fixes <tracker>:<id>"
9211
9085
msgstr ""
9212
9086
9213
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9087
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9214
9088
msgid "or::"
9215
9089
msgstr ""
9216
9090
9409
9283
"export Export current or past revision to a destination directory "
9410
9284
"or\n"
9411
9285
" archive.\n"
9412
"grep Print lines matching PATTERN for specified files and\n"
9413
" revisions. [grep]\n"
9414
9286
"help Show help on a command or other topic.\n"
9415
9287
"ignore Ignore specified files or patterns.\n"
9416
9288
"ignored List ignored files and the patterns that matched them.\n"
9434
9306
"mv Move or rename a file.\n"
9435
9307
"nick Print or set the branch nickname.\n"
9436
9308
"pack Compress the data within a repository.\n"
9437
"ping Pings a Bazaar smart server.\n"
9438
9309
"plugins List the installed plugins.\n"
9439
9310
"pull Turn this branch into a mirror of another branch.\n"
9440
9311
"push Update a mirror of this branch.\n"
9447
9318
"remove-tree Remove the working tree from a given branch/checkout.\n"
9448
9319
"renames Show list of renamed files.\n"
9449
9320
"resolve Mark a conflict as resolved.\n"
9450
"revert Set files in the working tree back to the contents of a\n"
9451
" previous revision.\n"
9321
"revert Revert files to a previous revision.\n"
9452
9322
"revno Show current revision number.\n"
9453
9323
"root Show the tree root directory.\n"
9454
9324
"send Mail or create a merge-directive for submitting changes.\n"
10104
9974
10105
9975
#: en/help_topics/configuration.txt:336
10106
9976
msgid ""
10107
"Another such option is ``branchname``, which refers to the name of a "
10108
"colocated\n"
10109
"branch. For non-colocated branches, it behaves like basename. It can be "
10110
"used\n"
10111
"like this::"
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:340
10115
msgid ""
10116
" [/home/vila/src/bzr/bugs]\n"
10117
" mypush = lp:~vila/bzr/{branchname}"
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:343
10121
msgid ""
10122
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10123
"get::"
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:345
10127
msgid ""
10128
" bzr config mypush\n"
10129
" lp:~vila/bzr/832013-expand-in-stack"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:348
10133
msgid ""
10134
9977
"When an option is local to a Section, it cannot be referred to from option\n"
10135
9978
"values in any other section from the same ``Store`` nor from any other\n"
10136
9979
"``Store``."
10137
9980
msgstr ""
10138
9981
10139
#: en/help_topics/configuration.txt:352
9982
#: en/help_topics/configuration.txt:340
10140
9983
msgid ""
10141
9984
"\n"
10142
9985
"The main configuration file, bazaar.conf\n"
10143
9986
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10144
9987
msgstr ""
10145
9988
10146
#: en/help_topics/configuration.txt:356
9989
#: en/help_topics/configuration.txt:344
10147
9990
msgid ""
10148
9991
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10149
9992
"The default section contains the default\n"
10151
9994
"overriden by providing a branch-specific section in ``locations.conf``."
10152
9995
msgstr ""
10153
9996
10154
#: en/help_topics/configuration.txt:361
9997
#: en/help_topics/configuration.txt:349
10155
9998
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10156
9999
msgstr ""
10157
10000
10158
#: en/help_topics/configuration.txt:363
10001
#: en/help_topics/configuration.txt:351
10159
10002
msgid ""
10160
10003
" [DEFAULT]\n"
10161
10004
" email = John Doe <jdoe@isp.com>\n"
10163
10006
" create_signatures = when-required"
10164
10007
msgstr ""
10165
10008
10166
#: en/help_topics/configuration.txt:368
10009
#: en/help_topics/configuration.txt:356
10167
10010
msgid ""
10168
10011
"\n"
10169
10012
"The branch location configuration file, locations.conf\n"
10170
10013
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10171
10014
msgstr ""
10172
10015
10173
#: en/help_topics/configuration.txt:372
10016
#: en/help_topics/configuration.txt:360
10174
10017
msgid ""
10175
10018
"``locations.conf`` allows one to specify overriding settings for\n"
10176
10019
"a specific branch. The format is almost identical to the default section in\n"
10180
10023
"for. The '?' and '*' wildcards are supported::"
10181
10024
msgstr ""
10182
10025
10183
#: en/help_topics/configuration.txt:378
10026
#: en/help_topics/configuration.txt:366
10184
10027
msgid ""
10185
10028
" [/home/jdoe/branches/nethack]\n"
10186
10029
" email = Nethack Admin <nethack@nethack.com>"
10187
10030
msgstr ""
10188
10031
10189
#: en/help_topics/configuration.txt:381
10032
#: en/help_topics/configuration.txt:369
10190
10033
msgid ""
10191
10034
" [http://hypothetical.site.com/branches/devel-branch]\n"
10192
10035
" create_signatures = always"
10193
10036
msgstr ""
10194
10037
10195
#: en/help_topics/configuration.txt:384
10038
#: en/help_topics/configuration.txt:372
10196
10039
msgid ""
10197
10040
"The authentication configuration file, authentication.conf\n"
10198
10041
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10199
10042
msgstr ""
10200
10043
10201
#: en/help_topics/configuration.txt:387
10044
#: en/help_topics/configuration.txt:375
10202
10045
msgid ""
10203
10046
"``authentication.conf`` allows one to specify credentials for\n"
10204
10047
"remote servers. This can be used for all the supported transports and any "
10206
10049
"of bzr that requires authentication (smtp for example)."
10207
10050
msgstr ""
10208
10051
10209
#: en/help_topics/configuration.txt:391
10052
#: en/help_topics/configuration.txt:379
10210
10053
msgid ""
10211
10054
"The syntax of the file obeys the same rules as the others except for the\n"
10212
10055
"option policies which don't apply."
10213
10056
msgstr ""
10214
10057
10215
#: en/help_topics/configuration.txt:394
10058
#: en/help_topics/configuration.txt:382
10216
10059
msgid ""
10217
10060
"For more information on the possible uses of the authentication "
10218
10061
"configuration\n"
10219
10062
"file see :doc:`authentication-help`."
10220
10063
msgstr ""
10221
10064
10222
#: en/help_topics/configuration.txt:397
10065
#: en/help_topics/configuration.txt:385
10223
10066
msgid ""
10224
10067
"\n"
10225
10068
"Common options\n"
10226
10069
"--------------"
10227
10070
msgstr ""
10228
10071
10229
#: en/help_topics/configuration.txt:401
10072
#: en/help_topics/configuration.txt:389
10230
10073
msgid ""
10231
10074
"debug_flags\n"
10232
10075
"~~~~~~~~~~~"
10233
10076
msgstr ""
10234
10077
10235
#: en/help_topics/configuration.txt:404
10078
#: en/help_topics/configuration.txt:392
10236
10079
msgid ""
10237
10080
"A comma-separated list of debugging options to turn on. The same values\n"
10238
10081
"can be used as with the -D command-line option (see `help global-options`).\n"
10239
10082
"For example::"
10240
10083
msgstr ""
10241
10084
10242
#: en/help_topics/configuration.txt:408
10085
#: en/help_topics/configuration.txt:396
10243
10086
msgid " debug_flags = hpss"
10244
10087
msgstr ""
10245
10088
10246
#: en/help_topics/configuration.txt:412
10089
#: en/help_topics/configuration.txt:400
10247
10090
msgid " debug_flags = hpss,evil"
10248
10091
msgstr ""
10249
10092
10250
#: en/help_topics/configuration.txt:414
10093
#: en/help_topics/configuration.txt:402
10251
10094
msgid ""
10252
10095
"email\n"
10253
10096
"~~~~~"
10254
10097
msgstr ""
10255
10098
10256
#: en/help_topics/configuration.txt:417
10099
#: en/help_topics/configuration.txt:405
10257
10100
msgid ""
10258
10101
"The email address to use when committing a branch. Typically takes the form\n"
10259
10102
"of::"
10260
10103
msgstr ""
10261
10104
10262
#: en/help_topics/configuration.txt:420
10105
#: en/help_topics/configuration.txt:408
10263
10106
msgid " email = Full Name <account@hostname.tld>"
10264
10107
msgstr ""
10265
10108
10266
#: en/help_topics/configuration.txt:422
10109
#: en/help_topics/configuration.txt:410
10267
10110
msgid ""
10268
10111
"editor\n"
10269
10112
"~~~~~~"
10270
10113
msgstr ""
10271
10114
10272
#: en/help_topics/configuration.txt:425
10115
#: en/help_topics/configuration.txt:413
10273
10116
msgid ""
10274
10117
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10275
10118
"a commit message. This setting is trumped by the environment variable\n"
10277
10120
"variables."
10278
10121
msgstr ""
10279
10122
10280
#: en/help_topics/configuration.txt:430
10123
#: en/help_topics/configuration.txt:418
10281
10124
msgid ""
10282
10125
"log_format\n"
10283
10126
"~~~~~~~~~~"
10284
10127
msgstr ""
10285
10128
10286
#: en/help_topics/configuration.txt:433
10129
#: en/help_topics/configuration.txt:421
10287
10130
msgid ""
10288
10131
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10289
10132
"and ``line``. Additional formats may be provided by plugins. The default\n"
10290
10133
"value is ``long``."
10291
10134
msgstr ""
10292
10135
10293
#: en/help_topics/configuration.txt:437
10136
#: en/help_topics/configuration.txt:425
10294
10137
msgid ""
10295
10138
"check_signatures\n"
10296
10139
"~~~~~~~~~~~~~~~~"
10297
10140
msgstr ""
10298
10141
10299
#: en/help_topics/configuration.txt:440
10142
#: en/help_topics/configuration.txt:428
10300
10143
msgid ""
10301
10144
"Reserved for future use. These options will allow a policy for branches to\n"
10302
10145
"require signatures."
10303
10146
msgstr ""
10304
10147
10305
#: en/help_topics/configuration.txt:443
10148
#: en/help_topics/configuration.txt:431
10306
10149
msgid ""
10307
10150
"require\n"
10308
10151
" The gnupg signature for revisions must be present and must be valid."
10309
10152
msgstr ""
10310
10153
10311
#: en/help_topics/configuration.txt:446
10154
#: en/help_topics/configuration.txt:434
10312
10155
msgid ""
10313
10156
"ignore\n"
10314
10157
" Do not check gnupg signatures of revisions."
10315
10158
msgstr ""
10316
10159
10317
#: en/help_topics/configuration.txt:449
10160
#: en/help_topics/configuration.txt:437
10318
10161
msgid ""
10319
10162
"check-available\n"
10320
10163
" (default) If gnupg signatures for revisions are present, check them.\n"
10322
10165
" no signature is present."
10323
10166
msgstr ""
10324
10167
10325
#: en/help_topics/configuration.txt:454
10168
#: en/help_topics/configuration.txt:442
10326
10169
msgid ""
10327
10170
"create_signatures\n"
10328
10171
"~~~~~~~~~~~~~~~~~"
10329
10172
msgstr ""
10330
10173
10331
#: en/help_topics/configuration.txt:457
10174
#: en/help_topics/configuration.txt:445
10332
10175
msgid ""
10333
10176
"Defines the behaviour of signing revisions on commits. By default bzr will "
10334
10177
"not\n"
10335
10178
"sign new commits."
10336
10179
msgstr ""
10337
10180
10338
#: en/help_topics/configuration.txt:460
10181
#: en/help_topics/configuration.txt:448
10339
10182
msgid ""
10340
10183
"always\n"
10341
10184
" Sign every new revision that is committed. If the signing fails then "
10343
10186
" commit will not be made."
10344
10187
msgstr ""
10345
10188
10346
#: en/help_topics/configuration.txt:464
10189
#: en/help_topics/configuration.txt:452
10347
10190
msgid ""
10348
10191
"when-required\n"
10349
10192
" Reserved for future use."
10350
10193
msgstr ""
10351
10194
10352
#: en/help_topics/configuration.txt:467
10195
#: en/help_topics/configuration.txt:455
10353
10196
msgid ""
10354
10197
"never\n"
10355
10198
" Reserved for future use."
10356
10199
msgstr ""
10357
10200
10358
#: en/help_topics/configuration.txt:470
10201
#: en/help_topics/configuration.txt:458
10359
10202
msgid ""
10360
10203
"In future it is planned that ``when-required`` will sign newly\n"
10361
10204
"committed revisions only when the branch requires them. ``never`` will "
10363
10206
"to sign newly committed revisions, even if the branch requires signatures."
10364
10207
msgstr ""
10365
10208
10366
#: en/help_topics/configuration.txt:474
10209
#: en/help_topics/configuration.txt:462
10367
10210
msgid ""
10368
10211
"dirstate.fdatasync\n"
10369
10212
"~~~~~~~~~~~~~~~~~~"
10370
10213
msgstr ""
10371
10214
10372
#: en/help_topics/configuration.txt:477
10215
#: en/help_topics/configuration.txt:465
10373
10216
msgid ""
10374
10217
"If true (default), working tree metadata changes are flushed through the\n"
10375
10218
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10376
10219
"should not be lost if the machine crashes. See also repository.fdatasync."
10377
10220
msgstr ""
10378
10221
10379
#: en/help_topics/configuration.txt:481
10222
#: en/help_topics/configuration.txt:469
10380
10223
msgid ""
10381
10224
"gpg_signing_key\n"
10382
10225
"~~~~~~~~~~~~~~~"
10383
10226
msgstr ""
10384
10227
10385
#: en/help_topics/configuration.txt:484
10228
#: en/help_topics/configuration.txt:472
10386
10229
msgid ""
10387
10230
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10388
10231
"address, key fingerprint or full key ID. When unset or when set to\n"
10389
10232
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10390
10233
msgstr ""
10391
10234
10392
#: en/help_topics/configuration.txt:488
10235
#: en/help_topics/configuration.txt:476
10393
10236
msgid ""
10394
10237
"recurse\n"
10395
10238
"~~~~~~~"
10396
10239
msgstr ""
10397
10240
10398
#: en/help_topics/configuration.txt:491
10241
#: en/help_topics/configuration.txt:479
10399
10242
msgid ""
10400
10243
"Only useful in ``locations.conf``. Defines whether or not the\n"
10401
10244
"configuration for this section applies to subdirectories:"
10402
10245
msgstr ""
10403
10246
10404
#: en/help_topics/configuration.txt:494
10247
#: en/help_topics/configuration.txt:482
10405
10248
msgid ""
10406
10249
"true\n"
10407
10250
" (default) This section applies to subdirectories as well."
10408
10251
msgstr ""
10409
10252
10410
#: en/help_topics/configuration.txt:497
10253
#: en/help_topics/configuration.txt:485
10411
10254
msgid ""
10412
10255
"false\n"
10413
10256
" This section only applies to the branch at this directory and not\n"
10414
10257
" branches below it."
10415
10258
msgstr ""
10416
10259
10417
#: en/help_topics/configuration.txt:501
10260
#: en/help_topics/configuration.txt:489
10418
10261
msgid ""
10419
10262
"gpg_signing_command\n"
10420
10263
"~~~~~~~~~~~~~~~~~~~"
10421
10264
msgstr ""
10422
10265
10423
#: en/help_topics/configuration.txt:504
10266
#: en/help_topics/configuration.txt:492
10424
10267
msgid ""
10425
10268
"(Default: \"gpg\"). Which program should be used to sign and check "
10426
10269
"revisions.\n"
10427
10270
"For example::"
10428
10271
msgstr ""
10429
10272
10430
#: en/help_topics/configuration.txt:507
10273
#: en/help_topics/configuration.txt:495
10431
10274
msgid " gpg_signing_command = /usr/bin/gnpg"
10432
10275
msgstr ""
10433
10276
10434
#: en/help_topics/configuration.txt:509
10277
#: en/help_topics/configuration.txt:497
10435
10278
msgid ""
10436
10279
"The specified command must accept the options \"--clearsign\" and \"-u "
10437
10280
"<email>\"."
10438
10281
msgstr ""
10439
10282
10440
#: en/help_topics/configuration.txt:511
10283
#: en/help_topics/configuration.txt:499
10441
10284
msgid ""
10442
10285
"bzr_remote_path\n"
10443
10286
"~~~~~~~~~~~~~~~"
10444
10287
msgstr ""
10445
10288
10446
#: en/help_topics/configuration.txt:514
10289
#: en/help_topics/configuration.txt:502
10447
10290
msgid ""
10448
10291
"(Default: \"bzr\"). The path to the command that should be used to run the "
10449
10292
"smart\n"
10450
10293
"server for bzr. This value may only be specified in locations.conf, because:"
10451
10294
msgstr ""
10452
10295
10453
#: en/help_topics/configuration.txt:517
10296
#: en/help_topics/configuration.txt:505
10454
10297
msgid ""
10455
10298
"- it's needed before branch.conf is accessible\n"
10456
10299
"- allowing remote branch.conf files to specify commands would be a security\n"
10457
10300
" risk"
10458
10301
msgstr ""
10459
10302
10460
#: en/help_topics/configuration.txt:521
10303
#: en/help_topics/configuration.txt:509
10461
10304
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10462
10305
msgstr ""
10463
10306
10464
#: en/help_topics/configuration.txt:523
10307
#: en/help_topics/configuration.txt:511
10465
10308
msgid ""
10466
10309
"smtp_server\n"
10467
10310
"~~~~~~~~~~~"
10468
10311
msgstr ""
10469
10312
10470
#: en/help_topics/configuration.txt:526
10313
#: en/help_topics/configuration.txt:514
10471
10314
msgid ""
10472
10315
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10473
10316
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10474
10317
msgstr ""
10475
10318
10476
#: en/help_topics/configuration.txt:529
10319
#: en/help_topics/configuration.txt:517
10477
10320
msgid ""
10478
10321
"smtp_username, smtp_password\n"
10479
10322
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10480
10323
msgstr ""
10481
10324
10482
#: en/help_topics/configuration.txt:532
10325
#: en/help_topics/configuration.txt:520
10483
10326
msgid ""
10484
10327
"User and password to authenticate to the SMTP server. If smtp_username\n"
10485
10328
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10487
10330
"to send mail."
10488
10331
msgstr ""
10489
10332
10490
#: en/help_topics/configuration.txt:537
10333
#: en/help_topics/configuration.txt:525
10491
10334
msgid ""
10492
10335
"locks.steal_dead\n"
10493
10336
"~~~~~~~~~~~~~~~~"
10494
10337
msgstr ""
10495
10338
10496
#: en/help_topics/configuration.txt:540
10339
#: en/help_topics/configuration.txt:528
10497
10340
msgid ""
10498
10341
"If set to true, bzr will automatically break locks held by processes from\n"
10499
10342
"the same machine and user that are no longer alive. Otherwise, it will\n"
10501
10344
"the object is no longer in use."
10502
10345
msgstr ""
10503
10346
10504
#: en/help_topics/configuration.txt:545
10347
#: en/help_topics/configuration.txt:533
10505
10348
msgid ""
10506
10349
"mail_client\n"
10507
10350
"~~~~~~~~~~~"
10508
10351
msgstr ""
10509
10352
10510
#: en/help_topics/configuration.txt:548
10353
#: en/help_topics/configuration.txt:536
10511
10354
msgid ""
10512
10355
"A mail client to use for sending merge requests.\n"
10513
10356
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10516
10359
"``editor``."
10517
10360
msgstr ""
10518
10361
10519
#: en/help_topics/configuration.txt:553
10362
#: en/help_topics/configuration.txt:541
10520
10363
msgid "Supported values for specific clients:"
10521
10364
msgstr ""
10522
10365
10523
#: en/help_topics/configuration.txt:555
10366
#: en/help_topics/configuration.txt:543
10524
10367
msgid ""
10525
10368
":claws: Use Claws. This skips a dialog for attaching files.\n"
10526
10369
":evolution: Use Evolution.\n"
10531
10374
" this works around some bugs that xdg-email doesn't handle."
10532
10375
msgstr ""
10533
10376
10534
#: en/help_topics/configuration.txt:562
10377
#: en/help_topics/configuration.txt:550
10535
10378
msgid "Supported generic values are:"
10536
10379
msgstr ""
10537
10380
10538
#: en/help_topics/configuration.txt:564
10381
#: en/help_topics/configuration.txt:552
10539
10382
msgid ""
10540
10383
":default: See above.\n"
10541
10384
":editor: Use your editor to compose the merge request. This also uses\n"
10545
10388
":xdg-email: Use xdg-email to run your preferred mail program"
10546
10389
msgstr ""
10547
10390
10548
#: en/help_topics/configuration.txt:571
10391
#: en/help_topics/configuration.txt:559
10549
10392
msgid ""
10550
10393
"repository.fdatasync\n"
10551
10394
"~~~~~~~~~~~~~~~~~~~~"
10552
10395
msgstr ""
10553
10396
10554
#: en/help_topics/configuration.txt:574
10397
#: en/help_topics/configuration.txt:562
10555
10398
msgid ""
10556
10399
"If true (default), repository changes are flushed through the OS buffers\n"
10557
10400
"to physical disk. This is somewhat slower, but means data should not be\n"
10558
10401
"lost if the machine crashes. See also dirstate.fdatasync."
10559
10402
msgstr ""
10560
10403
10561
#: en/help_topics/configuration.txt:578
10404
#: en/help_topics/configuration.txt:566
10562
10405
msgid ""
10563
10406
"submit_branch\n"
10564
10407
"~~~~~~~~~~~~~"
10565
10408
msgstr ""
10566
10409
10567
#: en/help_topics/configuration.txt:581
10410
#: en/help_topics/configuration.txt:569
10568
10411
msgid ""
10569
10412
"The branch you intend to submit your current work to. This is "
10570
10413
"automatically\n"
10573
10416
"should usually be set on a per-branch or per-location basis."
10574
10417
msgstr ""
10575
10418
10576
#: en/help_topics/configuration.txt:585
10419
#: en/help_topics/configuration.txt:573
10577
10420
msgid ""
10578
10421
"public_branch\n"
10579
10422
"~~~~~~~~~~~~~"
10580
10423
msgstr ""
10581
10424
10582
#: en/help_topics/configuration.txt:588
10425
#: en/help_topics/configuration.txt:576
10583
10426
msgid ""
10584
10427
"A publically-accessible version of this branch (implying that this version "
10585
10428
"is\n"
10586
10429
"not publically-accessible). Used (and set) by ``bzr send``."
10587
10430
msgstr ""
10588
10431
10589
#: en/help_topics/configuration.txt:591
10432
#: en/help_topics/configuration.txt:579
10590
10433
msgid ""
10591
10434
"suppress_warnings\n"
10592
10435
"~~~~~~~~~~~~~~~~~"
10593
10436
msgstr ""
10594
10437
10595
#: en/help_topics/configuration.txt:594
10438
#: en/help_topics/configuration.txt:582
10596
10439
msgid ""
10597
10440
"A list of strings, each string represent a warning that can be emitted by\n"
10598
10441
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10599
10442
msgstr ""
10600
10443
10601
#: en/help_topics/configuration.txt:597
10444
#: en/help_topics/configuration.txt:585
10602
10445
msgid "Valid values:"
10603
10446
msgstr ""
10604
10447
10605
#: en/help_topics/configuration.txt:599
10448
#: en/help_topics/configuration.txt:587
10606
10449
msgid ""
10607
10450
"* ``format_deprecation``:\n"
10608
10451
" whether the format deprecation warning is shown on repositories that "
10610
10453
" using deprecated formats."
10611
10454
msgstr ""
10612
10455
10613
#: en/help_topics/configuration.txt:603
10456
#: en/help_topics/configuration.txt:591
10614
10457
msgid ""
10615
10458
"default_format\n"
10616
10459
"~~~~~~~~~~~~~~"
10617
10460
msgstr ""
10618
10461
10619
#: en/help_topics/configuration.txt:606
10462
#: en/help_topics/configuration.txt:594
10620
10463
msgid ""
10621
10464
"A format name for the default format used when creating branches. See "
10622
10465
"``bzr\n"
10623
10466
"help formats`` for possible values."
10624
10467
msgstr ""
10625
10468
10626
#: en/help_topics/configuration.txt:609
10469
#: en/help_topics/configuration.txt:597
10627
10470
msgid ""
10628
10471
"\n"
10629
10472
"Unicode options\n"
10630
10473
"---------------"
10631
10474
msgstr ""
10632
10475
10633
#: en/help_topics/configuration.txt:613
10476
#: en/help_topics/configuration.txt:601
10634
10477
msgid ""
10635
10478
"output_encoding\n"
10636
10479
"~~~~~~~~~~~~~~~"
10637
10480
msgstr ""
10638
10481
10639
#: en/help_topics/configuration.txt:616
10482
#: en/help_topics/configuration.txt:604
10640
10483
msgid ""
10641
10484
"A Python unicode encoding name for text output from bzr, such as log\n"
10642
10485
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10643
10486
"is the terminal encoding prefered by the operating system."
10644
10487
msgstr ""
10645
10488
10646
#: en/help_topics/configuration.txt:620
10489
#: en/help_topics/configuration.txt:608
10647
10490
msgid ""
10648
10491
"\n"
10649
10492
"Branch type specific options\n"
10650
10493
"----------------------------"
10651
10494
msgstr ""
10652
10495
10653
#: en/help_topics/configuration.txt:624
10496
#: en/help_topics/configuration.txt:612
10654
10497
msgid ""
10655
10498
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10656
10499
"later format. They\n"
10658
10501
"manually set in ``locations.conf`` or ``bazaar.conf``."
10659
10502
msgstr ""
10660
10503
10661
#: en/help_topics/configuration.txt:629
10504
#: en/help_topics/configuration.txt:617
10662
10505
msgid ""
10663
10506
"append_revisions_only\n"
10664
10507
"~~~~~~~~~~~~~~~~~~~~~"
10665
10508
msgstr ""
10666
10509
10667
#: en/help_topics/configuration.txt:632
10510
#: en/help_topics/configuration.txt:620
10668
10511
msgid ""
10669
10512
"If set to \"True\" then revisions can only be appended to the log, not\n"
10670
10513
"removed. A branch with this setting enabled can only pull from another\n"
10674
10517
"compatibility with previous bzr versions (older than 2.2)."
10675
10518
msgstr ""
10676
10519
10677
#: en/help_topics/configuration.txt:639
10520
#: en/help_topics/configuration.txt:627
10678
10521
msgid ""
10679
10522
"parent_location\n"
10680
10523
"~~~~~~~~~~~~~~~"
10681
10524
msgstr ""
10682
10525
10683
#: en/help_topics/configuration.txt:642
10526
#: en/help_topics/configuration.txt:630
10684
10527
msgid ""
10685
10528
"If present, the location of the default branch for pull or merge. This "
10686
10529
"option\n"
10688
10531
"--remember``."
10689
10532
msgstr ""
10690
10533
10691
#: en/help_topics/configuration.txt:646
10534
#: en/help_topics/configuration.txt:634
10692
10535
msgid ""
10693
10536
"push_location\n"
10694
10537
"~~~~~~~~~~~~~"
10695
10538
msgstr ""
10696
10539
10697
#: en/help_topics/configuration.txt:649
10540
#: en/help_topics/configuration.txt:637
10698
10541
msgid ""
10699
10542
"If present, the location of the default branch for push. This option\n"
10700
10543
"is normally set by the first ``push`` or ``push --remember``."
10701
10544
msgstr ""
10702
10545
10703
#: en/help_topics/configuration.txt:652
10546
#: en/help_topics/configuration.txt:640
10704
10547
msgid ""
10705
10548
"push_strict\n"
10706
10549
"~~~~~~~~~~~"
10707
10550
msgstr ""
10708
10551
10709
#: en/help_topics/configuration.txt:655
10552
#: en/help_topics/configuration.txt:643
10710
10553
msgid ""
10711
10554
"If present, defines the ``--strict`` option default value for checking\n"
10712
10555
"uncommitted changes before pushing."
10713
10556
msgstr ""
10714
10557
10715
#: en/help_topics/configuration.txt:658
10558
#: en/help_topics/configuration.txt:646
10716
10559
msgid ""
10717
10560
"dpush_strict\n"
10718
10561
"~~~~~~~~~~~~"
10719
10562
msgstr ""
10720
10563
10721
#: en/help_topics/configuration.txt:661
10564
#: en/help_topics/configuration.txt:649
10722
10565
msgid ""
10723
10566
"If present, defines the ``--strict`` option default value for checking\n"
10724
10567
"uncommitted changes before pushing into a different VCS without any\n"
10725
10568
"custom bzr metadata."
10726
10569
msgstr ""
10727
10570
10728
#: en/help_topics/configuration.txt:665
10571
#: en/help_topics/configuration.txt:653
10729
10572
msgid ""
10730
10573
"bound_location\n"
10731
10574
"~~~~~~~~~~~~~~"
10732
10575
msgstr ""
10733
10576
10734
#: en/help_topics/configuration.txt:668
10577
#: en/help_topics/configuration.txt:656
10735
10578
msgid ""
10736
10579
"The location that commits should go to when acting as a checkout.\n"
10737
10580
"This option is normally set by ``bind``."
10738
10581
msgstr ""
10739
10582
10740
#: en/help_topics/configuration.txt:671
10583
#: en/help_topics/configuration.txt:659
10741
10584
msgid ""
10742
10585
"bound\n"
10743
10586
"~~~~~"
10744
10587
msgstr ""
10745
10588
10746
#: en/help_topics/configuration.txt:674
10589
#: en/help_topics/configuration.txt:662
10747
10590
msgid ""
10748
10591
"If set to \"True\", the branch should act as a checkout, and push each "
10749
10592
"commit to\n"
10750
10593
"the bound_location. This option is normally set by ``bind``/``unbind``."
10751
10594
msgstr ""
10752
10595
10753
#: en/help_topics/configuration.txt:677
10596
#: en/help_topics/configuration.txt:665
10754
10597
msgid ""
10755
10598
"send_strict\n"
10756
10599
"~~~~~~~~~~~"
10757
10600
msgstr ""
10758
10601
10759
#: en/help_topics/configuration.txt:680
10602
#: en/help_topics/configuration.txt:668
10760
10603
msgid ""
10761
10604
"If present, defines the ``--strict`` option default value for checking\n"
10762
10605
"uncommitted changes before sending a merge directive."
10763
10606
msgstr ""
10764
10607
10765
#: en/help_topics/configuration.txt:683
10608
#: en/help_topics/configuration.txt:671
10766
10609
msgid ""
10767
10610
"add.maximum_file_size\n"
10768
10611
"~~~~~~~~~~~~~~~~~~~~~"
10769
10612
msgstr ""
10770
10613
10771
#: en/help_topics/configuration.txt:686
10614
#: en/help_topics/configuration.txt:674
10772
10615
msgid ""
10773
10616
"Defines the maximum file size the command line \"add\" operation will allow\n"
10774
10617
"in recursive mode, with files larger than this value being skipped. You "
10780
10623
"will disable skipping."
10781
10624
msgstr ""
10782
10625
10783
#: en/help_topics/configuration.txt:692
10626
#: en/help_topics/configuration.txt:680
10784
10627
msgid ""
10785
10628
"External Merge Tools\n"
10786
10629
"--------------------"
10787
10630
msgstr ""
10788
10631
10789
#: en/help_topics/configuration.txt:695
10632
#: en/help_topics/configuration.txt:683
10790
10633
msgid ""
10791
10634
"bzr.mergetool.<name>\n"
10792
10635
"~~~~~~~~~~~~~~~~~~~~"
10793
10636
msgstr ""
10794
10637
10795
#: en/help_topics/configuration.txt:698
10638
#: en/help_topics/configuration.txt:686
10796
10639
msgid ""
10797
10640
"Defines an external merge tool called <name> with the given command-line.\n"
10798
10641
"Arguments containing spaces should be quoted using single or double quotes. "
10800
10643
"executable may omit its path if it can be found on the PATH."
10801
10644
msgstr ""
10802
10645
10803
#: en/help_topics/configuration.txt:702
10646
#: en/help_topics/configuration.txt:690
10804
10647
msgid ""
10805
10648
"The following markers can be used in the command-line to substitute "
10806
10649
"filenames\n"
10807
10650
"involved in the merge conflict::"
10808
10651
msgstr ""
10809
10652
10810
#: en/help_topics/configuration.txt:705
10653
#: en/help_topics/configuration.txt:693
10811
10654
msgid ""
10812
10655
" {base} file.BASE\n"
10813
10656
" {this} file.THIS\n"
10818
10661
" succeeds."
10819
10662
msgstr ""
10820
10663
10821
#: en/help_topics/configuration.txt:714
10664
#: en/help_topics/configuration.txt:702
10822
10665
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10823
10666
msgstr ""
10824
10667
10825
#: en/help_topics/configuration.txt:716
10826
msgid ""
10827
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10828
"interpolation markers, trying to display the mergetool line results in the\n"
10829
"following problem::"
10830
msgstr ""
10831
10832
#: en/help_topics/configuration.txt:720
10833
msgid ""
10834
"\n"
10835
" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10836
"{result}'\n"
10837
" $ bzr config bzr.mergetool.kdiff3\n"
10838
" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10839
"{this} {other} -o {result}\"."
10840
msgstr ""
10841
10842
#: en/help_topics/configuration.txt:725
10843
msgid ""
10844
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10845
msgstr ""
10846
10847
#: en/help_topics/configuration.txt:727
10848
msgid ""
10849
" $ bzr config --all bzr.mergetool.kdiff3\n"
10850
" branch:\n"
10851
" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10852
msgstr ""
10853
10854
#: en/help_topics/configuration.txt:731
10855
msgid ""
10856
"\n"
10668
#: en/help_topics/configuration.txt:704
10669
msgid ""
10857
10670
"bzr.default_mergetool\n"
10858
10671
"~~~~~~~~~~~~~~~~~~~~~"
10859
10672
msgstr ""
10860
10673
10861
#: en/help_topics/configuration.txt:735
10674
#: en/help_topics/configuration.txt:707
10862
10675
msgid ""
10863
10676
"Specifies which external merge tool (as defined above) should be selected "
10864
10677
"by\n"
10865
10678
"default in tools such as ``bzr qconflicts``."
10866
10679
msgstr ""
10867
10680
10868
#: en/help_topics/configuration.txt:740
10681
#: en/help_topics/configuration.txt:712
10869
10682
msgid " bzr.default_mergetool = kdiff3\n"
10870
10683
msgstr ""
10871
10684
11815
11628
"branch can now be pushed to the mainline.\n"
11816
11629
msgstr ""
11817
11630
11818
#: en/help_topics/env-variables.txt:1
11819
msgid "Environment Variables"
11820
msgstr ""
11821
11822
#: en/help_topics/env-variables.txt:3
11823
msgid "See bzr help configuration for more details."
11824
msgstr ""
11825
11826
#: en/help_topics/env-variables.txt:5
11827
msgid ""
11828
"=================== "
11829
"===========================================================\n"
11830
"BZRPATH Path where bzr is to look for shell plugin external\n"
11831
" commands.\n"
11832
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11833
"EMAIL E-Mail address of the user.\n"
11834
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11835
"EDITOR Editor for editing commit messages.\n"
11836
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11837
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11838
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11839
"BZR_PLUGIN_PATH.\n"
11840
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11841
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11842
"and\n"
11843
" HOME.\n"
11844
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11845
"URLs).\n"
11846
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11847
"sshcorp,\n"
11848
" plink or lsh.\n"
11849
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11850
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11851
"BZR_COLUMNS Override implicit terminal width.\n"
11852
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11853
"(selftest)\n"
11854
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11855
"'text'.\n"
11856
"BZR_PDB Control whether to launch a debugger on error.\n"
11857
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11858
" breakin debugger.\n"
11859
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11860
"(instead\n"
11861
" of char-based).\n"
11862
"=================== "
11863
"===========================================================\n"
11864
msgstr ""
11865
11866
11631
#: en/help_topics/eol.txt:1
11867
11632
msgid ""
11868
11633
"End of Line Conversion\n"
12170
11935
msgstr ""
12171
11936
12172
11937
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12173
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11938
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12174
11939
msgid "Introduced in: 2.2"
12175
11940
msgstr ""
12176
11941
12188
11953
"~~~~"
12189
11954
msgstr ""
12190
11955
12191
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12192
#: en/help_topics/hooks.txt:307
11956
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11957
#: en/help_topics/hooks.txt:304
12193
11958
msgid "Introduced in: 1.8"
12194
11959
msgstr ""
12195
11960
12219
11984
"~~~~~~~~~~~~~~~~~~~~~~"
12220
11985
msgstr ""
12221
11986
12222
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11987
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12223
11988
msgid "Introduced in: 1.4"
12224
11989
msgstr ""
12225
11990
12231
11996
"uncommit will all trigger this hook."
12232
11997
msgstr ""
12233
11998
12234
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11999
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12235
12000
msgid ""
12236
12001
"post_commit\n"
12237
12002
"~~~~~~~~~~~"
12239
12004
12240
12005
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12241
12006
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12007
#: en/help_topics/hooks.txt:145
12242
12008
msgid "Introduced in: 0.15"
12243
12009
msgstr ""
12244
12010
12343
12109
12344
12110
#: en/help_topics/hooks.txt:142
12345
12111
msgid ""
12112
"set_rh\n"
12113
"~~~~~~"
12114
msgstr ""
12115
12116
#: en/help_topics/hooks.txt:147
12117
msgid ""
12118
"Invoked whenever the revision history has been set via\n"
12119
"set_revision_history. The api signature is (branch, revision_history),\n"
12120
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12121
"for bzr to trigger, a better hook to use is\n"
12122
"Branch.post_change_branch_tip."
12123
msgstr ""
12124
12125
#: en/help_topics/hooks.txt:153
12126
msgid ""
12346
12127
"transform_fallback_location\n"
12347
12128
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12348
12129
msgstr ""
12349
12130
12350
#: en/help_topics/hooks.txt:145
12131
#: en/help_topics/hooks.txt:156
12351
12132
msgid "Introduced in: 1.9"
12352
12133
msgstr ""
12353
12134
12354
#: en/help_topics/hooks.txt:147
12135
#: en/help_topics/hooks.txt:158
12355
12136
msgid ""
12356
12137
"Called when a stacked branch is activating its fallback locations.\n"
12357
12138
"transform_fallback_location is called with (branch, url), and should\n"
12365
12146
"however undefined."
12366
12147
msgstr ""
12367
12148
12368
#: en/help_topics/hooks.txt:158
12149
#: en/help_topics/hooks.txt:169
12369
12150
msgid ""
12370
12151
"CommandHooks\n"
12371
12152
"------------"
12372
12153
msgstr ""
12373
12154
12374
#: en/help_topics/hooks.txt:161
12155
#: en/help_topics/hooks.txt:172
12375
12156
msgid ""
12376
12157
"extend_command\n"
12377
12158
"~~~~~~~~~~~~~~"
12378
12159
msgstr ""
12379
12160
12380
#: en/help_topics/hooks.txt:164
12161
#: en/help_topics/hooks.txt:175
12381
12162
msgid "Introduced in: 1.13"
12382
12163
msgstr ""
12383
12164
12384
#: en/help_topics/hooks.txt:166
12165
#: en/help_topics/hooks.txt:177
12385
12166
msgid ""
12386
12167
"Called after creating a command object to allow modifications such as\n"
12387
12168
"adding or removing options, docs etc. Called with the new\n"
12388
12169
"bzrlib.commands.Command object."
12389
12170
msgstr ""
12390
12171
12391
#: en/help_topics/hooks.txt:170
12172
#: en/help_topics/hooks.txt:181
12392
12173
msgid ""
12393
12174
"get_command\n"
12394
12175
"~~~~~~~~~~~"
12395
12176
msgstr ""
12396
12177
12397
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12398
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12178
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12179
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12399
12180
msgid "Introduced in: 1.17"
12400
12181
msgstr ""
12401
12182
12402
#: en/help_topics/hooks.txt:175
12183
#: en/help_topics/hooks.txt:186
12403
12184
msgid ""
12404
12185
"Called when creating a single command. Called with (cmd_or_None,\n"
12405
12186
"command_name). get_command should either return the cmd_or_None\n"
12409
12190
"plugin_cmds.register_lazy."
12410
12191
msgstr ""
12411
12192
12412
#: en/help_topics/hooks.txt:182
12193
#: en/help_topics/hooks.txt:193
12413
12194
msgid ""
12414
12195
"get_missing_command\n"
12415
12196
"~~~~~~~~~~~~~~~~~~~"
12416
12197
msgstr ""
12417
12198
12418
#: en/help_topics/hooks.txt:187
12199
#: en/help_topics/hooks.txt:198
12419
12200
msgid ""
12420
12201
"Called when creating a single command if no command could be found.\n"
12421
12202
"Called with (command_name). get_missing_command should either return\n"
12422
12203
"None, or a Command object to be used for the command."
12423
12204
msgstr ""
12424
12205
12425
#: en/help_topics/hooks.txt:191
12206
#: en/help_topics/hooks.txt:202
12426
12207
msgid ""
12427
12208
"list_commands\n"
12428
12209
"~~~~~~~~~~~~~"
12429
12210
msgstr ""
12430
12211
12431
#: en/help_topics/hooks.txt:196
12212
#: en/help_topics/hooks.txt:207
12432
12213
msgid ""
12433
12214
"Called when enumerating commands. Called with a set of cmd_name\n"
12434
12215
"strings for all the commands found so far. This set is safe to mutate\n"
12436
12217
"set of command names."
12437
12218
msgstr ""
12438
12219
12439
#: en/help_topics/hooks.txt:201
12440
msgid ""
12441
"post_command\n"
12442
"~~~~~~~~~~~~"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12446
msgid "Introduced in: 2.6"
12447
msgstr ""
12448
12449
#: en/help_topics/hooks.txt:206
12450
msgid "Called after executing a command. Called with the command object."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:208
12454
msgid ""
12455
"pre_command\n"
12456
"~~~~~~~~~~~"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:213
12460
msgid "Called prior to executing a command. Called with the command object."
12220
#: en/help_topics/hooks.txt:212
12221
msgid ""
12222
"_ConfigHooks\n"
12223
"------------"
12461
12224
msgstr ""
12462
12225
12463
12226
#: en/help_topics/hooks.txt:215
12464
12227
msgid ""
12465
"_ConfigHooks\n"
12466
"------------"
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:218
12470
msgid ""
12471
12228
"get\n"
12472
12229
"~~~"
12473
12230
msgstr ""
12474
12231
12475
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12476
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12477
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12478
#: en/help_topics/hooks.txt:446
12232
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12233
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12234
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12235
#: en/help_topics/hooks.txt:443
12479
12236
msgid "Introduced in: 2.4"
12480
12237
msgstr ""
12481
12238
12239
#: en/help_topics/hooks.txt:220
12240
msgid ""
12241
"Invoked when a config option is read. The signature is (stack, name,\n"
12242
"value)."
12243
msgstr ""
12244
12482
12245
#: en/help_topics/hooks.txt:223
12483
12246
msgid ""
12484
"Invoked when a config option is read. The signature is (stack, name,\n"
12485
"value)."
12486
msgstr ""
12487
12488
#: en/help_topics/hooks.txt:226
12489
msgid ""
12490
12247
"load\n"
12491
12248
"~~~~"
12492
12249
msgstr ""
12493
12250
12494
#: en/help_topics/hooks.txt:231
12251
#: en/help_topics/hooks.txt:228
12495
12252
msgid "Invoked when a config store is loaded. The signature is (store)."
12496
12253
msgstr ""
12497
12254
12498
#: en/help_topics/hooks.txt:233
12255
#: en/help_topics/hooks.txt:230
12499
12256
msgid ""
12500
12257
"remove\n"
12501
12258
"~~~~~~"
12502
12259
msgstr ""
12503
12260
12504
#: en/help_topics/hooks.txt:238
12261
#: en/help_topics/hooks.txt:235
12505
12262
msgid ""
12506
12263
"Invoked when a config option is removed. The signature is (stack,\n"
12507
12264
"name)."
12508
12265
msgstr ""
12509
12266
12510
#: en/help_topics/hooks.txt:241
12267
#: en/help_topics/hooks.txt:238
12511
12268
msgid ""
12512
12269
"save\n"
12513
12270
"~~~~"
12514
12271
msgstr ""
12515
12272
12516
#: en/help_topics/hooks.txt:246
12273
#: en/help_topics/hooks.txt:243
12517
12274
msgid "Invoked when a config store is saved. The signature is (store)."
12518
12275
msgstr ""
12519
12276
12520
#: en/help_topics/hooks.txt:248
12277
#: en/help_topics/hooks.txt:245
12521
12278
msgid ""
12522
12279
"set\n"
12523
12280
"~~~"
12524
12281
msgstr ""
12525
12282
12283
#: en/help_topics/hooks.txt:250
12284
msgid ""
12285
"Invoked when a config option is set. The signature is (stack, name,\n"
12286
"value)."
12287
msgstr ""
12288
12526
12289
#: en/help_topics/hooks.txt:253
12527
12290
msgid ""
12528
"Invoked when a config option is set. The signature is (stack, name,\n"
12529
"value)."
12291
"ControlDirHooks\n"
12292
"---------------"
12530
12293
msgstr ""
12531
12294
12532
12295
#: en/help_topics/hooks.txt:256
12533
12296
msgid ""
12534
"ControlDirHooks\n"
12535
"---------------"
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:259
12539
msgid ""
12540
12297
"post_repo_init\n"
12541
12298
"~~~~~~~~~~~~~~"
12542
12299
msgstr ""
12543
12300
12544
#: en/help_topics/hooks.txt:264
12301
#: en/help_topics/hooks.txt:261
12545
12302
msgid ""
12546
12303
"Invoked after a repository has been initialized. post_repo_init is\n"
12547
12304
"called with a bzrlib.controldir.RepoInitHookParams."
12548
12305
msgstr ""
12549
12306
12307
#: en/help_topics/hooks.txt:264
12308
msgid ""
12309
"pre_open\n"
12310
"~~~~~~~~"
12311
msgstr ""
12312
12550
12313
#: en/help_topics/hooks.txt:267
12551
msgid ""
12552
"pre_open\n"
12553
"~~~~~~~~"
12554
msgstr ""
12555
12556
#: en/help_topics/hooks.txt:270
12557
12314
msgid "Introduced in: 1.14"
12558
12315
msgstr ""
12559
12316
12560
#: en/help_topics/hooks.txt:272
12317
#: en/help_topics/hooks.txt:269
12561
12318
msgid ""
12562
12319
"Invoked before attempting to open a ControlDir with the transport that\n"
12563
12320
"the open will use."
12564
12321
msgstr ""
12565
12322
12323
#: en/help_topics/hooks.txt:272
12324
msgid ""
12325
"InfoHooks\n"
12326
"---------"
12327
msgstr ""
12328
12566
12329
#: en/help_topics/hooks.txt:275
12567
12330
msgid ""
12568
"InfoHooks\n"
12569
"---------"
12570
msgstr ""
12571
12572
#: en/help_topics/hooks.txt:278
12573
msgid ""
12574
12331
"repository\n"
12575
12332
"~~~~~~~~~~"
12576
12333
msgstr ""
12577
12334
12578
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12579
#: en/help_topics/hooks.txt:524
12335
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12336
#: en/help_topics/hooks.txt:521
12580
12337
msgid "Introduced in: 1.15"
12581
12338
msgstr ""
12582
12339
12583
#: en/help_topics/hooks.txt:283
12340
#: en/help_topics/hooks.txt:280
12584
12341
msgid ""
12585
12342
"Invoked when displaying the statistics for a repository. repository is\n"
12586
12343
"called with a statistics dictionary as returned by the repository and\n"
12587
12344
"a file-like object to write to."
12588
12345
msgstr ""
12589
12346
12347
#: en/help_topics/hooks.txt:284
12348
msgid ""
12349
"LockHooks\n"
12350
"---------"
12351
msgstr ""
12352
12590
12353
#: en/help_topics/hooks.txt:287
12591
12354
msgid ""
12592
"LockHooks\n"
12593
"---------"
12594
msgstr ""
12595
12596
#: en/help_topics/hooks.txt:290
12597
msgid ""
12598
12355
"lock_acquired\n"
12599
12356
"~~~~~~~~~~~~~"
12600
12357
msgstr ""
12601
12358
12602
#: en/help_topics/hooks.txt:295
12359
#: en/help_topics/hooks.txt:292
12603
12360
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12604
12361
msgstr ""
12605
12362
12606
#: en/help_topics/hooks.txt:297
12363
#: en/help_topics/hooks.txt:294
12607
12364
msgid ""
12608
12365
"lock_broken\n"
12609
12366
"~~~~~~~~~~~"
12610
12367
msgstr ""
12611
12368
12612
#: en/help_topics/hooks.txt:302
12369
#: en/help_topics/hooks.txt:299
12613
12370
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12614
12371
msgstr ""
12615
12372
12616
#: en/help_topics/hooks.txt:304
12373
#: en/help_topics/hooks.txt:301
12617
12374
msgid ""
12618
12375
"lock_released\n"
12619
12376
"~~~~~~~~~~~~~"
12620
12377
msgstr ""
12621
12378
12622
#: en/help_topics/hooks.txt:309
12379
#: en/help_topics/hooks.txt:306
12623
12380
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
12624
12381
msgstr ""
12625
12382
12383
#: en/help_topics/hooks.txt:308
12384
msgid ""
12385
"MergeHooks\n"
12386
"----------"
12387
msgstr ""
12388
12626
12389
#: en/help_topics/hooks.txt:311
12627
12390
msgid ""
12628
"MergeHooks\n"
12629
"----------"
12391
"merge_file_content\n"
12392
"~~~~~~~~~~~~~~~~~~"
12630
12393
msgstr ""
12631
12394
12632
12395
#: en/help_topics/hooks.txt:314
12633
msgid ""
12634
"merge_file_content\n"
12635
"~~~~~~~~~~~~~~~~~~"
12636
msgstr ""
12637
12638
#: en/help_topics/hooks.txt:317
12639
12396
msgid "Introduced in: 2.1"
12640
12397
msgstr ""
12641
12398
12642
#: en/help_topics/hooks.txt:319
12399
#: en/help_topics/hooks.txt:316
12643
12400
msgid ""
12644
12401
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12645
12402
"object when starting a merge. Should return either None or a subclass\n"
12649
12406
"AbstractPerFileMerger API docs for details on how it is used by merge."
12650
12407
msgstr ""
12651
12408
12652
#: en/help_topics/hooks.txt:326
12409
#: en/help_topics/hooks.txt:323
12653
12410
msgid ""
12654
12411
"post_merge\n"
12655
12412
"~~~~~~~~~~"
12656
12413
msgstr ""
12657
12414
12658
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12659
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12660
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12415
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12416
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12417
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12661
12418
msgid "Introduced in: 2.5"
12662
12419
msgstr ""
12663
12420
12664
#: en/help_topics/hooks.txt:331
12421
#: en/help_topics/hooks.txt:328
12665
12422
msgid ""
12666
12423
"Called after a merge. Receives a Merger object as the single argument.\n"
12667
12424
"The return value is ignored."
12668
12425
msgstr ""
12669
12426
12670
#: en/help_topics/hooks.txt:334
12427
#: en/help_topics/hooks.txt:331
12671
12428
msgid ""
12672
12429
"pre_merge\n"
12673
12430
"~~~~~~~~~"
12674
12431
msgstr ""
12675
12432
12676
#: en/help_topics/hooks.txt:339
12433
#: en/help_topics/hooks.txt:336
12677
12434
msgid ""
12678
12435
"Called before a merge. Receives a Merger object as the single\n"
12679
12436
"argument."
12680
12437
msgstr ""
12681
12438
12439
#: en/help_topics/hooks.txt:339
12440
msgid ""
12441
"MergeDirectiveHooks\n"
12442
"-------------------"
12443
msgstr ""
12444
12682
12445
#: en/help_topics/hooks.txt:342
12683
12446
msgid ""
12684
"MergeDirectiveHooks\n"
12685
"-------------------"
12447
"merge_request_body\n"
12448
"~~~~~~~~~~~~~~~~~~"
12686
12449
msgstr ""
12687
12450
12688
12451
#: en/help_topics/hooks.txt:345
12689
msgid ""
12690
"merge_request_body\n"
12691
"~~~~~~~~~~~~~~~~~~"
12692
msgstr ""
12693
12694
#: en/help_topics/hooks.txt:348
12695
12452
msgid "Introduced in: 1.15.0"
12696
12453
msgstr ""
12697
12454
12698
#: en/help_topics/hooks.txt:350
12455
#: en/help_topics/hooks.txt:347
12699
12456
msgid ""
12700
12457
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12701
12458
"request. Callbacks must return a body. If more than one callback is\n"
12702
12459
"registered, the output of one callback is provided to the next."
12703
12460
msgstr ""
12704
12461
12462
#: en/help_topics/hooks.txt:351
12463
msgid ""
12464
"MessageEditorHooks\n"
12465
"------------------"
12466
msgstr ""
12467
12705
12468
#: en/help_topics/hooks.txt:354
12706
12469
msgid ""
12707
"MessageEditorHooks\n"
12708
"------------------"
12470
"commit_message_template\n"
12471
"~~~~~~~~~~~~~~~~~~~~~~~"
12709
12472
msgstr ""
12710
12473
12711
12474
#: en/help_topics/hooks.txt:357
12712
msgid ""
12713
"commit_message_template\n"
12714
"~~~~~~~~~~~~~~~~~~~~~~~"
12715
msgstr ""
12716
12717
#: en/help_topics/hooks.txt:360
12718
12475
msgid "Introduced in: 1.10"
12719
12476
msgstr ""
12720
12477
12721
#: en/help_topics/hooks.txt:362
12478
#: en/help_topics/hooks.txt:359
12722
12479
msgid ""
12723
12480
"Called when a commit message is being generated.\n"
12724
12481
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12729
12486
"second, and so on."
12730
12487
msgstr ""
12731
12488
12732
#: en/help_topics/hooks.txt:370
12489
#: en/help_topics/hooks.txt:367
12733
12490
msgid ""
12734
12491
"set_commit_message\n"
12735
12492
"~~~~~~~~~~~~~~~~~~"
12736
12493
msgstr ""
12737
12494
12738
#: en/help_topics/hooks.txt:375
12495
#: en/help_topics/hooks.txt:372
12739
12496
msgid ""
12740
12497
"Set a fixed commit message. set_commit_message is called with the\n"
12741
12498
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12744
12501
"should use the message editor as normal."
12745
12502
msgstr ""
12746
12503
12504
#: en/help_topics/hooks.txt:378
12505
msgid ""
12506
"MutableTreeHooks\n"
12507
"----------------"
12508
msgstr ""
12509
12747
12510
#: en/help_topics/hooks.txt:381
12748
12511
msgid ""
12749
"MutableTreeHooks\n"
12750
"----------------"
12751
msgstr ""
12752
12753
#: en/help_topics/hooks.txt:384
12754
msgid ""
12755
12512
"post_build_tree\n"
12756
12513
"~~~~~~~~~~~~~~~"
12757
12514
msgstr ""
12758
12515
12759
#: en/help_topics/hooks.txt:389
12516
#: en/help_topics/hooks.txt:386
12760
12517
msgid ""
12761
12518
"Called after a completely new tree is built. The hook is called with\n"
12762
12519
"the tree as its only argument."
12763
12520
msgstr ""
12764
12521
12765
#: en/help_topics/hooks.txt:395
12522
#: en/help_topics/hooks.txt:392
12766
12523
msgid "Introduced in: 2.0"
12767
12524
msgstr ""
12768
12525
12769
#: en/help_topics/hooks.txt:397
12526
#: en/help_topics/hooks.txt:394
12770
12527
msgid ""
12771
12528
"Called after a commit is performed on a tree. The hook is called with\n"
12772
12529
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12774
12531
"that object."
12775
12532
msgstr ""
12776
12533
12777
#: en/help_topics/hooks.txt:402
12534
#: en/help_topics/hooks.txt:399
12778
12535
msgid ""
12779
12536
"post_transform\n"
12780
12537
"~~~~~~~~~~~~~~"
12781
12538
msgstr ""
12782
12539
12783
#: en/help_topics/hooks.txt:407
12540
#: en/help_topics/hooks.txt:404
12784
12541
msgid ""
12785
12542
"Called after a tree transform has been performed on a tree. The hook\n"
12786
12543
"is called with the tree that is being transformed and the transform."
12787
12544
msgstr ""
12788
12545
12789
#: en/help_topics/hooks.txt:410
12546
#: en/help_topics/hooks.txt:407
12790
12547
msgid ""
12791
12548
"pre_transform\n"
12792
12549
"~~~~~~~~~~~~~"
12793
12550
msgstr ""
12794
12551
12795
#: en/help_topics/hooks.txt:415
12552
#: en/help_topics/hooks.txt:412
12796
12553
msgid ""
12797
12554
"Called before a tree transform on this tree. The hook is called with\n"
12798
12555
"the tree that is being transformed and the transform."
12799
12556
msgstr ""
12800
12557
12801
#: en/help_topics/hooks.txt:418
12558
#: en/help_topics/hooks.txt:415
12802
12559
msgid ""
12803
12560
"start_commit\n"
12804
12561
"~~~~~~~~~~~~"
12805
12562
msgstr ""
12806
12563
12807
#: en/help_topics/hooks.txt:423
12564
#: en/help_topics/hooks.txt:420
12808
12565
msgid ""
12809
12566
"Called before a commit is performed on a tree. The start commit hook\n"
12810
12567
"is able to change the tree before the commit takes place. start_commit\n"
12812
12569
"being performed on."
12813
12570
msgstr ""
12814
12571
12572
#: en/help_topics/hooks.txt:425
12573
msgid ""
12574
"SmartClientHooks\n"
12575
"----------------"
12576
msgstr ""
12577
12815
12578
#: en/help_topics/hooks.txt:428
12816
12579
msgid ""
12817
"SmartClientHooks\n"
12818
"----------------"
12580
"call\n"
12581
"~~~~"
12819
12582
msgstr ""
12820
12583
12821
12584
#: en/help_topics/hooks.txt:431
12822
msgid ""
12823
"call\n"
12824
"~~~~"
12825
msgstr ""
12826
12827
#: en/help_topics/hooks.txt:434
12828
12585
msgid "Introduced in: unknown"
12829
12586
msgstr ""
12830
12587
12831
#: en/help_topics/hooks.txt:436
12588
#: en/help_topics/hooks.txt:433
12832
12589
msgid ""
12833
12590
"Called when the smart client is submitting a request to the smart\n"
12834
12591
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12835
12592
"Streaming request bodies, and responses, are not accessible."
12836
12593
msgstr ""
12837
12594
12595
#: en/help_topics/hooks.txt:437
12596
msgid ""
12597
"SmartServerHooks\n"
12598
"----------------"
12599
msgstr ""
12600
12838
12601
#: en/help_topics/hooks.txt:440
12839
12602
msgid ""
12840
"SmartServerHooks\n"
12841
"----------------"
12842
msgstr ""
12843
12844
#: en/help_topics/hooks.txt:443
12845
msgid ""
12846
12603
"server_exception\n"
12847
12604
"~~~~~~~~~~~~~~~~"
12848
12605
msgstr ""
12849
12606
12850
#: en/help_topics/hooks.txt:448
12607
#: en/help_topics/hooks.txt:445
12851
12608
msgid ""
12852
12609
"Called by the bzr server when an exception occurs. server_exception is\n"
12853
12610
"called with the sys.exc_info() tuple return true for the hook if the\n"
12855
12612
"normally."
12856
12613
msgstr ""
12857
12614
12858
#: en/help_topics/hooks.txt:453
12615
#: en/help_topics/hooks.txt:450
12859
12616
msgid ""
12860
12617
"server_started\n"
12861
12618
"~~~~~~~~~~~~~~"
12862
12619
msgstr ""
12863
12620
12864
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12621
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12865
12622
msgid "Introduced in: 0.16"
12866
12623
msgstr ""
12867
12624
12868
#: en/help_topics/hooks.txt:458
12625
#: en/help_topics/hooks.txt:455
12869
12626
msgid ""
12870
12627
"Called by the bzr server when it starts serving a directory.\n"
12871
12628
"server_started is called with (backing urls, public url), where\n"
12874
12631
"served."
12875
12632
msgstr ""
12876
12633
12877
#: en/help_topics/hooks.txt:464
12634
#: en/help_topics/hooks.txt:461
12878
12635
msgid ""
12879
12636
"server_started_ex\n"
12880
12637
"~~~~~~~~~~~~~~~~~"
12881
12638
msgstr ""
12882
12639
12640
#: en/help_topics/hooks.txt:466
12641
msgid ""
12642
"Called by the bzr server when it starts serving a directory.\n"
12643
"server_started is called with (backing_urls, server_obj)."
12644
msgstr ""
12645
12883
12646
#: en/help_topics/hooks.txt:469
12884
12647
msgid ""
12885
"Called by the bzr server when it starts serving a directory.\n"
12886
"server_started is called with (backing_urls, server_obj)."
12887
msgstr ""
12888
12889
#: en/help_topics/hooks.txt:472
12890
msgid ""
12891
12648
"server_stopped\n"
12892
12649
"~~~~~~~~~~~~~~"
12893
12650
msgstr ""
12894
12651
12895
#: en/help_topics/hooks.txt:477
12652
#: en/help_topics/hooks.txt:474
12896
12653
msgid ""
12897
12654
"Called by the bzr server when it stops serving a directory.\n"
12898
12655
"server_stopped is called with the same parameters as the\n"
12899
12656
"server_started hook: (backing_urls, public_url)."
12900
12657
msgstr ""
12901
12658
12659
#: en/help_topics/hooks.txt:478
12660
msgid ""
12661
"StatusHooks\n"
12662
"-----------"
12663
msgstr ""
12664
12902
12665
#: en/help_topics/hooks.txt:481
12903
12666
msgid ""
12904
"StatusHooks\n"
12905
"-----------"
12906
msgstr ""
12907
12908
#: en/help_topics/hooks.txt:484
12909
msgid ""
12910
12667
"post_status\n"
12911
12668
"~~~~~~~~~~~"
12912
12669
msgstr ""
12913
12670
12914
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12671
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12915
12672
msgid "Introduced in: 2.3"
12916
12673
msgstr ""
12917
12674
12918
#: en/help_topics/hooks.txt:489
12675
#: en/help_topics/hooks.txt:486
12919
12676
msgid ""
12920
12677
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12921
12678
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12924
12681
"status command. to_file is the output stream for writing."
12925
12682
msgstr ""
12926
12683
12927
#: en/help_topics/hooks.txt:495
12684
#: en/help_topics/hooks.txt:492
12928
12685
msgid ""
12929
12686
"pre_status\n"
12930
12687
"~~~~~~~~~~"
12931
12688
msgstr ""
12932
12689
12933
#: en/help_topics/hooks.txt:500
12690
#: en/help_topics/hooks.txt:497
12934
12691
msgid ""
12935
12692
"Called with argument StatusHookParams before Bazaar displays the\n"
12936
12693
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12939
12696
"status command. to_file is the output stream for writing."
12940
12697
msgstr ""
12941
12698
12699
#: en/help_topics/hooks.txt:503
12700
msgid ""
12701
"TransportHooks\n"
12702
"--------------"
12703
msgstr ""
12704
12942
12705
#: en/help_topics/hooks.txt:506
12943
12706
msgid ""
12944
"TransportHooks\n"
12945
"--------------"
12946
msgstr ""
12947
12948
#: en/help_topics/hooks.txt:509
12949
msgid ""
12950
12707
"post_connect\n"
12951
12708
"~~~~~~~~~~~~"
12952
12709
msgstr ""
12953
12710
12954
#: en/help_topics/hooks.txt:514
12711
#: en/help_topics/hooks.txt:511
12955
12712
msgid ""
12956
12713
"Called after a new connection is established or a reconnect occurs.\n"
12957
12714
"The sole argument passed is either the connected transport or smart\n"
12958
12715
"medium instance."
12959
12716
msgstr ""
12960
12717
12718
#: en/help_topics/hooks.txt:515
12719
msgid ""
12720
"RioVersionInfoBuilderHooks\n"
12721
"--------------------------"
12722
msgstr ""
12723
12961
12724
#: en/help_topics/hooks.txt:518
12962
12725
msgid ""
12963
"RioVersionInfoBuilderHooks\n"
12964
"--------------------------"
12965
msgstr ""
12966
12967
#: en/help_topics/hooks.txt:521
12968
msgid ""
12969
12726
"revision\n"
12970
12727
"~~~~~~~~"
12971
12728
msgstr ""
12972
12729
12973
#: en/help_topics/hooks.txt:526
12730
#: en/help_topics/hooks.txt:523
12974
12731
msgid ""
12975
12732
"Invoked when adding information about a revision to the RIO stanza\n"
12976
12733
"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