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