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