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