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