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