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