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