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