« back to all changes in this revision
Viewing changes to po/it.po
- browse files at revision 6609.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6609.1.1
- Committer: Vincent Ladeuil
- Date: 2016-01-21 09:52:36 UTC
- mto: This revision was merged to the branch mainline in revision 6611.
- Revision ID: v.ladeuil+lp@free.fr-20160121095236-iandk0fic0phu9ey
Fix the failing gpg test on wily.
- files added:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- .bzrignore
added
removed
po/it.po
1
# Italian translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
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"
13
"Language-Team: Italian <it@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
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"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr "Rimozione dallo stack"
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:2957
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
41
#: bzrlib/branch.py:2960
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:2962
46
msgid "No new revisions to push."
47
msgstr "Nessuna nuova revisione da caricare."
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr "controllato branch {0} formato {1}"
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr "trovato errore:%s"
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignorati i file al di fuori della visualizzazione, che è %s"
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
"bzr %s --revision richiede esattamente un identificativo di revisione"
68
69
#: bzrlib/builtins.py:315
70
msgid "Display status summary."
71
msgstr "Visualizza un riepilogo dello stato"
72
73
#: bzrlib/builtins.py:317
74
msgid ""
75
"This reports on versioned and unknown files, reporting them\n"
76
"grouped by state. Possible states are:"
77
msgstr ""
78
79
#: bzrlib/builtins.py:320
80
msgid ""
81
"added\n"
82
" Versioned in the working copy but not in the previous revision."
83
msgstr ""
84
85
#: bzrlib/builtins.py:323
86
msgid ""
87
"removed\n"
88
" Versioned in the previous revision but removed or deleted\n"
89
" in the working copy."
90
msgstr ""
91
92
#: bzrlib/builtins.py:327
93
msgid ""
94
"renamed\n"
95
" Path of this file changed from the previous revision;\n"
96
" the text may also have changed. This includes files whose\n"
97
" parent directory was renamed."
98
msgstr ""
99
"Rinominato\n"
100
" Il percorso del file è stato modificato rispetto alla revisione "
101
"precedente;\n"
102
" è possibile che anche il testo sia stato modificato. Sono inclusi file "
103
"la cui\n"
104
" directory superiore è stata rinominata."
105
106
#: bzrlib/builtins.py:332
107
msgid ""
108
"modified\n"
109
" Text has changed since the previous revision."
110
msgstr ""
111
"Modificato\n"
112
" Il testo è stato modificato rispetto alla revisione precedente."
113
114
#: bzrlib/builtins.py:335
115
msgid ""
116
"kind changed\n"
117
" File kind has been changed (e.g. from file to directory)."
118
msgstr ""
119
"Tipo modificato\n"
120
" La tipologia del file è stata modificata (per es. da file a directory)."
121
122
#: bzrlib/builtins.py:338
123
msgid ""
124
"unknown\n"
125
" Not versioned and not matching an ignore pattern."
126
msgstr ""
127
128
#: bzrlib/builtins.py:341
129
msgid ""
130
"Additionally for directories, symlinks and files with a changed\n"
131
"executable bit, Bazaar indicates their type using a trailing\n"
132
"character: '/', '@' or '*' respectively. These decorations can be\n"
133
"disabled using the '--no-classify' option."
134
msgstr ""
135
136
#: bzrlib/builtins.py:346
137
msgid ""
138
"To see ignored files use 'bzr ignored'. For details on the\n"
139
"changes to file texts, use 'bzr diff'."
140
msgstr ""
141
"Per visualizzare i file ignorati, usare «bzr ignored». Per dettagli sulle \n"
142
"modifiche effettuate nei file di testo, usare «bzr diff»."
143
144
#: bzrlib/builtins.py:349
145
msgid ""
146
"Note that --short or -S gives status flags for each item, similar\n"
147
"to Subversion's status command. To get output similar to svn -q,\n"
148
"use bzr status -SV."
149
msgstr ""
150
"Notare che --short o -S fornisce per ciascun elemento indicatori di\n"
151
"stato simili a quelli del comando status di Subversion. Per ottenere\n"
152
"un output simile a quello di svn -q, usare bzr status -SV."
153
154
#: bzrlib/builtins.py:353
155
msgid ""
156
"If no arguments are specified, the status of the entire working\n"
157
"directory is shown. Otherwise, only the status of the specified\n"
158
"files or directories is reported. If a directory is given, status\n"
159
"is reported for everything inside that directory."
160
msgstr ""
161
"Se non vengono specificati argomenti, viene mostrato lo stato\n"
162
"dell'intera directory in uso, altrimenti viene riportato solo lo stato\n"
163
"dei file o delle directory specificati. Se viene indicata una directory,\n"
164
"sarà riportato lo stato del suo contenuto."
165
166
#: bzrlib/builtins.py:358
167
msgid ""
168
"Before merges are committed, the pending merge tip revisions are\n"
169
"shown. To see all pending merge revisions, use the -v option.\n"
170
"To skip the display of pending merge information altogether, use\n"
171
"the no-pending option or specify a file/directory."
172
msgstr ""
173
"Prima di rendere definitive le unioni, vengono mostrati i suggerimenti per\n"
174
"le revisioni in sospeso. Per visualizzare tutte le revisioni in attesa di "
175
"unione,\n"
176
"usare l'opzione -v. Per ignorare completamente tutte le informazioni in "
177
"attesa\n"
178
"di unione, usare l'opzione no-pending o specificare un file o una directory."
179
180
#: bzrlib/builtins.py:363
181
msgid ""
182
"To compare the working directory to a specific revision, pass a\n"
183
"single revision to the revision argument."
184
msgstr ""
185
"Per comparare la directory in uso con una specifica revisione, inserire una\n"
186
"singola revisione nel corrispondente argomento."
187
188
#: bzrlib/builtins.py:366
189
msgid ""
190
"To see which files have changed in a specific revision, or between\n"
191
"two revisions, pass a revision range to the revision argument.\n"
192
"This will produce the same results as calling 'bzr diff --summarize'."
193
msgstr ""
194
"Per visualizzare quali file sono stati modificati in una specifica "
195
"revisione, o fra\n"
196
"due revisioni, inserire un intervallo di revisioni nel corrispondente "
197
"argomento.\n"
198
"Ciò produrrà lo stesso risultato di «bzr diff --summarize»."
199
200
#: bzrlib/builtins.py:375
201
msgid "Use short status indicators."
202
msgstr "Usa indicatori di stato brevi"
203
204
#: bzrlib/builtins.py:377
205
msgid "Only show versioned files."
206
msgstr "Mostra solo i file con versione"
207
208
#: bzrlib/builtins.py:379
209
msgid "Don't show pending merges."
210
msgstr "Non mostra le unioni in sospeso"
211
212
#: bzrlib/builtins.py:382
213
msgid "Do not mark object type using indicator."
214
msgstr "Non indica la tipologia dell'oggetto"
215
216
#: bzrlib/builtins.py:397
217
msgid "bzr status --revision takes exactly one or two revision specifiers"
218
msgstr ""
219
"bzr status --revision richiede esattamente uno o due specificatori di "
220
"revisione"
221
222
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
223
msgid "You can only supply one of revision_id or --revision"
224
msgstr "È possibile fornire solo un identificativo di revisione o --revision"
225
226
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
227
msgid "You must supply either --revision or a revision_id"
228
msgstr "È necessario fornire o --revision o un identificativo di revisione"
229
230
#: bzrlib/builtins.py:451
231
#, python-format
232
msgid "Repository %r does not support access to raw revision texts"
233
msgstr ""
234
"Il repository %r non supporta l'accesso a testi di revisione non formattati"
235
236
#: bzrlib/builtins.py:462
237
msgid "The repository {0} contains no revision {1}."
238
msgstr "Il repository {0} non contiene alcuna revisione {1}."
239
240
#: bzrlib/builtins.py:469
241
msgid "You cannot specify a NULL revision."
242
msgstr "Non è possibile specificare una revisione NULL."
243
244
#: bzrlib/builtins.py:561
245
msgid "Remove the working tree from a given branch/checkout."
246
msgstr ""
247
"Rimuove l'albero di lavoro da un branch o da un checkout specificato."
248
249
#: bzrlib/builtins.py:563
250
msgid ""
251
"Since a lightweight checkout is little more than a working tree\n"
252
"this will refuse to run against one."
253
msgstr ""
254
"Non è possibile eseguire questo comando su di un checkout leggero, dal\n"
255
"momento che questo è leggermente superiore a un albero di lavoro."
256
257
#: bzrlib/builtins.py:566
258
msgid "To re-create the working tree, use \"bzr checkout\"."
259
msgstr "Per creare nuovamente l'albero di lavoro, usare «bzr checkout»."
260
261
#: bzrlib/builtins.py:572
262
msgid ""
263
"Remove the working tree even if it has uncommitted or shelved changes."
264
msgstr ""
265
266
#: bzrlib/builtins.py:586
267
msgid "No working tree to remove"
268
msgstr "Nessun albero di lavoro da rimuovere"
269
270
#: bzrlib/builtins.py:588
271
msgid "You cannot remove the working tree of a remote path"
272
msgstr "Impossibile rimuovere l'albero di lavoro di un percorso remoto."
273
274
#: bzrlib/builtins.py:597
275
msgid "You cannot remove the working tree from a lightweight checkout"
276
msgstr "Non è possibile rimuovere l'albero di lavoro da un checkout leggero"
277
278
#: bzrlib/builtins.py:637
279
msgid ""
280
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
281
"instead. Use \"--force\" if you are sure you want to reset the working tree."
282
msgstr ""
283
"L'albero non sembra essere danneggiato; probabilmente è necessario usare "
284
"«bzr revert». Usare «--force» se è necessario ripristinare l'albero di "
285
"lavoro."
286
287
#: bzrlib/builtins.py:648
288
msgid ""
289
", the header appears corrupt, try passing -r -1 to set the state to the last "
290
"commit"
291
msgstr ""
292
", l'header sembra danneggiato, provare a inserire -r -1 per impostare lo "
293
"stato dell'ultimo commit"
294
295
#: bzrlib/builtins.py:652
296
msgid "failed to reset the tree state{0}"
297
msgstr "Il ripristino dello stato dell'albero non è riuscito{0}"
298
299
#: bzrlib/builtins.py:656
300
msgid "Show current revision number."
301
msgstr "Mostra il numero di revisione corrente."
302
303
#: bzrlib/builtins.py:658
304
msgid "This is equal to the number of revisions on this branch."
305
msgstr ""
306
307
#: bzrlib/builtins.py:671
308
msgid "--tree and --revision can not be used together"
309
msgstr "--tree e --revision non possono essere utilizzati insieme"
310
311
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
312
msgid "Tags can only be placed on a single revision, not on a range"
313
msgstr ""
314
315
#: bzrlib/builtins.py:712
316
msgid "Show revno of working tree."
317
msgstr ""
318
319
#: bzrlib/builtins.py:760
320
msgid "Add specified files or directories."
321
msgstr ""
322
323
#: bzrlib/builtins.py:762
324
msgid ""
325
"In non-recursive mode, all the named items are added, regardless\n"
326
"of whether they were previously ignored. A warning is given if\n"
327
"any of the named files are already versioned."
328
msgstr ""
329
330
#: bzrlib/builtins.py:766
331
msgid ""
332
"In recursive mode (the default), files are treated the same way\n"
333
"but the behaviour for directories is different. Directories that\n"
334
"are already versioned do not give a warning. All directories,\n"
335
"whether already versioned or not, are searched for files or\n"
336
"subdirectories that are neither versioned or ignored, and these\n"
337
"are added. This search proceeds recursively into versioned\n"
338
"directories. If no names are given '.' is assumed."
339
msgstr ""
340
341
#: bzrlib/builtins.py:774
342
msgid ""
343
"A warning will be printed when nested trees are encountered,\n"
344
"unless they are explicitly ignored."
345
msgstr ""
346
347
#: bzrlib/builtins.py:777
348
msgid ""
349
"Therefore simply saying 'bzr add' will version all files that\n"
350
"are currently unknown."
351
msgstr ""
352
353
#: bzrlib/builtins.py:780
354
msgid ""
355
"Adding a file whose parent directory is not versioned will\n"
356
"implicitly add the parent, and so on up to the root. This means\n"
357
"you should never need to explicitly add a directory, they'll just\n"
358
"get added when you add a file in the directory."
359
msgstr ""
360
361
#: bzrlib/builtins.py:785
362
msgid ""
363
"--dry-run will show which files would be added, but not actually\n"
364
"add them."
365
msgstr ""
366
367
#: bzrlib/builtins.py:788
368
msgid ""
369
"--file-ids-from will try to use the file ids from the supplied path.\n"
370
"It looks up ids trying to find a matching parent directory with the\n"
371
"same filename, and then by pure path. This option is rarely needed\n"
372
"but can be useful when adding the same logical file into two\n"
373
"branches that will be merged later (without showing the two different\n"
374
"adds as a conflict). It is also useful when merging another project\n"
375
"into a subdirectory of this one."
376
msgstr ""
377
378
#: bzrlib/builtins.py:796
379
msgid ""
380
"Any files matching patterns in the ignore list will not be added\n"
381
"unless they are explicitly mentioned."
382
msgstr ""
383
384
#: bzrlib/builtins.py:799
385
msgid ""
386
"In recursive mode, files larger than the configuration option \n"
387
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
388
"to file size."
389
msgstr ""
390
391
#: bzrlib/builtins.py:806
392
msgid "Don't recursively add the contents of directories."
393
msgstr ""
394
395
#: bzrlib/builtins.py:813
396
msgid "Lookup file ids from this tree."
397
msgstr ""
398
399
#: bzrlib/builtins.py:849
400
msgid "ignored {0} matching \"{1}\"\n"
401
msgstr ""
402
403
#: bzrlib/builtins.py:854
404
msgid "Create a new versioned directory."
405
msgstr ""
406
407
#: bzrlib/builtins.py:856
408
msgid "This is equivalent to creating the directory and then adding it."
409
msgstr ""
410
411
#: bzrlib/builtins.py:863
412
msgid "No error if existing, make parent directories as needed."
413
msgstr ""
414
415
#: bzrlib/builtins.py:897
416
#, python-format
417
msgid "added %s\n"
418
msgstr ""
419
420
#: bzrlib/builtins.py:939
421
#, python-format
422
msgid "invalid kind %r specified"
423
msgstr ""
424
425
#: bzrlib/builtins.py:976
426
msgid "Move or rename a file."
427
msgstr ""
428
429
#: bzrlib/builtins.py:978
430
msgid " bzr mv SOURCE... DESTINATION"
431
msgstr ""
432
433
#: bzrlib/builtins.py:980
434
msgid ""
435
"If the last argument is a versioned directory, all the other names\n"
436
"are moved into it. Otherwise, there must be exactly two arguments\n"
437
"and the file is changed to a new name."
438
msgstr ""
439
440
#: bzrlib/builtins.py:984
441
msgid ""
442
"If OLDNAME does not exist on the filesystem but is versioned and\n"
443
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
444
"assumes that the file has been manually moved and only updates\n"
445
"its internal inventory to reflect that change.\n"
446
"The same is valid when moving many SOURCE files to a DESTINATION."
447
msgstr ""
448
449
#: bzrlib/builtins.py:990
450
msgid "Files cannot be moved between branches."
451
msgstr ""
452
453
#: bzrlib/builtins.py:997
454
msgid ""
455
"Move only the bzr identifier of the file, because the file has already been "
456
"moved."
457
msgstr ""
458
459
#: bzrlib/builtins.py:999
460
msgid "Automatically guess renames."
461
msgstr ""
462
463
#: bzrlib/builtins.py:1000
464
msgid "Avoid making changes when guessing renames."
465
msgstr ""
466
467
#: bzrlib/builtins.py:1009
468
msgid "--dry-run requires --auto."
469
msgstr ""
470
471
#: bzrlib/builtins.py:1013
472
msgid "missing file argument"
473
msgstr ""
474
475
#: bzrlib/builtins.py:1017
476
msgid "can not move root of branch"
477
msgstr ""
478
479
#: bzrlib/builtins.py:1023
480
msgid "Only one path may be specified to --auto."
481
msgstr ""
482
483
#: bzrlib/builtins.py:1026
484
msgid "--after cannot be specified with --auto."
485
msgstr ""
486
487
#: bzrlib/builtins.py:1062
488
msgid "to mv multiple files the destination must be a versioned directory"
489
msgstr ""
490
491
#: bzrlib/builtins.py:1114
492
msgid "Turn this branch into a mirror of another branch."
493
msgstr ""
494
495
#: bzrlib/builtins.py:1116
496
msgid ""
497
"By default, this command only works on branches that have not diverged.\n"
498
"Branches are considered diverged if the destination branch's most recent \n"
499
"commit is one that has not been merged (directly or indirectly) into the \n"
500
"parent."
501
msgstr ""
502
503
#: bzrlib/builtins.py:1121
504
msgid ""
505
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
506
"from one into the other. Once one branch has merged, the other should\n"
507
"be able to pull it again."
508
msgstr ""
509
510
#: bzrlib/builtins.py:1125
511
msgid ""
512
"If you want to replace your local changes and just want your branch to\n"
513
"match the remote one, use pull --overwrite. This will work even if the two\n"
514
"branches have diverged."
515
msgstr ""
516
517
#: bzrlib/builtins.py:1129
518
msgid ""
519
"If there is no default location set, the first pull will set it (use\n"
520
"--no-remember to avoid setting it). After that, you can omit the\n"
521
"location to use the default. To change the default, use --remember. The\n"
522
"value will only be saved if the remote location can be accessed."
523
msgstr ""
524
525
#: bzrlib/builtins.py:1134
526
msgid ""
527
"The --verbose option will display the revisions pulled using the log_format\n"
528
"configuration option. You can use a different format by overriding it with\n"
529
"-Olog_format=<other_format>."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1138
533
msgid ""
534
"Note: The location can be specified either in the form of a branch,\n"
535
"or in the form of a path to a file containing a merge directive generated\n"
536
"with bzr send."
537
msgstr ""
538
539
#: bzrlib/builtins.py:1146
540
msgid "Show logs of pulled revisions."
541
msgstr ""
542
543
#: bzrlib/builtins.py:1148
544
msgid ""
545
"Branch to pull into, rather than the one containing the working directory."
546
msgstr ""
547
548
#: bzrlib/builtins.py:1151
549
msgid ""
550
"Perform a local pull in a bound branch. Local pulls are not applied to the "
551
"master branch."
552
msgstr ""
553
554
#: bzrlib/builtins.py:1189
555
msgid "Need working tree for --show-base."
556
msgstr ""
557
558
#: bzrlib/builtins.py:1205
559
msgid "No pull location known or specified."
560
msgstr ""
561
562
#: bzrlib/builtins.py:1211
563
#, python-format
564
msgid "Using saved parent location: %s\n"
565
msgstr ""
566
567
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
568
msgid "Cannot use -r with merge directives or bundles"
569
msgstr ""
570
571
#: bzrlib/builtins.py:1261
572
msgid "Update a mirror of this branch."
573
msgstr ""
574
575
#: bzrlib/builtins.py:1263
576
msgid ""
577
"The target branch will not have its working tree populated because this\n"
578
"is both expensive, and is not supported on remote file systems."
579
msgstr ""
580
581
#: bzrlib/builtins.py:1266
582
msgid ""
583
"Some smart servers or protocols *may* put the working tree in place in\n"
584
"the future."
585
msgstr ""
586
587
#: bzrlib/builtins.py:1269
588
msgid ""
589
"This command only works on branches that have not diverged. Branches are\n"
590
"considered diverged if the destination branch's most recent commit is one\n"
591
"that has not been merged (directly or indirectly) by the source branch."
592
msgstr ""
593
594
#: bzrlib/builtins.py:1273
595
msgid ""
596
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
597
"the other branch completely, discarding its unmerged changes."
598
msgstr ""
599
600
#: bzrlib/builtins.py:1276
601
msgid ""
602
"If you want to ensure you have the different changes in the other branch,\n"
603
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
604
"After that you will be able to do a push without '--overwrite'."
605
msgstr ""
606
607
#: bzrlib/builtins.py:1280
608
msgid ""
609
"If there is no default push location set, the first push will set it (use\n"
610
"--no-remember to avoid setting it). After that, you can omit the\n"
611
"location to use the default. To change the default, use --remember. The\n"
612
"value will only be saved if the remote location can be accessed."
613
msgstr ""
614
615
#: bzrlib/builtins.py:1285
616
msgid ""
617
"The --verbose option will display the revisions pushed using the log_format\n"
618
"configuration option. You can use a different format by overriding it with\n"
619
"-Olog_format=<other_format>."
620
msgstr ""
621
"L'opzione --verbose visualizza le revisioni per le quali è stato effettuato "
622
"il push\n"
623
"usando l'opzione di configurazione log_format. È possibile usare un diverso\n"
624
"formato sovrascrivendolo con -Olog_format=<altro_formato>."
625
626
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
627
msgid ""
628
"Branch to push from, rather than the one containing the working directory."
629
msgstr ""
630
631
#: bzrlib/builtins.py:1299
632
msgid ""
633
"By default push will fail if the target directory exists, but does not "
634
"already have a control directory. This flag will allow push to proceed."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1304
638
msgid ""
639
"Create a stacked branch that references the public location of the parent "
640
"branch."
641
msgstr ""
642
643
#: bzrlib/builtins.py:1307
644
msgid ""
645
"Create a stacked branch that refers to another branch for the commit "
646
"history. Only the work not present in the referenced branch is included in "
647
"the branch created."
648
msgstr ""
649
650
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
651
msgid ""
652
"Refuse to push if there are uncommitted changes in the working tree, --no-"
653
"strict disables the check."
654
msgstr ""
655
656
#: bzrlib/builtins.py:1315
657
msgid "Don't populate the working tree, even for protocols that support it."
658
msgstr ""
659
660
#: bzrlib/builtins.py:1318
661
msgid "Overwrite tags only."
662
msgstr ""
663
664
#: bzrlib/builtins.py:1369
665
msgid "Could not determine branch to refer to."
666
msgstr ""
667
668
#: bzrlib/builtins.py:1378
669
#, python-format
670
msgid ""
671
"No push location known or specified. To push to the parent branch (at %s), "
672
"use 'bzr push :parent'."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
676
msgid "No push location known or specified."
677
msgstr "Non è stata specificata o non è nota una localizzazione per il push."
678
679
#: bzrlib/builtins.py:1388
680
#, python-format
681
msgid "Using saved push location: %s"
682
msgstr "Utilizzo di localizzazione memorizzata per il push: %s"
683
684
#: bzrlib/builtins.py:1398
685
msgid "Create a new branch that is a copy of an existing branch."
686
msgstr ""
687
688
#: bzrlib/builtins.py:1400
689
msgid ""
690
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
691
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
692
"./bar.\n"
693
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
694
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
695
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
696
"create ./foo-bar."
697
msgstr ""
698
"Se viene omesso TO_LOCATION, verrà usato l'ultimo componente del\n"
699
"FROM_LOCATION. In altri termini, «branch ../foo/bar» tenterà di creare "
700
"./bar.\n"
701
"Se non è incorporato nel FROM_LOCATION un «/» o un separatore di percorso,\n"
702
"il TO_LOCATION viene ricavato dal FROM_LOCATION separando uno schema\n"
703
"principale o un identificativo di drive, se esistenti. Per esempio,\n"
704
"«branch lp:foo-bar» tenterà di creare ./foo-bar."
705
706
#: bzrlib/builtins.py:1407
707
msgid ""
708
"To retrieve the branch as of a particular revision, supply the --revision\n"
709
"parameter, as in \"branch foo/bar -r 5\"."
710
msgstr ""
711
712
#: bzrlib/builtins.py:1410
713
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
714
msgstr ""
715
716
#: bzrlib/builtins.py:1420
717
msgid "Create a branch without a working-tree."
718
msgstr ""
719
720
#: bzrlib/builtins.py:1422
721
msgid "Switch the checkout in the current directory to the new branch."
722
msgstr ""
723
724
#: bzrlib/builtins.py:1425
725
msgid ""
726
"Create a stacked branch referring to the source branch. The new branch will "
727
"depend on the availability of the source branch for all operations."
728
msgstr ""
729
730
#: bzrlib/builtins.py:1429
731
msgid "Do not use a shared repository, even if available."
732
msgstr ""
733
734
#: bzrlib/builtins.py:1431
735
msgid ""
736
"By default branch will fail if the target directory exists, but does not "
737
"already have a control directory. This flag will allow branch to proceed."
738
msgstr ""
739
740
#: bzrlib/builtins.py:1436
741
msgid "Bind new branch to from location."
742
msgstr ""
743
744
#: bzrlib/builtins.py:1483
745
#, python-format
746
msgid "Target directory \"%s\" already exists."
747
msgstr ""
748
749
#: bzrlib/builtins.py:1495
750
#, python-format
751
msgid "Parent of \"%s\" does not exist."
752
msgstr ""
753
754
#: bzrlib/builtins.py:1514
755
msgid "The branch {0} has no revision {1}."
756
msgstr ""
757
758
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
759
#, python-format
760
msgid "Created new stacked branch referring to %s."
761
msgstr ""
762
763
#: bzrlib/builtins.py:1533
764
#, python-format
765
msgid "Branched %d revision."
766
msgid_plural "Branched %d revisions."
767
msgstr[0] ""
768
msgstr[1] ""
769
770
#: bzrlib/builtins.py:1538
771
#, python-format
772
msgid "New branch bound to %s"
773
msgstr ""
774
775
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
776
#, python-format
777
msgid "Switched to branch: %s"
778
msgstr ""
779
780
#: bzrlib/builtins.py:1548
781
msgid "List the branches available at the current location."
782
msgstr ""
783
784
#: bzrlib/builtins.py:1550
785
msgid ""
786
"This command will print the names of all the branches at the current\n"
787
"location."
788
msgstr ""
789
790
#: bzrlib/builtins.py:1557
791
msgid ""
792
"Recursively scan for branches rather than just looking in the specified "
793
"location."
794
msgstr ""
795
796
#: bzrlib/builtins.py:1586
797
msgid "(default)"
798
msgstr ""
799
800
#: bzrlib/builtins.py:1598
801
msgid "Create a new checkout of an existing branch."
802
msgstr ""
803
804
#: bzrlib/builtins.py:1600
805
msgid ""
806
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
807
"for\n"
808
"the branch found in '.'. This is useful if you have removed the working "
809
"tree\n"
810
"or if it was never created - i.e. if you pushed the branch to its current\n"
811
"location using SFTP."
812
msgstr ""
813
814
#: bzrlib/builtins.py:1605
815
msgid ""
816
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
817
"will\n"
818
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
819
"./bar.\n"
820
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
821
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
822
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
823
"create ./foo-bar."
824
msgstr ""
825
826
#: bzrlib/builtins.py:1612
827
msgid ""
828
"To retrieve the branch as of a particular revision, supply the --revision\n"
829
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
830
"immediately\n"
831
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
832
"old\n"
833
"code.)"
834
msgstr ""
835
836
#: bzrlib/builtins.py:1622
837
msgid ""
838
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
839
"the branch for every operation. Normal checkouts can perform common "
840
"operations like diff and status without such access, and also support local "
841
"commits."
842
msgstr ""
843
844
#: bzrlib/builtins.py:1629
845
msgid "Get file contents from this tree."
846
msgstr ""
847
848
#: bzrlib/builtins.py:1631
849
msgid "Hard-link working tree files where possible."
850
msgstr ""
851
852
#: bzrlib/builtins.py:1672
853
msgid ""
854
"Show list of renamed files.\n"
855
" "
856
msgstr ""
857
858
#: bzrlib/builtins.py:1700
859
msgid "Update a working tree to a new revision."
860
msgstr ""
861
862
#: bzrlib/builtins.py:1702
863
msgid ""
864
"This will perform a merge of the destination revision (the tip of the\n"
865
"branch, or the specified revision) into the working tree, and then make\n"
866
"that revision the basis revision for the working tree. "
867
msgstr ""
868
869
#: bzrlib/builtins.py:1706
870
msgid ""
871
"You can use this to visit an older revision, or to update a working tree\n"
872
"that is out of date from its branch."
873
msgstr ""
874
875
#: bzrlib/builtins.py:1709
876
msgid ""
877
"If there are any uncommitted changes in the tree, they will be carried\n"
878
"across and remain as uncommitted changes after the update. To discard\n"
879
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
880
"with the changes brought in by the change in basis revision."
881
msgstr ""
882
883
#: bzrlib/builtins.py:1714
884
msgid ""
885
"If the tree's branch is bound to a master branch, bzr will also update\n"
886
"the branch from the master."
887
msgstr ""
888
889
#: bzrlib/builtins.py:1717
890
msgid ""
891
"You cannot update just a single file or directory, because each Bazaar\n"
892
"working tree has just a single basis revision. If you want to restore a\n"
893
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
894
"update'. If you want to restore a file to its state in a previous\n"
895
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
896
"out the old content of that file to a new location."
897
msgstr ""
898
899
#: bzrlib/builtins.py:1724
900
msgid ""
901
"The 'dir' argument, if given, must be the location of the root of a\n"
902
"working tree to update. By default, the working tree that contains the \n"
903
"current working directory is used."
904
msgstr ""
905
906
#: bzrlib/builtins.py:1740
907
msgid "bzr update --revision takes exactly one revision"
908
msgstr "bzr update --revision prende esattamente una revisione"
909
910
#: bzrlib/builtins.py:1748
911
msgid "bzr update can only update a whole tree, not a file or subdirectory"
912
msgstr ""
913
914
#: bzrlib/builtins.py:1779
915
msgid "Tree is up to date at revision {0} of branch {1}"
916
msgstr ""
917
918
#: bzrlib/builtins.py:1795
919
#, python-format
920
msgid ""
921
"branch has no revision %s\n"
922
"bzr update --revision only works for a revision in the branch history"
923
msgstr ""
924
925
#: bzrlib/builtins.py:1801
926
msgid "Updated to revision {0} of branch {1}"
927
msgstr ""
928
929
#: bzrlib/builtins.py:1805
930
msgid ""
931
"Your local commits will now show as pending merges with 'bzr status', and "
932
"can be committed with 'bzr commit'."
933
msgstr ""
934
935
#: bzrlib/builtins.py:1814
936
msgid "Show information about a working tree, branch or repository."
937
msgstr ""
938
939
#: bzrlib/builtins.py:1816
940
msgid ""
941
"This command will show all known locations and formats associated to the\n"
942
"tree, branch or repository."
943
msgstr ""
944
945
#: bzrlib/builtins.py:1819
946
msgid ""
947
"In verbose mode, statistical information is included with each report.\n"
948
"To see extended statistic information, use a verbosity level of 2 or\n"
949
"higher by specifying the verbose option multiple times, e.g. -vv."
950
msgstr ""
951
952
#: bzrlib/builtins.py:1823
953
msgid "Branches and working trees will also report any missing revisions."
954
msgstr ""
955
956
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
957
#: bzrlib/builtins.py:6466
958
msgid ":Examples:"
959
msgstr ""
960
961
#: bzrlib/builtins.py:1827
962
msgid " Display information on the format and related locations:"
963
msgstr ""
964
965
#: bzrlib/builtins.py:1829
966
msgid " bzr info"
967
msgstr ""
968
969
#: bzrlib/builtins.py:1831
970
msgid ""
971
" Display the above together with extended format information and\n"
972
" basic statistics (like the number of files in the working tree and\n"
973
" number of revisions in the branch and repository):"
974
msgstr ""
975
976
#: bzrlib/builtins.py:1835
977
msgid " bzr info -v"
978
msgstr ""
979
980
#: bzrlib/builtins.py:1837
981
msgid " Display the above together with number of committers to the branch:"
982
msgstr ""
983
984
#: bzrlib/builtins.py:1839
985
msgid " bzr info -vv"
986
msgstr ""
987
988
#: bzrlib/builtins.py:1858
989
msgid "Remove files or directories."
990
msgstr ""
991
992
#: bzrlib/builtins.py:1860
993
msgid ""
994
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
995
"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"
997
"parameters are given Bazaar will scan for files that are being tracked by\n"
998
"Bazaar but missing in your tree and stop tracking them for you."
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1868
1002
msgid "Only remove files that have never been committed."
1003
msgstr "Rimuove solo i file sui quali non è mai stato eseguito il commit."
1004
1005
#: bzrlib/builtins.py:1870
1006
msgid "The file deletion mode to be used."
1007
msgstr ""
1008
1009
#: bzrlib/builtins.py:1871
1010
msgid "Deletion Strategy"
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1872
1014
msgid "Backup changed files (default)."
1015
msgstr ""
1016
1017
#: bzrlib/builtins.py:1873
1018
msgid "Delete from bzr but leave the working copy."
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:1874
1022
msgid "Don't backup changed files."
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:1875
1026
msgid ""
1027
"Delete all the specified files, even if they can not be recovered and even "
1028
"if they are non-empty directories. (deprecated, use no-backup)"
1029
msgstr ""
1030
1031
#: bzrlib/builtins.py:1884
1032
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1033
msgstr ""
1034
1035
#: bzrlib/builtins.py:1901
1036
msgid "No matching files."
1037
msgstr ""
1038
1039
#: bzrlib/builtins.py:1962
1040
msgid "Reconcile bzr metadata in a branch."
1041
msgstr ""
1042
1043
#: bzrlib/builtins.py:1964
1044
msgid ""
1045
"This can correct data mismatches that may have been caused by\n"
1046
"previous ghost operations or bzr upgrades. You should only\n"
1047
"need to run this command if 'bzr check' or a bzr developer\n"
1048
"advises you to run it."
1049
msgstr ""
1050
1051
#: bzrlib/builtins.py:1969
1052
msgid ""
1053
"If a second branch is provided, cross-branch reconciliation is\n"
1054
"also attempted, which will check that data like the tree root\n"
1055
"id which was not present in very early bzr versions is represented\n"
1056
"correctly in both branches."
1057
msgstr ""
1058
1059
#: bzrlib/builtins.py:1974
1060
msgid ""
1061
"At the same time it is run it may recompress data resulting in\n"
1062
"a potential saving in disk space or performance gain."
1063
msgstr ""
1064
1065
#: bzrlib/builtins.py:1977
1066
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1067
msgstr ""
1068
1069
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1070
msgid ""
1071
"Format for the bzr 2.0 series.\n"
1072
"Uses group-compress storage.\n"
1073
"Provides rich roots which are a one-way transition.\n"
1074
msgstr ""
1075
1076
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1077
msgid ""
1078
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1079
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1080
msgstr ""
1081
1082
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1083
msgid "The 2a format with experimental support for colocated branches.\n"
1084
msgstr ""
1085
1086
#: bzrlib/builtins.py:2045
1087
msgid "Make a directory into a versioned branch."
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:2047
1091
msgid ""
1092
"Use this to create an empty branch, or before importing an\n"
1093
"existing project."
1094
msgstr ""
1095
1096
#: bzrlib/builtins.py:2050
1097
msgid ""
1098
"If there is a repository in a parent directory of the location, then\n"
1099
"the history of the branch will be stored in the repository. Otherwise\n"
1100
"init creates a standalone branch which carries its own history\n"
1101
"in the .bzr directory."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2055
1105
msgid ""
1106
"If there is already a branch at the location but it has no working tree,\n"
1107
"the tree can be populated with 'bzr checkout'."
1108
msgstr ""
1109
1110
#: bzrlib/builtins.py:2058
1111
msgid "Recipe for importing a tree of files::"
1112
msgstr ""
1113
1114
#: bzrlib/builtins.py:2060
1115
msgid ""
1116
" cd ~/project\n"
1117
" bzr init\n"
1118
" bzr add .\n"
1119
" bzr status\n"
1120
" bzr commit -m \"imported project\""
1121
msgstr ""
1122
1123
#: bzrlib/builtins.py:2071
1124
msgid ""
1125
"Create the path leading up to the branch if it does not already exist."
1126
msgstr ""
1127
1128
#: bzrlib/builtins.py:2074
1129
msgid "Specify a format for this branch. See \"help formats\"."
1130
msgstr ""
1131
1132
#: bzrlib/builtins.py:2082
1133
msgid ""
1134
"Never change revnos or the existing log. Append revisions to it only."
1135
msgstr ""
1136
1137
#: bzrlib/builtins.py:2085
1138
msgid "Create a branch without a working tree."
1139
msgstr ""
1140
1141
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1142
#, python-format
1143
msgid ""
1144
"Parent directory of %s does not exist.\n"
1145
"You may supply --create-prefix to create all leading parent directories."
1146
msgstr ""
1147
1148
#: bzrlib/builtins.py:2139
1149
msgid ""
1150
"This branch format cannot be set to append-revisions-only. Try --default."
1151
msgstr ""
1152
1153
#: bzrlib/builtins.py:2150
1154
msgid "Created a {0} (format: {1})\n"
1155
msgstr ""
1156
1157
#: bzrlib/builtins.py:2159
1158
#, python-format
1159
msgid "Using shared repository: %s\n"
1160
msgstr ""
1161
1162
#: bzrlib/builtins.py:2163
1163
msgid "Create a shared repository for branches to share storage space."
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2165
1167
msgid ""
1168
"New branches created under the repository directory will store their\n"
1169
"revisions in the repository, not in the branch directory. For branches\n"
1170
"with shared history, this reduces the amount of storage needed and \n"
1171
"speeds up the creation of new branches."
1172
msgstr ""
1173
1174
#: bzrlib/builtins.py:2170
1175
msgid ""
1176
"If the --no-trees option is given then the branches in the repository\n"
1177
"will not have working trees by default. They will still exist as \n"
1178
"directories on disk, but they will not have separate copies of the \n"
1179
"files at a certain revision. This can be useful for repositories that\n"
1180
"store branches which are interacted with through checkouts or remote\n"
1181
"branches, such as on a server."
1182
msgstr ""
1183
1184
#: bzrlib/builtins.py:2177
1185
msgid ""
1186
":Examples:\n"
1187
" Create a shared repository holding just branches::"
1188
msgstr ""
1189
1190
#: bzrlib/builtins.py:2180
1191
msgid ""
1192
" bzr init-repo --no-trees repo\n"
1193
" bzr init repo/trunk"
1194
msgstr ""
1195
1196
#: bzrlib/builtins.py:2183
1197
msgid " Make a lightweight checkout elsewhere::"
1198
msgstr ""
1199
1200
#: bzrlib/builtins.py:2185
1201
msgid ""
1202
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1203
" cd trunk-checkout\n"
1204
" (add files here)"
1205
msgstr ""
1206
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1207
" cd trunk-checkout\n"
1208
" (aggiunge file qui)"
1209
1210
#: bzrlib/builtins.py:2193
1211
msgid ""
1212
"Specify a format for this repository. See \"bzr help formats\" for details."
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2197
1216
msgid "Repository format"
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:2199
1220
msgid "Branches in the repository will default to not having a working tree."
1221
msgstr ""
1222
1223
#: bzrlib/builtins.py:2225
1224
msgid "Show differences in the working tree, between revisions or branches."
1225
msgstr ""
1226
1227
#: bzrlib/builtins.py:2227
1228
msgid ""
1229
"If no arguments are given, all changes for the current tree are listed.\n"
1230
"If files are given, only the changes in those files are listed.\n"
1231
"Remote and multiple branches can be compared by using the --old and\n"
1232
"--new options. If not provided, the default for both is derived from\n"
1233
"the first argument, if any, or the current tree if no arguments are\n"
1234
"given."
1235
msgstr ""
1236
1237
#: bzrlib/builtins.py:2234
1238
msgid ""
1239
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1240
"produces patches suitable for \"patch -p1\"."
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2237
1244
msgid ""
1245
"Note that when using the -r argument with a range of revisions, the\n"
1246
"differences are computed between the two specified revisions. That\n"
1247
"is, the command does not show the changes introduced by the first \n"
1248
"revision in the range. This differs from the interpretation of \n"
1249
"revision ranges used by \"bzr log\" which includes the first revision\n"
1250
"in the range."
1251
msgstr ""
1252
1253
#: bzrlib/builtins.py:2244
1254
msgid ""
1255
":Exit values:\n"
1256
" 1 - changed\n"
1257
" 2 - unrepresentable changes\n"
1258
" 3 - error\n"
1259
" 0 - no change"
1260
msgstr ""
1261
":Valori in uscita:\n"
1262
" 1 - modificato\n"
1263
" 2 - modifiche non rappresentabili\n"
1264
" 3 - errore\n"
1265
" 0 - nessuna modifica"
1266
1267
#: bzrlib/builtins.py:2250
1268
msgid ""
1269
":Examples:\n"
1270
" Shows the difference in the working tree versus the last commit::"
1271
msgstr ""
1272
1273
#: bzrlib/builtins.py:2253
1274
msgid " bzr diff"
1275
msgstr ""
1276
1277
#: bzrlib/builtins.py:2255
1278
msgid " Difference between the working tree and revision 1::"
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2257
1282
msgid " bzr diff -r1"
1283
msgstr ""
1284
1285
#: bzrlib/builtins.py:2259
1286
msgid " Difference between revision 3 and revision 1::"
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2261
1290
msgid " bzr diff -r1..3"
1291
msgstr ""
1292
1293
#: bzrlib/builtins.py:2263
1294
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2265
1298
msgid " bzr diff -r1..3 xxx"
1299
msgstr ""
1300
1301
#: bzrlib/builtins.py:2267
1302
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1303
msgstr ""
1304
1305
#: bzrlib/builtins.py:2269
1306
msgid " bzr diff -c2"
1307
msgstr ""
1308
1309
#: bzrlib/builtins.py:2271
1310
msgid ""
1311
" To see the changes introduced by revision X::\n"
1312
" \n"
1313
" bzr diff -cX"
1314
msgstr ""
1315
1316
#: bzrlib/builtins.py:2275
1317
msgid ""
1318
" Note that in the case of a merge, the -c option shows the changes\n"
1319
" compared to the left hand parent. To see the changes against\n"
1320
" another parent, use::"
1321
msgstr ""
1322
1323
#: bzrlib/builtins.py:2279
1324
msgid " bzr diff -r<chosen_parent>..X"
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2281
1328
msgid ""
1329
" The changes between the current revision and the previous revision\n"
1330
" (equivalent to -c-1 and -r-2..-1)"
1331
msgstr ""
1332
1333
#: bzrlib/builtins.py:2284
1334
msgid " bzr diff -r-2.."
1335
msgstr ""
1336
1337
#: bzrlib/builtins.py:2286
1338
msgid " Show just the differences for file NEWS::"
1339
msgstr ""
1340
1341
#: bzrlib/builtins.py:2288
1342
msgid " bzr diff NEWS"
1343
msgstr ""
1344
1345
#: bzrlib/builtins.py:2290
1346
msgid " Show the differences in working tree xxx for file NEWS::"
1347
msgstr ""
1348
1349
#: bzrlib/builtins.py:2292
1350
msgid " bzr diff xxx/NEWS"
1351
msgstr ""
1352
1353
#: bzrlib/builtins.py:2294
1354
msgid " Show the differences from branch xxx to this working tree:"
1355
msgstr ""
1356
1357
#: bzrlib/builtins.py:2296
1358
msgid " bzr diff --old xxx"
1359
msgstr ""
1360
1361
#: bzrlib/builtins.py:2298
1362
msgid " Show the differences between two branches for file NEWS::"
1363
msgstr ""
1364
1365
#: bzrlib/builtins.py:2300
1366
msgid " bzr diff --old xxx --new yyy NEWS"
1367
msgstr ""
1368
1369
#: bzrlib/builtins.py:2302
1370
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1371
msgstr ""
1372
1373
#: bzrlib/builtins.py:2304
1374
msgid ""
1375
" bzr diff --prefix old/:new/\n"
1376
" \n"
1377
" Show the differences using a custom diff program with options::\n"
1378
" \n"
1379
" bzr diff --using /usr/bin/diff --diff-options -wu"
1380
msgstr ""
1381
1382
#: bzrlib/builtins.py:2314
1383
msgid "Pass these options to the external diff program."
1384
msgstr ""
1385
1386
#: bzrlib/builtins.py:2317
1387
msgid ""
1388
"Set prefixes added to old and new filenames, as two values separated by a "
1389
"colon. (eg \"old/:new/\")."
1390
msgstr ""
1391
1392
#: bzrlib/builtins.py:2320
1393
msgid "Branch/tree to compare from."
1394
msgstr ""
1395
1396
#: bzrlib/builtins.py:2324
1397
msgid "Branch/tree to compare to."
1398
msgstr ""
1399
1400
#: bzrlib/builtins.py:2330
1401
msgid "Use this command to compare files."
1402
msgstr ""
1403
1404
#: bzrlib/builtins.py:2335
1405
msgid "Diff format to use."
1406
msgstr ""
1407
1408
#: bzrlib/builtins.py:2337
1409
msgid "Diff format"
1410
msgstr ""
1411
1412
#: bzrlib/builtins.py:2359
1413
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1414
msgstr ""
1415
1416
#: bzrlib/builtins.py:2363
1417
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1418
msgstr ""
1419
1420
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1421
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1422
msgid "{0} and {1} are mutually exclusive"
1423
msgstr ""
1424
1425
#: bzrlib/builtins.py:2388
1426
msgid ""
1427
"List files deleted in the working tree.\n"
1428
" "
1429
msgstr ""
1430
1431
#: bzrlib/builtins.py:2465
1432
msgid "Show the tree root directory."
1433
msgstr ""
1434
1435
#: bzrlib/builtins.py:2467
1436
msgid ""
1437
"The root is the nearest enclosing directory with a .bzr control\n"
1438
"directory."
1439
msgstr ""
1440
1441
#: bzrlib/builtins.py:2482
1442
msgid "The limit argument must be an integer."
1443
msgstr ""
1444
1445
#: bzrlib/builtins.py:2490
1446
msgid "The levels argument must be an integer."
1447
msgstr ""
1448
1449
#: bzrlib/builtins.py:2495
1450
msgid "Show historical log for a branch or subset of a branch."
1451
msgstr ""
1452
1453
#: bzrlib/builtins.py:2497
1454
msgid ""
1455
"log is bzr's default tool for exploring the history of a branch.\n"
1456
"The branch to use is taken from the first parameter. If no parameters\n"
1457
"are given, the branch containing the working directory is logged.\n"
1458
"Here are some simple examples::"
1459
msgstr ""
1460
1461
#: bzrlib/builtins.py:2502
1462
msgid ""
1463
" bzr log log the current branch\n"
1464
" bzr log foo.py log a file in its branch\n"
1465
" bzr log http://server/branch log a branch on a server"
1466
msgstr ""
1467
1468
#: bzrlib/builtins.py:2506
1469
msgid ""
1470
"The filtering, ordering and information shown for each revision can\n"
1471
"be controlled as explained below. By default, all revisions are\n"
1472
"shown sorted (topologically) so that newer revisions appear before\n"
1473
"older ones and descendants always appear before ancestors. If displayed,\n"
1474
"merged revisions are shown indented under the revision in which they\n"
1475
"were merged."
1476
msgstr ""
1477
1478
#: bzrlib/builtins.py:2513
1479
msgid ":Output control:"
1480
msgstr ""
1481
1482
#: bzrlib/builtins.py:2515
1483
msgid ""
1484
" The log format controls how information about each revision is\n"
1485
" displayed. The standard log formats are called ``long``, ``short``\n"
1486
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1487
" for more details on log formats."
1488
msgstr ""
1489
1490
#: bzrlib/builtins.py:2520
1491
msgid ""
1492
" The following options can be used to control what information is\n"
1493
" displayed::"
1494
msgstr ""
1495
1496
#: bzrlib/builtins.py:2523
1497
msgid ""
1498
" -l N display a maximum of N revisions\n"
1499
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1500
" -v display a status summary (delta) for each revision\n"
1501
" -p display a diff (patch) for each revision\n"
1502
" --show-ids display revision-ids (and file-ids), not just revnos"
1503
msgstr ""
1504
1505
#: bzrlib/builtins.py:2529
1506
msgid ""
1507
" Note that the default number of levels to display is a function of the\n"
1508
" log format. If the -n option is not used, the standard log formats show\n"
1509
" just the top level (mainline)."
1510
msgstr ""
1511
1512
#: bzrlib/builtins.py:2533
1513
msgid ""
1514
" Status summaries are shown using status flags like A, M, etc. To see\n"
1515
" the changes explained using words like ``added`` and ``modified``\n"
1516
" instead, use the -vv option."
1517
msgstr ""
1518
1519
#: bzrlib/builtins.py:2537
1520
msgid ":Ordering control:"
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2539
1524
msgid ""
1525
" To display revisions from oldest to newest, use the --forward option.\n"
1526
" In most cases, using this option will have little impact on the total\n"
1527
" time taken to produce a log, though --forward does not incrementally\n"
1528
" display revisions like --reverse does when it can."
1529
msgstr ""
1530
1531
#: bzrlib/builtins.py:2544
1532
msgid ":Revision filtering:"
1533
msgstr ""
1534
1535
#: bzrlib/builtins.py:2546
1536
msgid ""
1537
" The -r option can be used to specify what revision or range of revisions\n"
1538
" to filter against. The various forms are shown below::"
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2549
1542
msgid ""
1543
" -rX display revision X\n"
1544
" -rX.. display revision X and later\n"
1545
" -r..Y display up to and including revision Y\n"
1546
" -rX..Y display from X to Y inclusive"
1547
msgstr ""
1548
1549
#: bzrlib/builtins.py:2554
1550
msgid ""
1551
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1552
" Some common examples are given below::"
1553
msgstr ""
1554
1555
#: bzrlib/builtins.py:2557
1556
msgid ""
1557
" -r-1 show just the tip\n"
1558
" -r-10.. show the last 10 mainline revisions\n"
1559
" -rsubmit:.. show what's new on this branch\n"
1560
" -rancestor:path.. show changes since the common ancestor of this\n"
1561
" branch and the one at location path\n"
1562
" -rdate:yesterday.. show changes since yesterday"
1563
msgstr ""
1564
" -r-1 visualizza solo il suggerimento\n"
1565
" -r-10.. visualizza le ultime 10 revisioni mainline\n"
1566
" -rsubmit:.. visualizza quanto di nuovo c'è sul branch\n"
1567
" -rancestor:path.. visualizza le modifiche rispetto al comune "
1568
"predecessore di questo\n"
1569
" branch e di quello nel percorso di locazione \n"
1570
" -rdate:yesterday.. visualizza le modifiche riespetto al giorno precedente"
1571
1572
#: bzrlib/builtins.py:2564
1573
msgid ""
1574
" When logging a range of revisions using -rX..Y, log starts at\n"
1575
" revision Y and searches back in history through the primary\n"
1576
" (\"left-hand\") parents until it finds X. When logging just the\n"
1577
" top level (using -n1), an error is reported if X is not found\n"
1578
" along the way. If multi-level logging is used (-n0), X may be\n"
1579
" a nested merge revision and the log will be truncated accordingly."
1580
msgstr ""
1581
1582
#: bzrlib/builtins.py:2571
1583
msgid ":Path filtering:"
1584
msgstr ""
1585
1586
#: bzrlib/builtins.py:2573
1587
msgid ""
1588
" If parameters are given and the first one is not a branch, the log\n"
1589
" will be filtered to show only those revisions that changed the\n"
1590
" nominated files or directories."
1591
msgstr ""
1592
1593
#: bzrlib/builtins.py:2577
1594
msgid ""
1595
" Filenames are interpreted within their historical context. To log a\n"
1596
" deleted file, specify a revision range so that the file existed at\n"
1597
" the end or start of the range."
1598
msgstr ""
1599
1600
#: bzrlib/builtins.py:2581
1601
msgid ""
1602
" Historical context is also important when interpreting pathnames of\n"
1603
" renamed files/directories. Consider the following example:"
1604
msgstr ""
1605
1606
#: bzrlib/builtins.py:2584
1607
msgid ""
1608
" * revision 1: add tutorial.txt\n"
1609
" * revision 2: modify tutorial.txt\n"
1610
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1611
msgstr ""
1612
" * revision 1: add tutorial.txt\n"
1613
" * revision 2: modify tutorial.txt\n"
1614
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1615
1616
#: bzrlib/builtins.py:2588
1617
msgid " In this case:"
1618
msgstr ""
1619
1620
#: bzrlib/builtins.py:2590
1621
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1622
msgstr ""
1623
1624
#: bzrlib/builtins.py:2592
1625
msgid ""
1626
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1627
msgstr ""
1628
1629
#: bzrlib/builtins.py:2594
1630
msgid ""
1631
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1632
" the original file in revision 2."
1633
msgstr ""
1634
1635
#: bzrlib/builtins.py:2597
1636
msgid ""
1637
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1638
" was no file called guide.txt in revision 2."
1639
msgstr ""
1640
1641
#: bzrlib/builtins.py:2600
1642
msgid ""
1643
" Renames are always followed by log. By design, there is no need to\n"
1644
" explicitly ask for this (and no way to stop logging a file back\n"
1645
" until it was last renamed)."
1646
msgstr ""
1647
1648
#: bzrlib/builtins.py:2604
1649
msgid ":Other filtering:"
1650
msgstr ""
1651
1652
#: bzrlib/builtins.py:2606
1653
msgid ""
1654
" The --match option can be used for finding revisions that match a\n"
1655
" regular expression in a commit message, committer, author or bug.\n"
1656
" Specifying the option several times will match any of the supplied\n"
1657
" expressions. --match-author, --match-bugs, --match-committer and\n"
1658
" --match-message can be used to only match a specific field."
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2612
1662
msgid ":Tips & tricks:"
1663
msgstr ""
1664
1665
#: bzrlib/builtins.py:2614
1666
msgid ""
1667
" GUI tools and IDEs are often better at exploring history than command\n"
1668
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1669
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1670
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1671
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1672
msgstr ""
1673
" Nell'esplorazione della cronologia gli strumenti GUI e gli IDE sono spesso "
1674
"migliori\n"
1675
" di quelli da riga di comando: può risultare preferibile qlog o viz da qbzr "
1676
"o bzr_gtk,\n"
1677
" la shell bzr-explorer o l'interfaccia web Loggerhead. Consultare la Guida "
1678
"ai\n"
1679
" plugin <http://doc.bazaar.canonical.com/plugins/en/> e\n"
1680
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1681
1682
#: bzrlib/builtins.py:2620
1683
msgid ""
1684
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2622
1688
msgid ""
1689
" [ALIASES]\n"
1690
" tip = log -r-1\n"
1691
" top = log -l10 --line\n"
1692
" show = log -v -p"
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2627
1696
msgid ""
1697
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1698
" will show the last 10 mainline revisions. To see the details of a\n"
1699
" particular revision X, ``bzr show -rX``."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2631
1703
msgid ""
1704
" If you are interested in looking deeper into a particular merge X,\n"
1705
" use ``bzr log -n0 -rX``."
1706
msgstr ""
1707
1708
#: bzrlib/builtins.py:2634
1709
msgid ""
1710
" ``bzr log -v`` on a branch with lots of history is currently\n"
1711
" very slow. A fix for this issue is currently under development.\n"
1712
" With or without that fix, it is recommended that a revision range\n"
1713
" be given when using the -v option."
1714
msgstr ""
1715
1716
#: bzrlib/builtins.py:2639
1717
msgid ""
1718
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1719
" used to find revisions matching user names, commit messages, etc.\n"
1720
" Among other features, this plugin can find all revisions containing\n"
1721
" a list of words but not others."
1722
msgstr ""
1723
1724
#: bzrlib/builtins.py:2644
1725
msgid ""
1726
" When exploring non-mainline history on large projects with deep\n"
1727
" history, the performance of log can be greatly improved by installing\n"
1728
" the historycache plugin. This plugin buffers historical information\n"
1729
" trading disk space for faster speed."
1730
msgstr ""
1731
1732
#: bzrlib/builtins.py:2653
1733
msgid "Show from oldest to newest."
1734
msgstr ""
1735
1736
#: bzrlib/builtins.py:2656
1737
msgid "Show files changed in each revision."
1738
msgstr ""
1739
1740
#: bzrlib/builtins.py:2662
1741
msgid "Show just the specified revision. See also \"help revisionspec\"."
1742
msgstr ""
1743
1744
#: bzrlib/builtins.py:2666
1745
msgid "What names to list as authors - first, all or committer."
1746
msgstr ""
1747
1748
#: bzrlib/builtins.py:2667
1749
msgid "Authors"
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2672
1753
msgid "Number of levels to display - 0 for all, 1 for flat."
1754
msgstr ""
1755
1756
#: bzrlib/builtins.py:2682
1757
msgid "Limit the output to the first N revisions."
1758
msgstr ""
1759
1760
#: bzrlib/builtins.py:2687
1761
msgid "Show changes made in each revision as a patch."
1762
msgstr ""
1763
1764
#: bzrlib/builtins.py:2689
1765
msgid "Show merged revisions like --levels 0 does."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2693
1769
msgid "Do not report commits with more than one parent."
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:2695
1773
msgid ""
1774
"Display only the revisions that are not part of both ancestries (require -"
1775
"rX..Y)."
1776
msgstr ""
1777
1778
#: bzrlib/builtins.py:2699
1779
msgid "Show digital signature validity."
1780
msgstr ""
1781
1782
#: bzrlib/builtins.py:2702
1783
msgid "Show revisions whose properties match this expression."
1784
msgstr ""
1785
1786
#: bzrlib/builtins.py:2706
1787
msgid "Show revisions whose message matches this expression."
1788
msgstr ""
1789
1790
#: bzrlib/builtins.py:2710
1791
msgid "Show revisions whose committer matches this expression."
1792
msgstr ""
1793
1794
#: bzrlib/builtins.py:2714
1795
msgid "Show revisions whose authors match this expression."
1796
msgstr ""
1797
"Visualizza le revisioni i cui autori corrispondono a questa espressione."
1798
1799
#: bzrlib/builtins.py:2718
1800
msgid "Show revisions whose bugs match this expression."
1801
msgstr ""
1802
"Visualizza le revisioni i cui bug corrispondono a questa espressione."
1803
1804
#: bzrlib/builtins.py:2772
1805
msgid "--exclude-common-ancestry requires -r with two revisions"
1806
msgstr ""
1807
1808
#: bzrlib/builtins.py:2800
1809
#, python-format
1810
msgid "Path unknown at end or start of revision range: %s"
1811
msgstr ""
1812
1813
#: bzrlib/builtins.py:2917
1814
#, python-format
1815
msgid "bzr %s doesn't accept two revisions in different branches."
1816
msgstr ""
1817
1818
#: bzrlib/builtins.py:2933
1819
#, python-format
1820
msgid "bzr %s --revision takes one or two values."
1821
msgstr ""
1822
1823
#: bzrlib/builtins.py:2978
1824
msgid ""
1825
"List files in a tree.\n"
1826
" "
1827
msgstr ""
1828
1829
#: bzrlib/builtins.py:2987
1830
msgid "Recurse into subdirectories."
1831
msgstr ""
1832
1833
#: bzrlib/builtins.py:2989
1834
msgid "Print paths relative to the root of the branch."
1835
msgstr ""
1836
1837
#: bzrlib/builtins.py:2991
1838
msgid "Print unknown files."
1839
msgstr ""
1840
1841
#: bzrlib/builtins.py:2992
1842
msgid "Print versioned files."
1843
msgstr ""
1844
1845
#: bzrlib/builtins.py:2995
1846
msgid "Print ignored files."
1847
msgstr ""
1848
1849
#: bzrlib/builtins.py:2997
1850
msgid "List entries of a particular kind: file, directory, symlink."
1851
msgstr ""
1852
1853
#: bzrlib/builtins.py:3010
1854
msgid "invalid kind specified"
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:3013
1858
msgid "Cannot set both --verbose and --null"
1859
msgstr ""
1860
1861
#: bzrlib/builtins.py:3022
1862
msgid "cannot specify both --from-root and PATH"
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:3109
1866
msgid "Ignore specified files or patterns."
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3111
1870
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:3113
1874
msgid ""
1875
"If a .bzrignore file does not exist, the ignore command\n"
1876
"will create one and add the specified files or patterns to the newly\n"
1877
"created file. The ignore command will also automatically add the \n"
1878
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1879
"the use of the ignore command will require an explicit add command."
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3119
1883
msgid ""
1884
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1885
"After adding, editing or deleting that file either indirectly by\n"
1886
"using this command or directly by using an editor, be sure to commit\n"
1887
"it."
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3124
1891
msgid ""
1892
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1893
"the global ignore file can be found in the application data directory as\n"
1894
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1895
"Global ignores are not touched by this command. The global ignore file\n"
1896
"can be edited directly using an editor."
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:3130
1900
msgid ""
1901
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1902
"precedence over regular ignores. Such exceptions are used to specify\n"
1903
"files that should be versioned which would otherwise be ignored."
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3134
1907
msgid ""
1908
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1909
"precedence over the '!' exception patterns."
1910
msgstr ""
1911
1912
#: bzrlib/builtins.py:3137
1913
msgid ""
1914
":Notes: \n"
1915
" \n"
1916
"* Ignore patterns containing shell wildcards must be quoted from\n"
1917
" the shell on Unix."
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:3142
1921
msgid ""
1922
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1923
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:3145
1927
msgid ""
1928
":Examples:\n"
1929
" Ignore the top level Makefile::"
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:3148
1933
msgid " bzr ignore ./Makefile"
1934
msgstr ""
1935
1936
#: bzrlib/builtins.py:3150
1937
msgid " Ignore .class files in all directories...::"
1938
msgstr ""
1939
1940
#: bzrlib/builtins.py:3152
1941
msgid " bzr ignore \"*.class\""
1942
msgstr ""
1943
1944
#: bzrlib/builtins.py:3154
1945
msgid " ...but do not ignore \"special.class\"::"
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:3156
1949
msgid " bzr ignore \"!special.class\""
1950
msgstr ""
1951
1952
#: bzrlib/builtins.py:3158
1953
msgid " Ignore files whose name begins with the \"#\" character::"
1954
msgstr ""
1955
1956
#: bzrlib/builtins.py:3160
1957
msgid " bzr ignore \"RE:^#\""
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1961
msgid " Ignore .o files under the lib directory::"
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3164
1965
msgid " bzr ignore \"lib/**/*.o\""
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3168
1969
msgid " bzr ignore \"RE:lib/.*\\.o\""
1970
msgstr ""
1971
1972
#: bzrlib/builtins.py:3170
1973
msgid " Ignore everything but the \"debian\" toplevel directory::"
1974
msgstr ""
1975
1976
#: bzrlib/builtins.py:3172
1977
msgid ""
1978
" bzr ignore \"RE:(?!debian/).*\"\n"
1979
" \n"
1980
" Ignore everything except the \"local\" toplevel directory,\n"
1981
" but always ignore autosave files ending in ~, even under local/::\n"
1982
" \n"
1983
" bzr ignore \"*\"\n"
1984
" bzr ignore \"!./local\"\n"
1985
" bzr ignore \"!!*~\""
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3186
1989
msgid "Display the default ignore rules that bzr uses."
1990
msgstr ""
1991
1992
#: bzrlib/builtins.py:3198
1993
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1994
msgstr ""
1995
1996
#: bzrlib/builtins.py:3209
1997
#, python-format
1998
msgid "Invalid ignore pattern found. %s"
1999
msgid_plural "Invalid ignore patterns found. %s"
2000
msgstr[0] ""
2001
msgstr[1] ""
2002
2003
#: bzrlib/builtins.py:3218
2004
msgid "NAME_PATTERN should not be an absolute path"
2005
msgstr ""
2006
2007
#: bzrlib/builtins.py:3231
2008
#, python-format
2009
msgid ""
2010
"Warning: the following files are version controlled and match your ignore "
2011
"pattern:\n"
2012
"%s\n"
2013
"These files will continue to be version controlled unless you 'bzr remove' "
2014
"them.\n"
2015
msgstr ""
2016
2017
#: bzrlib/builtins.py:3238
2018
msgid "List ignored files and the patterns that matched them."
2019
msgstr ""
2020
2021
#: bzrlib/builtins.py:3240
2022
msgid ""
2023
"List all the ignored files and the ignore pattern that caused the file to\n"
2024
"be ignored."
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3243
2028
msgid "Alternatively, to list just the files::"
2029
msgstr ""
2030
2031
#: bzrlib/builtins.py:3245
2032
msgid " bzr ls --ignored"
2033
msgstr ""
2034
2035
#: bzrlib/builtins.py:3279
2036
#, python-format
2037
msgid "not a valid revision-number: %r"
2038
msgstr ""
2039
2040
#: bzrlib/builtins.py:3286
2041
msgid ""
2042
"Export current or past revision to a destination directory or archive."
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3288
2046
msgid "If no revision is specified this exports the last committed revision."
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3290
2050
msgid ""
2051
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2052
"given, try to find the format with the extension. If no extension\n"
2053
"is found exports to a directory (equivalent to --format=dir)."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3294
2057
msgid ""
2058
"If root is supplied, it will be used as the root directory inside\n"
2059
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2060
"to the exported filename. The root option has no effect for 'dir' format."
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3298
2064
msgid ""
2065
"If branch is omitted then the branch containing the current working\n"
2066
"directory will be used."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3301
2070
msgid ""
2071
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2072
msgstr ""
2073
2074
#: bzrlib/builtins.py:3303
2075
msgid ""
2076
" ================= =========================\n"
2077
" Supported formats Autodetected by extension\n"
2078
" ================= =========================\n"
2079
" dir (none)\n"
2080
" tar .tar\n"
2081
" tbz2 .tar.bz2, .tbz2\n"
2082
" tgz .tar.gz, .tgz\n"
2083
" zip .zip\n"
2084
" ================= ========================="
2085
msgstr ""
2086
2087
#: bzrlib/builtins.py:3317
2088
msgid "Type of file to export to."
2089
msgstr ""
2090
2091
#: bzrlib/builtins.py:3320
2092
msgid "Apply content filters to export the convenient form."
2093
msgstr ""
2094
2095
#: bzrlib/builtins.py:3324
2096
msgid "Name of the root directory inside the exported file."
2097
msgstr ""
2098
2099
#: bzrlib/builtins.py:3326
2100
msgid ""
2101
"Set modification time of files to that of the last revision in which it was "
2102
"changed."
2103
msgstr ""
2104
2105
#: bzrlib/builtins.py:3329
2106
msgid ""
2107
"Export the working tree contents rather than that of the last revision."
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3348
2111
msgid "--uncommitted requires a working tree"
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3357
2115
#, python-format
2116
msgid "Unsupported export format: %s"
2117
msgstr ""
2118
2119
#: bzrlib/builtins.py:3361
2120
msgid ""
2121
"Write the contents of a file as of a given revision to standard output."
2122
msgstr ""
2123
2124
#: bzrlib/builtins.py:3363
2125
msgid "If no revision is nominated, the last revision is used."
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3365
2129
msgid ""
2130
"Note: Take care to redirect standard output when using this command on a\n"
2131
"binary file."
2132
msgstr ""
2133
2134
#: bzrlib/builtins.py:3371
2135
msgid "The path name in the old tree."
2136
msgstr ""
2137
2138
#: bzrlib/builtins.py:3372
2139
msgid "Apply content filters to display the convenience form."
2140
msgstr ""
2141
2142
#: bzrlib/builtins.py:3383
2143
msgid "bzr cat --revision takes exactly one revision specifier"
2144
msgstr ""
2145
2146
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2147
msgid "{0!r} is not present in revision {1}"
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3443
2151
msgid "Commit changes into a new revision."
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3445
2155
msgid ""
2156
"An explanatory message needs to be given for each commit. This is\n"
2157
"often done by using the --message option (getting the message from the\n"
2158
"command line) or by using the --file option (getting the message from\n"
2159
"a file). If neither of these options is given, an editor is opened for\n"
2160
"the user to enter the message. To see the changed files in the\n"
2161
"boilerplate text loaded into the editor, use the --show-diff option."
2162
msgstr ""
2163
2164
#: bzrlib/builtins.py:3452
2165
msgid ""
2166
"By default, the entire tree is committed and the person doing the\n"
2167
"commit is assumed to be the author. These defaults can be overridden\n"
2168
"as explained below."
2169
msgstr ""
2170
2171
#: bzrlib/builtins.py:3456
2172
msgid ":Selective commits:"
2173
msgstr ""
2174
2175
#: bzrlib/builtins.py:3458
2176
msgid ""
2177
" If selected files are specified, only changes to those files are\n"
2178
" committed. If a directory is specified then the directory and\n"
2179
" everything within it is committed."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3462
2183
msgid ""
2184
" When excludes are given, they take precedence over selected files.\n"
2185
" For example, to commit only changes within foo, but not changes\n"
2186
" within foo/bar::"
2187
msgstr ""
2188
2189
#: bzrlib/builtins.py:3466
2190
msgid " bzr commit foo -x foo/bar"
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3468
2194
msgid " A selective commit after a merge is not yet supported."
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3470
2198
msgid ":Custom authors:"
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3472
2202
msgid ""
2203
" If the author of the change is not the same person as the committer,\n"
2204
" you can specify the author's name using the --author option. The\n"
2205
" name should be in the same format as a committer-id, e.g.\n"
2206
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2207
" the change you can specify the option multiple times, once for each\n"
2208
" author."
2209
msgstr ""
2210
2211
#: bzrlib/builtins.py:3479
2212
msgid ":Checks:"
2213
msgstr ""
2214
2215
#: bzrlib/builtins.py:3481
2216
msgid ""
2217
" A common mistake is to forget to add a new file or directory before\n"
2218
" running the commit command. The --strict option checks for unknown\n"
2219
" files and aborts the commit if any are found. More advanced pre-commit\n"
2220
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2221
" for details."
2222
msgstr ""
2223
2224
#: bzrlib/builtins.py:3487
2225
msgid ":Things to note:"
2226
msgstr ""
2227
2228
#: bzrlib/builtins.py:3489
2229
msgid ""
2230
" If you accidentially commit the wrong changes or make a spelling\n"
2231
" mistake in the commit message say, you can use the uncommit command\n"
2232
" to undo it. See ``bzr help uncommit`` for details."
2233
msgstr ""
2234
2235
#: bzrlib/builtins.py:3493
2236
msgid ""
2237
" Hooks can also be configured to run after a commit. This allows you\n"
2238
" to trigger updates to external systems like bug trackers. The --fixes\n"
2239
" option can be used to record the association between a revision and\n"
2240
" one or more bugs. See ``bzr help bugs`` for details."
2241
msgstr ""
2242
2243
#: bzrlib/builtins.py:3503
2244
msgid "Do not consider changes made to a given path."
2245
msgstr ""
2246
2247
#: bzrlib/builtins.py:3506
2248
msgid "Description of the new revision."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3509
2252
msgid "Commit even if nothing has changed."
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:3513
2256
msgid "Take commit message from this file."
2257
msgstr ""
2258
2259
#: bzrlib/builtins.py:3515
2260
msgid "Refuse to commit if there are unknown files in the working tree."
2261
msgstr ""
2262
2263
#: bzrlib/builtins.py:3518
2264
msgid ""
2265
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2266
"08:00:00 +0100'."
2267
msgstr ""
2268
2269
#: bzrlib/builtins.py:3521
2270
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2271
msgstr ""
2272
2273
#: bzrlib/builtins.py:3524
2274
msgid "Set the author's name, if it's different from the committer."
2275
msgstr ""
2276
2277
#: bzrlib/builtins.py:3527
2278
msgid ""
2279
"Perform a local commit in a bound branch. Local commits are not pushed to "
2280
"the master branch until a normal commit is performed."
2281
msgstr ""
2282
2283
#: bzrlib/builtins.py:3533
2284
msgid ""
2285
"When no message is supplied, show the diff along with the status summary in "
2286
"the message editor."
2287
msgstr ""
2288
2289
#: bzrlib/builtins.py:3536
2290
msgid ""
2291
"When committing to a foreign version control system do not push data that "
2292
"can not be natively represented."
2293
msgstr ""
2294
2295
#: bzrlib/builtins.py:3554
2296
#, python-format
2297
msgid ""
2298
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2299
"default bug tracker using the `bugtracker` option.\n"
2300
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2301
msgstr ""
2302
2303
#: bzrlib/builtins.py:3563
2304
#, python-format
2305
msgid ""
2306
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2307
"for more information on this feature.\n"
2308
"Commit refused."
2309
msgstr ""
2310
2311
#: bzrlib/builtins.py:3572
2312
#, python-format
2313
msgid "Unrecognized bug %s. Commit refused."
2314
msgstr ""
2315
2316
#: bzrlib/builtins.py:3575
2317
#, python-format
2318
msgid ""
2319
"%s\n"
2320
"Commit refused."
2321
msgstr ""
2322
2323
#: bzrlib/builtins.py:3599
2324
msgid "Could not parse --commit-time: "
2325
msgstr ""
2326
2327
#: bzrlib/builtins.py:3639
2328
msgid "please specify either --message or --file"
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3668
2332
msgid "please specify a commit message with either --message or --file"
2333
msgstr ""
2334
2335
#: bzrlib/builtins.py:3671
2336
msgid ""
2337
"Empty commit message specified. Please specify a commit message with either -"
2338
"-message or --file or leave a blank message with --message \"\"."
2339
msgstr ""
2340
2341
#: bzrlib/builtins.py:3691
2342
msgid ""
2343
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2344
"-unchanged to force an empty commit."
2345
msgstr ""
2346
2347
#: bzrlib/builtins.py:3695
2348
msgid ""
2349
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2350
"resolve FILE\" to resolve."
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3699
2354
msgid "Commit refused because there are unknown files in the working tree."
2355
msgstr ""
2356
2357
#: bzrlib/builtins.py:3702
2358
msgid ""
2359
"\n"
2360
"To commit to master branch, run update and then commit.\n"
2361
"You can also pass --local to commit to continue working disconnected."
2362
msgstr ""
2363
2364
#: bzrlib/builtins.py:3710
2365
msgid ""
2366
"Validate working tree structure, branch consistency and repository history."
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3712
2370
msgid ""
2371
"This command checks various invariants about branch and repository storage\n"
2372
"to detect data corruption or bzr bugs."
2373
msgstr ""
2374
2375
#: bzrlib/builtins.py:3715
2376
msgid ""
2377
"The working tree and branch checks will only give output if a problem is\n"
2378
"detected. The output fields of the repository check are:"
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3718
2382
msgid ""
2383
"revisions\n"
2384
" This is just the number of revisions checked. It doesn't\n"
2385
" indicate a problem."
2386
msgstr ""
2387
2388
#: bzrlib/builtins.py:3722
2389
msgid ""
2390
"versionedfiles\n"
2391
" This is just the number of versionedfiles checked. It\n"
2392
" doesn't indicate a problem."
2393
msgstr ""
2394
2395
#: bzrlib/builtins.py:3726
2396
msgid ""
2397
"unreferenced ancestors\n"
2398
" Texts that are ancestors of other texts, but\n"
2399
" are not properly referenced by the revision ancestry. This is a\n"
2400
" subtle problem that Bazaar can work around."
2401
msgstr ""
2402
2403
#: bzrlib/builtins.py:3731
2404
msgid ""
2405
"unique file texts\n"
2406
" This is the total number of unique file contents\n"
2407
" seen in the checked revisions. It does not indicate a problem."
2408
msgstr ""
2409
2410
#: bzrlib/builtins.py:3735
2411
msgid ""
2412
"repeated file texts\n"
2413
" This is the total number of repeated texts seen\n"
2414
" in the checked revisions. Texts can be repeated when their file\n"
2415
" entries are modified, but the file contents are not. It does not\n"
2416
" indicate a problem."
2417
msgstr ""
2418
2419
#: bzrlib/builtins.py:3741
2420
msgid ""
2421
"If no restrictions are specified, all Bazaar data that is found at the "
2422
"given\n"
2423
"location will be checked."
2424
msgstr ""
2425
2426
#: bzrlib/builtins.py:3746
2427
msgid " Check the tree and branch at 'foo'::"
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3748
2431
msgid " bzr check --tree --branch foo"
2432
msgstr ""
2433
2434
#: bzrlib/builtins.py:3750
2435
msgid " Check only the repository at 'bar'::"
2436
msgstr ""
2437
2438
#: bzrlib/builtins.py:3752
2439
msgid " bzr check --repo bar"
2440
msgstr ""
2441
2442
#: bzrlib/builtins.py:3754
2443
msgid " Check everything at 'baz'::"
2444
msgstr ""
2445
2446
#: bzrlib/builtins.py:3756
2447
msgid " bzr check baz"
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3762
2451
msgid "Check the branch related to the current directory."
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3764
2455
msgid "Check the repository related to the current directory."
2456
msgstr ""
2457
2458
#: bzrlib/builtins.py:3766
2459
msgid "Check the working tree related to the current directory."
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3780
2463
msgid "Upgrade a repository, branch or working tree to a newer format."
2464
msgstr ""
2465
2466
#: bzrlib/builtins.py:3782
2467
msgid ""
2468
"When the default format has changed after a major new release of\n"
2469
"Bazaar, you may be informed during certain operations that you\n"
2470
"should upgrade. Upgrading to a newer format may improve performance\n"
2471
"or make new features available. It may however limit interoperability\n"
2472
"with older repositories or with older versions of Bazaar."
2473
msgstr ""
2474
2475
#: bzrlib/builtins.py:3788
2476
msgid ""
2477
"If you wish to upgrade to a particular format rather than the\n"
2478
"current default, that can be specified using the --format option.\n"
2479
"As a consequence, you can use the upgrade command this way to\n"
2480
"\"downgrade\" to an earlier format, though some conversions are\n"
2481
"a one way process (e.g. changing from the 1.x default to the\n"
2482
"2.x default) so downgrading is not always possible."
2483
msgstr ""
2484
2485
#: bzrlib/builtins.py:3795
2486
msgid ""
2487
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2488
"process (where # is a number). By default, this is left there on\n"
2489
"completion. If the conversion fails, delete the new .bzr directory\n"
2490
"and rename this one back in its place. Use the --clean option to ask\n"
2491
"for the backup.bzr directory to be removed on successful conversion.\n"
2492
"Alternatively, you can delete it by hand if everything looks good\n"
2493
"afterwards."
2494
msgstr ""
2495
2496
#: bzrlib/builtins.py:3803
2497
msgid ""
2498
"If the location given is a shared repository, dependent branches\n"
2499
"are also converted provided the repository converts successfully.\n"
2500
"If the conversion of a branch fails, remaining branches are still\n"
2501
"tried."
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3808
2505
msgid ""
2506
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2507
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3816
2511
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3820
2515
msgid "Branch format"
2516
msgstr ""
2517
2518
#: bzrlib/builtins.py:3822
2519
msgid "Remove the backup.bzr directory if successful."
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3824
2523
msgid "Show what would be done, but don't actually do anything."
2524
msgstr ""
2525
2526
#: bzrlib/builtins.py:3839
2527
msgid "Show or set bzr user id."
2528
msgstr ""
2529
2530
#: bzrlib/builtins.py:3841
2531
msgid ""
2532
":Examples:\n"
2533
" Show the email of the current user::"
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:3844
2537
msgid " bzr whoami --email"
2538
msgstr ""
2539
2540
#: bzrlib/builtins.py:3846
2541
msgid " Set the current user::"
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:3848
2545
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2546
msgstr ""
2547
2548
#: bzrlib/builtins.py:3852
2549
msgid "Display email address only."
2550
msgstr ""
2551
2552
#: bzrlib/builtins.py:3854
2553
msgid "Set identity for the current branch instead of globally."
2554
msgstr ""
2555
2556
#: bzrlib/builtins.py:3880
2557
msgid "--email can only be used to display existing identity"
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:3904
2561
msgid "Print or set the branch nickname."
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:3906
2565
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."
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:3910
2572
msgid ""
2573
"Bound branches use the nickname of its master branch unless it is set\n"
2574
"locally."
2575
msgstr ""
2576
2577
#: bzrlib/builtins.py:3930
2578
msgid "Set/unset and display aliases."
2579
msgstr ""
2580
2581
#: bzrlib/builtins.py:3932
2582
msgid ""
2583
":Examples:\n"
2584
" Show the current aliases::"
2585
msgstr ""
2586
2587
#: bzrlib/builtins.py:3935
2588
msgid " bzr alias"
2589
msgstr ""
2590
2591
#: bzrlib/builtins.py:3937
2592
msgid " Show the alias specified for 'll'::"
2593
msgstr ""
2594
2595
#: bzrlib/builtins.py:3939
2596
msgid " bzr alias ll"
2597
msgstr ""
2598
2599
#: bzrlib/builtins.py:3941
2600
msgid " Set an alias for 'll'::"
2601
msgstr ""
2602
2603
#: bzrlib/builtins.py:3943
2604
msgid " bzr alias ll=\"log --line -r-10..-1\""
2605
msgstr ""
2606
2607
#: bzrlib/builtins.py:3945
2608
msgid " To remove an alias for 'll'::"
2609
msgstr ""
2610
2611
#: bzrlib/builtins.py:3947
2612
msgid " bzr alias --remove ll"
2613
msgstr ""
2614
2615
#: bzrlib/builtins.py:3952
2616
msgid "Remove the alias."
2617
msgstr ""
2618
2619
#: bzrlib/builtins.py:3970
2620
msgid "bzr alias --remove expects an alias to remove."
2621
msgstr ""
2622
2623
#: bzrlib/builtins.py:4151
2624
msgid ""
2625
"subunit not available. subunit needs to be installed to use --subunit."
2626
msgstr ""
2627
2628
#: bzrlib/builtins.py:4168
2629
msgid ""
2630
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2631
msgstr ""
2632
2633
#: bzrlib/builtins.py:4215
2634
msgid "Show version of bzr."
2635
msgstr ""
2636
2637
#: bzrlib/builtins.py:4219
2638
msgid "Print just the version number."
2639
msgstr ""
2640
2641
#: bzrlib/builtins.py:4238
2642
msgid "It sure does!\n"
2643
msgstr ""
2644
2645
#: bzrlib/builtins.py:4262
2646
#, python-format
2647
msgid "merge base is revision %s\n"
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:4266
2651
msgid "Perform a three-way merge."
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:4268
2655
msgid ""
2656
"The source of the merge can be specified either in the form of a branch,\n"
2657
"or in the form of a path to a file containing a merge directive generated\n"
2658
"with bzr send. If neither is specified, the default is the upstream branch\n"
2659
"or the branch most recently merged using --remember. The source of the\n"
2660
"merge may also be specified in the form of a path to a file in another\n"
2661
"branch: in this case, only the modifications to that file are merged into\n"
2662
"the current working tree."
2663
msgstr ""
2664
2665
#: bzrlib/builtins.py:4276
2666
msgid ""
2667
"When merging from a branch, by default bzr will try to merge in all new\n"
2668
"work from the other branch, automatically determining an appropriate base\n"
2669
"revision. If this fails, you may need to give an explicit base."
2670
msgstr ""
2671
2672
#: bzrlib/builtins.py:4280
2673
msgid ""
2674
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2675
"try to merge in all new work up to and including revision OTHER."
2676
msgstr ""
2677
2678
#: bzrlib/builtins.py:4283
2679
msgid ""
2680
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2681
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2682
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2683
"not already contain revision BASE, such a merge is commonly referred to as\n"
2684
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2685
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2686
"changes from the other branch is not stored in the commit."
2687
msgstr ""
2688
2689
#: bzrlib/builtins.py:4291
2690
msgid "Revision numbers are always relative to the source branch."
2691
msgstr ""
2692
2693
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2694
msgid ""
2695
"Merge will do its best to combine the changes in two branches, but there\n"
2696
"are some kinds of problems only a human can fix. When it encounters those,\n"
2697
"it will mark a conflict. A conflict means that you need to fix something,\n"
2698
"before you can commit."
2699
msgstr ""
2700
2701
#: bzrlib/builtins.py:4298
2702
msgid ""
2703
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2704
msgstr ""
2705
2706
#: bzrlib/builtins.py:4300
2707
msgid ""
2708
"If there is no default branch set, the first merge will set it (use\n"
2709
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2710
"to use the default. To change the default, use --remember. The value will\n"
2711
"only be saved if the remote location can be accessed."
2712
msgstr ""
2713
2714
#: bzrlib/builtins.py:4305
2715
msgid ""
2716
"The results of the merge are placed into the destination working\n"
2717
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2718
"committed to record the result of the merge."
2719
msgstr ""
2720
2721
#: bzrlib/builtins.py:4309
2722
msgid ""
2723
"merge refuses to run if there are any uncommitted changes, unless\n"
2724
"--force is given. If --force is given, then the changes from the source \n"
2725
"will be merged with the current working tree, including any uncommitted\n"
2726
"changes in the tree. The --force option can also be used to create a\n"
2727
"merge revision which has more than two parents."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:4315
2731
msgid ""
2732
"If one would like to merge changes from the working tree of the other\n"
2733
"branch without merging any committed revisions, the --uncommitted option\n"
2734
"can be given."
2735
msgstr ""
2736
2737
#: bzrlib/builtins.py:4319
2738
msgid ""
2739
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2740
"you to apply each diff hunk and file change, similar to \"shelve\"."
2741
msgstr ""
2742
2743
#: bzrlib/builtins.py:4322
2744
msgid ""
2745
":Examples:\n"
2746
" To merge all new revisions from bzr.dev::"
2747
msgstr ""
2748
2749
#: bzrlib/builtins.py:4325
2750
msgid " bzr merge ../bzr.dev"
2751
msgstr ""
2752
2753
#: bzrlib/builtins.py:4327
2754
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2755
msgstr ""
2756
2757
#: bzrlib/builtins.py:4329
2758
msgid " bzr merge -r 82 ../bzr.dev"
2759
msgstr ""
2760
2761
#: bzrlib/builtins.py:4331
2762
msgid " To merge the changes introduced by 82, without previous changes::"
2763
msgstr ""
2764
2765
#: bzrlib/builtins.py:4333
2766
msgid " bzr merge -r 81..82 ../bzr.dev"
2767
msgstr ""
2768
2769
#: bzrlib/builtins.py:4335
2770
msgid " To apply a merge directive contained in /tmp/merge::"
2771
msgstr ""
2772
2773
#: bzrlib/builtins.py:4337
2774
msgid " bzr merge /tmp/merge"
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4339
2778
msgid ""
2779
" To create a merge revision with three parents from two branches\n"
2780
" feature1a and feature1b:"
2781
msgstr ""
2782
2783
#: bzrlib/builtins.py:4342
2784
msgid ""
2785
" bzr merge ../feature1a\n"
2786
" bzr merge ../feature1b --force\n"
2787
" bzr commit -m 'revision with three parents'"
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4354
2791
msgid "Merge even if the destination tree has uncommitted changes."
2792
msgstr ""
2793
2794
#: bzrlib/builtins.py:4360
2795
msgid ""
2796
"Apply uncommitted changes from a working copy, instead of branch changes."
2797
msgstr ""
2798
2799
#: bzrlib/builtins.py:4362
2800
msgid ""
2801
"If the destination is already completely merged into the source, pull from "
2802
"the source rather than merging. When this happens, you do not need to "
2803
"commit the result."
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4367
2807
msgid ""
2808
"Branch to merge into, rather than the one containing the working directory."
2809
msgstr ""
2810
2811
#: bzrlib/builtins.py:4369
2812
msgid "Instead of merging, show a diff of the merge."
2813
msgstr ""
2814
2815
#: bzrlib/builtins.py:4371
2816
msgid "Select changes interactively."
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:4393
2820
msgid ""
2821
"Merging into empty branches not currently supported, "
2822
"https://bugs.launchpad.net/bzr/+bug/308562"
2823
msgstr ""
2824
2825
#: bzrlib/builtins.py:4420
2826
msgid "Cannot use --uncommitted with bundles or merge directives."
2827
msgstr ""
2828
2829
#: bzrlib/builtins.py:4431
2830
msgid "Cannot use --uncommitted and --revision at the same time."
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4451
2834
msgid "merger: "
2835
msgstr ""
2836
2837
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2838
msgid "Nothing to do."
2839
msgstr ""
2840
2841
#: bzrlib/builtins.py:4457
2842
msgid "Cannot pull individual files"
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4465
2846
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2847
msgstr ""
2848
2849
#: bzrlib/builtins.py:4523
2850
#, python-format
2851
msgid "Show-base is not supported for this merge type. %s"
2852
msgstr ""
2853
2854
#: bzrlib/builtins.py:4532
2855
#, python-format
2856
msgid "Conflict reduction is not supported for merge type %s."
2857
msgstr ""
2858
2859
#: bzrlib/builtins.py:4536
2860
msgid "Cannot do conflict reduction and show base."
2861
msgstr ""
2862
2863
#: bzrlib/builtins.py:4647
2864
msgid "No location specified or remembered"
2865
msgstr ""
2866
2867
#: bzrlib/builtins.py:4649
2868
msgid "{0} remembered {1} location {2}"
2869
msgstr ""
2870
2871
#: bzrlib/builtins.py:4655
2872
msgid "Redo a merge."
2873
msgstr ""
2874
2875
#: bzrlib/builtins.py:4657
2876
msgid ""
2877
"Use this if you want to try a different merge technique while resolving\n"
2878
"conflicts. Some merge techniques are better than others, and remerge\n"
2879
"lets you try different ones on different files."
2880
msgstr ""
2881
2882
#: bzrlib/builtins.py:4661
2883
msgid ""
2884
"The options for remerge have the same meaning and defaults as the ones for\n"
2885
"merge. The difference is that remerge can (only) be run when there is a\n"
2886
"pending merge, and it lets you specify particular files."
2887
msgstr ""
2888
2889
#: bzrlib/builtins.py:4665
2890
msgid ""
2891
":Examples:\n"
2892
" Re-do the merge of all conflicted files, and show the base text in\n"
2893
" conflict regions, in addition to the usual THIS and OTHER texts::"
2894
msgstr ""
2895
2896
#: bzrlib/builtins.py:4669
2897
msgid " bzr remerge --show-base"
2898
msgstr ""
2899
2900
#: bzrlib/builtins.py:4671
2901
msgid ""
2902
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2903
" additional processing to reduce the size of conflict regions::"
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4674
2907
msgid " bzr remerge --merge-type weave --reprocess foobar"
2908
msgstr ""
2909
2910
#: bzrlib/builtins.py:4681
2911
msgid "Show base revision text in conflicts."
2912
msgstr ""
2913
2914
#: bzrlib/builtins.py:4693
2915
msgid ""
2916
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2917
"merges."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4751
2921
msgid ""
2922
"Set files in the working tree back to the contents of a previous revision."
2923
msgstr ""
2924
2925
#: bzrlib/builtins.py:4753
2926
msgid ""
2927
"Giving a list of files will revert only those files. Otherwise, all files\n"
2928
"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."
2932
msgstr ""
2933
2934
#: bzrlib/builtins.py:4759
2935
msgid ""
2936
"To remove only some changes, without reverting to a prior version, use\n"
2937
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2938
"will remove the changes introduced by the second last commit (-2), without\n"
2939
"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."
2944
msgstr ""
2945
2946
#: bzrlib/builtins.py:4768
2947
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."
2952
msgstr ""
2953
2954
#: bzrlib/builtins.py:4773
2955
msgid ""
2956
"When you provide files, you can use their current pathname or the pathname\n"
2957
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2958
"name. If you name a directory, all the contents of that directory will be\n"
2959
"reverted."
2960
msgstr ""
2961
2962
#: bzrlib/builtins.py:4778
2963
msgid ""
2964
"If you have newly added files since the target revision, they will be\n"
2965
"removed. If the files to be removed have been changed, backups will be\n"
2966
"created as above. Directories containing unknown files will not be\n"
2967
"deleted."
2968
msgstr ""
2969
2970
#: bzrlib/builtins.py:4783
2971
msgid ""
2972
"The working tree contains a list of revisions that have been merged but\n"
2973
"not yet committed. These revisions will be included as additional parents\n"
2974
"of the next commit. Normally, using revert clears that list as well as\n"
2975
"reverting the files. If any files are specified, revert leaves the list\n"
2976
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2977
".`` in the tree root to revert all files but keep the recorded merges,\n"
2978
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2979
"reverting any files."
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:4792
2983
msgid ""
2984
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2985
"changes from a branch in a single revision. To do this, perform the merge\n"
2986
"as desired. Then doing revert with the \"--forget-merges\" option will "
2987
"keep\n"
2988
"the content of the tree as it was, but it will clear the list of pending\n"
2989
"merges. The next commit will then contain all of the changes that are\n"
2990
"present in the other branch, but without any other parent revisions.\n"
2991
"Because this technique forgets where these changes originated, it may\n"
2992
"cause additional conflicts on later merges involving the same source and\n"
2993
"target branches."
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4806
2997
msgid "Do not save backups of reverted files."
2998
msgstr ""
2999
3000
#: bzrlib/builtins.py:4808
3001
msgid "Remove pending merge marker, without changing any files."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4839
3005
msgid ""
3006
"Show help on a command or other topic.\n"
3007
" "
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4844
3011
msgid "Show help on all commands."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4873
3015
msgid "Show unmerged/unpulled revisions between two branches."
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4875
3019
msgid "OTHER_BRANCH may be local or remote."
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:4877
3023
msgid ""
3024
"To filter on a range of revisions, you can use the command -r begin..end\n"
3025
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3026
"also valid.\n"
3027
" \n"
3028
":Exit values:\n"
3029
" 1 - some missing revisions\n"
3030
" 0 - no missing revisions"
3031
msgstr ""
3032
3033
#: bzrlib/builtins.py:4887
3034
msgid ""
3035
" Determine the missing revisions between this and the branch at the\n"
3036
" remembered pull location::"
3037
msgstr ""
3038
3039
#: bzrlib/builtins.py:4890
3040
msgid " bzr missing"
3041
msgstr ""
3042
3043
#: bzrlib/builtins.py:4892
3044
msgid " Determine the missing revisions between this and another branch::"
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:4894
3048
msgid " bzr missing http://server/branch"
3049
msgstr ""
3050
3051
#: bzrlib/builtins.py:4896
3052
msgid ""
3053
" Determine the missing revisions up to a specific revision on the other\n"
3054
" branch::"
3055
msgstr ""
3056
3057
#: bzrlib/builtins.py:4899
3058
msgid " bzr missing -r ..-10"
3059
msgstr ""
3060
3061
#: bzrlib/builtins.py:4901
3062
msgid ""
3063
" Determine the missing revisions up to a specific revision on this\n"
3064
" branch::"
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:4904
3068
msgid " bzr missing --my-revision ..-10"
3069
msgstr ""
3070
3071
#: bzrlib/builtins.py:4911
3072
msgid "Reverse the order of revisions."
3073
msgstr ""
3074
3075
#: bzrlib/builtins.py:4913
3076
msgid "Display changes in the local branch only."
3077
msgstr ""
3078
3079
#: bzrlib/builtins.py:4914
3080
msgid "Same as --mine-only."
3081
msgstr ""
3082
3083
#: bzrlib/builtins.py:4916
3084
msgid "Display changes in the remote branch only."
3085
msgstr ""
3086
3087
#: bzrlib/builtins.py:4917
3088
msgid "Same as --theirs-only."
3089
msgstr ""
3090
3091
#: bzrlib/builtins.py:4922
3092
msgid ""
3093
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3094
"details."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:4926
3098
msgid ""
3099
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3100
"details."
3101
msgstr ""
3102
3103
#: bzrlib/builtins.py:4929
3104
msgid "Show all revisions in addition to the mainline ones."
3105
msgstr ""
3106
3107
#: bzrlib/builtins.py:4983
3108
msgid "No peer location known or specified."
3109
msgstr ""
3110
3111
#: bzrlib/builtins.py:4987
3112
msgid "Using saved parent location: {0}\n"
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:5020
3116
#, python-format
3117
msgid "You have %d extra revision:\n"
3118
msgid_plural "You have %d extra revisions:\n"
3119
msgstr[0] ""
3120
msgstr[1] ""
3121
3122
#: bzrlib/builtins.py:5040
3123
#, python-format
3124
msgid "You are missing %d revision:\n"
3125
msgid_plural "You are missing %d revisions:\n"
3126
msgstr[0] ""
3127
msgstr[1] ""
3128
3129
#: bzrlib/builtins.py:5055
3130
msgid "This branch has no new revisions.\n"
3131
msgstr ""
3132
3133
#: bzrlib/builtins.py:5058
3134
msgid "Other branch has no new revisions.\n"
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:5063
3138
msgid "Branches are up to date.\n"
3139
msgstr ""
3140
3141
#: bzrlib/builtins.py:5074
3142
msgid "Compress the data within a repository."
3143
msgstr ""
3144
3145
#: bzrlib/builtins.py:5076
3146
msgid ""
3147
"This operation compresses the data within a bazaar repository. As\n"
3148
"bazaar supports automatic packing of repository, this operation is\n"
3149
"normally not required to be done manually."
3150
msgstr ""
3151
3152
#: bzrlib/builtins.py:5080
3153
msgid ""
3154
"During the pack operation, bazaar takes a backup of existing repository\n"
3155
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3156
"automatically when it is safe to do so. To save disk space by removing\n"
3157
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3158
"used."
3159
msgstr ""
3160
3161
#: bzrlib/builtins.py:5086
3162
msgid ""
3163
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3164
"during or immediately after repacking, you may be left with a state\n"
3165
"where the deletion has been written to disk but the new packs have not\n"
3166
"been. In this case the repository may be unusable."
3167
msgstr ""
3168
3169
#: bzrlib/builtins.py:5095
3170
msgid "Delete obsolete packs to save disk space."
3171
msgstr ""
3172
3173
#: bzrlib/builtins.py:5109
3174
msgid "List the installed plugins."
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:5111
3178
msgid ""
3179
"This command displays the list of installed plugins including\n"
3180
"version of plugin and a short description of each."
3181
msgstr ""
3182
3183
#: bzrlib/builtins.py:5114
3184
msgid "--verbose shows the path where each plugin is located."
3185
msgstr ""
3186
3187
#: bzrlib/builtins.py:5116
3188
msgid ""
3189
"A plugin is an external component for Bazaar that extends the\n"
3190
"revision control system, by adding or replacing code in Bazaar.\n"
3191
"Plugins can do a variety of things, including overriding commands,\n"
3192
"adding new commands, providing additional network transports and\n"
3193
"customizing log output."
3194
msgstr ""
3195
3196
#: bzrlib/builtins.py:5122
3197
msgid ""
3198
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3199
"for further information on plugins including where to find them and how to\n"
3200
"install them. Instructions are also provided there on how to write new\n"
3201
"plugins using the Python programming language."
3202
msgstr ""
3203
3204
#: bzrlib/builtins.py:5138
3205
msgid "Show testament (signing-form) of a revision."
3206
msgstr ""
3207
3208
#: bzrlib/builtins.py:5141
3209
msgid "Produce long-format testament."
3210
msgstr ""
3211
3212
#: bzrlib/builtins.py:5143
3213
msgid "Produce a strict-format testament."
3214
msgstr ""
3215
3216
#: bzrlib/builtins.py:5169
3217
msgid "Show the origin of each line in a file."
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:5171
3221
msgid ""
3222
"This prints out the given file with an annotation on the left side\n"
3223
"indicating which revision, author and date introduced the change."
3224
msgstr ""
3225
3226
#: bzrlib/builtins.py:5174
3227
msgid ""
3228
"If the origin is the same for a run of consecutive lines, it is\n"
3229
"shown only at the top, unless the --all option is given."
3230
msgstr ""
3231
3232
#: bzrlib/builtins.py:5182
3233
msgid "Show annotations on all lines."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:5183
3237
msgid "Show commit date in annotations."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5270
3241
msgid "Cannot sign a range of non-revision-history revisions"
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5282
3245
msgid "Please supply either one revision, or a range."
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:5286
3249
msgid ""
3250
"Convert the current branch into a checkout of the supplied branch.\n"
3251
"If no branch is supplied, rebind to the last bound location."
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:5289
3255
msgid ""
3256
"Once converted into a checkout, commits must succeed on the master branch\n"
3257
"before they will be applied to the local branch."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5292
3261
msgid ""
3262
"Bound branches use the nickname of its master branch unless it is set\n"
3263
"locally, in which case binding will update the local nickname to be\n"
3264
"that of the master."
3265
msgstr ""
3266
3267
#: bzrlib/builtins.py:5307
3268
msgid "No location supplied. This format does not remember old locations."
3269
msgstr ""
3270
3271
#: bzrlib/builtins.py:5313
3272
msgid "Branch is already bound"
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:5316
3276
msgid "No location supplied and no previous location known"
3277
msgstr ""
3278
3279
#: bzrlib/builtins.py:5322
3280
msgid "These branches have diverged. Try merging, and then bind again."
3281
msgstr ""
3282
3283
#: bzrlib/builtins.py:5329
3284
msgid "Convert the current checkout into a regular branch."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5331
3288
msgid ""
3289
"After unbinding, the local branch is considered independent and subsequent\n"
3290
"commits will be local only."
3291
msgstr ""
3292
3293
#: bzrlib/builtins.py:5342
3294
msgid "Local branch is not bound"
3295
msgstr ""
3296
3297
#: bzrlib/builtins.py:5346
3298
msgid "Remove the last committed revision."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5348
3302
msgid ""
3303
"--verbose will print out what is being removed.\n"
3304
"--dry-run will go through all the motions, but not actually\n"
3305
"remove anything."
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:5352
3309
msgid ""
3310
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3311
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3312
"branch at revision 15."
3313
msgstr ""
3314
3315
#: bzrlib/builtins.py:5356
3316
msgid ""
3317
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3318
"it may make is to restore any pending merges that were present before\n"
3319
"the commit."
3320
msgstr ""
3321
3322
#: bzrlib/builtins.py:5367
3323
msgid "Don't actually make changes."
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:5368
3327
msgid "Say yes to all questions."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:5370
3331
msgid "Keep tags that point to removed revisions."
3332
msgstr ""
3333
3334
#: 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
msgid "No revisions to uncommit.\n"
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5436
3343
msgid "Dry-run, pretending to remove the above revisions.\n"
3344
msgstr ""
3345
3346
#: bzrlib/builtins.py:5439
3347
msgid "The above revision(s) will be removed.\n"
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5443
3351
msgid "Uncommit these revisions"
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5446
3355
msgid "Canceled\n"
3356
msgstr ""
3357
3358
#: bzrlib/builtins.py:5453
3359
#, python-format
3360
msgid ""
3361
"You can restore the old tip by running:\n"
3362
" bzr pull . -r revid:%s\n"
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5458
3366
msgid "Break a dead lock."
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5460
3370
msgid ""
3371
"This command breaks a lock on a repository, branch, working directory or\n"
3372
"config file."
3373
msgstr ""
3374
3375
#: bzrlib/builtins.py:5463
3376
msgid ""
3377
"CAUTION: Locks should only be broken when you are sure that the process\n"
3378
"holding the lock has been stopped."
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:5466
3382
msgid ""
3383
"You can get information on what locks are open via the 'bzr info\n"
3384
"[location]' command."
3385
msgstr ""
3386
3387
#: bzrlib/builtins.py:5469
3388
msgid ""
3389
":Examples:\n"
3390
" bzr break-lock\n"
3391
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3392
" bzr break-lock --conf ~/.bazaar"
3393
msgstr ""
3394
3395
#: bzrlib/builtins.py:5478
3396
msgid "LOCATION is the directory where the config lock is."
3397
msgstr ""
3398
3399
#: bzrlib/builtins.py:5480
3400
msgid "Do not ask for confirmation before breaking the lock."
3401
msgstr ""
3402
3403
#: bzrlib/builtins.py:5515
3404
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3405
msgstr ""
3406
3407
#: bzrlib/builtins.py:5516
3408
msgid "Run the bzr server."
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:5522
3412
msgid "Serve on stdin/out for use from inetd or sshd."
3413
msgstr ""
3414
3415
#: bzrlib/builtins.py:5523
3416
msgid "protocol"
3417
msgstr ""
3418
3419
#: bzrlib/builtins.py:5524
3420
msgid "Protocol to serve."
3421
msgstr ""
3422
3423
#: bzrlib/builtins.py:5528
3424
msgid "Listen for connections on nominated address."
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5530
3428
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."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:5535
3435
msgid "Serve contents of this directory."
3436
msgstr ""
3437
3438
#: bzrlib/builtins.py:5537
3439
msgid ""
3440
"By default the server is a readonly server. Supplying --allow-writes "
3441
"enables write access to the contents of the served directory and below. "
3442
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3443
"of external authentication is arranged supplying this option leads to global "
3444
"uncontrolled write access to your file system."
3445
msgstr ""
3446
3447
#: bzrlib/builtins.py:5546
3448
msgid "Override the default idle client timeout (5min)."
3449
msgstr ""
3450
3451
#: bzrlib/builtins.py:5564
3452
msgid "Combine a tree into its containing tree."
3453
msgstr ""
3454
3455
#: bzrlib/builtins.py:5566
3456
msgid "This command requires the target tree to be in a rich-root format."
3457
msgstr ""
3458
3459
#: bzrlib/builtins.py:5568
3460
msgid ""
3461
"The TREE argument should be an independent tree, inside another tree, but\n"
3462
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3463
"running \"bzr branch\" with the target inside a tree.)"
3464
msgstr ""
3465
3466
#: bzrlib/builtins.py:5572
3467
msgid ""
3468
"The result is a combined tree, with the subtree no longer an independent\n"
3469
"part. This is marked as a merge of the subtree into the containing tree,\n"
3470
"and all history is preserved."
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:5590
3474
#, python-format
3475
msgid ""
3476
"Can't join trees because %s doesn't support rich root data.\n"
3477
"You can use bzr upgrade on the repository."
3478
msgstr ""
3479
3480
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3481
msgid "Cannot join {0}. {1}"
3482
msgstr ""
3483
3484
#: bzrlib/builtins.py:5610
3485
msgid "Split a subdirectory of a tree into a separate tree."
3486
msgstr ""
3487
3488
#: bzrlib/builtins.py:5612
3489
msgid ""
3490
"This command will produce a target tree in a format that supports\n"
3491
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3492
"converted into earlier formats like 'dirstate-tags'."
3493
msgstr ""
3494
3495
#: bzrlib/builtins.py:5616
3496
msgid ""
3497
"The TREE argument should be a subdirectory of a working tree. That\n"
3498
"subdirectory will be converted into an independent tree, with its own\n"
3499
"branch. Commits in the top-level tree will not apply to the new subtree."
3500
msgstr ""
3501
3502
#: bzrlib/builtins.py:5696
3503
msgid "No submit branch specified or known"
3504
msgstr ""
3505
3506
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3507
msgid "No public branch specified or known"
3508
msgstr ""
3509
3510
#: bzrlib/builtins.py:5710
3511
msgid "bzr merge-directive takes at most two one revision identifiers"
3512
msgstr ""
3513
3514
#: bzrlib/builtins.py:5719
3515
msgid "No revisions to bundle."
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5738
3519
msgid "Mail or create a merge-directive for submitting changes."
3520
msgstr ""
3521
3522
#: bzrlib/builtins.py:5740
3523
msgid "A merge directive provides many things needed for requesting merges:"
3524
msgstr ""
3525
3526
#: bzrlib/builtins.py:5742
3527
msgid "* A machine-readable description of the merge to perform"
3528
msgstr ""
3529
3530
#: bzrlib/builtins.py:5744
3531
msgid "* An optional patch that is a preview of the changes requested"
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5746
3535
msgid ""
3536
"* An optional bundle of revision data, so that the changes can be applied\n"
3537
" directly from the merge directive, without retrieving data from a\n"
3538
" branch."
3539
msgstr ""
3540
3541
#: bzrlib/builtins.py:5750
3542
msgid ""
3543
"`bzr send` creates a compact data set that, when applied using bzr\n"
3544
"merge, has the same effect as merging from the source branch. "
3545
msgstr ""
3546
3547
#: bzrlib/builtins.py:5753
3548
msgid ""
3549
"By default the merge directive is self-contained and can be applied to any\n"
3550
"branch containing submit_branch in its ancestory without needing access to\n"
3551
"the source branch."
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:5757
3555
msgid ""
3556
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3557
"revisions, but only a structured request to merge from the\n"
3558
"public_location. In that case the public_branch is needed and it must be\n"
3559
"up-to-date and accessible to the recipient. The public_branch is always\n"
3560
"included if known, so that people can check it later."
3561
msgstr ""
3562
3563
#: bzrlib/builtins.py:5763
3564
msgid ""
3565
"The submit branch defaults to the parent of the source branch, but can be\n"
3566
"overridden. Both submit branch and public branch will be remembered in\n"
3567
"branch.conf the first time they are used for a particular branch. The\n"
3568
"source branch defaults to that containing the working directory, but can\n"
3569
"be changed using --from."
3570
msgstr ""
3571
3572
#: bzrlib/builtins.py:5769
3573
msgid ""
3574
"Both the submit branch and the public branch follow the usual behavior with\n"
3575
"respect to --remember: If there is no default location set, the first send\n"
3576
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3577
"omit the location to use the default. To change the default, use\n"
3578
"--remember. The value will only be saved if the location can be accessed."
3579
msgstr ""
3580
3581
#: bzrlib/builtins.py:5775
3582
msgid ""
3583
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3584
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3585
"If a public location is known for the submit_branch, that location is used\n"
3586
"in the merge directive."
3587
msgstr ""
3588
3589
#: bzrlib/builtins.py:5780
3590
msgid ""
3591
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3592
"given, in which case it is sent to a file."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5783
3596
msgid ""
3597
"Mail is sent using your preferred mail program. This should be transparent\n"
3598
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3599
"If the preferred client can't be found (or used), your editor will be used."
3600
msgstr ""
3601
3602
#: bzrlib/builtins.py:5787
3603
msgid ""
3604
"To use a specific mail program, set the mail_client configuration option.\n"
3605
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3606
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3607
"(MacOS X's\n"
3608
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3609
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3610
"add\n"
3611
"supported clients."
3612
msgstr ""
3613
3614
#: bzrlib/builtins.py:5794
3615
msgid ""
3616
"If mail is being sent, a to address is required. This can be supplied\n"
3617
"either on the commandline, by setting the submit_to configuration\n"
3618
"option in the branch itself or the child_submit_to configuration option\n"
3619
"in the submit branch."
3620
msgstr ""
3621
3622
#: bzrlib/builtins.py:5799
3623
msgid ""
3624
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3625
"and\n"
3626
"merge directive format 2. It is significantly faster and smaller than\n"
3627
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3628
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3629
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3630
msgstr ""
3631
3632
#: bzrlib/builtins.py:5805
3633
msgid ""
3634
"The merge directives created by bzr send may be applied using bzr merge or\n"
3635
"bzr pull by specifying a file containing a merge directive as the location."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5808
3639
msgid ""
3640
"bzr send makes extensive use of public locations to map local locations "
3641
"into\n"
3642
"URLs that can be used by other people. See `bzr help configuration` to\n"
3643
"set them, and use `bzr info` to display them."
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5832
3647
msgid "Write merge directive to this file or directory; use - for stdout."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5836
3651
msgid ""
3652
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3653
"strict disables the check."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5838
3657
msgid "Mail the request to this address."
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5842
3661
msgid "Body for the email."
3662
msgstr ""
3663
3664
#: bzrlib/builtins.py:5895
3665
msgid "Do not include a bundle in the merge directive."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5896
3669
msgid "Do not include a preview patch in the merge directive."
3670
msgstr ""
3671
3672
#: bzrlib/builtins.py:5899
3673
msgid "Remember submit and public branch."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5901
3677
msgid ""
3678
"Branch to generate the submission from, rather than the one containing the "
3679
"working directory."
3680
msgstr ""
3681
3682
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3683
msgid "format"
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5912
3687
msgid "Use the specified output format."
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:5934
3691
msgid "Create, remove or modify a tag naming a revision."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5936
3695
msgid ""
3696
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3697
"(--revision) option can be given -rtag:X, where X is any previously\n"
3698
"created tag."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:5940
3702
msgid ""
3703
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3704
"along when you branch, push, pull or merge."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:5943
3708
msgid ""
3709
"It is an error to give a tag name that already exists unless you pass\n"
3710
"--force, in which case the tag is moved to point to the new revision."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5946
3714
msgid ""
3715
"To rename a tag (change the name but keep it on the same revsion), run "
3716
"``bzr\n"
3717
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3718
msgstr ""
3719
3720
#: bzrlib/builtins.py:5949
3721
msgid ""
3722
"If no tag name is specified it will be determined through the \n"
3723
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3724
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3725
"details."
3726
msgstr ""
3727
3728
#: bzrlib/builtins.py:5959
3729
msgid "Delete this tag rather than placing it."
3730
msgstr ""
3731
3732
#: bzrlib/builtins.py:5962
3733
msgid "Branch in which to place the tag."
3734
msgstr ""
3735
3736
#: bzrlib/builtins.py:5964
3737
msgid "Replace existing tags."
3738
msgstr ""
3739
3740
#: bzrlib/builtins.py:5979
3741
msgid "No tag specified to delete."
3742
msgstr ""
3743
3744
#: bzrlib/builtins.py:5981
3745
#, python-format
3746
msgid "Deleted tag %s."
3747
msgstr ""
3748
3749
#: bzrlib/builtins.py:5995
3750
msgid "Please specify a tag name."
3751
msgstr ""
3752
3753
#: bzrlib/builtins.py:6003
3754
#, python-format
3755
msgid "Tag %s already exists for that revision."
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:6007
3759
#, python-format
3760
msgid "Created tag %s."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:6009
3764
#, python-format
3765
msgid "Updated tag %s."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:6013
3769
msgid "List tags."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:6015
3773
msgid ""
3774
"This command shows a table of tag names and the revisions they reference."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:6021
3778
msgid "Branch whose tags should be displayed."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:6023
3782
msgid "Sort tags by different criteria."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:6023
3786
msgid "Sorting"
3787
msgstr ""
3788
3789
#: bzrlib/builtins.py:6092
3790
msgid "Reconfigure the type of a bzr directory."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:6094
3794
msgid "A target configuration must be specified."
3795
msgstr ""
3796
3797
#: bzrlib/builtins.py:6096
3798
msgid ""
3799
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3800
"The order of preference is\n"
3801
"1. For a lightweight checkout, the current bound location.\n"
3802
"2. For branches that used to be checkouts, the previously-bound location.\n"
3803
"3. The push location.\n"
3804
"4. The parent location.\n"
3805
"If none of these is available, --bind-to must be specified."
3806
msgstr ""
3807
3808
#: bzrlib/builtins.py:6110
3809
msgid "Tree type"
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:6111
3813
msgid "The relation between branch and tree."
3814
msgstr ""
3815
3816
#: bzrlib/builtins.py:6113
3817
msgid "Reconfigure to be an unbound branch with no working tree."
3818
msgstr ""
3819
3820
#: bzrlib/builtins.py:6114
3821
msgid "Reconfigure to be an unbound branch with a working tree."
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:6115
3825
msgid "Reconfigure to be a bound branch with a working tree."
3826
msgstr ""
3827
3828
#: bzrlib/builtins.py:6116
3829
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3830
msgstr ""
3831
3832
#: bzrlib/builtins.py:6121
3833
msgid "Repository type"
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:6122
3837
msgid "Location fo the repository."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:6124
3841
msgid ""
3842
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3843
msgstr ""
3844
3845
#: bzrlib/builtins.py:6126
3846
msgid "Reconfigure to use a shared repository."
3847
msgstr ""
3848
3849
#: bzrlib/builtins.py:6130
3850
msgid "Trees in Repository"
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:6131
3854
msgid "Whether new branches in the repository have trees."
3855
msgstr ""
3856
3857
#: bzrlib/builtins.py:6133
3858
msgid ""
3859
"Reconfigure repository to create working trees on branches by default."
3860
msgstr ""
3861
3862
#: bzrlib/builtins.py:6135
3863
msgid ""
3864
"Reconfigure repository to not create working trees on branches by default."
3865
msgstr ""
3866
3867
#: bzrlib/builtins.py:6138
3868
msgid "Branch to bind checkout to."
3869
msgstr ""
3870
3871
#: bzrlib/builtins.py:6140
3872
msgid "Perform reconfiguration even if local changes will be lost."
3873
msgstr ""
3874
3875
#: bzrlib/builtins.py:6143
3876
msgid "Reconfigure a branch to be stacked on another branch."
3877
msgstr ""
3878
3879
#: bzrlib/builtins.py:6147
3880
msgid ""
3881
"Reconfigure a branch to be unstacked. This may require copying substantial "
3882
"data into it."
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6157
3886
msgid "Can't use both --stacked-on and --unstacked"
3887
msgstr ""
3888
3889
#: bzrlib/builtins.py:6171
3890
msgid "No target configuration specified"
3891
msgstr ""
3892
3893
#: bzrlib/builtins.py:6206
3894
msgid "Set the branch of a checkout and update."
3895
msgstr ""
3896
3897
#: bzrlib/builtins.py:6208
3898
msgid ""
3899
"For lightweight checkouts, this changes the branch being referenced.\n"
3900
"For heavyweight checkouts, this checks that there are no local commits\n"
3901
"versus the current bound branch, then it makes the local branch a mirror\n"
3902
"of the new location and binds to it."
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:6213
3906
msgid ""
3907
"In both cases, the working tree is updated and uncommitted changes\n"
3908
"are merged. The user can commit or revert these as they desire."
3909
msgstr ""
3910
3911
#: bzrlib/builtins.py:6216
3912
msgid "Pending merges need to be committed or reverted before using switch."
3913
msgstr ""
3914
3915
#: bzrlib/builtins.py:6218
3916
msgid ""
3917
"The path to the branch to switch to can be specified relative to the parent\n"
3918
"directory of the current branch. For example, if you are currently in a\n"
3919
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3920
"/path/to/newbranch."
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:6223
3924
msgid ""
3925
"Bound branches use the nickname of its master branch unless it is set\n"
3926
"locally, in which case switching will update the local nickname to be\n"
3927
"that of the master."
3928
msgstr ""
3929
3930
#: bzrlib/builtins.py:6231
3931
msgid "Switch even if local commits will be lost."
3932
msgstr ""
3933
3934
#: bzrlib/builtins.py:6234
3935
msgid "Create the target branch from this one before switching to it."
3936
msgstr ""
3937
3938
#: bzrlib/builtins.py:6248
3939
msgid "You must supply either a revision or a location"
3940
msgstr ""
3941
3942
#: bzrlib/builtins.py:6261
3943
msgid "cannot create branch without source branch"
3944
msgstr ""
3945
3946
#: bzrlib/builtins.py:6286
3947
msgid "Manage filtered views."
3948
msgstr ""
3949
3950
#: bzrlib/builtins.py:6288
3951
msgid ""
3952
"Views provide a mask over the tree so that users can focus on\n"
3953
"a subset of a tree when doing their work. After creating a view,\n"
3954
"commands that support a list of files - status, diff, commit, etc -\n"
3955
"effectively have that list of files implicitly given each time.\n"
3956
"An explicit list of files can still be given but those files\n"
3957
"must be within the current view."
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6295
3961
msgid ""
3962
"In most cases, a view has a short life-span: it is created to make\n"
3963
"a selected change and is deleted once that change is committed.\n"
3964
"At other times, you may wish to create one or more named views\n"
3965
"and switch between them."
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6300
3969
msgid ""
3970
"To disable the current view without deleting it, you can switch to\n"
3971
"the pseudo view called ``off``. This can be useful when you need\n"
3972
"to see the whole tree for an operation or two (e.g. merge) but\n"
3973
"want to switch back to your view after that."
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6305
3977
msgid ""
3978
":Examples:\n"
3979
" To define the current view::"
3980
msgstr ""
3981
3982
#: bzrlib/builtins.py:6308
3983
msgid " bzr view file1 dir1 ..."
3984
msgstr ""
3985
3986
#: bzrlib/builtins.py:6310
3987
msgid " To list the current view::"
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:6312
3991
msgid " bzr view"
3992
msgstr ""
3993
3994
#: bzrlib/builtins.py:6314
3995
msgid " To delete the current view::"
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6316
3999
msgid " bzr view --delete"
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6318
4003
msgid " To disable the current view without deleting it::"
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6320
4007
msgid " bzr view --switch off"
4008
msgstr ""
4009
4010
#: bzrlib/builtins.py:6322
4011
msgid " To define a named view and switch to it::"
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6324
4015
msgid " bzr view --name view-name file1 dir1 ..."
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6326
4019
msgid " To list a named view::"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6328
4023
msgid " bzr view --name view-name"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6330
4027
msgid " To delete a named view::"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6332
4031
msgid " bzr view --name view-name --delete"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6334
4035
msgid " To switch to a named view::"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6336
4039
msgid " bzr view --switch view-name"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6338
4043
msgid " To list all views defined::"
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6340
4047
msgid " bzr view --all"
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6342
4051
msgid " To delete all views::"
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6344
4055
msgid " bzr view --delete --all"
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6351
4059
msgid "Apply list or delete action to all views."
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:6354
4063
msgid "Delete the view."
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:6357
4067
msgid "Name of the view to define, list or delete."
4068
msgstr ""
4069
4070
#: bzrlib/builtins.py:6361
4071
msgid "Name of the view to switch to."
4072
msgstr ""
4073
4074
#: bzrlib/builtins.py:6380
4075
msgid "Both --delete and a file list specified"
4076
msgstr ""
4077
4078
#: bzrlib/builtins.py:6383
4079
msgid "Both --delete and --switch specified"
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6386
4083
msgid "Deleted all views.\n"
4084
msgstr ""
4085
4086
#: bzrlib/builtins.py:6388
4087
msgid "No current view to delete"
4088
msgstr ""
4089
4090
#: bzrlib/builtins.py:6391
4091
#, python-format
4092
msgid "Deleted '%s' view.\n"
4093
msgstr ""
4094
4095
#: bzrlib/builtins.py:6395
4096
msgid "Both --switch and a file list specified"
4097
msgstr ""
4098
4099
#: bzrlib/builtins.py:6398
4100
msgid "Both --switch and --all specified"
4101
msgstr ""
4102
4103
#: bzrlib/builtins.py:6401
4104
msgid "No current view to disable"
4105
msgstr ""
4106
4107
#: bzrlib/builtins.py:6403
4108
#, python-format
4109
msgid "Disabled '%s' view.\n"
4110
msgstr "Disabilitata la visualizzazione '%s'.\n"
4111
4112
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4113
msgid "Using '{0}' view: {1}\n"
4114
msgstr ""
4115
4116
#: bzrlib/builtins.py:6410
4117
msgid "Views defined:\n"
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6419
4121
msgid "No views defined.\n"
4122
msgstr ""
4123
4124
#: bzrlib/builtins.py:6426
4125
msgid "Cannot change the 'off' pseudo view"
4126
msgstr ""
4127
4128
#: bzrlib/builtins.py:6434
4129
msgid "No current view.\n"
4130
msgstr ""
4131
4132
#: bzrlib/builtins.py:6437
4133
msgid "'{0}' view is: {1}\n"
4134
msgstr ""
4135
4136
#: bzrlib/builtins.py:6457
4137
msgid " <no hooks installed>\n"
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6461
4141
msgid "Remove a branch."
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6463
4145
msgid ""
4146
"This will remove the branch from the specified location but \n"
4147
"will keep any working tree or repository in place."
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6468
4151
msgid " Remove the branch at repo/trunk::"
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6470
4155
msgid " bzr remove-branch repo/trunk"
4156
msgstr ""
4157
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
4167
msgid "Plaintext diff output."
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6496
4171
msgid "Temporarily set aside some changes from the current tree."
4172
msgstr ""
4173
4174
#: bzrlib/builtins.py:6498
4175
msgid ""
4176
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4177
"ie. out of the way, until a later time when you can bring them back from\n"
4178
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4179
"your working tree, and so they aren't propagated along with your branch nor\n"
4180
"will they survive its deletion."
4181
msgstr ""
4182
4183
#: bzrlib/builtins.py:6504
4184
msgid "If shelve --list is specified, previously-shelved changes are listed."
4185
msgstr ""
4186
4187
#: bzrlib/builtins.py:6506
4188
msgid ""
4189
"Shelve is intended to help separate several sets of changes that have\n"
4190
"been inappropriately mingled. If you just want to get rid of all changes\n"
4191
"and you don't need to restore them later, use revert. If you want to\n"
4192
"shelve all text changes at once, use shelve --all."
4193
msgstr ""
4194
4195
#: bzrlib/builtins.py:6511
4196
msgid ""
4197
"If filenames are specified, only the changes to those files will be\n"
4198
"shelved. Other files will be left untouched."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6514
4202
msgid ""
4203
"If a revision is specified, changes since that revision will be shelved."
4204
msgstr ""
4205
4206
#: bzrlib/builtins.py:6516
4207
msgid ""
4208
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4209
"restore the most recently shelved changes."
4210
msgstr ""
4211
4212
#: bzrlib/builtins.py:6519
4213
msgid ""
4214
"For complicated changes, it is possible to edit the changes in a separate\n"
4215
"editor program to decide what the file remaining in the working copy\n"
4216
"should look like. To do this, add the configuration option"
4217
msgstr ""
4218
4219
#: bzrlib/builtins.py:6523
4220
msgid " change_editor = PROGRAM @new_path @old_path"
4221
msgstr ""
4222
4223
#: bzrlib/builtins.py:6525
4224
msgid ""
4225
"where @new_path is replaced with the path of the new version of the \n"
4226
"file and @old_path is replaced with the path of the old version of \n"
4227
"the file. The PROGRAM should save the new file with the desired \n"
4228
"contents of the file in the working tree.\n"
4229
" "
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6537
4233
msgid "Shelve all changes."
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:6539
4237
msgid "Method to use for writing diffs."
4238
msgstr ""
4239
4240
#: bzrlib/builtins.py:6539
4241
msgid "writer"
4242
msgstr ""
4243
4244
#: bzrlib/builtins.py:6543
4245
msgid "List shelved changes."
4246
msgstr ""
4247
4248
#: bzrlib/builtins.py:6545
4249
msgid "Destroy removed changes instead of shelving them."
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6574
4253
msgid "No shelved changes."
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6585
4257
msgid "Restore shelved changes."
4258
msgstr ""
4259
4260
#: bzrlib/builtins.py:6587
4261
msgid ""
4262
"By default, the most recently shelved changes are restored. However if you\n"
4263
"specify a shelf by id those changes will be restored instead. This works\n"
4264
"best when the changes don't depend on each other."
4265
msgstr ""
4266
4267
#: bzrlib/builtins.py:6596
4268
msgid "The action to perform."
4269
msgstr ""
4270
4271
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4272
msgid "action"
4273
msgstr ""
4274
4275
#: bzrlib/builtins.py:6598
4276
msgid "Apply changes and remove from the shelf."
4277
msgstr ""
4278
4279
#: bzrlib/builtins.py:6599
4280
msgid "Show changes, but do not apply or remove them."
4281
msgstr ""
4282
4283
#: bzrlib/builtins.py:6600
4284
msgid ""
4285
"Instead of unshelving the changes, show the diff that would result from "
4286
"unshelving."
4287
msgstr ""
4288
4289
#: bzrlib/builtins.py:6602
4290
msgid "Delete changes without applying them."
4291
msgstr ""
4292
4293
#: bzrlib/builtins.py:6603
4294
msgid "Apply changes but don't delete them."
4295
msgstr ""
4296
4297
#: bzrlib/builtins.py:6618
4298
msgid "Remove unwanted files from working tree."
4299
msgstr ""
4300
4301
#: bzrlib/builtins.py:6620
4302
msgid ""
4303
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4304
"files are never deleted."
4305
msgstr ""
4306
4307
#: bzrlib/builtins.py:6623
4308
msgid ""
4309
"Another class is 'detritus', which includes files emitted by bzr during\n"
4310
"normal operations and selftests. (The value of these files decreases with\n"
4311
"time.)"
4312
msgstr ""
4313
4314
#: bzrlib/builtins.py:6627
4315
msgid ""
4316
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4317
"flags are respected, and may be combined."
4318
msgstr ""
4319
4320
#: bzrlib/builtins.py:6630
4321
msgid "To check what clean-tree will do, use --dry-run."
4322
msgstr ""
4323
4324
#: bzrlib/builtins.py:6633
4325
msgid "Delete all ignored files."
4326
msgstr ""
4327
4328
#: bzrlib/builtins.py:6634
4329
msgid ""
4330
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4331
msgstr ""
4332
4333
#: bzrlib/builtins.py:6637
4334
msgid "Delete files unknown to bzr (default)."
4335
msgstr ""
4336
4337
#: bzrlib/builtins.py:6638
4338
msgid "Show files to delete instead of deleting them."
4339
msgstr ""
4340
4341
#: bzrlib/builtins.py:6640
4342
msgid "Do not prompt before deleting."
4343
msgstr ""
4344
4345
#: bzrlib/bundle/__init__.py:59
4346
msgid "A directory cannot be a bundle"
4347
msgstr ""
4348
4349
#: bzrlib/bundle/apply_bundle.py:40
4350
msgid "Install revisions"
4351
msgstr ""
4352
4353
#: bzrlib/bundle/commands.py:64
4354
msgid "--verbose requires a merge directive"
4355
msgstr ""
4356
4357
#: bzrlib/bundle/commands.py:67
4358
msgid "Bundle format not supported"
4359
msgstr ""
4360
4361
#: bzrlib/bundle/commands.py:77
4362
msgid "Records\n"
4363
msgstr ""
4364
4365
#: bzrlib/bundle/commands.py:81
4366
msgid "{0}: {1} ({2} multiparent)\n"
4367
msgstr ""
4368
4369
#: bzrlib/bundle/commands.py:83
4370
#, python-format
4371
msgid "unique files: %d\n"
4372
msgstr ""
4373
4374
#: bzrlib/bundle/commands.py:92
4375
msgid "Revisions\n"
4376
msgstr ""
4377
4378
#: bzrlib/bundle/commands.py:93
4379
#, python-format
4380
msgid "nicks: %s\n"
4381
msgstr ""
4382
4383
#: bzrlib/bundle/commands.py:95
4384
#, python-format
4385
msgid ""
4386
"committers: \n"
4387
"%s\n"
4388
msgstr ""
4389
4390
#: bzrlib/bundle/commands.py:103
4391
msgid "Decoded contents\n"
4392
msgstr ""
4393
4394
#: bzrlib/bundle/serializer/v4.py:327
4395
#, python-format
4396
msgid "Bundling %d revision."
4397
msgid_plural "Bundling %d revisions."
4398
msgstr[0] ""
4399
msgstr[1] ""
4400
4401
#: bzrlib/bzrdir.py:487
4402
msgid ""
4403
"making backup of {0}\n"
4404
" to {1}"
4405
msgstr ""
4406
4407
#: bzrlib/bzrdir.py:510
4408
msgid "renamed {0} to {1}"
4409
msgstr ""
4410
4411
#: bzrlib/bzrdir.py:1639
4412
#, python-format
4413
msgid ""
4414
"Source repository format does not support stacking, using format:\n"
4415
" %s"
4416
msgstr ""
4417
4418
#: bzrlib/bzrdir.py:1659
4419
#, python-format
4420
msgid ""
4421
"Source branch format does not support stacking, using format:\n"
4422
" %s"
4423
msgstr ""
4424
"Il formato del branch sorgente non supporta l'effettuazione dello stack, "
4425
"viene usato il formato:\n"
4426
" %s"
4427
4428
#: bzrlib/bzrdir.py:1805
4429
msgid "starting repository conversion"
4430
msgstr ""
4431
4432
#: bzrlib/bzrdir.py:2026
4433
msgid "Using default stacking branch {0} at {1}"
4434
msgstr ""
4435
4436
#: bzrlib/check.py:108
4437
msgid "check"
4438
msgstr ""
4439
4440
#: bzrlib/check.py:110
4441
msgid "checking revisions"
4442
msgstr ""
4443
4444
#: bzrlib/check.py:112
4445
msgid "checking commit contents"
4446
msgstr ""
4447
4448
#: bzrlib/check.py:114
4449
msgid "checking file graphs"
4450
msgstr ""
4451
4452
#: bzrlib/check.py:118
4453
msgid "checking branches and trees"
4454
msgstr ""
4455
4456
#: bzrlib/check.py:205
4457
msgid "checked repository {0} format {1}"
4458
msgstr ""
4459
4460
#: bzrlib/check.py:208
4461
#, python-format
4462
msgid "%6d revisions"
4463
msgstr ""
4464
4465
#: bzrlib/check.py:209
4466
#, python-format
4467
msgid "%6d file-ids"
4468
msgstr ""
4469
4470
#: bzrlib/check.py:211
4471
#, python-format
4472
msgid "%6d unreferenced text versions"
4473
msgstr ""
4474
4475
#: bzrlib/check.py:215
4476
msgid "unreferenced version: {{{0}}} in {1}"
4477
msgstr ""
4478
4479
#: bzrlib/check.py:218
4480
#, python-format
4481
msgid "%6d revisions are missing inventory_sha1"
4482
msgstr ""
4483
4484
#: bzrlib/check.py:221
4485
#, python-format
4486
msgid "%6d revisions are mentioned but not present"
4487
msgstr ""
4488
4489
#: bzrlib/check.py:224
4490
#, python-format
4491
msgid "%6d ghost revisions"
4492
msgstr ""
4493
4494
#: bzrlib/check.py:229
4495
#, python-format
4496
msgid "%6d revisions missing parents in ancestry"
4497
msgstr ""
4498
4499
#: bzrlib/check.py:233
4500
#, python-format
4501
msgid " %s should be in the ancestry for:"
4502
msgstr ""
4503
4504
#: bzrlib/check.py:237
4505
#, python-format
4506
msgid "%6d inconsistent parents"
4507
msgstr ""
4508
4509
#: bzrlib/check.py:241
4510
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4511
msgstr ""
4512
4513
#: bzrlib/check.py:247
4514
#, python-format
4515
msgid "%6d revisions have incorrect parents in the revision index"
4516
msgstr ""
4517
4518
#: bzrlib/check.py:253
4519
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4520
msgstr ""
4521
4522
#: bzrlib/check.py:267
4523
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4524
msgstr ""
4525
4526
#: bzrlib/check.py:296
4527
msgid ""
4528
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4529
"{{{4}}}"
4530
msgstr ""
4531
4532
#: bzrlib/check.py:354
4533
#, python-format
4534
msgid "Checking branch at '%s'."
4535
msgstr ""
4536
4537
#: bzrlib/check.py:374
4538
#, python-format
4539
msgid "Checking working tree at '%s'."
4540
msgstr ""
4541
4542
#: bzrlib/check.py:427 bzrlib/check.py:441
4543
msgid "No branch found at specified location."
4544
msgstr ""
4545
4546
#: bzrlib/check.py:429 bzrlib/check.py:439
4547
msgid "No working tree found at specified location."
4548
msgstr ""
4549
4550
#: bzrlib/check.py:432
4551
#, python-format
4552
msgid "Checking repository at '%s'."
4553
msgstr ""
4554
4555
#: bzrlib/check.py:443
4556
msgid "No repository found at specified location."
4557
msgstr ""
4558
4559
#: bzrlib/clean_tree.py:63
4560
msgid "Nothing to delete."
4561
msgstr ""
4562
4563
#: bzrlib/clean_tree.py:68
4564
msgid "Are you sure you wish to delete these"
4565
msgstr ""
4566
4567
#: bzrlib/clean_tree.py:70
4568
msgid "Canceled"
4569
msgstr ""
4570
4571
#: bzrlib/clean_tree.py:107
4572
#, python-format
4573
msgid "unable to remove %s"
4574
msgstr ""
4575
4576
#: bzrlib/clean_tree.py:111
4577
msgid "deleting paths:"
4578
msgstr ""
4579
4580
#: bzrlib/clean_tree.py:125
4581
msgid "unable to remove \"{0}\": {1}."
4582
msgstr ""
4583
4584
#: bzrlib/clean_tree.py:130
4585
msgid "No files deleted."
4586
msgstr ""
4587
4588
#: bzrlib/cmd_version_info.py:47
4589
msgid "No known version info format {0}. Supported types are: {1}"
4590
msgstr ""
4591
4592
#: bzrlib/cmd_version_info.py:52
4593
msgid "Version info in Custom template-based format."
4594
msgstr ""
4595
4596
#: bzrlib/cmd_version_info.py:52
4597
msgid "Version info in Python format."
4598
msgstr ""
4599
4600
#: bzrlib/cmd_version_info.py:52
4601
msgid "Version info in RIO (simple text) format (default)."
4602
msgstr ""
4603
4604
#: bzrlib/cmd_version_info.py:53
4605
msgid "Show version information about this tree."
4606
msgstr ""
4607
4608
#: bzrlib/cmd_version_info.py:55
4609
msgid ""
4610
"You can use this command to add information about version into\n"
4611
"source code of an application. The output can be in one of the\n"
4612
"supported formats or in a custom format based on a template."
4613
msgstr ""
4614
4615
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4616
#: en/help_topics/configuration.txt:722
4617
msgid "For example::"
4618
msgstr ""
4619
4620
#: bzrlib/cmd_version_info.py:61
4621
msgid ""
4622
" bzr version-info --custom \\\n"
4623
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4624
msgstr ""
4625
4626
#: bzrlib/cmd_version_info.py:64
4627
msgid ""
4628
"will produce a C header file with formatted string containing the\n"
4629
"current revision number. Other supported variables in templates are:"
4630
msgstr ""
4631
4632
#: bzrlib/cmd_version_info.py:67
4633
msgid ""
4634
" * {date} - date of the last revision\n"
4635
" * {build_date} - current date\n"
4636
" * {revno} - revision number\n"
4637
" * {revision_id} - revision id\n"
4638
" * {branch_nick} - branch nickname\n"
4639
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4640
" otherwise 1"
4641
msgstr ""
4642
4643
#: bzrlib/cmd_version_info.py:77
4644
msgid "Select the output format."
4645
msgstr ""
4646
4647
#: bzrlib/cmd_version_info.py:81
4648
msgid "Include all possible information."
4649
msgstr ""
4650
4651
#: bzrlib/cmd_version_info.py:82
4652
msgid "Check if tree is clean."
4653
msgstr ""
4654
4655
#: bzrlib/cmd_version_info.py:84
4656
msgid "Include the revision-history."
4657
msgstr ""
4658
4659
#: bzrlib/cmd_version_info.py:86
4660
msgid "Include the last revision for each file."
4661
msgstr ""
4662
4663
#: bzrlib/cmd_version_info.py:87
4664
msgid "Template for the output."
4665
msgstr ""
4666
4667
#: bzrlib/cmd_version_info.py:101
4668
msgid "bzr version-info --revision takes exactly one revision specifier"
4669
msgstr ""
4670
4671
#: bzrlib/commands.py:229
4672
#, python-format
4673
msgid "unknown command \"%s\""
4674
msgstr ""
4675
4676
#: bzrlib/commands.py:476
4677
msgid "No help for this command."
4678
msgstr ""
4679
4680
#: bzrlib/commands.py:489
4681
#, python-format
4682
msgid ":Purpose: %s\n"
4683
msgstr ""
4684
4685
#: bzrlib/commands.py:491
4686
#, python-format
4687
msgid ""
4688
":Usage:\n"
4689
"%s\n"
4690
msgstr ""
4691
4692
#: bzrlib/commands.py:493
4693
#, python-format
4694
msgid ":Usage: %s\n"
4695
msgstr ""
4696
4697
#: bzrlib/commands.py:512
4698
#, python-format
4699
msgid ":Options:%s"
4700
msgstr ""
4701
4702
#: bzrlib/commands.py:523
4703
#, python-format
4704
msgid ""
4705
":Description:\n"
4706
" %s\n"
4707
"\n"
4708
msgstr ""
4709
4710
#: bzrlib/commands.py:533
4711
#, python-format
4712
msgid ""
4713
"See bzr help %s for more details and examples.\n"
4714
"\n"
4715
msgstr ""
4716
4717
#: bzrlib/commands.py:538
4718
msgid ":Aliases: "
4719
msgstr ""
4720
4721
#: bzrlib/commands.py:542
4722
#, python-format
4723
msgid ":From: plugin \"%s\"\n"
4724
msgstr ""
4725
4726
#: bzrlib/commands.py:554
4727
msgid ":doc:`{0} <{1}-help>`"
4728
msgstr ""
4729
4730
#: bzrlib/commands.py:558
4731
#, python-format
4732
msgid ":See also: %s"
4733
msgstr ""
4734
4735
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4736
msgid "Only ASCII permitted in option names"
4737
msgstr ""
4738
4739
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4740
msgid "command {0!r} needs one or more {1}"
4741
msgstr ""
4742
4743
#: bzrlib/commands.py:868
4744
msgid "command {0!r} requires argument {1}"
4745
msgstr ""
4746
4747
#: bzrlib/commands.py:875
4748
msgid "extra argument to command {0}: {1}"
4749
msgstr ""
4750
4751
#: bzrlib/commands.py:972
4752
#, python-format
4753
msgid "Profile data written to \"%s\"."
4754
msgstr ""
4755
4756
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4757
msgid "added"
4758
msgstr ""
4759
4760
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4761
msgid "modified"
4762
msgstr ""
4763
4764
#: bzrlib/commit.py:131
4765
#, python-format
4766
msgid "Committing%s"
4767
msgstr ""
4768
4769
#: bzrlib/commit.py:134
4770
#, python-format
4771
msgid "Committed revision %d."
4772
msgstr ""
4773
4774
#: bzrlib/commit.py:143
4775
#, python-format
4776
msgid "deleted %s"
4777
msgstr ""
4778
4779
#: bzrlib/commit.py:146
4780
#, python-format
4781
msgid "missing %s"
4782
msgstr ""
4783
4784
#: bzrlib/commit.py:511
4785
msgid ""
4786
"Conflicting tags in bound branch:\n"
4787
"{0}"
4788
msgstr ""
4789
4790
#: bzrlib/commit.py:742
4791
msgid "renamed"
4792
msgstr ""
4793
4794
#: bzrlib/commit.py:976
4795
msgid "unchanged"
4796
msgstr ""
4797
4798
#: bzrlib/commit.py:998
4799
msgid "{0} [{1}] - Stage"
4800
msgstr ""
4801
4802
#: bzrlib/commit.py:1001
4803
#, python-format
4804
msgid "%s - Stage"
4805
msgstr ""
4806
4807
#: bzrlib/commit_signature_commands.py:34
4808
msgid "Sign all commits by a given committer."
4809
msgstr ""
4810
4811
#: bzrlib/commit_signature_commands.py:36
4812
msgid ""
4813
"If location is not specified the local tree is used.\n"
4814
"If committer is not specified the default committer is used."
4815
msgstr ""
4816
4817
#: bzrlib/commit_signature_commands.py:39
4818
msgid "This does not sign commits that already have signatures."
4819
msgstr ""
4820
4821
#: bzrlib/commit_signature_commands.py:47
4822
msgid ""
4823
"Don't actually sign anything, just print the revisions that would be signed."
4824
msgstr ""
4825
4826
#: bzrlib/commit_signature_commands.py:98
4827
#, python-format
4828
msgid "Signed %d revision.\n"
4829
msgid_plural "Signed %d revisions.\n"
4830
msgstr[0] ""
4831
msgstr[1] ""
4832
4833
#: bzrlib/commit_signature_commands.py:103
4834
msgid "Verify all commit signatures."
4835
msgstr ""
4836
4837
#: bzrlib/commit_signature_commands.py:105
4838
msgid ""
4839
"Verifies that all commits in the branch are signed by known GnuPG keys."
4840
msgstr ""
4841
4842
#: bzrlib/commit_signature_commands.py:110
4843
msgid ""
4844
"Comma separated list of GPG key patterns which are acceptable for "
4845
"verification."
4846
msgstr ""
4847
4848
#: bzrlib/commit_signature_commands.py:148
4849
msgid "Cannot verify a range of non-revision-history revisions"
4850
msgstr ""
4851
4852
#: bzrlib/commit_signature_commands.py:166
4853
msgid "All commits signed with verifiable keys"
4854
msgstr ""
4855
4856
#: bzrlib/config.py:436
4857
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4858
msgstr ""
4859
4860
#: bzrlib/config.py:2452
4861
msgid "{0} is not an SI unit."
4862
msgstr ""
4863
4864
#: bzrlib/config.py:2971
4865
msgid ""
4866
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4867
"will be saved."
4868
msgstr ""
4869
4870
#: bzrlib/config.py:3116
4871
#, python-format
4872
msgid "Invalid '%s', should be of the form 'name=value'"
4873
msgstr ""
4874
4875
#: bzrlib/config.py:4018
4876
msgid "Display, set or remove a configuration option."
4877
msgstr ""
4878
4879
#: bzrlib/config.py:4020
4880
msgid "Display the active value for a given option."
4881
msgstr ""
4882
4883
#: bzrlib/config.py:4022
4884
msgid ""
4885
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4886
"matching options are displayed mentioning their scope. The active value\n"
4887
"that bzr will take into account is the first one displayed for each option."
4888
msgstr ""
4889
4890
#: bzrlib/config.py:4026
4891
msgid "If no NAME is given, --all .* is implied."
4892
msgstr ""
4893
4894
#: bzrlib/config.py:4028
4895
msgid ""
4896
"Setting a value is achieved by using name=value without spaces. The value\n"
4897
"is set in the most relevant scope and can be checked by displaying the\n"
4898
"option again."
4899
msgstr ""
4900
4901
#: bzrlib/config.py:4040
4902
msgid "Reduce the scope to the specified configuration file."
4903
msgstr ""
4904
4905
#: bzrlib/config.py:4044
4906
msgid "Display all the defined values for the matching options."
4907
msgstr ""
4908
4909
#: bzrlib/config.py:4046
4910
msgid "Remove the option from the configuration file."
4911
msgstr ""
4912
4913
#: bzrlib/conflicts.py:50
4914
msgid "List files with conflicts."
4915
msgstr ""
4916
4917
#: bzrlib/conflicts.py:57
4918
msgid ""
4919
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4920
"is supplied, the pathnames of files with text conflicts are listed,\n"
4921
"instead. (This is useful for editing all files with text conflicts.)"
4922
msgstr ""
4923
4924
#: bzrlib/conflicts.py:61
4925
msgid "Use bzr resolve when you have fixed a problem."
4926
msgstr ""
4927
4928
#: bzrlib/conflicts.py:66
4929
msgid "List paths of files with text conflicts."
4930
msgstr ""
4931
4932
#: bzrlib/conflicts.py:85
4933
msgid "Marks the conflict as resolved."
4934
msgstr ""
4935
4936
#: bzrlib/conflicts.py:88
4937
msgid "Resolve the conflict preserving the version in the working tree."
4938
msgstr ""
4939
4940
#: bzrlib/conflicts.py:91
4941
msgid "Resolve the conflict taking the merged version into account."
4942
msgstr ""
4943
4944
#: bzrlib/conflicts.py:98
4945
msgid "How to resolve the conflict."
4946
msgstr ""
4947
4948
#: bzrlib/conflicts.py:104
4949
msgid "Mark a conflict as resolved."
4950
msgstr ""
4951
4952
#: bzrlib/conflicts.py:111
4953
msgid ""
4954
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4955
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4956
"as\n"
4957
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4958
msgstr ""
4959
4960
#: bzrlib/conflicts.py:119
4961
msgid "Resolve all conflicts in this tree."
4962
msgstr ""
4963
4964
#: bzrlib/conflicts.py:126
4965
msgid "If --all is specified, no FILE may be provided"
4966
msgstr ""
4967
4968
#: bzrlib/conflicts.py:151
4969
#, python-format
4970
msgid "%d conflict auto-resolved."
4971
msgid_plural "%d conflicts auto-resolved."
4972
msgstr[0] ""
4973
msgstr[1] ""
4974
4975
#: bzrlib/conflicts.py:154
4976
msgid "Remaining conflicts:"
4977
msgstr ""
4978
4979
#: bzrlib/conflicts.py:159
4980
msgid "All conflicts resolved."
4981
msgstr ""
4982
4983
#: bzrlib/conflicts.py:168
4984
msgid "{0} conflict resolved, {1} remaining"
4985
msgid_plural "{0} conflicts resolved, {1} remaining"
4986
msgstr[0] ""
4987
msgstr[1] ""
4988
4989
#: bzrlib/controldir.py:712
4990
msgid "{0} is{1} redirected to {2}"
4991
msgstr ""
4992
4993
#: bzrlib/diff.py:399
4994
#, python-format
4995
msgid "*** Ignoring files outside view. View is %s"
4996
msgstr ""
4997
4998
#: bzrlib/errors.py:157
4999
msgid "The tree builder is already building a tree."
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:178
5003
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5004
msgstr ""
5005
5006
#: bzrlib/errors.py:197
5007
msgid ""
5008
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5009
"versions \"%(minimum)s\" to \"%(current)s\"."
5010
msgstr ""
5011
5012
#: bzrlib/errors.py:209
5013
msgid "The transport '%(transport)s' is only accessible within this process."
5014
msgstr ""
5015
5016
#: bzrlib/errors.py:227
5017
msgid "Invalid revision number %(revno)s"
5018
msgstr ""
5019
5020
#: bzrlib/errors.py:236
5021
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5022
msgstr ""
5023
5024
#: bzrlib/errors.py:247
5025
msgid "Reserved revision-id {%(revision_id)s}"
5026
msgstr ""
5027
5028
#: bzrlib/errors.py:261
5029
msgid "There is no public branch set for \"%(branch_url)s\"."
5030
msgstr ""
5031
5032
#: bzrlib/errors.py:271
5033
msgid ""
5034
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5035
"obtain a list of topics."
5036
msgstr ""
5037
"Non è stata trovata nessuna informazione per '%(topic)s'. Usare «bzr help "
5038
"topics» per ottenere un elenco di argomenti."
5039
5040
#: bzrlib/errors.py:280
5041
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5042
msgstr ""
5043
5044
#: bzrlib/errors.py:290
5045
msgid ""
5046
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5047
msgstr ""
5048
5049
#: bzrlib/errors.py:299
5050
msgid "The branch '%(branch)s' is not stacked."
5051
msgstr ""
5052
5053
#: bzrlib/errors.py:313
5054
msgid "No WorkingTree exists for \"%(base)s\"."
5055
msgstr ""
5056
5057
#: bzrlib/errors.py:322
5058
msgid "Not currently building a tree."
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:327
5062
msgid "%(url)s is not a local path."
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:355
5066
msgid "%(not_locked)r is not write locked but needs to be."
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:363
5070
msgid "Error in command line options"
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:368
5074
msgid "%(value)s is not an index of type %(_type)s."
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:378
5078
msgid "Error in data for index %(value)s."
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:387
5082
msgid "The key '%(key)s' is already in index '%(index)s'."
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:397
5086
msgid "The key '%(key)s' is not a valid key."
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:406
5090
msgid "Could not parse options for index %(value)s."
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:415
5094
msgid "The value '%(value)s' is not a valid value."
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:424
5098
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:443
5102
msgid "Generic path error: %(path)r%(extra)s)"
5103
msgstr ""
5104
5105
#: bzrlib/errors.py:456
5106
msgid "No such file: %(path)r%(extra)s"
5107
msgstr ""
5108
5109
#: bzrlib/errors.py:461
5110
msgid "File exists: %(path)r%(extra)s"
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:467
5114
msgid ""
5115
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5116
"after to tell bzr about a rename that has already happened)%(extra)s"
5117
msgstr ""
5118
5119
#: bzrlib/errors.py:483
5120
msgid "\"%(path)s\" is not a directory %(extra)s"
5121
msgstr ""
5122
5123
#: bzrlib/errors.py:488
5124
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:493
5128
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:498
5132
msgid "Hard-linking \"%(path)s\" is not supported"
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:513
5136
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:518
5140
msgid "Permission denied: \"%(path)s\"%(extra)s"
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:523
5144
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:528
5148
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:539
5152
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:561
5156
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:571
5160
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:579
5164
msgid ""
5165
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5166
"upgrade the branch to permit branch stacking."
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:590
5170
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:600
5174
msgid ""
5175
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5176
"need to upgrade the repository to permit branch stacking."
5177
msgstr ""
5178
5179
#: bzrlib/errors.py:611
5180
msgid "Error reading from %(path)r."
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:630
5184
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:646
5188
msgid "Path \"%(path)s\" is not unicode normalized"
5189
msgstr ""
5190
5191
#: bzrlib/errors.py:654
5192
msgid "Not a branch: \"%(path)s\"%(detail)s."
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:696
5196
msgid "No submit branch available for branch \"%(path)s\""
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:705
5200
msgid "A control directory already exists: \"%(path)s\"."
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:710
5204
msgid "Already a branch: \"%(path)s\"."
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:715
5208
msgid "Invalid branch name: %(name)s"
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:724
5212
msgid "Parent branch already exists: \"%(path)s\"."
5213
msgstr ""
5214
5215
#: bzrlib/errors.py:730
5216
msgid ""
5217
"Directory contains a branch, but no working tree (use bzr checkout if you "
5218
"wish to build a working tree): \"%(path)s\""
5219
msgstr ""
5220
5221
#: bzrlib/errors.py:735
5222
msgid ""
5223
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5224
msgstr ""
5225
5226
#: bzrlib/errors.py:745
5227
msgid ""
5228
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5229
msgstr ""
5230
5231
#: bzrlib/errors.py:755
5232
msgid "No repository present: \"%(path)s\""
5233
msgstr ""
5234
5235
#: bzrlib/errors.py:762
5236
msgid ""
5237
"Unsupported branch format: %(format)s\n"
5238
"Please run 'bzr upgrade'"
5239
msgstr ""
5240
5241
#: bzrlib/errors.py:768
5242
msgid "Unknown %(kind)s format: %(format)r"
5243
msgstr ""
5244
5245
#: bzrlib/errors.py:777
5246
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5247
msgstr ""
5248
5249
#: bzrlib/errors.py:787
5250
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:802
5254
msgid ""
5255
"%(target)s\n"
5256
"is not compatible with\n"
5257
"%(source)s\n"
5258
"%(details)s"
5259
msgstr ""
5260
5261
#: bzrlib/errors.py:818
5262
msgid "Revision is not compatible with %(repo_format)s"
5263
msgstr ""
5264
5265
#: bzrlib/errors.py:828
5266
msgid "%(context_info)s%(path)s is already versioned."
5267
msgstr ""
5268
5269
#: bzrlib/errors.py:849
5270
msgid "%(context_info)s%(path)s is not versioned."
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:870
5274
msgid "Path(s) are not versioned: %(paths_as_string)s"
5275
msgstr ""
5276
5277
#: bzrlib/errors.py:881
5278
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5279
msgstr ""
5280
5281
#: bzrlib/errors.py:900
5282
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5283
msgstr ""
5284
5285
#: bzrlib/errors.py:908
5286
msgid ""
5287
"Filename %(filename)r is not valid in your current filesystem encoding "
5288
"%(fs_encoding)s"
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:919
5292
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:937
5296
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:976
5300
msgid "Cannot lock %(lock)s: %(why)s"
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:986
5304
msgid ""
5305
"A transaction related operation was attempted after the transaction finished."
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:1013
5309
msgid "Cannot lock: transport is read only: %(transport)s"
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:1021
5313
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:1032
5317
msgid ""
5318
"Lock was broken while still open: %(lock)s - check storage consistency!"
5319
msgstr ""
5320
5321
#: bzrlib/errors.py:1043
5322
msgid ""
5323
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5324
"%(holder)r, wanted to break %(target)r"
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:1055
5328
msgid ""
5329
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5330
"Use 'bzr break-lock' to clear it"
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:1068
5334
msgid "Lock not held: %(lock)s"
5335
msgstr ""
5336
5337
#: bzrlib/errors.py:1097
5338
msgid "No changes to commit"
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:1102
5342
msgid ""
5343
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:1112
5347
msgid ""
5348
"Excluding paths during commit is not supported by repository at "
5349
"%(repository)r."
5350
msgstr ""
5351
5352
#: bzrlib/errors.py:1121
5353
msgid ""
5354
"The specified commit message contains characters unsupported by the current "
5355
"encoding."
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1127
5359
msgid "Upgrade URL cannot work with readonly URLs."
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1132
5363
msgid "The branch format %(format)s is already at the most recent format."
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1155
5367
msgid "Option --change does not accept revision ranges"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:1160
5371
msgid "No namespace registered for string: %(spec)r"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1179
5375
msgid ""
5376
"Requested revision: '%(spec)s' does not exist in branch: "
5377
"%(branch_url)s%(extra)s"
5378
msgstr ""
5379
5380
#: bzrlib/errors.py:1193
5381
msgid ""
5382
"Operation denied because it would change the main history, which is not "
5383
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5384
msgstr ""
5385
5386
#: bzrlib/errors.py:1204
5387
msgid ""
5388
"These branches have diverged. Use the missing command to see how.\n"
5389
"Use the merge command to reconcile them."
5390
msgstr ""
5391
5392
#: bzrlib/errors.py:1224
5393
msgid ""
5394
"Branches have no common ancestor, and no merge base revision was specified."
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:1230
5398
msgid ""
5399
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5400
msgstr ""
5401
5402
#: bzrlib/errors.py:1236
5403
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5404
msgstr ""
5405
5406
#: bzrlib/errors.py:1245
5407
msgid ""
5408
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5409
msgstr ""
5410
5411
#: 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
msgid "Branch %(branch)s has no commits."
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:1281
5420
msgid ""
5421
"Bound branch %(branch)s is out of date with master branch "
5422
"%(master)s.%(extra_help)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1293
5426
msgid ""
5427
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5428
"bound to %(remote)s."
5429
msgstr ""
5430
5431
#: 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
msgid ""
5437
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5438
"%(error)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1326
5442
msgid "Error in processing weave: %(msg)s"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1335
5446
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1346
5450
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1356
5454
msgid "Weave invariant violated: %(what)s"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1365
5458
msgid "Parents are mismatched between two revisions. %(msg)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1387
5462
msgid ""
5463
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5464
"%(weave_b)s"
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:1399
5468
msgid "Versioned file error"
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1404
5472
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1414
5476
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:1424
5480
msgid "Text did not match its checksum: %(msg)s"
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1550
5484
msgid "Export format %(format)r not supported"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1559
5488
msgid "Transport error: %(msg)s %(orig_error)s"
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:1585
5492
msgid "Generic bzr smart protocol error: %(details)s"
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1593
5496
msgid "Received bad protocol version marker: %(marker)r"
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:1625
5500
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:1630
5504
msgid "Connection error: %(msg)s %(orig_error)s"
5505
msgstr ""
5506
5507
#: bzrlib/errors.py:1635
5508
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:1656
5512
msgid "Connection closed: %(msg)s %(orig_error)s"
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1661
5516
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5517
msgstr ""
5518
5519
#: bzrlib/errors.py:1666
5520
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:1676
5524
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:1691
5528
msgid "Certificate error: %(error)s"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1699
5532
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:1713
5536
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5537
msgstr ""
5538
5539
#: 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
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:1744
5548
msgid "Too many redirections"
5549
msgstr ""
5550
5551
#: bzrlib/errors.py:1749
5552
msgid "Working tree has conflicts."
5553
msgstr ""
5554
5555
#: 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
msgid ""
5561
"Error(s) parsing config file %(filename)s:\n"
5562
"%(errors)s"
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:1772
5566
msgid ""
5567
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5568
"See ``bzr help %(name)s``"
5569
msgstr ""
5570
5571
#: 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
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5577
msgstr ""
5578
5579
#: bzrlib/errors.py:1799
5580
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5581
msgstr ""
5582
5583
#: bzrlib/errors.py:1807
5584
msgid "Unable to import library \"%(library)s\": %(error)s"
5585
msgstr ""
5586
5587
#: bzrlib/errors.py:1815
5588
msgid "python-gpgme is not installed, it is needed to verify signatures"
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:1823
5592
msgid ""
5593
"The working tree for %(basedir)s has changed since the last commit, but "
5594
"weave merge requires that it be unchanged"
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:1833
5598
msgid ""
5599
"Can't reprocess and show base, because reprocessing obscures the "
5600
"relationship of conflicting lines to the base"
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:1839
5604
msgid "Cycle in graph %(graph)r"
5605
msgstr ""
5606
5607
#: bzrlib/errors.py:1867
5608
msgid "File %(filename)s is not conflicted."
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:1889
5612
msgid "No bundle was found in \"%(filename)s\"."
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:1898
5616
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5617
msgstr ""
5618
5619
#: bzrlib/errors.py:1908
5620
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:1921
5624
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:1931
5628
msgid "Key %(key)s is already present in map"
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:1936
5632
msgid "The prefix %(prefix)s is in the help search path twice."
5633
msgstr ""
5634
5635
#: bzrlib/errors.py:1946
5636
msgid ""
5637
"No final name for trans_id %(trans_id)r\n"
5638
"file-id: %(file_id)r\n"
5639
"root trans-id: %(root_trans_id)r\n"
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:1978
5643
msgid "Attempt to reuse a transform that has already been applied."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:1983
5647
msgid "Moving the root directory is not supported at this time"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:1988
5651
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:1999
5655
msgid ""
5656
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5657
msgstr ""
5658
5659
#: bzrlib/errors.py:2035
5660
msgid ""
5661
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5662
msgstr ""
5663
5664
#: bzrlib/errors.py:2065
5665
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:2073
5669
msgid "Nothing to merge."
5670
msgstr ""
5671
5672
#: 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
msgid ""
5678
"Cannot convert from format %(from_format)s to format %(format)s. "
5679
"%(problem)s"
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:2099
5683
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:2107
5687
msgid "%(exe_name)s could not be found on this machine"
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:2115
5691
msgid "Diff is not installed on this machine: %(msg)s"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2123
5695
msgid "Diff3 is not installed on this machine."
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:2129
5699
msgid "The content being inserted is already present."
5700
msgstr ""
5701
5702
#: bzrlib/errors.py:2134
5703
msgid ""
5704
"This tree contains left-over files from a failed operation.\n"
5705
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5706
"to\n"
5707
" keep, and delete it when you are done."
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:2145
5711
msgid ""
5712
"This tree contains left-over files from a failed operation.\n"
5713
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5714
" wish to keep, and delete it when you are done."
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:2155
5718
msgid ""
5719
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5720
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5721
"to\n"
5722
" keep, and delete it when you are done."
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2166
5726
msgid ""
5727
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5728
"examine %(pending_deletion)s to see if it contains any files you wish to "
5729
"keep, and delete it when you are done."
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:2176
5733
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:2190
5737
msgid ""
5738
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5739
msgstr ""
5740
5741
#: bzrlib/errors.py:2203
5742
msgid "Error in merge modified format"
5743
msgstr ""
5744
5745
#: bzrlib/errors.py:2208
5746
msgid "Format error in conflict listings"
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:2212
5750
msgid ""
5751
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5752
"Error: %(description)s"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2223
5756
msgid ""
5757
"An error has been detected in the repository %(repo_path)s.\n"
5758
"Please run bzr reconcile on this repository."
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:2234
5762
msgid ""
5763
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5764
"reason: %(reason)s"
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2247
5768
msgid ""
5769
"An inconsistent delta was supplied: %(delta)r\n"
5770
"reason: %(reason)s"
5771
msgstr ""
5772
5773
#: 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
msgid "To use this feature you must upgrade your repository at %(path)s."
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2273
5782
msgid ""
5783
"To use this feature you must upgrade your branch at %(path)s to a format "
5784
"which supports rich roots."
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2279
5788
msgid "Cannot perform local-only commits on unbound branches."
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:2284
5792
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:2305
5796
msgid "Ghost tags not supported by format %(format)r."
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2313
5800
msgid "File is binary but should be text."
5801
msgstr ""
5802
5803
#: 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
msgid ""
5809
"Testament did not match expected value.\n"
5810
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5811
" {%(measured)s}"
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2339
5815
msgid "Not a bzr revision-bundle: %(text)r"
5816
msgstr ""
5817
5818
#: bzrlib/errors.py:2348
5819
msgid "Bad bzr revision-bundle: %(text)r"
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2357
5823
msgid "Malformed bzr revision-bundle header: %(text)r"
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:2362
5827
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:2367
5831
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:2372
5835
msgid "End of line marker was not \\n in bzr revision-bundle"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2382
5839
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2392
5843
msgid "Root class for inventory serialization errors"
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:2396
5847
msgid ""
5848
"The inventory was not in the expected format:\n"
5849
" %(msg)s"
5850
msgstr ""
5851
5852
#: bzrlib/errors.py:2405
5853
msgid "This operation requires rich root data storage"
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:2418
5857
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5858
msgstr ""
5859
5860
#: bzrlib/errors.py:2427
5861
msgid ""
5862
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5863
"variable."
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2434
5867
msgid ""
5868
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5869
"ghost at {%(ghost_revision_id)s}"
5870
msgstr ""
5871
5872
#: bzrlib/errors.py:2444
5873
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5874
msgstr ""
5875
5876
#: bzrlib/errors.py:2495
5877
msgid ""
5878
"A merge directive must provide either a bundle or a public branch location."
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2502
5882
msgid "Bad merge directive payload %(start)r"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:2512
5886
msgid "Preview patch does not match requested changes."
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2518
5890
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2528
5894
msgid ""
5895
"Your branch does not have all of the revisions required in order to merge "
5896
"this merge directive and the target location specified in the merge "
5897
"directive is not a branch: %(location)s."
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:2540
5901
msgid "Unsupported entry kind %(kind)s"
5902
msgstr ""
5903
5904
#: bzrlib/errors.py:2548
5905
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:2558
5909
msgid "Subsume target %(other_tree)s needs to be upgraded."
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:2577
5913
msgid "No such tag: %(tag_name)s"
5914
msgstr ""
5915
5916
#: 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
msgid "Tag %(tag_name)s already exists."
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:2602
5925
msgid ""
5926
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5927
"bugs\" for more information on this feature."
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:2612
5931
msgid ""
5932
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5933
msgstr ""
5934
5935
#: bzrlib/errors.py:2622
5936
msgid ""
5937
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2632
5941
msgid "Invalid line in bugs property: '%(line)s'"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:2640
5945
msgid "Invalid bug status: '%(status)s'"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2648
5949
msgid "Could not understand response from smart server: %(response_tuple)r"
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:2687
5953
msgid "Server sent an unexpected error: %(error_tuple)r"
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:2706
5957
msgid "Unrecognised container format: %(container_format)r"
5958
msgstr ""
5959
5960
#: bzrlib/errors.py:2714
5961
msgid "Unexpected end of container stream"
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:2719
5965
msgid "Unknown record type: %(record_type)r"
5966
msgstr ""
5967
5968
#: bzrlib/errors.py:2727
5969
msgid "Invalid record: %(reason)s"
5970
msgstr ""
5971
5972
#: bzrlib/errors.py:2735
5973
msgid "Container has data after end marker: %(excess)r"
5974
msgstr ""
5975
5976
#: bzrlib/errors.py:2743
5977
msgid "Container has multiple records with the same name: %(name)s"
5978
msgstr ""
5979
5980
#: bzrlib/errors.py:2756
5981
msgid "Corrupt or incompatible data stream: %(reason)s"
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:2764
5985
msgid "SMTP error: %(error)s"
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:2772
5989
msgid "No message supplied."
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:2777
5993
msgid "No mail-to address (--mail-to) or output (-o) specified."
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2782
5997
msgid ""
5998
"Unable to find mail client with the following names: "
5999
"%(mail_command_list_string)s"
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:2792
6003
msgid "SMTP connection to %(host)s refused"
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:2801
6007
msgid "Please specify smtp_server. No server at default %(host)s."
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:2815
6011
msgid ""
6012
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6013
"reconfigure."
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:2827
6017
msgid "'%(display_url)s' is already a branch."
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:2832
6021
msgid "'%(display_url)s' is already a tree."
6022
msgstr ""
6023
6024
#: bzrlib/errors.py:2837
6025
msgid "'%(display_url)s' is already a checkout."
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:2842
6029
msgid "'%(display_url)s' is already a lightweight checkout."
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:2847
6033
msgid "'%(display_url)s' is already using a shared repository."
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:2852
6037
msgid "'%(display_url)s' is already standalone."
6038
msgstr ""
6039
6040
#: bzrlib/errors.py:2857
6041
msgid "Shared repository '%(display_url)s' already creates working trees."
6042
msgstr ""
6043
6044
#: bzrlib/errors.py:2863
6045
msgid ""
6046
"Shared repository '%(display_url)s' already doesn't create working trees."
6047
msgstr ""
6048
6049
#: bzrlib/errors.py:2869
6050
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:2874
6054
msgid "No location could be found to bind to at %(display_url)s."
6055
msgstr ""
6056
6057
#: bzrlib/errors.py:2879
6058
msgid ""
6059
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6060
"status).%(more)s"
6061
msgstr ""
6062
6063
#: bzrlib/errors.py:2898
6064
msgid ""
6065
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6066
"list).%(more)s"
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:2904
6070
msgid "Variable {%(name)s} is not available."
6071
msgstr ""
6072
6073
#: bzrlib/errors.py:2912
6074
msgid "No template specified."
6075
msgstr ""
6076
6077
#: bzrlib/errors.py:2917
6078
msgid "Unable to create symlink %(path_str)son this platform"
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:2932
6082
msgid ""
6083
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6084
"\"original\", \"local\"."
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:2966
6088
msgid ""
6089
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6090
msgstr ""
6091
6092
#: bzrlib/errors.py:2978
6093
msgid "The \"%(config_id)s\" configuration does not exist."
6094
msgstr ""
6095
6096
#: bzrlib/errors.py:2986
6097
msgid "The \"%(option_name)s\" configuration option does not exist."
6098
msgstr ""
6099
6100
#: bzrlib/errors.py:2994
6101
msgid "The alias \"%(alias_name)s\" does not exist."
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:3008
6105
msgid "\"%(alias_name)s\" is not a valid location alias."
6106
msgstr ""
6107
6108
#: bzrlib/errors.py:3016
6109
msgid "No %(alias_name)s location assigned."
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:3024
6113
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:3034
6117
msgid "Unknown rules detected: %(unknowns_str)s."
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:3045
6121
msgid "Tip change rejected: %(msg)s"
6122
msgstr ""
6123
6124
#: bzrlib/errors.py:3053
6125
msgid "Shelf corrupt."
6126
msgstr ""
6127
6128
#: bzrlib/errors.py:3058
6129
msgid "Corruption while decompressing repository file%(orig_error)s"
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:3070
6133
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6134
msgstr ""
6135
6136
#: bzrlib/errors.py:3078
6137
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6138
msgstr ""
6139
6140
#: bzrlib/errors.py:3086
6141
msgid ""
6142
"An attempt to access a url outside the server jail was made: '%(url)s'."
6143
msgstr ""
6144
6145
#: bzrlib/errors.py:3094
6146
msgid "The user aborted the operation."
6147
msgstr ""
6148
6149
#: bzrlib/errors.py:3099
6150
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:3109
6154
msgid "No such view: %(view_name)s."
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:3119
6158
msgid ""
6159
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6160
"to a later format."
6161
msgstr ""
6162
6163
#: bzrlib/errors.py:3128
6164
msgid ""
6165
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6166
msgstr ""
6167
6168
#: bzrlib/errors.py:3195
6169
msgid "%(bzrdir)r does not support co-located branches."
6170
msgstr ""
6171
6172
#: bzrlib/errors.py:3201
6173
msgid ""
6174
"Unable to determine your name.\n"
6175
"Please, set your name with the 'whoami' command.\n"
6176
"E.g. bzr whoami \"Your Name <name@example.com>\""
6177
msgstr ""
6178
6179
#: bzrlib/errors.py:3210
6180
msgid "Invalid pattern(s) found. %(msg)s"
6181
msgstr ""
6182
6183
#: bzrlib/errors.py:3218
6184
msgid ""
6185
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6186
"unbind` to fix."
6187
msgstr ""
6188
6189
#: bzrlib/errors.py:3229
6190
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6191
msgstr ""
6192
6193
#: bzrlib/errors.py:3238
6194
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6195
msgstr ""
6196
6197
#: bzrlib/errors.py:3247
6198
msgid ""
6199
"No compatible object available for operations from %(source)r to %(target)r."
6200
msgstr ""
6201
6202
#: bzrlib/errors.py:3257
6203
msgid ""
6204
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6205
"%(arguments)s."
6206
msgstr ""
6207
6208
#: bzrlib/errors.py:3267
6209
msgid ""
6210
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6211
"format %(format)r"
6212
msgstr ""
6213
6214
#: bzrlib/errors.py:3279
6215
msgid ""
6216
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6217
"plugin."
6218
msgstr ""
6219
6220
#: bzrlib/errors.py:3292
6221
msgid "Binary files section encountered."
6222
msgstr ""
6223
6224
#: bzrlib/errors.py:3300
6225
msgid ""
6226
"Malformed patch header. %(desc)s\n"
6227
"%(line)r"
6228
msgstr ""
6229
6230
#: bzrlib/errors.py:3309
6231
msgid ""
6232
"Malformed hunk header. %(desc)s\n"
6233
"%(line)r"
6234
msgstr ""
6235
6236
#: bzrlib/errors.py:3318
6237
msgid ""
6238
"Malformed line. %(desc)s\n"
6239
"%(line)r"
6240
msgstr ""
6241
6242
#: bzrlib/errors.py:3328
6243
msgid ""
6244
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6245
"but patch says it should be \"%(patch_line)s\""
6246
msgstr ""
6247
6248
#: bzrlib/errors.py:3339
6249
msgid "The feature %(feature)s has already been registered."
6250
msgstr ""
6251
6252
#: bzrlib/export_pot.py:252
6253
#, python-format
6254
msgid "Exporting messages from builtin command: %s"
6255
msgstr ""
6256
6257
#: bzrlib/export_pot.py:271
6258
msgid "Exporting messages from plugin command: {0} in {1}"
6259
msgstr ""
6260
6261
#: bzrlib/export_pot.py:292
6262
#, python-format
6263
msgid "Exporting message from error: %s"
6264
msgstr ""
6265
6266
#: bzrlib/fetch.py:98
6267
msgid "Finding revisions"
6268
msgstr ""
6269
6270
#: bzrlib/fetch.py:103
6271
msgid "Fetching revisions"
6272
msgstr ""
6273
6274
#: bzrlib/foreign.py:262
6275
msgid "Push into a different VCS without any custom bzr metadata."
6276
msgstr ""
6277
6278
#: bzrlib/foreign.py:264
6279
msgid ""
6280
"This will afterwards rebase the local branch on the remote\n"
6281
"branch unless the --no-rebase option is used, in which case \n"
6282
"the two branches will be out of sync after the push. "
6283
msgstr ""
6284
6285
#: bzrlib/foreign.py:277
6286
msgid "Do not rebase after push."
6287
msgstr ""
6288
6289
#: bzrlib/foreign.py:311
6290
#, python-format
6291
msgid "Using saved location: %s\n"
6292
msgstr ""
6293
6294
#: bzrlib/foreign.py:321
6295
msgid ""
6296
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6297
"regular push."
6298
msgstr ""
6299
6300
#: bzrlib/gpg.py:366
6301
msgid "No GnuPG key results for pattern: {0}"
6302
msgstr ""
6303
6304
#: bzrlib/gpg.py:439
6305
msgid "{0} commits with valid signatures"
6306
msgstr ""
6307
6308
#: bzrlib/gpg.py:445
6309
msgid "{0} commit with unknown key"
6310
msgid_plural "{0} commits with unknown keys"
6311
msgstr[0] ""
6312
msgstr[1] ""
6313
6314
#: bzrlib/gpg.py:453
6315
msgid "{0} commit not valid"
6316
msgid_plural "{0} commits not valid"
6317
msgstr[0] ""
6318
msgstr[1] ""
6319
6320
#: bzrlib/gpg.py:461
6321
msgid "{0} commit not signed"
6322
msgid_plural "{0} commits not signed"
6323
msgstr[0] ""
6324
msgstr[1] ""
6325
6326
#: bzrlib/gpg.py:469
6327
msgid "{0} commit with key now expired"
6328
msgid_plural "{0} commits with key now expired"
6329
msgstr[0] ""
6330
msgstr[1] ""
6331
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] ""
6337
6338
#: bzrlib/gpg.py:505
6339
msgid "{0} signed {1} commit"
6340
msgid_plural "{0} signed {1} commits"
6341
msgstr[0] ""
6342
msgstr[1] ""
6343
6344
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6345
msgid "{0} commit by author {1}"
6346
msgid_plural "{0} commits by author {1}"
6347
msgstr[0] ""
6348
msgstr[1] ""
6349
6350
#: bzrlib/gpg.py:554
6351
msgid "Unknown key {0} signed {1} commit"
6352
msgid_plural "Unknown key {0} signed {1} commits"
6353
msgstr[0] ""
6354
msgstr[1] ""
6355
6356
#: bzrlib/groupcompress.py:1739
6357
#, python-format
6358
msgid "Insert claimed random_id=True, but then inserted %r two times"
6359
msgstr ""
6360
6361
#: bzrlib/hooks.py:313
6362
#, python-format
6363
msgid "Introduced in: %s"
6364
msgstr ""
6365
6366
#: bzrlib/hooks.py:316
6367
#, python-format
6368
msgid "Deprecated in: %s"
6369
msgstr ""
6370
6371
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6372
msgid "Walking content"
6373
msgstr ""
6374
6375
#: bzrlib/knit.py:3330
6376
msgid "annotating"
6377
msgstr ""
6378
6379
#: bzrlib/lock.py:548
6380
msgid "{0!r} was {1} locked again"
6381
msgstr ""
6382
6383
#: bzrlib/lockdir.py:321
6384
#, python-format
6385
msgid "error removing pending lock: %s"
6386
msgstr ""
6387
6388
#: bzrlib/lockdir.py:616
6389
msgid "Unable to obtain"
6390
msgstr ""
6391
6392
#: bzrlib/lockdir.py:618
6393
msgid "Lock owner changed for"
6394
msgstr ""
6395
6396
#: bzrlib/lockdir.py:620
6397
msgid "{0} lock {1} {2}."
6398
msgstr ""
6399
6400
#: bzrlib/lockdir.py:627
6401
#, python-format
6402
msgid "Will continue to try until %s, unless you press Ctrl-C."
6403
msgstr ""
6404
6405
#: bzrlib/lockdir.py:629
6406
msgid "See \"bzr help break-lock\" for more."
6407
msgstr ""
6408
6409
#: bzrlib/lockdir.py:739
6410
#, python-format
6411
msgid ""
6412
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6413
msgstr ""
6414
6415
#: bzrlib/log.py:563
6416
msgid "--exclude-common-ancestry requires two different revisions"
6417
msgstr ""
6418
6419
#: bzrlib/log.py:565
6420
#, python-format
6421
msgid "invalid direction %r"
6422
msgstr ""
6423
6424
#: bzrlib/log.py:653
6425
msgid "Start revision not found in history of end revision."
6426
msgstr ""
6427
6428
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6429
msgid "Logging revision 0 is invalid."
6430
msgstr ""
6431
6432
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6433
msgid "Start revision must be older than the end revision."
6434
msgstr ""
6435
6436
#: bzrlib/log.py:1818
6437
#, python-format
6438
msgid "unknown log formatter: %r"
6439
msgstr ""
6440
6441
#: bzrlib/log.py:2114
6442
msgid "fixes bug"
6443
msgid_plural "fixes bugs"
6444
msgstr[0] ""
6445
msgstr[1] ""
6446
6447
#: bzrlib/merge.py:689
6448
msgid "All changes applied successfully."
6449
msgstr ""
6450
6451
#: bzrlib/merge.py:691
6452
#, python-format
6453
msgid "%d conflicts encountered."
6454
msgstr ""
6455
6456
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6457
msgid "Preparing file merge"
6458
msgstr ""
6459
6460
#: bzrlib/multiparent.py:426
6461
msgid "Importing revisions"
6462
msgstr ""
6463
6464
#: bzrlib/option.py:526
6465
msgid "Show help message."
6466
msgstr ""
6467
6468
#: bzrlib/option.py:528
6469
msgid "Only display errors and warnings."
6470
msgstr ""
6471
6472
#: bzrlib/option.py:531
6473
msgid "Show usage message and options."
6474
msgstr ""
6475
6476
#: bzrlib/option.py:533
6477
msgid "Display more information."
6478
msgstr ""
6479
6480
#: bzrlib/option.py:541
6481
msgid ""
6482
"Select changes introduced by the specified revision. See also \"help "
6483
"revisionspec\"."
6484
msgstr ""
6485
6486
#: bzrlib/option.py:543
6487
msgid "Branch to operate on, instead of working directory."
6488
msgstr ""
6489
6490
#: bzrlib/option.py:545
6491
msgid "Detailed log format."
6492
msgstr ""
6493
6494
#: bzrlib/option.py:545
6495
msgid "Format used by GNU ChangeLog files."
6496
msgstr ""
6497
6498
#: bzrlib/option.py:545
6499
msgid "Log format with one line per revision."
6500
msgstr ""
6501
6502
#: bzrlib/option.py:545
6503
msgid "Moderately short log format."
6504
msgstr ""
6505
6506
#: bzrlib/option.py:545
6507
msgid "Use specified log format."
6508
msgstr ""
6509
6510
#: bzrlib/option.py:547
6511
msgid "Log format"
6512
msgstr ""
6513
6514
#: bzrlib/option.py:549
6515
msgid "LCA-newness merge."
6516
msgstr ""
6517
6518
#: bzrlib/option.py:549
6519
msgid "Merge using external diff3."
6520
msgstr ""
6521
6522
#: bzrlib/option.py:549
6523
msgid "Native diff3-style merge."
6524
msgstr ""
6525
6526
#: bzrlib/option.py:549
6527
msgid "Select a particular merge algorithm."
6528
msgstr ""
6529
6530
#: bzrlib/option.py:549
6531
msgid "Weave-based merge."
6532
msgstr ""
6533
6534
#: bzrlib/option.py:551
6535
msgid "Merge algorithm"
6536
msgstr ""
6537
6538
#: bzrlib/option.py:554
6539
msgid "Message string."
6540
msgstr ""
6541
6542
#: bzrlib/option.py:556
6543
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6544
msgstr ""
6545
6546
#: bzrlib/option.py:558
6547
msgid "Ignore differences between branches and overwrite unconditionally."
6548
msgstr ""
6549
6550
#: bzrlib/option.py:560
6551
msgid "Remember the specified location as a default."
6552
msgstr ""
6553
6554
#: bzrlib/option.py:562
6555
msgid "Reprocess to reduce spurious conflicts."
6556
msgstr ""
6557
6558
#: bzrlib/option.py:566
6559
msgid "See \"help revisionspec\" for details."
6560
msgstr ""
6561
6562
#: bzrlib/option.py:568
6563
msgid "Show internal object ids."
6564
msgstr ""
6565
6566
#: bzrlib/option.py:571
6567
msgid "Display timezone as local, original, or utc."
6568
msgstr ""
6569
6570
#: bzrlib/osutils.py:100
6571
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6572
msgstr ""
6573
6574
#: bzrlib/osutils.py:220
6575
msgid "lstat/stat of ({0!r}): {1!r}"
6576
msgstr ""
6577
6578
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6579
#, python-format
6580
msgid "sorry, %r not allowed in path"
6581
msgstr ""
6582
6583
#: bzrlib/osutils.py:1259
6584
#, python-format
6585
msgid "%r is too short to calculate a relative path"
6586
msgstr "%r è troppo breve per calcolare un percorso relativo"
6587
6588
#: bzrlib/plugin.py:143
6589
#, python-format
6590
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6591
msgstr ""
6592
6593
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6594
msgid "Enable completions for the selected plugin (default: all plugins)"
6595
msgstr ""
6596
6597
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6598
msgid "Generate a shell function for bash command line completion."
6599
msgstr ""
6600
6601
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6602
msgid ""
6603
"This command generates a shell function which can be used by bash to\n"
6604
"automatically complete the currently typed command when the user presses\n"
6605
"the completion key (usually tab)."
6606
msgstr ""
6607
6608
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6609
msgid ""
6610
"Commonly used like this:\n"
6611
" eval \"`bzr bash-completion`\""
6612
msgstr ""
6613
6614
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6615
msgid "Name of the generated function (default: _bzr)"
6616
msgstr ""
6617
6618
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6619
msgid "Generate only the shell function, don't enable it"
6620
msgstr ""
6621
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
6627
msgid "Register a branch with launchpad.net."
6628
msgstr ""
6629
6630
#: bzrlib/plugins/launchpad/cmds.py:46
6631
msgid ""
6632
"This command lists a bzr branch in the directory of branches on\n"
6633
"launchpad.net. Registration allows the branch to be associated with\n"
6634
"bugs or specifications."
6635
msgstr ""
6636
6637
#: bzrlib/plugins/launchpad/cmds.py:50
6638
msgid ""
6639
"Before using this command you must register the project to which the\n"
6640
"branch belongs, and create an account for yourself on launchpad.net."
6641
msgstr ""
6642
6643
#: bzrlib/plugins/launchpad/cmds.py:53
6644
msgid ""
6645
"arguments:\n"
6646
" public_url: The publicly visible url for the branch to register.\n"
6647
" This must be an http or https url (which Launchpad can read\n"
6648
" from to access the branch). Local file urls, SFTP urls, and\n"
6649
" bzr+ssh urls will not work.\n"
6650
" If no public_url is provided, bzr will use the configured\n"
6651
" public_url if there is one for the current branch, and\n"
6652
" otherwise error."
6653
msgstr ""
6654
6655
#: bzrlib/plugins/launchpad/cmds.py:62
6656
msgid ""
6657
"example:\n"
6658
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6659
" --project fooproject"
6660
msgstr ""
6661
6662
#: bzrlib/plugins/launchpad/cmds.py:69
6663
msgid "Launchpad project short name to associate with the branch."
6664
msgstr ""
6665
6666
#: bzrlib/plugins/launchpad/cmds.py:76
6667
msgid ""
6668
"Short name for the branch; by default taken from the last component of the "
6669
"url."
6670
msgstr ""
6671
6672
#: bzrlib/plugins/launchpad/cmds.py:80
6673
msgid "One-sentence description of the branch."
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/cmds.py:83
6677
msgid "Longer description of the purpose or contents of the branch."
6678
msgstr ""
6679
6680
#: bzrlib/plugins/launchpad/cmds.py:86
6681
msgid "Branch author's email address, if not yourself."
6682
msgstr ""
6683
6684
#: bzrlib/plugins/launchpad/cmds.py:89
6685
msgid "The bug this branch fixes."
6686
msgstr ""
6687
6688
#: bzrlib/plugins/launchpad/cmds.py:92
6689
msgid "Prepare the request but don't actually send it."
6690
msgstr ""
6691
6692
#: bzrlib/plugins/launchpad/cmds.py:114
6693
msgid ""
6694
"register-branch requires a public branch url - see bzr help register-branch."
6695
msgstr ""
6696
6697
#: bzrlib/plugins/launchpad/cmds.py:122
6698
msgid "--product is deprecated; please use --project."
6699
msgstr ""
6700
6701
#: bzrlib/plugins/launchpad/cmds.py:152
6702
msgid "Open a Launchpad branch page in your web browser."
6703
msgstr ""
6704
6705
#: bzrlib/plugins/launchpad/cmds.py:157
6706
msgid "Do not actually open the browser. Just say the URL we would use."
6707
msgstr ""
6708
6709
#: bzrlib/plugins/launchpad/cmds.py:192
6710
#, python-format
6711
msgid "Opening %s in web browser"
6712
msgstr ""
6713
6714
#: bzrlib/plugins/launchpad/cmds.py:200
6715
msgid "Show or set the Launchpad user ID."
6716
msgstr ""
6717
6718
#: bzrlib/plugins/launchpad/cmds.py:202
6719
msgid ""
6720
"When communicating with Launchpad, some commands need to know your\n"
6721
"Launchpad user ID. This command can be used to set or show the\n"
6722
"user ID that Bazaar will use for such communication."
6723
msgstr ""
6724
6725
#: bzrlib/plugins/launchpad/cmds.py:206
6726
msgid ""
6727
":Examples:\n"
6728
" Show the Launchpad ID of the current user::"
6729
msgstr ""
6730
6731
#: bzrlib/plugins/launchpad/cmds.py:209
6732
msgid " bzr launchpad-login"
6733
msgstr ""
6734
6735
#: bzrlib/plugins/launchpad/cmds.py:211
6736
msgid " Set the Launchpad ID of the current user to 'bob'::"
6737
msgstr ""
6738
6739
#: bzrlib/plugins/launchpad/cmds.py:213
6740
msgid " bzr launchpad-login bob"
6741
msgstr ""
6742
6743
#: bzrlib/plugins/launchpad/cmds.py:220
6744
msgid "Don't check that the user name is valid."
6745
msgstr ""
6746
6747
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6748
msgid "Launchpad user ID exists and has SSH keys.\n"
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/cmds.py:238
6752
msgid "No Launchpad user ID configured.\n"
6753
msgstr ""
6754
6755
#: bzrlib/plugins/launchpad/cmds.py:249
6756
#, python-format
6757
msgid "Launchpad user ID set to '%s'.\n"
6758
msgstr ""
6759
6760
#: bzrlib/plugins/launchpad/cmds.py:255
6761
msgid "Ask Launchpad to mirror a branch now."
6762
msgstr ""
6763
6764
#: bzrlib/plugins/launchpad/cmds.py:272
6765
msgid "Propose merging a branch on Launchpad."
6766
msgstr ""
6767
6768
#: bzrlib/plugins/launchpad/cmds.py:274
6769
msgid ""
6770
"This will open your usual editor to provide the initial comment. When it\n"
6771
"has created the proposal, it will open it in your default web browser."
6772
msgstr ""
6773
6774
#: bzrlib/plugins/launchpad/cmds.py:277
6775
msgid ""
6776
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6777
"is not supplied, the remembered submit branch will be used. If no submit\n"
6778
"branch is remembered, the development focus will be used."
6779
msgstr ""
6780
6781
#: bzrlib/plugins/launchpad/cmds.py:281
6782
msgid ""
6783
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6784
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6785
"The parameter the launchpad account name of the desired reviewer. This\n"
6786
"may optionally be followed by '=' and the review type. For example:"
6787
msgstr ""
6788
6789
#: bzrlib/plugins/launchpad/cmds.py:286
6790
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6791
msgstr ""
6792
6793
#: bzrlib/plugins/launchpad/cmds.py:288
6794
msgid ""
6795
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6796
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6797
msgstr ""
6798
6799
#: bzrlib/plugins/launchpad/cmds.py:293
6800
msgid "Propose the merge on staging."
6801
msgstr ""
6802
6803
#: bzrlib/plugins/launchpad/cmds.py:295
6804
msgid "Commit message."
6805
msgstr ""
6806
6807
#: bzrlib/plugins/launchpad/cmds.py:297
6808
msgid "Mark the proposal as approved immediately."
6809
msgstr ""
6810
6811
#: bzrlib/plugins/launchpad/cmds.py:298
6812
msgid "The bug this proposal fixes."
6813
msgstr ""
6814
6815
#: bzrlib/plugins/launchpad/cmds.py:300
6816
msgid "Requested reviewer and optional type."
6817
msgstr ""
6818
6819
#: bzrlib/plugins/launchpad/cmds.py:335
6820
msgid "Find the proposal to merge this revision."
6821
msgstr ""
6822
6823
#: bzrlib/plugins/launchpad/cmds.py:337
6824
msgid ""
6825
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6826
"This works only if the selected branch was the merge proposal target, and\n"
6827
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6828
"are opened in a web browser."
6829
msgstr ""
6830
6831
#: bzrlib/plugins/launchpad/cmds.py:342
6832
msgid ""
6833
"Any revision involved in the merge may be specified-- the revision in\n"
6834
"which the merge was performed, or one of the revisions that was merged."
6835
msgstr ""
6836
6837
#: bzrlib/plugins/launchpad/cmds.py:345
6838
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6839
msgstr ""
6840
6841
#: bzrlib/plugins/launchpad/cmds.py:347
6842
msgid " bzr lp-find-proposal -r annotate:README:1"
6843
msgstr ""
6844
6845
#: bzrlib/plugins/launchpad/cmds.py:363
6846
msgid "No review found."
6847
msgstr ""
6848
6849
#: bzrlib/plugins/launchpad/cmds.py:364
6850
#, python-format
6851
msgid "%d proposals(s) found."
6852
msgstr ""
6853
6854
#: bzrlib/plugins/launchpad/cmds.py:374
6855
msgid "Finding revision-id"
6856
msgstr ""
6857
6858
#: bzrlib/plugins/launchpad/cmds.py:381
6859
msgid "Finding merge"
6860
msgstr ""
6861
6862
#: bzrlib/plugins/launchpad/cmds.py:386
6863
msgid "Finding revno"
6864
msgstr ""
6865
6866
#: bzrlib/plugins/launchpad/cmds.py:392
6867
msgid "Finding Launchpad branch"
6868
msgstr ""
6869
6870
#: bzrlib/plugins/launchpad/cmds.py:395
6871
msgid "Finding proposals"
6872
msgstr ""
6873
6874
#: bzrlib/plugins/launchpad/lp_api.py:241
6875
#: bzrlib/plugins/launchpad/lp_api.py:246
6876
#, python-format
6877
msgid "%s is not registered on Launchpad"
6878
msgstr ""
6879
6880
#: bzrlib/plugins/launchpad/lp_api.py:256
6881
#, python-format
6882
msgid "%s has no development focus."
6883
msgstr ""
6884
6885
#: bzrlib/plugins/launchpad/lp_api.py:261
6886
#, python-format
6887
msgid "development focus %s has no branch."
6888
msgstr ""
6889
6890
#: bzrlib/plugins/launchpad/lp_api.py:266
6891
#, python-format
6892
msgid "source package %s has no branch."
6893
msgstr ""
6894
6895
#: bzrlib/plugins/launchpad/lp_api.py:270
6896
#, python-format
6897
msgid "%s has no associated product or source package."
6898
msgstr ""
6899
6900
#: bzrlib/plugins/launchpad/lp_api.py:282
6901
#, python-format
6902
msgid "%s is already up-to-date."
6903
msgstr ""
6904
6905
#: bzrlib/plugins/launchpad/lp_api.py:289
6906
#, python-format
6907
msgid "Pushing to %s"
6908
msgstr ""
6909
6910
#: bzrlib/plugins/launchpad/lp_directory.py:170
6911
msgid ""
6912
"resolution for {0}\n"
6913
" local: {1}\n"
6914
" remote: {2}"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/launchpad/lp_propose.py:150
6918
#, python-format
6919
msgid "There is already a branch merge proposal: %s"
6920
msgstr ""
6921
6922
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6923
msgid "pb parameter to convert() is deprecated"
6924
msgstr ""
6925
6926
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6927
msgid "starting upgrade from format 4 to 5"
6928
msgstr ""
6929
6930
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6931
msgid "note: upgrade may be faster if all store files are ungzipped first"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6935
msgid "converting revision"
6936
msgstr ""
6937
6938
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6939
msgid "upgraded to weaves:"
6940
msgstr ""
6941
6942
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6943
#, python-format
6944
msgid "%6d revisions and inventories"
6945
msgstr "%6d revisioni e inventari"
6946
6947
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6948
#, python-format
6949
msgid "%6d revisions not present"
6950
msgstr "%6d revisioni non presenti"
6951
6952
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6953
#, python-format
6954
msgid "%6d texts"
6955
msgstr "%6d testi"
6956
6957
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6958
msgid "writing weave"
6959
msgstr ""
6960
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6962
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6963
msgid "inventory"
6964
msgstr ""
6965
6966
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6967
msgid "write revision"
6968
msgstr ""
6969
6970
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6971
msgid "loading revision"
6972
msgstr ""
6973
6974
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6975
#, python-format
6976
msgid "revision {%s} not present in branch; will be converted as a ghost"
6977
msgstr ""
6978
6979
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6980
msgid "starting upgrade from format 5 to 6"
6981
msgstr ""
6982
6983
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6984
#, python-format
6985
msgid "adding prefixes to %s"
6986
msgstr ""
6987
6988
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6989
msgid "starting upgrade from format 6 to metadir"
6990
msgstr ""
6991
6992
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6993
msgid "Removing ancestry.weave"
6994
msgstr ""
6995
6996
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6997
msgid "Finding branch files"
6998
msgstr ""
6999
7000
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7001
msgid "Upgrading repository"
7002
msgstr ""
7003
7004
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7005
msgid "Upgrading branch"
7006
msgstr ""
7007
7008
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7009
msgid "No working tree."
7010
msgstr ""
7011
7012
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7013
msgid "Upgrading working tree"
7014
msgstr ""
7015
7016
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7017
#, python-format
7018
msgid "Make %s lock"
7019
msgstr ""
7020
7021
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7022
#, python-format
7023
msgid "Moving %s"
7024
msgstr ""
7025
7026
#: bzrlib/push.py:56
7027
msgid "Created new branch."
7028
msgstr ""
7029
7030
#: bzrlib/push.py:97
7031
#, python-format
7032
msgid ""
7033
"Target directory %s already contains a .bzr directory, but it is not valid."
7034
msgstr ""
7035
7036
#: bzrlib/push.py:101
7037
#, python-format
7038
msgid ""
7039
"Target directory %s already exists, but does not have a .bzr directory. "
7040
"Supply --use-existing-dir to push there anyway."
7041
msgstr ""
7042
7043
#: bzrlib/push.py:122
7044
#, python-format
7045
msgid "Too many redirections trying to make %s."
7046
msgstr ""
7047
7048
#: bzrlib/push.py:148
7049
msgid ""
7050
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7051
"information."
7052
msgstr ""
7053
7054
#: bzrlib/push.py:152
7055
#, python-format
7056
msgid ""
7057
"It is not possible to losslessly push to %s. You may want to use dpush "
7058
"instead."
7059
msgstr ""
7060
7061
#: bzrlib/push.py:158
7062
#, python-format
7063
msgid ""
7064
"At %s you have a valid .bzr control directory, but not a branch or "
7065
"repository. This is an unsupported configuration. Please move the target "
7066
"directory out of the way and try again."
7067
msgstr ""
7068
7069
#: bzrlib/reconcile.py:97
7070
#, python-format
7071
msgid "Reconciling branch %s"
7072
msgstr ""
7073
7074
#: bzrlib/reconcile.py:103
7075
#, python-format
7076
msgid "Reconciling repository %s"
7077
msgstr ""
7078
7079
#: bzrlib/reconcile.py:105
7080
msgid "Reconciling repository"
7081
msgstr ""
7082
7083
#: bzrlib/reconcile.py:111
7084
#, python-format
7085
msgid "%s cannot canonicalize CHKs."
7086
msgstr ""
7087
7088
#: bzrlib/reconcile.py:119
7089
msgid "Reconcile aborted: revision index has inconsistent parents."
7090
msgstr ""
7091
7092
#: bzrlib/reconcile.py:121
7093
msgid "Run \"bzr check\" for more details."
7094
msgstr ""
7095
7096
#: bzrlib/reconcile.py:123
7097
msgid "Reconciliation complete."
7098
msgstr ""
7099
7100
#: bzrlib/reconcile.py:166
7101
msgid "Fixing last revision info {0} => {1}"
7102
msgstr ""
7103
7104
#: bzrlib/reconcile.py:173
7105
msgid "revision_history ok."
7106
msgstr ""
7107
7108
#: bzrlib/reconcile.py:234
7109
msgid "Reading inventory data"
7110
msgstr ""
7111
7112
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7113
msgid "Inventory ok."
7114
msgstr ""
7115
7116
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7117
msgid "Backing up inventory"
7118
msgstr ""
7119
7120
#: bzrlib/reconcile.py:258
7121
msgid "Backup inventory created."
7122
msgstr ""
7123
7124
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7125
msgid "Writing weave"
7126
msgstr ""
7127
7128
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7129
msgid "Inventory regenerated."
7130
msgstr ""
7131
7132
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7133
msgid "Reading indexes"
7134
msgstr ""
7135
7136
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7137
msgid "Checking unused inventories"
7138
msgstr ""
7139
7140
#: bzrlib/reconcile.py:388
7141
msgid "Backup Inventory created"
7142
msgstr ""
7143
7144
#: bzrlib/reconcile.py:446
7145
msgid "Fixing text parents"
7146
msgstr ""
7147
7148
#: bzrlib/reconfigure.py:54
7149
msgid "{0} is now stacked on {1}\n"
7150
msgstr ""
7151
7152
#: bzrlib/reconfigure.py:69
7153
#, python-format
7154
msgid "%s is now not stacked\n"
7155
msgstr "%s ora non è in stack\n"
7156
7157
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7158
#, python-format
7159
msgid "bzr: ERROR (ignored): %s"
7160
msgstr ""
7161
7162
#: bzrlib/remote.py:2534
7163
msgid "Copying repository content as tarball..."
7164
msgstr ""
7165
7166
#: bzrlib/rename_map.py:69
7167
msgid "Calculating hashes"
7168
msgstr ""
7169
7170
#: bzrlib/rename_map.py:107
7171
msgid "Determining hash hits"
7172
msgstr ""
7173
7174
#: bzrlib/rename_map.py:242
7175
msgid "{0} => {1}"
7176
msgstr ""
7177
7178
#: bzrlib/repository.py:1738
7179
msgid "Moving repository to repository.backup"
7180
msgstr ""
7181
7182
#: bzrlib/repository.py:1745
7183
msgid "Creating new repository"
7184
msgstr ""
7185
7186
#: bzrlib/repository.py:1750
7187
msgid "Copying content"
7188
msgstr ""
7189
7190
#: bzrlib/repository.py:1754
7191
msgid "Deleting old repository content"
7192
msgstr ""
7193
7194
#: bzrlib/repository.py:1756
7195
msgid "repository converted"
7196
msgstr ""
7197
7198
#: bzrlib/revisionspec.py:903
7199
msgid "Using {0} {1}"
7200
msgstr ""
7201
7202
#: bzrlib/send.py:59
7203
#, python-format
7204
msgid "Mail client \"%s\" does not support specifying body"
7205
msgstr ""
7206
7207
#: bzrlib/send.py:63
7208
msgid "--remember requires a branch to be specified."
7209
msgstr ""
7210
7211
#: bzrlib/send.py:78
7212
msgid "No submit branch known or specified"
7213
msgstr ""
7214
7215
#: bzrlib/send.py:81
7216
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7217
msgstr ""
7218
7219
#: bzrlib/send.py:99
7220
#, python-format
7221
msgid "No such send format '%s'."
7222
msgstr ""
7223
7224
#: bzrlib/send.py:115
7225
msgid "bzr send takes at most two one revision identifiers"
7226
msgstr ""
7227
7228
#: bzrlib/send.py:128
7229
msgid "No revisions to submit."
7230
msgstr ""
7231
7232
#: bzrlib/send.py:140
7233
msgid ""
7234
"- not supported for merge directives that use more than one output file."
7235
msgstr ""
7236
7237
#: bzrlib/send.py:186
7238
msgid "Format 0.9 does not permit bundle with no patch"
7239
msgstr ""
7240
7241
#: bzrlib/shelf_ui.py:46
7242
#, python-format
7243
msgid "Shelve adding file \"%(path)s\"?"
7244
msgstr ""
7245
7246
#: bzrlib/shelf_ui.py:47
7247
msgid "Shelve binary changes?"
7248
msgstr ""
7249
7250
#: bzrlib/shelf_ui.py:48
7251
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7252
msgstr ""
7253
7254
#: bzrlib/shelf_ui.py:50
7255
#, python-format
7256
msgid "Shelve removing file \"%(path)s\"?"
7257
msgstr ""
7258
7259
#: bzrlib/shelf_ui.py:51
7260
#, python-format
7261
msgid "Shelve %d change(s)?"
7262
msgstr ""
7263
7264
#: bzrlib/shelf_ui.py:52
7265
msgid "Shelve?"
7266
msgstr ""
7267
7268
#: bzrlib/shelf_ui.py:53
7269
#, python-format
7270
msgid ""
7271
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7272
msgstr ""
7273
7274
#: bzrlib/shelf_ui.py:55
7275
#, python-format
7276
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7277
msgstr ""
7278
7279
#: bzrlib/shelf_ui.py:70
7280
#, python-format
7281
msgid "Changes shelved with id \"%d\"."
7282
msgstr ""
7283
7284
#: bzrlib/shelf_ui.py:74
7285
msgid "Selected changes destroyed."
7286
msgstr ""
7287
7288
#: bzrlib/shelf_ui.py:78
7289
msgid "Selected changes:"
7290
msgstr ""
7291
7292
#: bzrlib/shelf_ui.py:98
7293
#, python-format
7294
msgid "Delete file \"%(path)s\"?"
7295
msgstr ""
7296
7297
#: bzrlib/shelf_ui.py:99
7298
msgid "Apply binary changes?"
7299
msgstr ""
7300
7301
#: bzrlib/shelf_ui.py:100
7302
#, python-format
7303
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7304
msgstr ""
7305
7306
#: bzrlib/shelf_ui.py:102
7307
#, python-format
7308
msgid "Add file \"%(path)s\"?"
7309
msgstr ""
7310
7311
#: bzrlib/shelf_ui.py:103
7312
#, python-format
7313
msgid "Apply %d change(s)?"
7314
msgstr ""
7315
7316
#: bzrlib/shelf_ui.py:104
7317
msgid "Apply change?"
7318
msgstr ""
7319
7320
#: bzrlib/shelf_ui.py:105
7321
#, python-format
7322
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7323
msgstr ""
7324
7325
#: bzrlib/shelf_ui.py:107
7326
#, python-format
7327
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7328
msgstr ""
7329
7330
#: bzrlib/shelf_ui.py:402
7331
msgid "No changes are shelved."
7332
msgstr ""
7333
7334
#: bzrlib/shelf_ui.py:460
7335
#, python-format
7336
msgid "Using changes with id \"%d\"."
7337
msgstr ""
7338
7339
#: bzrlib/shelf_ui.py:464
7340
#, python-format
7341
msgid "Message: %s"
7342
msgstr ""
7343
7344
#: bzrlib/shelf_ui.py:476
7345
#, python-format
7346
msgid "Deleted changes with id \"%d\"."
7347
msgstr ""
7348
7349
#: bzrlib/smart/medium.py:714
7350
msgid "HPSS calls: {0} ({1} vfs) {2}"
7351
msgstr ""
7352
7353
#: bzrlib/smart/server.py:169
7354
msgid "Requested to stop gracefully"
7355
msgstr ""
7356
7357
#: bzrlib/smart/server.py:179
7358
#, python-format
7359
msgid "Waiting for %d client(s) to finish"
7360
msgstr ""
7361
7362
#: bzrlib/smart/server.py:185
7363
#, python-format
7364
msgid "Still waiting for %d client(s) to finish"
7365
msgstr ""
7366
7367
#: bzrlib/smart/server.py:219
7368
#, python-format
7369
msgid "listening socket error: %s"
7370
msgstr ""
7371
7372
#: bzrlib/smart/server.py:452
7373
#, python-format
7374
msgid "listening on port: %s"
7375
msgstr ""
7376
7377
#: bzrlib/switch.py:73
7378
msgid "Pending merges must be committed or reverted before using switch."
7379
msgstr ""
7380
7381
#: bzrlib/switch.py:100
7382
msgid ""
7383
"Cannot switch as local commits found in the checkout. Commit these to the "
7384
"bound branch or use --force to throw them away."
7385
msgstr ""
7386
7387
#: bzrlib/switch.py:105
7388
#, python-format
7389
msgid ""
7390
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7391
"anyway, use --force."
7392
msgstr ""
7393
7394
#: bzrlib/switch.py:129
7395
msgid "Cannot switch a branch, only a checkout."
7396
msgstr ""
7397
7398
#: bzrlib/switch.py:167
7399
#, python-format
7400
msgid "Tree is up to date at revision %d."
7401
msgstr ""
7402
7403
#: bzrlib/switch.py:173
7404
#, python-format
7405
msgid "Updated to revision %d."
7406
msgstr ""
7407
7408
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7409
msgid "Apply phase"
7410
msgstr ""
7411
7412
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7413
msgid "removing file"
7414
msgstr ""
7415
7416
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7417
msgid "adding file"
7418
msgstr ""
7419
7420
#: bzrlib/transform.py:2598
7421
msgid "Building tree"
7422
msgstr ""
7423
7424
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7425
msgid "Adding file contents"
7426
msgstr ""
7427
7428
#: bzrlib/transform.py:3017
7429
msgid "Resolution pass"
7430
msgstr ""
7431
7432
#: bzrlib/transport/ftp/_gssapi.py:88
7433
#, python-format
7434
msgid "Authenticated as %s"
7435
msgstr ""
7436
7437
#: bzrlib/tree.py:647
7438
msgid "*** {0} content-filter: {1} => {2!r}"
7439
msgstr ""
7440
7441
#: bzrlib/upgrade.py:77
7442
#, python-format
7443
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7444
msgstr ""
7445
7446
#: bzrlib/upgrade.py:100
7447
#, python-format
7448
msgid "cannot upgrade from bzrdir format %s"
7449
msgstr ""
7450
7451
#: bzrlib/upgrade.py:103
7452
#, python-format
7453
msgid "starting upgrade of %s"
7454
msgstr ""
7455
7456
#: bzrlib/upgrade.py:110
7457
msgid "finished"
7458
msgstr ""
7459
7460
#: bzrlib/upgrade.py:120
7461
msgid "Deleting backup.bzr"
7462
msgstr ""
7463
7464
#: bzrlib/upgrade.py:151
7465
msgid ""
7466
"\n"
7467
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7468
msgstr ""
7469
7470
#: bzrlib/upgrade.py:208
7471
#, python-format
7472
msgid "Found %d dependent branches - upgrading ..."
7473
msgstr ""
7474
7475
#: bzrlib/upgrade.py:276
7476
msgid "Upgrading bzrdirs"
7477
msgstr ""
7478
7479
#: bzrlib/upgrade.py:282
7480
#, python-format
7481
msgid "Upgrading %s"
7482
msgstr ""
7483
7484
#: bzrlib/upgrade.py:283
7485
msgid "Upgrading {0} {1} ..."
7486
msgstr ""
7487
7488
#: bzrlib/upgrade.py:301
7489
msgid "Removing backup ..."
7490
msgstr ""
7491
7492
#: bzrlib/upgrade.py:305
7493
msgid "failed to clean-up {0}: {1}"
7494
msgstr ""
7495
7496
#: bzrlib/vf_repository.py:1091
7497
msgid "inventories"
7498
msgstr ""
7499
7500
#: bzrlib/vf_repository.py:1117
7501
msgid "texts"
7502
msgstr ""
7503
7504
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7505
msgid "Calculating text parents"
7506
msgstr ""
7507
7508
#: bzrlib/vf_repository.py:1707
7509
msgid "Fetch texts"
7510
msgstr ""
7511
7512
#: bzrlib/vf_repository.py:2536
7513
msgid "loading text store"
7514
msgstr ""
7515
7516
#: bzrlib/vf_repository.py:2542
7517
msgid "checking text graph"
7518
msgstr ""
7519
7520
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7521
#: bzrlib/vf_repository.py:3127
7522
msgid "Transferring revisions"
7523
msgstr ""
7524
7525
#: bzrlib/win32utils.py:146
7526
msgid "Failed to GetProcessMemoryInfo()"
7527
msgstr "GetProcessMemoryInfo() non riuscito"
7528
7529
#: bzrlib/win32utils.py:167
7530
msgid "Cannot debug memory on win32 without ctypes or win32process"
7531
msgstr ""
7532
7533
#: bzrlib/win32utils.py:172
7534
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7535
msgstr ""
7536
7537
#: bzrlib/win32utils.py:180
7538
#, python-format
7539
msgid "WorkingSize %8d KiB"
7540
msgstr ""
7541
7542
#: bzrlib/win32utils.py:181
7543
#, python-format
7544
msgid "PeakWorking %8d KiB"
7545
msgstr ""
7546
7547
#: bzrlib/win32utils.py:182
7548
#, python-format
7549
msgid "PagefileUsage %8d KiB"
7550
msgstr ""
7551
7552
#: bzrlib/win32utils.py:183
7553
#, python-format
7554
msgid "PeakPagefileUsage %8d KiB"
7555
msgstr ""
7556
7557
#: bzrlib/win32utils.py:185
7558
#, python-format
7559
msgid "PrivateUsage %8d KiB"
7560
msgstr ""
7561
7562
#: bzrlib/win32utils.py:186
7563
#, python-format
7564
msgid "PageFaultCount %8d"
7565
msgstr ""
7566
7567
#: bzrlib/workingtree.py:1482
7568
msgid "Rerun update after fixing the conflicts."
7569
msgstr ""
7570
7571
#: dummy/help_topics/authentication/summary.txt:1
7572
msgid "Information on configuring authentication"
7573
msgstr ""
7574
7575
#: dummy/help_topics/basic/detail.txt:1
7576
msgid ""
7577
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7578
"http://bazaar.canonical.com/"
7579
msgstr ""
7580
7581
#: dummy/help_topics/basic/detail.txt:4
7582
msgid ""
7583
"Basic commands:\n"
7584
" bzr init makes this directory a versioned branch\n"
7585
" bzr branch make a copy of another branch"
7586
msgstr ""
7587
7588
#: dummy/help_topics/basic/detail.txt:8
7589
msgid ""
7590
" bzr add make files or directories versioned\n"
7591
" bzr ignore ignore a file or pattern\n"
7592
" bzr mv move or rename a versioned file"
7593
msgstr ""
7594
7595
#: dummy/help_topics/basic/detail.txt:12
7596
msgid ""
7597
" bzr status summarize changes in working copy\n"
7598
" bzr diff show detailed diffs"
7599
msgstr ""
7600
7601
#: dummy/help_topics/basic/detail.txt:15
7602
msgid ""
7603
" bzr merge pull in changes from another branch\n"
7604
" bzr commit save some or all changes\n"
7605
" bzr send send changes via email"
7606
msgstr ""
7607
7608
#: dummy/help_topics/basic/detail.txt:19
7609
msgid ""
7610
" bzr log show history of changes\n"
7611
" bzr check validate storage"
7612
msgstr ""
7613
7614
#: dummy/help_topics/basic/detail.txt:22
7615
msgid ""
7616
" bzr help init more help on e.g. init command\n"
7617
" bzr help commands list all commands\n"
7618
" bzr help topics list all help topics\n"
7619
msgstr ""
7620
7621
#: dummy/help_topics/basic/summary.txt:1
7622
msgid "Basic commands"
7623
msgstr ""
7624
7625
#: dummy/help_topics/branches/detail.txt:1
7626
msgid "Branches"
7627
msgstr ""
7628
7629
#: dummy/help_topics/branches/detail.txt:3
7630
msgid ""
7631
"A branch consists of the state of a project, including all of its\n"
7632
"history. All branches have a repository associated (which is where the\n"
7633
"branch history is stored), but multiple branches may share the same\n"
7634
"repository (a shared repository). Branches can be copied and merged."
7635
msgstr ""
7636
7637
#: dummy/help_topics/branches/detail.txt:8
7638
msgid ""
7639
"In addition, one branch may be bound to another one. Binding to another\n"
7640
"branch indicates that commits which happen in this branch must also \n"
7641
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7642
"commits when the two branches are out of date. In order for a commit \n"
7643
"to succeed, it may be necessary to update the current branch using \n"
7644
"``bzr update``."
7645
msgstr ""
7646
7647
#: dummy/help_topics/branches/detail.txt:15
7648
#: dummy/help_topics/checkouts/detail.txt:66
7649
#: dummy/help_topics/repositories/detail.txt:36
7650
msgid "Related commands::"
7651
msgstr ""
7652
7653
#: dummy/help_topics/branches/detail.txt:17
7654
msgid ""
7655
" init Change a directory into a versioned branch.\n"
7656
" branch Create a new branch that is a copy of an existing branch.\n"
7657
" merge Perform a three-way merge.\n"
7658
" bind Bind a branch to another one.\n"
7659
msgstr ""
7660
7661
#: dummy/help_topics/branches/summary.txt:1
7662
msgid "Information on what a branch is"
7663
msgstr ""
7664
7665
#: dummy/help_topics/bugs/summary.txt:1
7666
msgid "Bug tracker settings"
7667
msgstr ""
7668
7669
#: dummy/help_topics/checkouts/detail.txt:1
7670
msgid "Checkouts"
7671
msgstr ""
7672
7673
#: dummy/help_topics/checkouts/detail.txt:3
7674
msgid ""
7675
"Checkouts are source trees that are connected to a branch, so that when\n"
7676
"you commit in the source tree, the commit goes into that branch. They\n"
7677
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7678
"Bazaar's decentralized features until you want them. Using checkouts\n"
7679
"with shared repositories is very similar to working with SVN or CVS, but\n"
7680
"doesn't have the same restrictions. And using checkouts still allows\n"
7681
"others working on the project to use whatever workflow they like."
7682
msgstr ""
7683
7684
#: dummy/help_topics/checkouts/detail.txt:11
7685
msgid ""
7686
"A checkout is created with the bzr checkout command (see \"help "
7687
"checkout\").\n"
7688
"You pass it a reference to another branch, and it will create a local copy\n"
7689
"for you that still contains a reference to the branch you created the\n"
7690
"checkout from (the master branch). Then if you make any commits they will "
7691
"be\n"
7692
"made on the other branch first. This creates an instant mirror of your work, "
7693
"or\n"
7694
"facilitates lockstep development, where each developer is working together,\n"
7695
"continuously integrating the changes of others."
7696
msgstr ""
7697
7698
#: dummy/help_topics/checkouts/detail.txt:19
7699
msgid ""
7700
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7701
"you have the full history locally. As you have a first class branch you "
7702
"can\n"
7703
"also commit locally if you want, for instance due to the temporary loss af "
7704
"a\n"
7705
"network connection. Use the --local option to commit to do this. All the "
7706
"local\n"
7707
"commits will then be made on the master branch the next time you do a non-"
7708
"local\n"
7709
"commit."
7710
msgstr ""
7711
7712
#: dummy/help_topics/checkouts/detail.txt:26
7713
msgid ""
7714
"If you are using a checkout from a shared branch you will periodically want "
7715
"to\n"
7716
"pull in all the changes made by others. This is done using the \"update\"\n"
7717
"command. The changes need to be applied before any non-local commit, but\n"
7718
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7719
"command when needed."
7720
msgstr ""
7721
7722
#: dummy/help_topics/checkouts/detail.txt:32
7723
msgid ""
7724
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7725
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7726
"SVN checkout in that it is not a first class branch, it mainly consists of "
7727
"the\n"
7728
"working tree. This means that any history operations must query the master\n"
7729
"branch, which could be slow if a network connection is involved. Also, as "
7730
"you\n"
7731
"don't have a local branch, then you cannot commit locally."
7732
msgstr ""
7733
7734
#: dummy/help_topics/checkouts/detail.txt:39
7735
msgid ""
7736
"Lightweight checkouts work best when you have fast reliable access to the\n"
7737
"master branch. This means that if the master branch is on the same disk or "
7738
"LAN\n"
7739
"a lightweight checkout will be faster than a heavyweight one for any "
7740
"commands\n"
7741
"that modify the revision history (as only one copy of the branch needs to\n"
7742
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7743
"that uses the history but does not change it, but if the master branch is "
7744
"on\n"
7745
"the same disk then there won't be a noticeable difference."
7746
msgstr ""
7747
7748
#: dummy/help_topics/checkouts/detail.txt:47
7749
msgid ""
7750
"Another possible use for a checkout is to use it with a treeless repository\n"
7751
"containing your branches, where you maintain only one working tree by\n"
7752
"switching the master branch that the checkout points to when you want to\n"
7753
"work on a different branch."
7754
msgstr ""
7755
7756
#: dummy/help_topics/checkouts/detail.txt:52
7757
msgid ""
7758
"Obviously to commit on a checkout you need to be able to write to the "
7759
"master\n"
7760
"branch. This means that the master branch must be accessible over a "
7761
"writeable\n"
7762
"protocol , such as sftp://, and that you have write permissions at the "
7763
"other\n"
7764
"end. Checkouts also work on the local file system, so that all that matters "
7765
"is\n"
7766
"file permissions."
7767
msgstr ""
7768
7769
#: dummy/help_topics/checkouts/detail.txt:58
7770
msgid ""
7771
"You can change the master of a checkout by using the \"switch\" command "
7772
"(see\n"
7773
"\"help switch\"). This will change the location that the commits are sent "
7774
"to.\n"
7775
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7776
"checkout. If you would like to convert your heavy checkout into a normal\n"
7777
"branch so that every commit is local, you can use the \"unbind\" command. To "
7778
"see\n"
7779
"whether or not a branch is bound or not you can use the \"info\" command. If "
7780
"the\n"
7781
"branch is bound it will tell you the location of the bound branch."
7782
msgstr ""
7783
7784
#: dummy/help_topics/checkouts/detail.txt:68
7785
msgid ""
7786
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7787
" checkout\n"
7788
" update Pull any changes in the master branch in to your checkout\n"
7789
" commit Make a commit that is sent to the master branch. If you have\n"
7790
" a heavy checkout then the --local option will commit to the\n"
7791
" checkout without sending the commit to the master\n"
7792
" switch Change the master branch that the commits in the checkout "
7793
"will\n"
7794
" be sent to\n"
7795
" bind Turn a standalone branch into a heavy checkout so that any\n"
7796
" commits will be sent to the master branch\n"
7797
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7798
" commits are only made locally\n"
7799
" info Displays whether a branch is bound or unbound. If the branch "
7800
"is\n"
7801
" bound, then it will also display the location of the bound "
7802
"branch\n"
7803
msgstr ""
7804
7805
#: dummy/help_topics/checkouts/summary.txt:1
7806
msgid "Information on what a checkout is"
7807
msgstr ""
7808
7809
#: dummy/help_topics/commands/summary.txt:1
7810
msgid "Basic help for all commands"
7811
msgstr ""
7812
7813
#: dummy/help_topics/configuration/summary.txt:1
7814
msgid "Details on the configuration settings available"
7815
msgstr ""
7816
7817
#: dummy/help_topics/conflict-types/summary.txt:1
7818
msgid "Types of conflicts and what to do about them"
7819
msgstr ""
7820
7821
#: dummy/help_topics/content-filters/summary.txt:1
7822
msgid "Conversion of content into/from working trees"
7823
msgstr ""
7824
7825
#: dummy/help_topics/criss-cross/detail.txt:1
7826
msgid "Criss-Cross"
7827
msgstr ""
7828
7829
#: dummy/help_topics/criss-cross/detail.txt:3
7830
msgid ""
7831
"A criss-cross in the branch history can cause the default merge technique\n"
7832
"to emit more conflicts than would normally be expected."
7833
msgstr ""
7834
7835
#: dummy/help_topics/criss-cross/detail.txt:6
7836
msgid ""
7837
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7838
"give\n"
7839
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7840
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7841
msgstr ""
7842
7843
#: dummy/help_topics/criss-cross/detail.txt:10
7844
msgid ""
7845
"Criss-crosses occur in a branch's history if two branches merge the same "
7846
"thing\n"
7847
"and then merge one another, or if two branches merge one another at the "
7848
"same\n"
7849
"time. They can be avoided by having each branch only merge from or into a\n"
7850
"designated central branch (a \"star topology\")."
7851
msgstr ""
7852
7853
#: dummy/help_topics/criss-cross/detail.txt:15
7854
msgid ""
7855
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7856
"default\n"
7857
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7858
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7859
"differences between THIS and OTHER are due to one side adding lines, or\n"
7860
"from another side removing lines."
7861
msgstr ""
7862
7863
#: dummy/help_topics/criss-cross/detail.txt:21
7864
msgid ""
7865
"Criss-crosses mean there is no good choice for a base. Selecting the "
7866
"recent\n"
7867
"merge points could cause one side's changes to be silently discarded.\n"
7868
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7869
"are emitted."
7870
msgstr ""
7871
7872
#: dummy/help_topics/criss-cross/detail.txt:26
7873
msgid ""
7874
"The ``weave`` merge type is not affected by this problem because it uses\n"
7875
"line-origin detection instead of a basis revision to determine the cause of\n"
7876
"differences.\n"
7877
msgstr ""
7878
7879
#: dummy/help_topics/criss-cross/summary.txt:1
7880
msgid "Information on criss-cross merging"
7881
msgstr ""
7882
7883
#: dummy/help_topics/current-formats/summary.txt:1
7884
msgid "Current storage formats"
7885
msgstr ""
7886
7887
#: dummy/help_topics/debug-flags/summary.txt:1
7888
msgid "Options to show or record debug information"
7889
msgstr ""
7890
7891
#: dummy/help_topics/diverged-branches/summary.txt:1
7892
msgid "How to fix diverged branches"
7893
msgstr ""
7894
7895
#: dummy/help_topics/env-variables/summary.txt:1
7896
msgid "Environment variable names and values"
7897
msgstr ""
7898
7899
#: dummy/help_topics/eol/summary.txt:1
7900
msgid "Information on end-of-line handling"
7901
msgstr ""
7902
7903
#: dummy/help_topics/files/detail.txt:1
7904
msgid "Files"
7905
msgstr ""
7906
7907
#: dummy/help_topics/files/detail.txt:3
7908
msgid ""
7909
":On Unix: ~/.bazaar/bazaar.conf\n"
7910
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7911
"bazaar\\\\2.0\\\\bazaar.conf"
7912
msgstr ""
7913
7914
#: dummy/help_topics/files/detail.txt:6
7915
msgid ""
7916
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7917
"used to define general configuration that will be applied everywhere.\n"
7918
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7919
"commonly used options."
7920
msgstr ""
7921
7922
#: dummy/help_topics/files/detail.txt:11
7923
msgid "A typical config file might look something like::"
7924
msgstr ""
7925
7926
#: dummy/help_topics/files/detail.txt:13
7927
msgid ""
7928
" [DEFAULT]\n"
7929
" email=John Doe <jdoe@isp.com>"
7930
msgstr ""
7931
7932
#: dummy/help_topics/files/detail.txt:16
7933
msgid ""
7934
" [ALIASES]\n"
7935
" commit = commit --strict\n"
7936
" log10 = log --short -r -10..-1\n"
7937
msgstr ""
7938
7939
#: dummy/help_topics/files/summary.txt:1
7940
msgid "Information on configuration and log files"
7941
msgstr ""
7942
7943
#: dummy/help_topics/formats/detail.txt:1
7944
msgid "Storage Formats"
7945
msgstr ""
7946
7947
#: dummy/help_topics/formats/detail.txt:3
7948
msgid ""
7949
"To ensure that older clients do not access data incorrectly,\n"
7950
"Bazaar's policy is to introduce a new storage format whenever\n"
7951
"new features requiring new metadata are added. New storage\n"
7952
"formats may also be introduced to improve performance and\n"
7953
"scalability."
7954
msgstr ""
7955
7956
#: dummy/help_topics/formats/detail.txt:9
7957
msgid ""
7958
"The newest format, 2a, is highly recommended. If your\n"
7959
"project is not using 2a, then you should suggest to the\n"
7960
"project owner to upgrade."
7961
msgstr ""
7962
7963
#: dummy/help_topics/formats/detail.txt:13
7964
msgid ""
7965
"\n"
7966
".. note::"
7967
msgstr ""
7968
7969
#: dummy/help_topics/formats/detail.txt:16
7970
msgid ""
7971
" Some of the older formats have two variants:\n"
7972
" a plain one and a rich-root one. The latter include an additional\n"
7973
" field about the root of the tree. There is no performance cost\n"
7974
" for using a rich-root format but you cannot easily merge changes\n"
7975
" from a rich-root format into a plain format. As a consequence,\n"
7976
" moving a project to a rich-root format takes some co-ordination\n"
7977
" in that all contributors need to upgrade their repositories\n"
7978
" around the same time. 2a and all future formats will be\n"
7979
" implicitly rich-root."
7980
msgstr ""
7981
7982
#: dummy/help_topics/formats/detail.txt:26
7983
msgid ""
7984
"See :doc:`current-formats-help` for the complete list of\n"
7985
"currently supported formats. See :doc:`other-formats-help` for\n"
7986
"descriptions of any available experimental and deprecated formats.\n"
7987
msgstr ""
7988
7989
#: dummy/help_topics/formats/summary.txt:1
7990
msgid "Information on choosing a storage format"
7991
msgstr ""
7992
7993
#: dummy/help_topics/global-options/detail.txt:1
7994
msgid "Global Options"
7995
msgstr ""
7996
7997
#: dummy/help_topics/global-options/detail.txt:3
7998
msgid ""
7999
"These options may be used with any command, and may appear in front of any\n"
8000
"command. (e.g. ``bzr --profile help``)."
8001
msgstr ""
8002
8003
#: dummy/help_topics/global-options/detail.txt:6
8004
msgid ""
8005
"--version Print the version number. Must be supplied before the "
8006
"command.\n"
8007
"--no-aliases Do not process command aliases when running this command.\n"
8008
"--builtin Use the built-in version of a command, not the plugin "
8009
"version.\n"
8010
" This does not suppress other plugin effects.\n"
8011
"--no-plugins Do not process any plugins.\n"
8012
"--no-l10n Do not translate messages.\n"
8013
"--concurrency Number of processes that can be run concurrently (selftest)."
8014
msgstr ""
8015
8016
#: dummy/help_topics/global-options/detail.txt:14
8017
msgid ""
8018
"--profile Profile execution using the hotshot profiler.\n"
8019
"--lsprof Profile execution using the lsprof profiler.\n"
8020
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8021
" results to a specified file. If the filename ends with "
8022
"\".txt\",\n"
8023
" text format will be used. If the filename either starts "
8024
"with\n"
8025
" \"callgrind.out\" or end with \".callgrind\", the output will "
8026
"be\n"
8027
" formatted for use with KCacheGrind. Otherwise, the output\n"
8028
" will be a pickle.\n"
8029
"--coverage Generate line coverage report in the specified directory."
8030
msgstr ""
8031
8032
#: dummy/help_topics/global-options/detail.txt:24
8033
msgid ""
8034
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8035
"for\n"
8036
" the duration of the command. This can be used multiple times "
8037
"if\n"
8038
" several options need to be overridden."
8039
msgstr ""
8040
8041
#: dummy/help_topics/global-options/detail.txt:28
8042
msgid ""
8043
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8044
"information on profiling."
8045
msgstr ""
8046
8047
#: dummy/help_topics/global-options/detail.txt:31
8048
msgid ""
8049
"A number of debug flags are also available to assist troubleshooting and\n"
8050
"development. See :doc:`debug-flags-help`.\n"
8051
msgstr ""
8052
8053
#: dummy/help_topics/global-options/summary.txt:1
8054
msgid "Options that control how Bazaar runs"
8055
msgstr ""
8056
8057
#: dummy/help_topics/hidden-commands/summary.txt:1
8058
msgid "All hidden commands"
8059
msgstr ""
8060
8061
#: dummy/help_topics/hooks/summary.txt:1
8062
msgid "Points at which custom processing can be added"
8063
msgstr ""
8064
8065
#: dummy/help_topics/launchpad/detail.txt:1
8066
msgid "Integration with Launchpad.net"
8067
msgstr ""
8068
8069
#: dummy/help_topics/launchpad/detail.txt:3
8070
msgid ""
8071
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8072
"specification tracking."
8073
msgstr ""
8074
8075
#: dummy/help_topics/launchpad/detail.txt:6
8076
msgid ""
8077
"The bzr client (through the plugin called 'launchpad') has special\n"
8078
"features to communicate with Launchpad:"
8079
msgstr ""
8080
8081
#: dummy/help_topics/launchpad/detail.txt:9
8082
msgid ""
8083
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8084
"This\n"
8085
" is then used by the 'lp:' transport to download your branches using\n"
8086
" bzr+ssh://."
8087
msgstr ""
8088
8089
#: dummy/help_topics/launchpad/detail.txt:13
8090
msgid ""
8091
" * The 'lp:' transport uses Launchpad as a directory service: for "
8092
"example\n"
8093
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8094
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8095
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8096
msgstr ""
8097
8098
#: dummy/help_topics/launchpad/detail.txt:18
8099
msgid ""
8100
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8101
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8102
"lp:12345'\n"
8103
" will record a revision property that marks that revision as fixing\n"
8104
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8105
" automatically be linked to the bug report."
8106
msgstr ""
8107
8108
#: dummy/help_topics/launchpad/detail.txt:24
8109
msgid ""
8110
" * The register-branch command tells Launchpad about the url of a\n"
8111
" public branch. Launchpad will then mirror the branch, display\n"
8112
" its contents and allow it to be attached to bugs and other\n"
8113
" objects."
8114
msgstr ""
8115
8116
#: dummy/help_topics/launchpad/detail.txt:29
8117
msgid "For more information see http://help.launchpad.net/\n"
8118
msgstr ""
8119
8120
#: dummy/help_topics/launchpad/summary.txt:1
8121
msgid "Using Bazaar with Launchpad.net"
8122
msgstr ""
8123
8124
#: dummy/help_topics/location-alias/summary.txt:1
8125
msgid "Aliases for remembered locations"
8126
msgstr ""
8127
8128
#: dummy/help_topics/log-formats/summary.txt:1
8129
msgid "Details on the logging formats available"
8130
msgstr ""
8131
8132
#: dummy/help_topics/other-formats/summary.txt:1
8133
msgid "Experimental and deprecated storage formats"
8134
msgstr ""
8135
8136
#: dummy/help_topics/patterns/summary.txt:1
8137
msgid "Information on the pattern syntax"
8138
msgstr ""
8139
8140
#: dummy/help_topics/repositories/detail.txt:1
8141
msgid "Repositories"
8142
msgstr ""
8143
8144
#: dummy/help_topics/repositories/detail.txt:3
8145
msgid ""
8146
"Repositories in Bazaar are where committed information is stored. There is\n"
8147
"a repository associated with every branch."
8148
msgstr ""
8149
8150
#: dummy/help_topics/repositories/detail.txt:6
8151
msgid ""
8152
"Repositories are a form of database. Bzr will usually maintain this for\n"
8153
"good performance automatically, but in some situations (e.g. when doing\n"
8154
"very many commits in a short time period) you may want to ask bzr to\n"
8155
"optimise the database indices. This can be done by the 'bzr pack' command."
8156
msgstr ""
8157
8158
#: dummy/help_topics/repositories/detail.txt:11
8159
msgid ""
8160
"By default just running 'bzr init' will create a repository within the new\n"
8161
"branch but it is possible to create a shared repository which allows "
8162
"multiple\n"
8163
"branches to share their information in the same location. When a new branch "
8164
"is\n"
8165
"created it will first look to see if there is a containing shared repository "
8166
"it\n"
8167
"can use."
8168
msgstr ""
8169
8170
#: dummy/help_topics/repositories/detail.txt:17
8171
msgid ""
8172
"When two branches of the same project share a repository, there is\n"
8173
"generally a large space saving. For some operations (e.g. branching\n"
8174
"within the repository) this translates in to a large time saving."
8175
msgstr ""
8176
8177
#: dummy/help_topics/repositories/detail.txt:21
8178
msgid ""
8179
"To create a shared repository use the init-repository command (or the alias\n"
8180
"init-repo). This command takes the location of the repository to create. "
8181
"This\n"
8182
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8183
"which contains a shared repository. Any new branches that are created in "
8184
"this\n"
8185
"directory will then use it for storage."
8186
msgstr ""
8187
8188
#: dummy/help_topics/repositories/detail.txt:27
8189
msgid ""
8190
"It is a good idea to create a repository whenever you might create more\n"
8191
"than one branch of a project. This is true for both working areas where you\n"
8192
"are doing the development, and any server areas that you use for hosting\n"
8193
"projects. In the latter case, it is common to want branches without working\n"
8194
"trees. Since the files in the branch will not be edited directly there is "
8195
"no\n"
8196
"need to use up disk space for a working tree. To create a repository in "
8197
"which\n"
8198
"the branches will not have working trees pass the '--no-trees' option to\n"
8199
"'init-repository'."
8200
msgstr ""
8201
8202
#: dummy/help_topics/repositories/detail.txt:38
8203
msgid ""
8204
" init-repository Create a shared repository. Use --no-trees to create "
8205
"one\n"
8206
" in which new branches won't get a working tree.\n"
8207
msgstr ""
8208
8209
#: dummy/help_topics/repositories/summary.txt:1
8210
msgid "Basic information on shared repositories."
8211
msgstr ""
8212
8213
#: dummy/help_topics/revisionspec/summary.txt:1
8214
msgid "Explain how to use --revision"
8215
msgstr ""
8216
8217
#: dummy/help_topics/rules/summary.txt:1
8218
msgid "Information on defining rule-based preferences"
8219
msgstr ""
8220
8221
#: dummy/help_topics/standalone-trees/detail.txt:1
8222
msgid "Standalone Trees"
8223
msgstr ""
8224
8225
#: dummy/help_topics/standalone-trees/detail.txt:3
8226
msgid ""
8227
"A standalone tree is a working tree with an associated repository. It\n"
8228
"is an independently usable branch, with no dependencies on any other.\n"
8229
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8230
"an existing project under version control."
8231
msgstr ""
8232
8233
#: dummy/help_topics/standalone-trees/detail.txt:8
8234
msgid "Related Commands::"
8235
msgstr ""
8236
8237
#: dummy/help_topics/standalone-trees/detail.txt:10
8238
msgid " init Make a directory into a versioned branch.\n"
8239
msgstr ""
8240
8241
#: dummy/help_topics/standalone-trees/summary.txt:1
8242
msgid "Information on what a standalone tree is"
8243
msgstr ""
8244
8245
#: dummy/help_topics/standard-options/detail.txt:1
8246
msgid "Standard Options"
8247
msgstr ""
8248
8249
#: dummy/help_topics/standard-options/detail.txt:3
8250
msgid "Standard options are legal for all commands."
8251
msgstr ""
8252
8253
#: dummy/help_topics/standard-options/detail.txt:5
8254
msgid ""
8255
"--help, -h Show help message.\n"
8256
"--verbose, -v Display more information.\n"
8257
"--quiet, -q Only display errors and warnings."
8258
msgstr ""
8259
8260
#: dummy/help_topics/standard-options/detail.txt:9
8261
msgid "Unlike global options, standard options can be used in aliases.\n"
8262
msgstr ""
8263
8264
#: dummy/help_topics/standard-options/summary.txt:1
8265
msgid "Options that can be used with any command"
8266
msgstr ""
8267
8268
#: dummy/help_topics/status-flags/detail.txt:1
8269
msgid "Status Flags"
8270
msgstr ""
8271
8272
#: dummy/help_topics/status-flags/detail.txt:3
8273
msgid ""
8274
"Status flags are used to summarise changes to the working tree in a concise\n"
8275
"manner. They are in the form::"
8276
msgstr ""
8277
8278
#: dummy/help_topics/status-flags/detail.txt:6
8279
msgid " xxx <filename>"
8280
msgstr ""
8281
8282
#: dummy/help_topics/status-flags/detail.txt:8
8283
msgid "where the columns' meanings are as follows."
8284
msgstr ""
8285
8286
#: dummy/help_topics/status-flags/detail.txt:10
8287
msgid "Column 1 - versioning/renames::"
8288
msgstr ""
8289
8290
#: dummy/help_topics/status-flags/detail.txt:12
8291
msgid ""
8292
" + File versioned\n"
8293
" - File unversioned\n"
8294
" R File renamed\n"
8295
" ? File unknown\n"
8296
" X File nonexistent (and unknown to bzr)\n"
8297
" C File has conflicts\n"
8298
" P Entry for a pending merge (not a file)"
8299
msgstr ""
8300
8301
#: dummy/help_topics/status-flags/detail.txt:20
8302
msgid "Column 2 - contents::"
8303
msgstr ""
8304
8305
#: dummy/help_topics/status-flags/detail.txt:22
8306
msgid ""
8307
" N File created\n"
8308
" D File deleted\n"
8309
" K File kind changed\n"
8310
" M File modified"
8311
msgstr ""
8312
8313
#: dummy/help_topics/status-flags/detail.txt:27
8314
msgid "Column 3 - execute::"
8315
msgstr ""
8316
8317
#: dummy/help_topics/status-flags/detail.txt:29
8318
msgid " * The execute bit was changed\n"
8319
msgstr ""
8320
8321
#: dummy/help_topics/status-flags/summary.txt:1
8322
msgid "Help on status flags"
8323
msgstr ""
8324
8325
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8326
msgid "Branches Out of Sync"
8327
msgstr ""
8328
8329
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8330
msgid ""
8331
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8332
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8333
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8334
"have the same last revision as the new reference branch for the lightweight\n"
8335
"checkout, data could be lost, so Bazaar refuses."
8336
msgstr ""
8337
8338
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8339
msgid "How you deal with this depends on *why* the branches are out of sync."
8340
msgstr ""
8341
8342
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8343
msgid ""
8344
"If you have a checkout and have done local commits, you can get back in "
8345
"sync\n"
8346
"by running \"bzr update\" (and possibly \"bzr commit\")."
8347
msgstr ""
8348
8349
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8350
msgid ""
8351
"If you have a branch and the remote branch is out-of-date, you can push\n"
8352
"the local changes using \"bzr push\". If the local branch is out of date, "
8353
"you\n"
8354
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8355
"commit\n"
8356
"and then push your changes. If you decide that some of the changes aren't\n"
8357
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8358
msgstr ""
8359
8360
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8361
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8362
msgstr ""
8363
8364
#: dummy/help_topics/topics/summary.txt:1
8365
msgid "Topics list"
8366
msgstr ""
8367
8368
#: dummy/help_topics/url-special-chars/summary.txt:1
8369
msgid "Special character handling in URLs"
8370
msgstr ""
8371
8372
#: dummy/help_topics/urlspec/summary.txt:1
8373
msgid "Supported transport protocols"
8374
msgstr ""
8375
8376
#: dummy/help_topics/working-trees/detail.txt:1
8377
msgid "Working Trees"
8378
msgstr ""
8379
8380
#: dummy/help_topics/working-trees/detail.txt:3
8381
msgid ""
8382
"A working tree is the contents of a branch placed on disk so that you can\n"
8383
"see the files and edit them. The working tree is where you make changes to "
8384
"a\n"
8385
"branch, and when you commit the current state of the working tree is the\n"
8386
"snapshot that is recorded in the commit."
8387
msgstr ""
8388
8389
#: dummy/help_topics/working-trees/detail.txt:8
8390
msgid ""
8391
"When you push a branch to a remote system, a working tree will not be\n"
8392
"created. If one is already present the files will not be updated. The\n"
8393
"branch information will be updated and the working tree will be marked\n"
8394
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8395
"may be uncommitted changes or the update may cause content conflicts that "
8396
"are\n"
8397
"difficult to deal with remotely."
8398
msgstr ""
8399
8400
#: dummy/help_topics/working-trees/detail.txt:15
8401
msgid ""
8402
"If you have a branch with no working tree you can use the 'checkout' "
8403
"command\n"
8404
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8405
"will\n"
8406
"create the working tree. If the branch is updated remotely, you can update "
8407
"the\n"
8408
"working tree by running 'bzr update' in that directory."
8409
msgstr ""
8410
8411
#: dummy/help_topics/working-trees/detail.txt:20
8412
msgid ""
8413
"If you have a branch with a working tree that you do not want the 'remove-"
8414
"tree'\n"
8415
"command will remove the tree if it is safe. This can be done to avoid the\n"
8416
"warning about the remote working tree not being updated when pushing to the\n"
8417
"branch. It can also be useful when working with a '--no-trees' repository\n"
8418
"(see 'bzr help repositories')."
8419
msgstr ""
8420
8421
#: dummy/help_topics/working-trees/detail.txt:26
8422
msgid ""
8423
"If you want to have a working tree on a remote machine that you push to you\n"
8424
"can either run 'bzr update' in the remote branch after each push, or use "
8425
"some\n"
8426
"other method to update the tree during the push. There is an 'rspush' "
8427
"plugin\n"
8428
"that will update the working tree using rsync as well as doing a push. "
8429
"There\n"
8430
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8431
"SSH\n"
8432
"after each push."
8433
msgstr ""
8434
8435
#: dummy/help_topics/working-trees/detail.txt:33
8436
msgid "Useful commands::"
8437
msgstr ""
8438
8439
#: dummy/help_topics/working-trees/detail.txt:35
8440
msgid ""
8441
" checkout Create a working tree when a branch does not have one.\n"
8442
" remove-tree Removes the working tree from a branch when it is safe to do "
8443
"so.\n"
8444
" update When a working tree is out of sync with its associated "
8445
"branch\n"
8446
" this will update the tree to match the branch.\n"
8447
msgstr ""
8448
8449
#: dummy/help_topics/working-trees/summary.txt:1
8450
msgid "Information on working trees"
8451
msgstr ""
8452
8453
#: en/help_topics/authentication.txt:1
8454
msgid ""
8455
"Authentication Settings\n"
8456
"======================="
8457
msgstr ""
8458
8459
#: en/help_topics/authentication.txt:4
8460
msgid ""
8461
"\n"
8462
"Intent\n"
8463
"------"
8464
msgstr ""
8465
8466
#: en/help_topics/authentication.txt:8
8467
msgid ""
8468
"Many different authentication policies can be described in the\n"
8469
"``authentication.conf`` file but a particular user should need only a few\n"
8470
"definitions to cover his needs without having to specify a user and a "
8471
"password\n"
8472
"for every branch he uses."
8473
msgstr ""
8474
8475
#: en/help_topics/authentication.txt:13
8476
msgid ""
8477
"The definitions found in this file are used to find the credentials to use "
8478
"for\n"
8479
"a given url. The same credentials can generally be used for as many branches "
8480
"as\n"
8481
"possible by grouping their declaration around the remote servers that need\n"
8482
"them. It's even possible to declare credentials that will be used by "
8483
"different\n"
8484
"servers."
8485
msgstr ""
8486
8487
#: en/help_topics/authentication.txt:19
8488
msgid ""
8489
"The intent is to make this file as small as possible to minimize maintenance."
8490
msgstr ""
8491
8492
#: en/help_topics/authentication.txt:21
8493
msgid ""
8494
"Once the relevant credentials are declared in this file you may use branch "
8495
"urls\n"
8496
"without embedding passwords (security hazard) or even users (enabling "
8497
"sharing\n"
8498
"of your urls with others)."
8499
msgstr ""
8500
8501
#: en/help_topics/authentication.txt:25
8502
msgid "Instead of using::"
8503
msgstr ""
8504
8505
#: en/help_topics/authentication.txt:27
8506
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8507
msgstr ""
8508
8509
#: en/help_topics/authentication.txt:29
8510
msgid "you simply use::"
8511
msgstr ""
8512
8513
#: en/help_topics/authentication.txt:31
8514
msgid " bzr branch ftp://host.com/path/to/my/branch"
8515
msgstr ""
8516
8517
#: en/help_topics/authentication.txt:33
8518
msgid ""
8519
"provided you have created the following ``authentication.conf`` file::"
8520
msgstr ""
8521
8522
#: en/help_topics/authentication.txt:35
8523
msgid ""
8524
" [myprojects]\n"
8525
" scheme=ftp\n"
8526
" host=host.com\n"
8527
" user=joe\n"
8528
" password=secret\n"
8529
" "
8530
msgstr ""
8531
8532
#: en/help_topics/authentication.txt:42
8533
msgid ""
8534
"Authentication definitions\n"
8535
"--------------------------"
8536
msgstr ""
8537
8538
#: en/help_topics/authentication.txt:45
8539
msgid ""
8540
"There are two kinds of authentication used by the various schemes supported "
8541
"by\n"
8542
"bzr:"
8543
msgstr ""
8544
8545
#: en/help_topics/authentication.txt:48
8546
msgid "1. user and password"
8547
msgstr ""
8548
8549
#: en/help_topics/authentication.txt:50
8550
msgid ""
8551
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8552
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8553
"ssh agents are a better, more secure solution. So we have chosen to not "
8554
"provide\n"
8555
"our own less secure method."
8556
msgstr ""
8557
8558
#: en/help_topics/authentication.txt:55
8559
msgid "2. user, realm and password"
8560
msgstr ""
8561
8562
#: en/help_topics/authentication.txt:57
8563
msgid ""
8564
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8565
"against a host. But, by using ``.htaccess`` files, for example, it is "
8566
"possible\n"
8567
"to define several (``user, realm, password``) for a given ``host``. So what "
8568
"is\n"
8569
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8570
"is\n"
8571
"not taken into account in the definitions, but will displayed if bzr "
8572
"prompts\n"
8573
"you for a password."
8574
msgstr ""
8575
8576
#: en/help_topics/authentication.txt:64
8577
msgid ""
8578
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8579
"specifying the appropriate port."
8580
msgstr ""
8581
8582
#: en/help_topics/authentication.txt:67
8583
msgid ""
8584
"To take all schemes into account, the password will be deduced from a set "
8585
"of\n"
8586
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8587
"``user``,\n"
8588
"``password``)."
8589
msgstr ""
8590
8591
#: en/help_topics/authentication.txt:71
8592
msgid ""
8593
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8594
"used\n"
8595
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8596
"``ssh``\n"
8597
" should be used instead since this is the real scheme regarding\n"
8598
" authentication,"
8599
msgstr ""
8600
8601
#: en/help_topics/authentication.txt:76
8602
msgid " * ``host``: can be empty (to act as a default for any host),"
8603
msgstr ""
8604
8605
#: en/help_topics/authentication.txt:78
8606
msgid ""
8607
" * ``port`` can be empty (useful when an host provides several servers for "
8608
"the\n"
8609
" same scheme), only numerical values are allowed, this should be used "
8610
"only\n"
8611
" when the server uses a port different than the scheme standard port,"
8612
msgstr ""
8613
8614
#: en/help_topics/authentication.txt:82
8615
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8616
msgstr ""
8617
8618
#: en/help_topics/authentication.txt:84
8619
msgid ""
8620
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8621
" ``getpass.get_user()``),"
8622
msgstr ""
8623
8624
#: en/help_topics/authentication.txt:87
8625
msgid ""
8626
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8627
" password."
8628
msgstr ""
8629
8630
#: en/help_topics/authentication.txt:90
8631
msgid ""
8632
"Multiple definitions can be provided and, for a given URL, bzr will select "
8633
"a\n"
8634
"(``user`` [, ``password``]) based on the following rules :"
8635
msgstr ""
8636
8637
#: en/help_topics/authentication.txt:93
8638
msgid " 1. the first match wins,"
8639
msgstr ""
8640
8641
#: en/help_topics/authentication.txt:95
8642
msgid " 2. empty fields match everything,"
8643
msgstr ""
8644
8645
#: en/help_topics/authentication.txt:97
8646
msgid ""
8647
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8648
msgstr ""
8649
8650
#: en/help_topics/authentication.txt:99
8651
msgid ""
8652
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8653
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8654
"``projectbzr.sf.net``\n"
8655
" will not match ``bzr.sf.net``)."
8656
msgstr ""
8657
8658
#: en/help_topics/authentication.txt:103
8659
msgid ""
8660
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8661
msgstr ""
8662
8663
#: en/help_topics/authentication.txt:105
8664
msgid ""
8665
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8666
"above,\n"
8667
" empty paths will match any provided path)."
8668
msgstr ""
8669
8670
#: en/help_topics/authentication.txt:110
8671
msgid ""
8672
"File format\n"
8673
"-----------"
8674
msgstr ""
8675
8676
#: en/help_topics/authentication.txt:113
8677
msgid ""
8678
"The general rules for :doc:`configuration files <configuration-help>`\n"
8679
"apply except for the variable policies."
8680
msgstr ""
8681
8682
#: en/help_topics/authentication.txt:116
8683
msgid "Each section describes an authentication definition."
8684
msgstr ""
8685
8686
#: en/help_topics/authentication.txt:118
8687
msgid ""
8688
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8689
"reserved\n"
8690
"and should appear as the *last* section."
8691
msgstr ""
8692
8693
#: en/help_topics/authentication.txt:121
8694
msgid "Each section should define:"
8695
msgstr ""
8696
8697
#: en/help_topics/authentication.txt:123
8698
msgid "* ``user``: the login to be used,"
8699
msgstr ""
8700
8701
#: en/help_topics/authentication.txt:125
8702
msgid "Each section could define:"
8703
msgstr ""
8704
8705
#: en/help_topics/authentication.txt:127
8706
msgid "* ``host``: the remote server,"
8707
msgstr ""
8708
8709
#: en/help_topics/authentication.txt:129
8710
msgid "* ``port``: the port the server is listening,"
8711
msgstr ""
8712
8713
#: en/help_topics/authentication.txt:131
8714
msgid "* ``path``: the branch location,"
8715
msgstr ""
8716
8717
#: en/help_topics/authentication.txt:133
8718
msgid "* ``password``: the password."
8719
msgstr ""
8720
8721
#: en/help_topics/authentication.txt:135
8722
msgid ""
8723
"\n"
8724
"Examples\n"
8725
"--------"
8726
msgstr ""
8727
8728
#: en/help_topics/authentication.txt:139
8729
msgid ""
8730
"\n"
8731
"Personal projects hosted outside\n"
8732
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8733
msgstr ""
8734
8735
#: en/help_topics/authentication.txt:143
8736
msgid ""
8737
"All connections are done with the same ``user`` (the remote one for which "
8738
"the\n"
8739
"default bzr one is not appropriate) and the password is always prompted "
8740
"with\n"
8741
"some exceptions::"
8742
msgstr ""
8743
8744
#: en/help_topics/authentication.txt:147
8745
msgid ""
8746
" # Pet projects on hobby.net\n"
8747
" [hobby]\n"
8748
" host=r.hobby.net\n"
8749
" user=jim\n"
8750
" password=obvious1234\n"
8751
" \n"
8752
" # Home server\n"
8753
" [home]\n"
8754
" scheme=https\n"
8755
" host=home.net\n"
8756
" user=joe\n"
8757
" password=1essobV10us\n"
8758
" \n"
8759
" [DEFAULT]\n"
8760
" # Our local user is barbaz, on all remote sites we're known as "
8761
"foobar\n"
8762
" user=foobar"
8763
msgstr ""
8764
8765
#: en/help_topics/authentication.txt:164
8766
msgid ""
8767
"\n"
8768
"Source hosting provider\n"
8769
"~~~~~~~~~~~~~~~~~~~~~~~"
8770
msgstr ""
8771
"\n"
8772
"Provider sorgente del servizio di host\n"
8773
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8774
8775
#: en/help_topics/authentication.txt:168
8776
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8777
msgstr ""
8778
8779
#: en/help_topics/authentication.txt:170
8780
msgid ""
8781
" [shpnet domain]\n"
8782
" # we use sftp, but ssh is the scheme used for authentication\n"
8783
" scheme=ssh\n"
8784
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8785
" host=.shp.net\n"
8786
" user=joe\n"
8787
" # bzr don't support supplying a password for sftp,\n"
8788
" # consider using an ssh agent if you don't want to supply\n"
8789
" # a password interactively. (pageant, ssh-agent, etc)"
8790
msgstr ""
8791
8792
#: en/help_topics/authentication.txt:180
8793
msgid ""
8794
"HTTPS, SFTP servers and their proxy\n"
8795
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8796
msgstr ""
8797
8798
#: en/help_topics/authentication.txt:183
8799
msgid ""
8800
"At company.com, the server hosting release and integration branches is "
8801
"behind a\n"
8802
"proxy, and the two branches use different authentication policies::"
8803
msgstr ""
8804
8805
#: en/help_topics/authentication.txt:186
8806
msgid ""
8807
" [reference code]\n"
8808
" scheme=https\n"
8809
" host=dev.company.com\n"
8810
" path=/dev\n"
8811
" user=user1\n"
8812
" password=pass1"
8813
msgstr ""
8814
8815
#: en/help_topics/authentication.txt:193
8816
msgid ""
8817
" # development branches on dev server\n"
8818
" [dev]\n"
8819
" scheme=ssh # bzr+ssh and sftp are available here\n"
8820
" host=dev.company.com\n"
8821
" path=/dev/integration\n"
8822
" user=user2\n"
8823
" \n"
8824
" # proxy\n"
8825
" [proxy]\n"
8826
" scheme=http\n"
8827
" host=proxy.company.com\n"
8828
" port=3128\n"
8829
" user=proxyuser1\n"
8830
" password=proxypass1"
8831
msgstr ""
8832
8833
#: en/help_topics/authentication.txt:208
8834
msgid ""
8835
"\n"
8836
"Planned enhancements\n"
8837
"--------------------"
8838
msgstr ""
8839
8840
#: en/help_topics/authentication.txt:212
8841
msgid ""
8842
"The following are not yet implemented but planned as parts of a work in\n"
8843
"progress:"
8844
msgstr ""
8845
8846
#: en/help_topics/authentication.txt:215
8847
msgid "* add a ``password_encoding`` field allowing:"
8848
msgstr ""
8849
8850
#: en/help_topics/authentication.txt:217
8851
msgid ""
8852
" - storing the passwords in various obfuscating encodings (base64 for one),"
8853
msgstr ""
8854
8855
#: en/help_topics/authentication.txt:219
8856
msgid " - delegate password storage to plugins (.netrc for example)."
8857
msgstr ""
8858
8859
#: en/help_topics/authentication.txt:221
8860
msgid ""
8861
"* update the credentials when the user is prompted for user or password,"
8862
msgstr ""
8863
8864
#: en/help_topics/authentication.txt:223
8865
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8866
msgstr ""
8867
8868
#: en/help_topics/authentication.txt:225
8869
msgid ""
8870
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8871
"but\n"
8872
"ignored in the actual implementation.\n"
8873
msgstr ""
8874
8875
#: en/help_topics/bugs.txt:1
8876
msgid "Bug Tracker Settings"
8877
msgstr ""
8878
8879
#: en/help_topics/bugs.txt:3
8880
msgid ""
8881
"When making a commit, metadata about bugs fixed by that change can be\n"
8882
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8883
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8884
"(The only ``status`` value currently supported is ``fixed.``)"
8885
msgstr ""
8886
8887
#: en/help_topics/bugs.txt:8
8888
msgid ""
8889
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8890
"identifier\n"
8891
"rather than a full URL. This looks like::"
8892
msgstr ""
8893
8894
#: en/help_topics/bugs.txt:11
8895
msgid " bzr commit --fixes <tracker>:<id>"
8896
msgstr ""
8897
8898
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8899
msgid "or::"
8900
msgstr ""
8901
8902
#: en/help_topics/bugs.txt:15
8903
msgid " bzr commit --fixes <id>"
8904
msgstr ""
8905
8906
#: en/help_topics/bugs.txt:17
8907
msgid ""
8908
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8909
"the\n"
8910
"identifier for that bug within the bugtracker, usually the bug number.\n"
8911
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8912
"or global configuration is used."
8913
msgstr ""
8914
8915
#: en/help_topics/bugs.txt:22
8916
msgid ""
8917
"Bazaar knows about a few bug trackers that have many users. If\n"
8918
"you use one of these bug trackers then there is no setup required to\n"
8919
"use this feature, you just need to know the tracker identifier to use.\n"
8920
"These are the bugtrackers that are built in:"
8921
msgstr ""
8922
8923
#: en/help_topics/bugs.txt:27
8924
msgid ""
8925
" ============================ ============ ============\n"
8926
" URL Abbreviation Example\n"
8927
" ============================ ============ ============\n"
8928
" https://bugs.launchpad.net/ lp lp:12345\n"
8929
" http://bugs.debian.org/ deb deb:12345\n"
8930
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8931
" ============================ ============ ============"
8932
msgstr ""
8933
8934
#: en/help_topics/bugs.txt:35
8935
msgid ""
8936
"For the bug trackers not listed above configuration is required.\n"
8937
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8938
"is built in, along with a template mechanism for other bugtrackers with\n"
8939
"simple URL schemes. If your bug tracker can't be described by one\n"
8940
"of the schemes described below then you can write a plugin to support\n"
8941
"it."
8942
msgstr ""
8943
8944
#: en/help_topics/bugs.txt:42
8945
msgid ""
8946
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8947
"variable which contains the base URL of the bug tracker. These options\n"
8948
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8949
"configuration section in ``locations.conf``. You can set up these values\n"
8950
"for each of the projects you work on."
8951
msgstr ""
8952
8953
#: en/help_topics/bugs.txt:48
8954
msgid ""
8955
"Note: As you provide a short name for each tracker, you can specify one or\n"
8956
"more bugs in one or more trackers at commit time if you wish."
8957
msgstr ""
8958
8959
#: en/help_topics/bugs.txt:51
8960
msgid ""
8961
"Launchpad\n"
8962
"---------"
8963
msgstr ""
8964
8965
#: en/help_topics/bugs.txt:54
8966
msgid ""
8967
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8968
msgstr ""
8969
8970
#: en/help_topics/bugs.txt:56
8971
msgid ""
8972
"bugzilla_<tracker>_url\n"
8973
"----------------------"
8974
msgstr ""
8975
8976
#: en/help_topics/bugs.txt:59
8977
msgid ""
8978
"If present, the location of the Bugzilla bug tracker referred to by\n"
8979
"<tracker>. This option can then be used together with ``bzr commit\n"
8980
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8981
"example::"
8982
msgstr ""
8983
8984
#: en/help_topics/bugs.txt:64
8985
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8986
msgstr ""
8987
8988
#: en/help_topics/bugs.txt:66
8989
msgid ""
8990
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8991
"fixed."
8992
msgstr ""
8993
8994
#: en/help_topics/bugs.txt:69
8995
msgid ""
8996
"trac_<tracker>_url\n"
8997
"------------------"
8998
msgstr ""
8999
9000
#: en/help_topics/bugs.txt:72
9001
msgid ""
9002
"If present, the location of the Trac instance referred to by\n"
9003
"<tracker>. This option can then be used together with ``bzr commit\n"
9004
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9005
"example::"
9006
msgstr ""
9007
9008
#: en/help_topics/bugs.txt:77
9009
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9010
msgstr ""
9011
9012
#: en/help_topics/bugs.txt:79
9013
msgid ""
9014
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9015
"as\n"
9016
"fixed."
9017
msgstr ""
9018
9019
#: en/help_topics/bugs.txt:82
9020
msgid ""
9021
"bugtracker_<tracker>_url\n"
9022
"------------------------"
9023
msgstr ""
9024
9025
#: en/help_topics/bugs.txt:85
9026
msgid ""
9027
"If present, the location of a generic bug tracker instance referred to by\n"
9028
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9029
"which will be replaced by a specific bug ID. This option can then be used\n"
9030
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9031
"fixed by that commit. For example::"
9032
msgstr ""
9033
9034
#: en/help_topics/bugs.txt:91
9035
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9036
msgstr ""
9037
9038
#: en/help_topics/bugs.txt:93
9039
msgid ""
9040
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9041
"Roundup bug tracker as fixed, or::"
9042
msgstr ""
9043
9044
#: en/help_topics/bugs.txt:96
9045
msgid ""
9046
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9047
msgstr ""
9048
9049
#: en/help_topics/bugs.txt:98
9050
msgid ""
9051
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9052
"RT bug tracker as fixed, or::"
9053
msgstr ""
9054
9055
#: en/help_topics/bugs.txt:101
9056
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9057
msgstr ""
9058
9059
#: en/help_topics/bugs.txt:103
9060
msgid ""
9061
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9062
"1234\n"
9063
"in Hudson's JIRA bug tracker as fixed.\n"
9064
msgstr ""
9065
9066
#: en/help_topics/commands.txt:1
9067
msgid ""
9068
"add Add specified files or directories.\n"
9069
"alias Set/unset and display aliases.\n"
9070
"annotate Show the origin of each line in a file.\n"
9071
"bash-completion Generate a shell function for bash command line "
9072
"completion.\n"
9073
" [bash_completion]\n"
9074
"bind Convert the current branch into a checkout of the "
9075
"supplied\n"
9076
" branch.\n"
9077
"branch Create a new branch that is a copy of an existing branch.\n"
9078
"branches List the branches available at the current location.\n"
9079
"break-lock Break a dead lock.\n"
9080
"cat Write the contents of a file as of a given revision to\n"
9081
" standard output.\n"
9082
"check Validate working tree structure, branch consistency and\n"
9083
" repository history.\n"
9084
"checkout Create a new checkout of an existing branch.\n"
9085
"clean-tree Remove unwanted files from working tree.\n"
9086
"commit Commit changes into a new revision.\n"
9087
"config Display, set or remove a configuration option.\n"
9088
"conflicts List files with conflicts.\n"
9089
"deleted List files deleted in the working tree.\n"
9090
"diff Show differences in the working tree, between revisions "
9091
"or\n"
9092
" branches.\n"
9093
"dpush Push into a different VCS without any custom bzr "
9094
"metadata.\n"
9095
"export Export current or past revision to a destination directory "
9096
"or\n"
9097
" archive.\n"
9098
"help Show help on a command or other topic.\n"
9099
"ignore Ignore specified files or patterns.\n"
9100
"ignored List ignored files and the patterns that matched them.\n"
9101
"info Show information about a working tree, branch or "
9102
"repository.\n"
9103
"init Make a directory into a versioned branch.\n"
9104
"init-repository Create a shared repository for branches to share storage\n"
9105
" space.\n"
9106
"join Combine a tree into its containing tree.\n"
9107
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9108
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9109
"launchpad-open Open a Launchpad branch page in your web browser. "
9110
"[launchpad]\n"
9111
"log Show historical log for a branch or subset of a branch.\n"
9112
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9113
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9114
"ls List files in a tree.\n"
9115
"merge Perform a three-way merge.\n"
9116
"missing Show unmerged/unpulled revisions between two branches.\n"
9117
"mkdir Create a new versioned directory.\n"
9118
"mv Move or rename a file.\n"
9119
"nick Print or set the branch nickname.\n"
9120
"pack Compress the data within a repository.\n"
9121
"plugins List the installed plugins.\n"
9122
"pull Turn this branch into a mirror of another branch.\n"
9123
"push Update a mirror of this branch.\n"
9124
"reconcile Reconcile bzr metadata in a branch.\n"
9125
"reconfigure Reconfigure the type of a bzr directory.\n"
9126
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9127
"remerge Redo a merge.\n"
9128
"remove Remove files or directories.\n"
9129
"remove-branch Remove a branch.\n"
9130
"remove-tree Remove the working tree from a given branch/checkout.\n"
9131
"renames Show list of renamed files.\n"
9132
"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"
9135
"revno Show current revision number.\n"
9136
"root Show the tree root directory.\n"
9137
"send Mail or create a merge-directive for submitting changes.\n"
9138
"serve Run the bzr server.\n"
9139
"shelve Temporarily set aside some changes from the current tree.\n"
9140
"sign-my-commits Sign all commits by a given committer.\n"
9141
"split Split a subdirectory of a tree into a separate tree.\n"
9142
"status Display status summary.\n"
9143
"switch Set the branch of a checkout and update.\n"
9144
"tag Create, remove or modify a tag naming a revision.\n"
9145
"tags List tags.\n"
9146
"testament Show testament (signing-form) of a revision.\n"
9147
"unbind Convert the current checkout into a regular branch.\n"
9148
"uncommit Remove the last committed revision.\n"
9149
"unshelve Restore shelved changes.\n"
9150
"update Update a working tree to a new revision.\n"
9151
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9152
" format.\n"
9153
"verify-signatures Verify all commit signatures.\n"
9154
"version Show version of bzr.\n"
9155
"version-info Show version information about this tree.\n"
9156
"view Manage filtered views.\n"
9157
"whoami Show or set bzr user id.\n"
9158
msgstr ""
9159
9160
#: en/help_topics/configuration.txt:1
9161
msgid ""
9162
"Configuration Settings\n"
9163
"======================="
9164
msgstr ""
9165
9166
#: en/help_topics/configuration.txt:4
9167
msgid ""
9168
"Environment settings\n"
9169
"---------------------"
9170
msgstr ""
9171
9172
#: en/help_topics/configuration.txt:7
9173
msgid ""
9174
"While most configuration is handled by configuration files, some options\n"
9175
"which may be semi-permanent can also be controlled through the environment."
9176
msgstr ""
9177
9178
#: en/help_topics/configuration.txt:10
9179
msgid ""
9180
"BZR_EMAIL\n"
9181
"~~~~~~~~~"
9182
msgstr ""
9183
9184
#: en/help_topics/configuration.txt:13
9185
msgid "Override the email id used by Bazaar. Typical format::"
9186
msgstr ""
9187
9188
#: en/help_topics/configuration.txt:15
9189
msgid " \"John Doe <jdoe@example.com>\""
9190
msgstr ""
9191
9192
#: en/help_topics/configuration.txt:17
9193
msgid "See also the ``email`` configuration option."
9194
msgstr ""
9195
9196
#: en/help_topics/configuration.txt:19
9197
msgid ""
9198
"BZR_PROGRESS_BAR\n"
9199
"~~~~~~~~~~~~~~~~"
9200
msgstr ""
9201
9202
#: en/help_topics/configuration.txt:22
9203
msgid ""
9204
"Override the progress display. Possible values are \"none\" or \"text\". "
9205
"If\n"
9206
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9207
"draws\n"
9208
"the ordinary command line progress bar."
9209
msgstr ""
9210
9211
#: en/help_topics/configuration.txt:26
9212
msgid ""
9213
"BZR_SIGQUIT_PDB\n"
9214
"~~~~~~~~~~~~~~~"
9215
msgstr ""
9216
9217
#: en/help_topics/configuration.txt:29
9218
msgid ""
9219
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9220
msgstr ""
9221
9222
#: en/help_topics/configuration.txt:31
9223
msgid ""
9224
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9225
"* 1 = Invoke breakin debugger (default)"
9226
msgstr ""
9227
9228
#: en/help_topics/configuration.txt:34
9229
msgid ""
9230
"BZR_HOME\n"
9231
"~~~~~~~~"
9232
msgstr ""
9233
9234
#: en/help_topics/configuration.txt:37
9235
msgid "Override the home directory used by Bazaar."
9236
msgstr ""
9237
9238
#: en/help_topics/configuration.txt:39
9239
msgid ""
9240
"BZR_SSH\n"
9241
"~~~~~~~"
9242
msgstr ""
9243
9244
#: en/help_topics/configuration.txt:42
9245
msgid "Select a different SSH implementation."
9246
msgstr ""
9247
9248
#: en/help_topics/configuration.txt:44
9249
msgid ""
9250
"BZR_PDB\n"
9251
"~~~~~~~"
9252
msgstr ""
9253
9254
#: en/help_topics/configuration.txt:47
9255
msgid "Control whether to launch a debugger on error."
9256
msgstr ""
9257
9258
#: en/help_topics/configuration.txt:49
9259
msgid ""
9260
"* 0 = Standard behavior\n"
9261
"* 1 = Launch debugger"
9262
msgstr ""
9263
9264
#: en/help_topics/configuration.txt:52
9265
msgid ""
9266
"BZR_REMOTE_PATH\n"
9267
"~~~~~~~~~~~~~~~"
9268
msgstr ""
9269
9270
#: en/help_topics/configuration.txt:55
9271
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9272
msgstr ""
9273
9274
#: en/help_topics/configuration.txt:57
9275
msgid "See also the ``bzr_remote_path`` configuration option."
9276
msgstr ""
9277
9278
#: en/help_topics/configuration.txt:59
9279
msgid ""
9280
"BZR_EDITOR\n"
9281
"~~~~~~~~~~"
9282
msgstr ""
9283
9284
#: en/help_topics/configuration.txt:62
9285
msgid "Path to the editor Bazaar should use for commit messages, etc."
9286
msgstr ""
9287
9288
#: en/help_topics/configuration.txt:64
9289
msgid ""
9290
"BZR_LOG\n"
9291
"~~~~~~~"
9292
msgstr ""
9293
9294
#: en/help_topics/configuration.txt:67
9295
msgid ""
9296
"Location of the Bazaar log file. You can check the current location by\n"
9297
"running ``bzr version``."
9298
msgstr ""
9299
9300
#: en/help_topics/configuration.txt:70
9301
msgid ""
9302
"The log file contains debug information that is useful for diagnosing or\n"
9303
"reporting problems with Bazaar."
9304
msgstr ""
9305
9306
#: en/help_topics/configuration.txt:73
9307
msgid ""
9308
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9309
"will disable logging."
9310
msgstr ""
9311
9312
#: en/help_topics/configuration.txt:76
9313
msgid ""
9314
"\n"
9315
"BZR_PLUGIN_PATH\n"
9316
"~~~~~~~~~~~~~~~"
9317
msgstr ""
9318
9319
#: en/help_topics/configuration.txt:80
9320
msgid ""
9321
"The path to the plugins directory that Bazaar should use.\n"
9322
"If not set, Bazaar will search for plugins in:"
9323
msgstr ""
9324
9325
#: en/help_topics/configuration.txt:83
9326
msgid ""
9327
"* the user specific plugin directory (containing the ``user`` plugins),"
9328
msgstr ""
9329
"* nella directory specifica per i plugin dell'utente (contenente i plugin "
9330
"dell'«utente»),"
9331
9332
#: en/help_topics/configuration.txt:85
9333
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9334
msgstr ""
9335
9336
#: en/help_topics/configuration.txt:87
9337
msgid ""
9338
"* the site specific plugin directory if applicable (containing\n"
9339
" the ``site`` plugins)."
9340
msgstr ""
9341
9342
#: en/help_topics/configuration.txt:90
9343
msgid ""
9344
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9345
"the way the plugin are searched. "
9346
msgstr ""
9347
9348
#: en/help_topics/configuration.txt:93
9349
msgid ""
9350
"As for the ``PATH`` variables, if multiple directories are\n"
9351
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9352
"platform specific appropriate character (':' on Unix,\n"
9353
"';' on windows)"
9354
msgstr ""
9355
9356
#: en/help_topics/configuration.txt:98
9357
msgid ""
9358
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9359
"in ``user``. However it will continue to search in ``core`` and\n"
9360
"``site`` unless they are explicitly removed."
9361
msgstr ""
9362
9363
#: en/help_topics/configuration.txt:102
9364
msgid ""
9365
"If you need to change the order or remove one of these\n"
9366
"directories, you should use special values:"
9367
msgstr ""
9368
9369
#: en/help_topics/configuration.txt:105
9370
msgid ""
9371
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9372
" path from the default values,"
9373
msgstr ""
9374
9375
#: en/help_topics/configuration.txt:108
9376
msgid ""
9377
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9378
" before the remaining default values (and also remove it from\n"
9379
" the default values)."
9380
msgstr ""
9381
9382
#: en/help_topics/configuration.txt:112
9383
msgid ""
9384
"Note that the special values 'user', 'core' and 'site' should be\n"
9385
"used literally, they will be substituted by the corresponding,\n"
9386
"platform specific, values."
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:116
9390
msgid ""
9391
"The examples below use ':' as the separator, windows users\n"
9392
"should use ';'."
9393
msgstr ""
9394
9395
#: en/help_topics/configuration.txt:119
9396
msgid "Overriding the default user plugin directory::"
9397
msgstr ""
9398
9399
#: en/help_topics/configuration.txt:121
9400
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9401
msgstr ""
9402
9403
#: en/help_topics/configuration.txt:123
9404
msgid "Disabling the site directory while retaining the user directory::"
9405
msgstr ""
9406
9407
#: en/help_topics/configuration.txt:125
9408
msgid " BZR_PLUGIN_PATH='-site:+user'"
9409
msgstr ""
9410
9411
#: en/help_topics/configuration.txt:127
9412
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9413
msgstr ""
9414
9415
#: en/help_topics/configuration.txt:129
9416
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9417
msgstr ""
9418
9419
#: en/help_topics/configuration.txt:131
9420
msgid "Overriding the default site plugin directory::"
9421
msgstr ""
9422
9423
#: en/help_topics/configuration.txt:133
9424
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9425
msgstr ""
9426
9427
#: en/help_topics/configuration.txt:135
9428
msgid ""
9429
"BZR_DISABLE_PLUGINS\n"
9430
"~~~~~~~~~~~~~~~~~~~"
9431
msgstr ""
9432
9433
#: en/help_topics/configuration.txt:138
9434
msgid ""
9435
"Under special circumstances (mostly when trying to diagnose a\n"
9436
"bug), it's better to disable a plugin (or several) rather than\n"
9437
"uninstalling them completely. Such plugins can be specified in\n"
9438
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9439
msgstr ""
9440
9441
#: en/help_topics/configuration.txt:143
9442
msgid ""
9443
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9444
"will raise an import error if they are explicitly imported (by\n"
9445
"another plugin that depends on them for example)."
9446
msgstr ""
9447
9448
#: en/help_topics/configuration.txt:147
9449
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9450
msgstr ""
9451
9452
#: en/help_topics/configuration.txt:149
9453
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9454
msgstr ""
9455
9456
#: en/help_topics/configuration.txt:151
9457
msgid ""
9458
"BZR_PLUGINS_AT\n"
9459
"~~~~~~~~~~~~~~"
9460
msgstr ""
9461
9462
#: en/help_topics/configuration.txt:154
9463
msgid ""
9464
"When adding a new feature or working on a bug in a plugin,\n"
9465
"developers often need to use a specific version of a given\n"
9466
"plugin. Since python requires that the directory containing the\n"
9467
"code is named like the plugin itself this make it impossible to\n"
9468
"use arbitrary directory names (using a two-level directory scheme\n"
9469
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9470
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9471
msgstr ""
9472
9473
#: en/help_topics/configuration.txt:162
9474
msgid ""
9475
"Plugins specified in this environment variable takes precedence\n"
9476
"over the ones in ``BZR_PLUGIN_PATH``."
9477
msgstr ""
9478
9479
#: en/help_topics/configuration.txt:165
9480
msgid ""
9481
"The variable specified a list of ``plugin_name@plugin path``,\n"
9482
"``plugin_name`` being the name of the plugin as it appears in\n"
9483
"python module paths, ``plugin_path`` being the path to the\n"
9484
"directory containing the plugin code itself\n"
9485
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9486
"separator, use ';' on windows."
9487
msgstr ""
9488
9489
#: en/help_topics/configuration.txt:172
9490
msgid ""
9491
"Example:\n"
9492
"~~~~~~~~"
9493
msgstr ""
9494
9495
#: en/help_topics/configuration.txt:175
9496
msgid ""
9497
"Using a specific version of ``myplugin``:\n"
9498
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:178
9502
msgid ""
9503
"BZRPATH\n"
9504
"~~~~~~~"
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:181
9508
msgid "The path where Bazaar should look for shell plugin external commands."
9509
msgstr ""
9510
9511
#: en/help_topics/configuration.txt:183
9512
msgid ""
9513
"\n"
9514
"http_proxy, https_proxy\n"
9515
"~~~~~~~~~~~~~~~~~~~~~~~"
9516
msgstr ""
9517
9518
#: en/help_topics/configuration.txt:187
9519
msgid "Specifies the network proxy for outgoing connections, for example::"
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:189
9523
msgid ""
9524
" http_proxy=http://proxy.example.com:3128/ \n"
9525
" https_proxy=http://proxy.example.com:3128/"
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:192
9529
msgid ""
9530
"\n"
9531
"Configuration files\n"
9532
"-------------------"
9533
msgstr ""
9534
9535
#: en/help_topics/configuration.txt:196
9536
msgid ""
9537
"Location\n"
9538
"~~~~~~~~"
9539
msgstr ""
9540
9541
#: en/help_topics/configuration.txt:199
9542
msgid ""
9543
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9544
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9545
"on\n"
9546
"Windows. (You can check the location for your system by using\n"
9547
"``bzr version``.)"
9548
msgstr ""
9549
9550
#: en/help_topics/configuration.txt:204
9551
msgid "There are three primary configuration files in this location:"
9552
msgstr ""
9553
9554
#: en/help_topics/configuration.txt:206
9555
msgid "* ``bazaar.conf`` describes default configuration options,"
9556
msgstr ""
9557
9558
#: en/help_topics/configuration.txt:208
9559
msgid ""
9560
"* ``locations.conf`` describes configuration information for\n"
9561
" specific branch locations,"
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:211
9565
msgid ""
9566
"* ``authentication.conf`` describes credential information for\n"
9567
" remote servers."
9568
msgstr ""
9569
9570
#: en/help_topics/configuration.txt:214
9571
msgid ""
9572
"Each branch can also contain a configuration file that sets values specific\n"
9573
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9574
"the\n"
9575
"branch. This file is visible to all users of a branch, if you wish to "
9576
"override\n"
9577
"one of the values for a branch with a setting that is specific to you then "
9578
"you\n"
9579
"can do so in ``locations.conf``."
9580
msgstr ""
9581
9582
#: en/help_topics/configuration.txt:220
9583
msgid ""
9584
"General format\n"
9585
"~~~~~~~~~~~~~~"
9586
msgstr ""
9587
9588
#: en/help_topics/configuration.txt:223
9589
msgid ""
9590
"An ini file has three types of contructs: section headers, section\n"
9591
"options and comments."
9592
msgstr ""
9593
9594
#: en/help_topics/configuration.txt:226
9595
msgid ""
9596
"Comments\n"
9597
"^^^^^^^^"
9598
msgstr ""
9599
9600
#: en/help_topics/configuration.txt:229
9601
msgid ""
9602
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9603
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9604
"Bazaar when parsing ini files."
9605
msgstr ""
9606
9607
#: en/help_topics/configuration.txt:233
9608
msgid ""
9609
"Section headers\n"
9610
"^^^^^^^^^^^^^^^"
9611
msgstr ""
9612
9613
#: en/help_topics/configuration.txt:236
9614
msgid ""
9615
"A section header is a word enclosed in brackets that starts at the begining\n"
9616
"of a line. A typical section header looks like this::"
9617
msgstr ""
9618
9619
#: en/help_topics/configuration.txt:239
9620
msgid " [DEFAULT]"
9621
msgstr ""
9622
9623
#: en/help_topics/configuration.txt:241
9624
msgid ""
9625
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9626
"[ALIASES]. Section headers are case sensitive. The default section provides "
9627
"for\n"
9628
"setting options which can be overridden with the branch config file."
9629
msgstr ""
9630
9631
#: en/help_topics/configuration.txt:245
9632
msgid ""
9633
"For ``locations.conf``, the options from the section with the\n"
9634
"longest matching section header are used to the exclusion of other\n"
9635
"potentially valid section headers. A section header uses the path for\n"
9636
"the branch as the section header. Some examples include::"
9637
msgstr ""
9638
9639
#: en/help_topics/configuration.txt:250
9640
msgid ""
9641
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9642
" [/home/jdoe/branches/]"
9643
msgstr ""
9644
9645
#: en/help_topics/configuration.txt:253
9646
msgid ""
9647
"\n"
9648
"Section options\n"
9649
"^^^^^^^^^^^^^^^"
9650
msgstr ""
9651
"\n"
9652
"Opzioni di sezione\n"
9653
"^^^^^^^^^^^^^^^^^^"
9654
9655
#: en/help_topics/configuration.txt:257
9656
msgid ""
9657
"A section option resides within a section. A section option contains an\n"
9658
"option name, an equals sign and a value. For example::"
9659
msgstr ""
9660
9661
#: en/help_topics/configuration.txt:260
9662
msgid ""
9663
" email = John Doe <jdoe@isp.com>\n"
9664
" gpg_signing_key = Amy Pond <amy@example.com>"
9665
msgstr ""
9666
9667
#: en/help_topics/configuration.txt:263
9668
msgid ""
9669
"A option can reference other options by enclosing them in curly brackets::"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:265
9673
msgid ""
9674
" my_branch_name = feature_x\n"
9675
" my_server = bzr+ssh://example.com\n"
9676
" push_location = {my_server}/project/{my_branch_name}"
9677
msgstr ""
9678
9679
#: en/help_topics/configuration.txt:269
9680
msgid ""
9681
"Option policies\n"
9682
"^^^^^^^^^^^^^^^"
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:272
9686
msgid ""
9687
"Options defined in a section affect the named directory or URL plus\n"
9688
"any locations they contain. Policies can be used to change how an\n"
9689
"option value is interpreted for contained locations. Currently\n"
9690
"there are three policies available:"
9691
msgstr ""
9692
9693
#: en/help_topics/configuration.txt:277
9694
msgid ""
9695
" none:\n"
9696
" the value is interpreted the same for contained locations. This is\n"
9697
" the default behaviour.\n"
9698
" norecurse:\n"
9699
" the value is only used for the exact location specified by the\n"
9700
" section name.\n"
9701
" appendpath:\n"
9702
" for contained locations, any additional path components are\n"
9703
" appended to the value."
9704
msgstr ""
9705
9706
#: en/help_topics/configuration.txt:287
9707
msgid ""
9708
"Policies are specified by keys with names of the form "
9709
"\"<option_name>:policy\".\n"
9710
"For example, to define the push location for a tree of branches, the\n"
9711
"following could be used::"
9712
msgstr ""
9713
9714
#: en/help_topics/configuration.txt:291
9715
msgid ""
9716
" [/top/location]\n"
9717
" push_location = sftp://example.com/location\n"
9718
" push_location:policy = appendpath"
9719
msgstr ""
9720
9721
#: en/help_topics/configuration.txt:295
9722
msgid ""
9723
"With this configuration, the push location for ``/top/location/branch1``\n"
9724
"would be ``sftp://example.com/location/branch1``."
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:298
9728
msgid ""
9729
"Section local options\n"
9730
"^^^^^^^^^^^^^^^^^^^^^"
9731
msgstr ""
9732
9733
#: en/help_topics/configuration.txt:301
9734
msgid ""
9735
"Some options are defined automatically inside a given section and can be\n"
9736
"refered to in this section only. "
9737
msgstr ""
9738
9739
#: en/help_topics/configuration.txt:304
9740
msgid "For example, the ``appendpath`` policy can be used like this::"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:306
9744
msgid ""
9745
" [/home/vila/src/bzr/bugs]\n"
9746
" mypush = lp:~vila/bzr\n"
9747
" mypush:policy=appendpath"
9748
msgstr ""
9749
9750
#: en/help_topics/configuration.txt:310
9751
msgid "Using ``relpath`` to achieve the same result is done like this::"
9752
msgstr ""
9753
9754
#: en/help_topics/configuration.txt:312
9755
msgid ""
9756
" [/home/vila/src/bzr/bugs]\n"
9757
" mypush = lp:~vila/bzr/{relpath}"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:315
9761
msgid ""
9762
"In both cases, when used in a directory like\n"
9763
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9764
msgstr ""
9765
9766
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9767
msgid ""
9768
" $ bzr config mypush\n"
9769
" lp:~vila/bzr/832013-expand-in-stack"
9770
msgstr ""
9771
9772
#: en/help_topics/configuration.txt:321
9773
msgid "Another such option is ``basename`` which can be used like this::"
9774
msgstr ""
9775
9776
#: en/help_topics/configuration.txt:323
9777
msgid ""
9778
" [/home/vila/src/bzr]\n"
9779
" mypush = lp:~vila/bzr/{basename}"
9780
msgstr ""
9781
9782
#: en/help_topics/configuration.txt:326
9783
msgid ""
9784
"When used in a directory like\n"
9785
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9786
msgstr ""
9787
9788
#: en/help_topics/configuration.txt:332
9789
msgid ""
9790
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9791
"itself is defined as the relative path between the section name and the\n"
9792
"location it matches."
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:336
9796
msgid ""
9797
"Another such option is ``branchname``, which refers to the name of a "
9798
"colocated\n"
9799
"branch. For non-colocated branches, it behaves like basename. It can be "
9800
"used\n"
9801
"like this::"
9802
msgstr ""
9803
9804
#: en/help_topics/configuration.txt:340
9805
msgid ""
9806
" [/home/vila/src/bzr/bugs]\n"
9807
" mypush = lp:~vila/bzr/{branchname}"
9808
msgstr ""
9809
9810
#: en/help_topics/configuration.txt:343
9811
msgid ""
9812
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9813
"get::"
9814
msgstr ""
9815
9816
#: en/help_topics/configuration.txt:345
9817
msgid ""
9818
" bzr config mypush\n"
9819
" lp:~vila/bzr/832013-expand-in-stack"
9820
msgstr ""
9821
9822
#: en/help_topics/configuration.txt:348
9823
msgid ""
9824
"When an option is local to a Section, it cannot be referred to from option\n"
9825
"values in any other section from the same ``Store`` nor from any other\n"
9826
"``Store``."
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:352
9830
msgid ""
9831
"\n"
9832
"The main configuration file, bazaar.conf\n"
9833
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9834
msgstr ""
9835
9836
#: en/help_topics/configuration.txt:356
9837
msgid ""
9838
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9839
"The default section contains the default\n"
9840
"configuration options for all branches. The default section can be\n"
9841
"overriden by providing a branch-specific section in ``locations.conf``."
9842
msgstr ""
9843
9844
#: en/help_topics/configuration.txt:361
9845
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9846
msgstr ""
9847
9848
#: en/help_topics/configuration.txt:363
9849
msgid ""
9850
" [DEFAULT]\n"
9851
" email = John Doe <jdoe@isp.com>\n"
9852
" editor = /usr/bin/vim\n"
9853
" create_signatures = when-required"
9854
msgstr ""
9855
9856
#: en/help_topics/configuration.txt:368
9857
msgid ""
9858
"\n"
9859
"The branch location configuration file, locations.conf\n"
9860
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9861
msgstr ""
9862
"\n"
9863
"Il file di configurazione di posizione del branch, locations.conf\n"
9864
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9865
9866
#: en/help_topics/configuration.txt:372
9867
msgid ""
9868
"``locations.conf`` allows one to specify overriding settings for\n"
9869
"a specific branch. The format is almost identical to the default section in\n"
9870
"bazaar.conf with one significant change: The section header, instead of "
9871
"saying\n"
9872
"default, will be the path to a branch that you wish to override a value\n"
9873
"for. The '?' and '*' wildcards are supported::"
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:378
9877
msgid ""
9878
" [/home/jdoe/branches/nethack]\n"
9879
" email = Nethack Admin <nethack@nethack.com>"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:381
9883
msgid ""
9884
" [http://hypothetical.site.com/branches/devel-branch]\n"
9885
" create_signatures = always"
9886
msgstr ""
9887
9888
#: en/help_topics/configuration.txt:384
9889
msgid ""
9890
"The authentication configuration file, authentication.conf\n"
9891
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9892
msgstr ""
9893
9894
#: en/help_topics/configuration.txt:387
9895
msgid ""
9896
"``authentication.conf`` allows one to specify credentials for\n"
9897
"remote servers. This can be used for all the supported transports and any "
9898
"part\n"
9899
"of bzr that requires authentication (smtp for example)."
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:391
9903
msgid ""
9904
"The syntax of the file obeys the same rules as the others except for the\n"
9905
"option policies which don't apply."
9906
msgstr ""
9907
9908
#: en/help_topics/configuration.txt:394
9909
msgid ""
9910
"For more information on the possible uses of the authentication "
9911
"configuration\n"
9912
"file see :doc:`authentication-help`."
9913
msgstr ""
9914
9915
#: en/help_topics/configuration.txt:397
9916
msgid ""
9917
"\n"
9918
"Common options\n"
9919
"--------------"
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:401
9923
msgid ""
9924
"debug_flags\n"
9925
"~~~~~~~~~~~"
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:404
9929
msgid ""
9930
"A comma-separated list of debugging options to turn on. The same values\n"
9931
"can be used as with the -D command-line option (see `help global-options`).\n"
9932
"For example::"
9933
msgstr ""
9934
9935
#: en/help_topics/configuration.txt:408
9936
msgid " debug_flags = hpss"
9937
msgstr ""
9938
9939
#: en/help_topics/configuration.txt:412
9940
msgid " debug_flags = hpss,evil"
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:414
9944
msgid ""
9945
"email\n"
9946
"~~~~~"
9947
msgstr ""
9948
9949
#: en/help_topics/configuration.txt:417
9950
msgid ""
9951
"The email address to use when committing a branch. Typically takes the form\n"
9952
"of::"
9953
msgstr ""
9954
9955
#: en/help_topics/configuration.txt:420
9956
msgid " email = Full Name <account@hostname.tld>"
9957
msgstr ""
9958
9959
#: en/help_topics/configuration.txt:422
9960
msgid ""
9961
"editor\n"
9962
"~~~~~~"
9963
msgstr ""
9964
9965
#: en/help_topics/configuration.txt:425
9966
msgid ""
9967
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9968
"a commit message. This setting is trumped by the environment variable\n"
9969
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9970
"variables."
9971
msgstr ""
9972
9973
#: en/help_topics/configuration.txt:430
9974
msgid ""
9975
"log_format\n"
9976
"~~~~~~~~~~"
9977
msgstr ""
9978
9979
#: en/help_topics/configuration.txt:433
9980
msgid ""
9981
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9982
"and ``line``. Additional formats may be provided by plugins. The default\n"
9983
"value is ``long``."
9984
msgstr ""
9985
9986
#: en/help_topics/configuration.txt:437
9987
msgid ""
9988
"check_signatures\n"
9989
"~~~~~~~~~~~~~~~~"
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:440
9993
msgid ""
9994
"Reserved for future use. These options will allow a policy for branches to\n"
9995
"require signatures."
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:443
9999
msgid ""
10000
"require\n"
10001
" The gnupg signature for revisions must be present and must be valid."
10002
msgstr ""
10003
10004
#: en/help_topics/configuration.txt:446
10005
msgid ""
10006
"ignore\n"
10007
" Do not check gnupg signatures of revisions."
10008
msgstr ""
10009
10010
#: en/help_topics/configuration.txt:449
10011
msgid ""
10012
"check-available\n"
10013
" (default) If gnupg signatures for revisions are present, check them.\n"
10014
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10015
" no signature is present."
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:454
10019
msgid ""
10020
"create_signatures\n"
10021
"~~~~~~~~~~~~~~~~~"
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:457
10025
msgid ""
10026
"Defines the behaviour of signing revisions on commits. By default bzr will "
10027
"not\n"
10028
"sign new commits."
10029
msgstr ""
10030
10031
#: en/help_topics/configuration.txt:460
10032
msgid ""
10033
"always\n"
10034
" Sign every new revision that is committed. If the signing fails then "
10035
"the\n"
10036
" commit will not be made."
10037
msgstr ""
10038
10039
#: en/help_topics/configuration.txt:464
10040
msgid ""
10041
"when-required\n"
10042
" Reserved for future use."
10043
msgstr ""
10044
10045
#: en/help_topics/configuration.txt:467
10046
msgid ""
10047
"never\n"
10048
" Reserved for future use."
10049
msgstr ""
10050
10051
#: en/help_topics/configuration.txt:470
10052
msgid ""
10053
"In future it is planned that ``when-required`` will sign newly\n"
10054
"committed revisions only when the branch requires them. ``never`` will "
10055
"refuse\n"
10056
"to sign newly committed revisions, even if the branch requires signatures."
10057
msgstr ""
10058
10059
#: en/help_topics/configuration.txt:474
10060
msgid ""
10061
"dirstate.fdatasync\n"
10062
"~~~~~~~~~~~~~~~~~~"
10063
msgstr ""
10064
10065
#: en/help_topics/configuration.txt:477
10066
msgid ""
10067
"If true (default), working tree metadata changes are flushed through the\n"
10068
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10069
"should not be lost if the machine crashes. See also repository.fdatasync."
10070
msgstr ""
10071
10072
#: en/help_topics/configuration.txt:481
10073
msgid ""
10074
"gpg_signing_key\n"
10075
"~~~~~~~~~~~~~~~"
10076
msgstr ""
10077
10078
#: en/help_topics/configuration.txt:484
10079
msgid ""
10080
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10081
"address, key fingerprint or full key ID. When unset or when set to\n"
10082
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:488
10086
msgid ""
10087
"recurse\n"
10088
"~~~~~~~"
10089
msgstr ""
10090
10091
#: en/help_topics/configuration.txt:491
10092
msgid ""
10093
"Only useful in ``locations.conf``. Defines whether or not the\n"
10094
"configuration for this section applies to subdirectories:"
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:494
10098
msgid ""
10099
"true\n"
10100
" (default) This section applies to subdirectories as well."
10101
msgstr ""
10102
10103
#: en/help_topics/configuration.txt:497
10104
msgid ""
10105
"false\n"
10106
" This section only applies to the branch at this directory and not\n"
10107
" branches below it."
10108
msgstr ""
10109
10110
#: en/help_topics/configuration.txt:501
10111
msgid ""
10112
"gpg_signing_command\n"
10113
"~~~~~~~~~~~~~~~~~~~"
10114
msgstr ""
10115
10116
#: en/help_topics/configuration.txt:504
10117
msgid ""
10118
"(Default: \"gpg\"). Which program should be used to sign and check "
10119
"revisions.\n"
10120
"For example::"
10121
msgstr ""
10122
10123
#: en/help_topics/configuration.txt:507
10124
msgid " gpg_signing_command = /usr/bin/gnpg"
10125
msgstr ""
10126
10127
#: en/help_topics/configuration.txt:509
10128
msgid ""
10129
"The specified command must accept the options \"--clearsign\" and \"-u "
10130
"<email>\"."
10131
msgstr ""
10132
10133
#: en/help_topics/configuration.txt:511
10134
msgid ""
10135
"bzr_remote_path\n"
10136
"~~~~~~~~~~~~~~~"
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:514
10140
msgid ""
10141
"(Default: \"bzr\"). The path to the command that should be used to run the "
10142
"smart\n"
10143
"server for bzr. This value may only be specified in locations.conf, because:"
10144
msgstr ""
10145
10146
#: en/help_topics/configuration.txt:517
10147
msgid ""
10148
"- it's needed before branch.conf is accessible\n"
10149
"- allowing remote branch.conf files to specify commands would be a security\n"
10150
" risk"
10151
msgstr ""
10152
10153
#: en/help_topics/configuration.txt:521
10154
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10155
msgstr ""
10156
10157
#: en/help_topics/configuration.txt:523
10158
msgid ""
10159
"smtp_server\n"
10160
"~~~~~~~~~~~"
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:526
10164
msgid ""
10165
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10166
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10167
msgstr ""
10168
10169
#: en/help_topics/configuration.txt:529
10170
msgid ""
10171
"smtp_username, smtp_password\n"
10172
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10173
msgstr ""
10174
10175
#: en/help_topics/configuration.txt:532
10176
msgid ""
10177
"User and password to authenticate to the SMTP server. If smtp_username\n"
10178
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10179
"These settings are only needed if the SMTP server requires authentication\n"
10180
"to send mail."
10181
msgstr ""
10182
10183
#: en/help_topics/configuration.txt:537
10184
msgid ""
10185
"locks.steal_dead\n"
10186
"~~~~~~~~~~~~~~~~"
10187
msgstr ""
10188
10189
#: en/help_topics/configuration.txt:540
10190
msgid ""
10191
"If set to true, bzr will automatically break locks held by processes from\n"
10192
"the same machine and user that are no longer alive. Otherwise, it will\n"
10193
"print a message and you can break the lock manually, if you are satisfied\n"
10194
"the object is no longer in use."
10195
msgstr ""
10196
10197
#: en/help_topics/configuration.txt:545
10198
msgid ""
10199
"mail_client\n"
10200
"~~~~~~~~~~~"
10201
msgstr ""
10202
10203
#: en/help_topics/configuration.txt:548
10204
msgid ""
10205
"A mail client to use for sending merge requests.\n"
10206
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10207
"it\n"
10208
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10209
"``editor``."
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:553
10213
msgid "Supported values for specific clients:"
10214
msgstr ""
10215
10216
#: en/help_topics/configuration.txt:555
10217
msgid ""
10218
":claws: Use Claws. This skips a dialog for attaching files.\n"
10219
":evolution: Use Evolution.\n"
10220
":kmail: Use KMail.\n"
10221
":mutt: Use Mutt.\n"
10222
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10223
"1.5,\n"
10224
" this works around some bugs that xdg-email doesn't handle."
10225
msgstr ""
10226
10227
#: en/help_topics/configuration.txt:562
10228
msgid "Supported generic values are:"
10229
msgstr ""
10230
10231
#: en/help_topics/configuration.txt:564
10232
msgid ""
10233
":default: See above.\n"
10234
":editor: Use your editor to compose the merge request. This also uses\n"
10235
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10236
" smtp_username and smtp_password.\n"
10237
":mapi: Use your preferred e-mail client on Windows.\n"
10238
":xdg-email: Use xdg-email to run your preferred mail program"
10239
msgstr ""
10240
10241
#: en/help_topics/configuration.txt:571
10242
msgid ""
10243
"repository.fdatasync\n"
10244
"~~~~~~~~~~~~~~~~~~~~"
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:574
10248
msgid ""
10249
"If true (default), repository changes are flushed through the OS buffers\n"
10250
"to physical disk. This is somewhat slower, but means data should not be\n"
10251
"lost if the machine crashes. See also dirstate.fdatasync."
10252
msgstr ""
10253
10254
#: en/help_topics/configuration.txt:578
10255
msgid ""
10256
"submit_branch\n"
10257
"~~~~~~~~~~~~~"
10258
msgstr ""
10259
10260
#: en/help_topics/configuration.txt:581
10261
msgid ""
10262
"The branch you intend to submit your current work to. This is "
10263
"automatically\n"
10264
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10265
"This\n"
10266
"should usually be set on a per-branch or per-location basis."
10267
msgstr ""
10268
10269
#: en/help_topics/configuration.txt:585
10270
msgid ""
10271
"public_branch\n"
10272
"~~~~~~~~~~~~~"
10273
msgstr ""
10274
10275
#: en/help_topics/configuration.txt:588
10276
msgid ""
10277
"A publically-accessible version of this branch (implying that this version "
10278
"is\n"
10279
"not publically-accessible). Used (and set) by ``bzr send``."
10280
msgstr ""
10281
10282
#: en/help_topics/configuration.txt:591
10283
msgid ""
10284
"suppress_warnings\n"
10285
"~~~~~~~~~~~~~~~~~"
10286
msgstr ""
10287
10288
#: en/help_topics/configuration.txt:594
10289
msgid ""
10290
"A list of strings, each string represent a warning that can be emitted by\n"
10291
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10292
msgstr ""
10293
10294
#: en/help_topics/configuration.txt:597
10295
msgid "Valid values:"
10296
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:599
10299
msgid ""
10300
"* ``format_deprecation``:\n"
10301
" whether the format deprecation warning is shown on repositories that "
10302
"are\n"
10303
" using deprecated formats."
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:603
10307
msgid ""
10308
"default_format\n"
10309
"~~~~~~~~~~~~~~"
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:606
10313
msgid ""
10314
"A format name for the default format used when creating branches. See "
10315
"``bzr\n"
10316
"help formats`` for possible values."
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:609
10320
msgid ""
10321
"\n"
10322
"Unicode options\n"
10323
"---------------"
10324
msgstr ""
10325
10326
#: en/help_topics/configuration.txt:613
10327
msgid ""
10328
"output_encoding\n"
10329
"~~~~~~~~~~~~~~~"
10330
msgstr ""
10331
10332
#: en/help_topics/configuration.txt:616
10333
msgid ""
10334
"A Python unicode encoding name for text output from bzr, such as log\n"
10335
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10336
"is the terminal encoding prefered by the operating system."
10337
msgstr ""
10338
10339
#: en/help_topics/configuration.txt:620
10340
msgid ""
10341
"\n"
10342
"Branch type specific options\n"
10343
"----------------------------"
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:624
10347
msgid ""
10348
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10349
"later format. They\n"
10350
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10351
"manually set in ``locations.conf`` or ``bazaar.conf``."
10352
msgstr ""
10353
10354
#: en/help_topics/configuration.txt:629
10355
msgid ""
10356
"append_revisions_only\n"
10357
"~~~~~~~~~~~~~~~~~~~~~"
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:632
10361
msgid ""
10362
"If set to \"True\" then revisions can only be appended to the log, not\n"
10363
"removed. A branch with this setting enabled can only pull from another\n"
10364
"branch if the other branch's log is a longer version of its own. This is\n"
10365
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10366
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10367
"compatibility with previous bzr versions (older than 2.2)."
10368
msgstr ""
10369
10370
#: en/help_topics/configuration.txt:639
10371
msgid ""
10372
"parent_location\n"
10373
"~~~~~~~~~~~~~~~"
10374
msgstr ""
10375
10376
#: en/help_topics/configuration.txt:642
10377
msgid ""
10378
"If present, the location of the default branch for pull or merge. This "
10379
"option\n"
10380
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10381
"--remember``."
10382
msgstr ""
10383
10384
#: en/help_topics/configuration.txt:646
10385
msgid ""
10386
"push_location\n"
10387
"~~~~~~~~~~~~~"
10388
msgstr ""
10389
10390
#: en/help_topics/configuration.txt:649
10391
msgid ""
10392
"If present, the location of the default branch for push. This option\n"
10393
"is normally set by the first ``push`` or ``push --remember``."
10394
msgstr ""
10395
10396
#: en/help_topics/configuration.txt:652
10397
msgid ""
10398
"push_strict\n"
10399
"~~~~~~~~~~~"
10400
msgstr ""
10401
10402
#: en/help_topics/configuration.txt:655
10403
msgid ""
10404
"If present, defines the ``--strict`` option default value for checking\n"
10405
"uncommitted changes before pushing."
10406
msgstr ""
10407
10408
#: en/help_topics/configuration.txt:658
10409
msgid ""
10410
"dpush_strict\n"
10411
"~~~~~~~~~~~~"
10412
msgstr ""
10413
10414
#: en/help_topics/configuration.txt:661
10415
msgid ""
10416
"If present, defines the ``--strict`` option default value for checking\n"
10417
"uncommitted changes before pushing into a different VCS without any\n"
10418
"custom bzr metadata."
10419
msgstr ""
10420
10421
#: en/help_topics/configuration.txt:665
10422
msgid ""
10423
"bound_location\n"
10424
"~~~~~~~~~~~~~~"
10425
msgstr ""
10426
10427
#: en/help_topics/configuration.txt:668
10428
msgid ""
10429
"The location that commits should go to when acting as a checkout.\n"
10430
"This option is normally set by ``bind``."
10431
msgstr ""
10432
10433
#: en/help_topics/configuration.txt:671
10434
msgid ""
10435
"bound\n"
10436
"~~~~~"
10437
msgstr ""
10438
10439
#: en/help_topics/configuration.txt:674
10440
msgid ""
10441
"If set to \"True\", the branch should act as a checkout, and push each "
10442
"commit to\n"
10443
"the bound_location. This option is normally set by ``bind``/``unbind``."
10444
msgstr ""
10445
10446
#: en/help_topics/configuration.txt:677
10447
msgid ""
10448
"send_strict\n"
10449
"~~~~~~~~~~~"
10450
msgstr ""
10451
10452
#: en/help_topics/configuration.txt:680
10453
msgid ""
10454
"If present, defines the ``--strict`` option default value for checking\n"
10455
"uncommitted changes before sending a merge directive."
10456
msgstr ""
10457
10458
#: en/help_topics/configuration.txt:683
10459
msgid ""
10460
"add.maximum_file_size\n"
10461
"~~~~~~~~~~~~~~~~~~~~~"
10462
msgstr ""
10463
10464
#: en/help_topics/configuration.txt:686
10465
msgid ""
10466
"Defines the maximum file size the command line \"add\" operation will allow\n"
10467
"in recursive mode, with files larger than this value being skipped. You may "
10468
"\n"
10469
"specify this value as an integer (in which case it is interpreted as bytes), "
10470
"\n"
10471
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10472
"0 \n"
10473
"will disable skipping."
10474
msgstr ""
10475
10476
#: en/help_topics/configuration.txt:692
10477
msgid ""
10478
"External Merge Tools\n"
10479
"--------------------"
10480
msgstr ""
10481
10482
#: en/help_topics/configuration.txt:695
10483
msgid ""
10484
"bzr.mergetool.<name>\n"
10485
"~~~~~~~~~~~~~~~~~~~~"
10486
msgstr ""
10487
10488
#: en/help_topics/configuration.txt:698
10489
msgid ""
10490
"Defines an external merge tool called <name> with the given command-line.\n"
10491
"Arguments containing spaces should be quoted using single or double quotes. "
10492
"The\n"
10493
"executable may omit its path if it can be found on the PATH."
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:702
10497
msgid ""
10498
"The following markers can be used in the command-line to substitute "
10499
"filenames\n"
10500
"involved in the merge conflict::"
10501
msgstr ""
10502
10503
#: en/help_topics/configuration.txt:705
10504
msgid ""
10505
" {base} file.BASE\n"
10506
" {this} file.THIS\n"
10507
" {other} file.OTHER\n"
10508
" {result} output file\n"
10509
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10510
"merge\n"
10511
" succeeds."
10512
msgstr ""
10513
10514
#: en/help_topics/configuration.txt:714
10515
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10516
msgstr ""
10517
10518
#: en/help_topics/configuration.txt:716
10519
msgid ""
10520
"bzr.default_mergetool\n"
10521
"~~~~~~~~~~~~~~~~~~~~~"
10522
msgstr ""
10523
10524
#: en/help_topics/configuration.txt:719
10525
msgid ""
10526
"Specifies which external merge tool (as defined above) should be selected "
10527
"by\n"
10528
"default in tools such as ``bzr qconflicts``."
10529
msgstr ""
10530
10531
#: en/help_topics/configuration.txt:724
10532
msgid " bzr.default_mergetool = kdiff3\n"
10533
msgstr ""
10534
10535
#: en/help_topics/conflict-types.txt:1
10536
msgid ""
10537
"Conflict Types\n"
10538
"=============="
10539
msgstr ""
10540
10541
#: en/help_topics/conflict-types.txt:4
10542
msgid ""
10543
"Some operations, like merge, revert and pull, modify the contents of your\n"
10544
"working tree. These modifications are programmatically generated, and so "
10545
"they\n"
10546
"may conflict with the current state of your working tree. "
10547
msgstr ""
10548
10549
#: en/help_topics/conflict-types.txt:8
10550
msgid ""
10551
"When conflicts are present in your working tree (as shown by ``bzr\n"
10552
"conflicts``), you should resolve them and then inform bzr that the "
10553
"conflicts\n"
10554
"have been resolved."
10555
msgstr ""
10556
10557
#: en/help_topics/conflict-types.txt:12
10558
msgid ""
10559
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10560
"should resolve them is not the one responsible for their occurrence, as is "
10561
"the\n"
10562
"case when merging other people's work or because some conflicts are "
10563
"presented\n"
10564
"in a way that is not easy to understand."
10565
msgstr ""
10566
10567
#: en/help_topics/conflict-types.txt:17
10568
msgid ""
10569
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10570
"conflict if and only if there's an actual conceptual conflict in the source\n"
10571
"tree. Because Bazaar doesn't understand the real meaning of the files "
10572
"being\n"
10573
"versioned, it can, when faced with ambiguities, fall short in either "
10574
"direction\n"
10575
"trying to resolve the conflict itself. Many kinds of changes can be "
10576
"combined\n"
10577
"programmatically, but sometimes only a human can determine the right thing "
10578
"to\n"
10579
"do."
10580
msgstr ""
10581
10582
#: en/help_topics/conflict-types.txt:25
10583
msgid ""
10584
"When Bazaar generates a conflict, it adds information into the working tree "
10585
"to\n"
10586
"present the conflicting versions, and it's up to you to find the correct\n"
10587
"resolution."
10588
msgstr ""
10589
10590
#: en/help_topics/conflict-types.txt:29
10591
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10592
msgstr ""
10593
10594
#: en/help_topics/conflict-types.txt:31
10595
msgid ""
10596
"1. Modify the working tree content so that the conflicted item is now in "
10597
"the\n"
10598
" state you want to keep, then"
10599
msgstr ""
10600
10601
#: en/help_topics/conflict-types.txt:34
10602
msgid ""
10603
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10604
" remaining generated information (``bzr resolve <item>``)."
10605
msgstr ""
10606
10607
#: en/help_topics/conflict-types.txt:37
10608
msgid ""
10609
"For most conflict types, there are some obvious ways to modify the working\n"
10610
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10611
"itself already made a choice, when possible."
10612
msgstr ""
10613
10614
#: en/help_topics/conflict-types.txt:41
10615
msgid ""
10616
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10617
"different ways to resolve the conflict."
10618
msgstr ""
10619
10620
#: en/help_topics/conflict-types.txt:44
10621
msgid ""
10622
"Each type of conflict is explained below, and the action which must be done "
10623
"to\n"
10624
"resolve the conflict is outlined."
10625
msgstr ""
10626
10627
#: en/help_topics/conflict-types.txt:47
10628
msgid ""
10629
"Various actions are available depending on the kind of conflict, for some "
10630
"of\n"
10631
"these actions, Bazaar can provide some help. In the end you should at least\n"
10632
"inform Bazaar that you're done with the conflict with::"
10633
msgstr ""
10634
10635
#: en/help_topics/conflict-types.txt:51
10636
msgid " ``bzr resolve FILE --action=done'"
10637
msgstr ""
10638
10639
#: en/help_topics/conflict-types.txt:53
10640
msgid ""
10641
"Note that this is the default action when a single file is involved so you "
10642
"can\n"
10643
"simply use::"
10644
msgstr ""
10645
10646
#: en/help_topics/conflict-types.txt:56
10647
msgid " ``bzr resolve FILE``"
10648
msgstr ""
10649
10650
#: en/help_topics/conflict-types.txt:58
10651
msgid "See ``bzr help resolve`` for more details."
10652
msgstr ""
10653
10654
#: en/help_topics/conflict-types.txt:60
10655
msgid ""
10656
"Text conflicts\n"
10657
"--------------"
10658
msgstr ""
10659
10660
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10661
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10662
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10663
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10664
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10665
msgid "Typical message::"
10666
msgstr ""
10667
10668
#: en/help_topics/conflict-types.txt:65
10669
msgid " Text conflict in FILE"
10670
msgstr ""
10671
10672
#: en/help_topics/conflict-types.txt:67
10673
msgid ""
10674
"These are produced when a text merge cannot completely reconcile two sets "
10675
"of\n"
10676
"text changes. Bazaar will emit files for each version with the extensions\n"
10677
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10678
"tree,\n"
10679
"i.e. the tree that you are merging changes into. OTHER is the version that "
10680
"you\n"
10681
"are merging into the target. BASE is an older version that is used as a "
10682
"basis\n"
10683
"for comparison."
10684
msgstr ""
10685
10686
#: en/help_topics/conflict-types.txt:74
10687
msgid ""
10688
"In the main copy of the file, Bazaar will include all the changes that it\n"
10689
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10690
"\"herringbone\" markers like ``<<<<<<<``."
10691
msgstr ""
10692
10693
#: en/help_topics/conflict-types.txt:78
10694
msgid ""
10695
"Say the initial text is \"The project leader released it.\", and THIS "
10696
"modifies it\n"
10697
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10698
"leader\n"
10699
"released Bazaar.\" A conflict would look like this::"
10700
msgstr ""
10701
10702
#: en/help_topics/conflict-types.txt:82
10703
msgid ""
10704
" <<<<<<< TREE\n"
10705
" Martin Pool released it.\n"
10706
" =======\n"
10707
" The project leader released Bazaar.\n"
10708
" >>>>>>> MERGE-SOURCE"
10709
msgstr ""
10710
10711
#: en/help_topics/conflict-types.txt:88
10712
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10713
msgstr ""
10714
10715
#: en/help_topics/conflict-types.txt:90
10716
msgid ""
10717
"You can handle text conflicts either by editing the main copy of the file,\n"
10718
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10719
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10720
"set of changes over the other (but see below when you encounter these\n"
10721
"cases). More often, the two sets of changes must be intelligently combined."
10722
msgstr ""
10723
10724
#: en/help_topics/conflict-types.txt:96
10725
msgid ""
10726
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10727
"you are done editing, the file should look like it never had a conflict, and "
10728
"be\n"
10729
"ready to commit."
10730
msgstr ""
10731
10732
#: en/help_topics/conflict-types.txt:100
10733
msgid ""
10734
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10735
"Bazaar will auto-detect which conflicts you have resolved."
10736
msgstr ""
10737
10738
#: en/help_topics/conflict-types.txt:103
10739
msgid ""
10740
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10741
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10742
"working tree."
10743
msgstr ""
10744
10745
#: en/help_topics/conflict-types.txt:107
10746
msgid ""
10747
"\n"
10748
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10749
"resolve`` with one of the following actions:"
10750
msgstr ""
10751
10752
#: en/help_topics/conflict-types.txt:111
10753
msgid ""
10754
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10755
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10756
msgstr ""
10757
10758
#: en/help_topics/conflict-types.txt:114
10759
msgid ""
10760
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10761
"modifications will be taken into account."
10762
msgstr ""
10763
10764
#: en/help_topics/conflict-types.txt:117
10765
msgid ""
10766
"Content conflicts\n"
10767
"-----------------"
10768
msgstr ""
10769
10770
#: en/help_topics/conflict-types.txt:122
10771
msgid " Contents conflict in FILE"
10772
msgstr ""
10773
10774
#: en/help_topics/conflict-types.txt:124
10775
msgid ""
10776
"This conflict happens when there are conflicting changes in the working "
10777
"tree\n"
10778
"and the merge source, but the conflicted items are not text files. They "
10779
"may\n"
10780
"be binary files, or symlinks, or directories. It can even happen with "
10781
"files\n"
10782
"that are deleted on one side, and modified on the other."
10783
msgstr ""
10784
10785
#: en/help_topics/conflict-types.txt:129
10786
msgid ""
10787
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10788
"be\n"
10789
"regular files, symlinks or directories). But it will not include a \"main "
10790
"copy\"\n"
10791
"of the file with herringbone conflict markers. It will appear that the "
10792
"\"main\n"
10793
"copy\" has been renamed to THIS or OTHER."
10794
msgstr ""
10795
10796
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10797
msgid ""
10798
"To resolve that kind of conflict, you should rebuild FILE from either "
10799
"version\n"
10800
"or a combination of both."
10801
msgstr ""
10802
10803
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10804
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10805
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10806
#: en/help_topics/conflict-types.txt:361
10807
msgid "``bzr resolve`` recognizes the following actions:"
10808
msgstr ""
10809
10810
#: en/help_topics/conflict-types.txt:139
10811
msgid ""
10812
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10813
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10814
"* ``--action=done`` will just mark the conflict as resolved."
10815
msgstr ""
10816
10817
#: en/help_topics/conflict-types.txt:143
10818
msgid ""
10819
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10820
"and\n"
10821
"``.OTHER`` files if they are still present in the working tree."
10822
msgstr ""
10823
10824
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10825
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10826
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10827
#: en/help_topics/conflict-types.txt:369
10828
msgid ""
10829
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10830
msgstr ""
10831
10832
#: en/help_topics/conflict-types.txt:148
10833
msgid ""
10834
"Tag conflicts\n"
10835
"-------------"
10836
msgstr ""
10837
10838
#: en/help_topics/conflict-types.txt:153
10839
msgid ""
10840
" Conflicting tags:\n"
10841
" version-0.1"
10842
msgstr ""
10843
10844
#: en/help_topics/conflict-types.txt:156
10845
msgid ""
10846
"When pulling from or pushing to another branch, Bazaar informs you about "
10847
"tags\n"
10848
"that conflict between the two branches; that is the same tag points to two\n"
10849
"different revisions. You need not resolve these conflicts, but subsequent\n"
10850
"uses of pull or push will result in the same message."
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:161
10854
msgid ""
10855
"To resolve the conflict, you must apply the correct tags to either the "
10856
"target\n"
10857
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10858
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10859
"target branch's tags match the source branch, then in the target branch do\n"
10860
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10861
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10862
"source\n"
10863
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10864
"favor of the target branch, you need to similarly use ``tag --force`` in "
10865
"the\n"
10866
"source branch. (Note that pulling or pushing using --overwrite will "
10867
"overwrite\n"
10868
"all tags as well.)"
10869
msgstr ""
10870
10871
#: en/help_topics/conflict-types.txt:172
10872
msgid ""
10873
"Duplicate paths\n"
10874
"---------------"
10875
msgstr ""
10876
10877
#: en/help_topics/conflict-types.txt:177
10878
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10879
msgstr ""
10880
10881
#: en/help_topics/conflict-types.txt:179
10882
msgid ""
10883
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10884
"already been used. The existing file will be renamed to \"FILE.moved\". "
10885
msgstr ""
10886
10887
#: en/help_topics/conflict-types.txt:187
10888
msgid ""
10889
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10890
"FILE``,\n"
10891
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10892
"* ``--action=done`` will just mark the conflict as resolved."
10893
msgstr ""
10894
10895
#: en/help_topics/conflict-types.txt:191
10896
msgid ""
10897
"Note that you must get rid of FILE.moved before using ``--action=done``."
10898
msgstr ""
10899
10900
#: en/help_topics/conflict-types.txt:195
10901
msgid ""
10902
"Unversioned parent\n"
10903
"------------------"
10904
msgstr ""
10905
10906
#: en/help_topics/conflict-types.txt:200
10907
msgid ""
10908
" Conflict because FILE is not versioned, but has versioned children."
10909
msgstr ""
10910
10911
#: en/help_topics/conflict-types.txt:202
10912
msgid ""
10913
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10914
"not\n"
10915
"versioned. This happens when the directory has been deleted in the target,\n"
10916
"but has a new child in the source, or vice versa. In this situation, "
10917
"Bazaar\n"
10918
"will version the parent directory as well. Resolving this issue depends\n"
10919
"very much on the particular scenario. You may wish to rename or delete "
10920
"either\n"
10921
"the file or the directory. When you are satisfied, you can run \"bzr "
10922
"resolve\n"
10923
"FILE\" to mark the conflict as resolved."
10924
msgstr ""
10925
10926
#: en/help_topics/conflict-types.txt:210
10927
msgid ""
10928
"Missing parent\n"
10929
"--------------"
10930
msgstr ""
10931
10932
#: en/help_topics/conflict-types.txt:215
10933
msgid " Conflict adding files to FILE. Created directory."
10934
msgstr ""
10935
10936
#: en/help_topics/conflict-types.txt:217
10937
msgid ""
10938
"This happens when a directory has been deleted in the target, but has new\n"
10939
"children in the source. This is similar to the \"unversioned parent\" "
10940
"conflict,\n"
10941
"except that the parent directory does not *exist*, instead of just being\n"
10942
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10943
"Resolving this issue depends very much on the particular scenario."
10944
msgstr ""
10945
10946
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10947
msgid ""
10948
"To resolve that kind of conflict, you should either remove or rename the\n"
10949
"children or the directory or a combination of both."
10950
msgstr ""
10951
10952
#: en/help_topics/conflict-types.txt:228
10953
msgid ""
10954
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10955
" children,\n"
10956
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10957
"children\n"
10958
" and restoring the directory,\n"
10959
"* ``--action=done`` will just mark the conflict as resolved."
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:236
10963
msgid ""
10964
"Deleting parent\n"
10965
"---------------"
10966
msgstr ""
10967
10968
#: en/help_topics/conflict-types.txt:241
10969
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10970
msgstr ""
10971
10972
#: en/help_topics/conflict-types.txt:243
10973
msgid ""
10974
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10975
"source, but has new children in the target (either because a directory\n"
10976
"deletion is merged or because the merge introduce new children). Bazaar\n"
10977
"will retain the directory. Resolving this issue depends very much on the\n"
10978
"particular scenario."
10979
msgstr ""
10980
10981
#: en/help_topics/conflict-types.txt:254
10982
msgid ""
10983
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10984
"directory,"
10985
msgstr ""
10986
10987
#: en/help_topics/conflict-types.txt:256
10988
msgid ""
10989
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10990
" children,"
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:259
10994
msgid "* ``--action=done`` will just mark the conflict as resolved."
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:261
10998
msgid ""
10999
"Note that when merging a directory deletion, if unversioned files are\n"
11000
"present, they become potential orphans has they don't have a directory\n"
11001
"parent anymore."
11002
msgstr ""
11003
11004
#: en/help_topics/conflict-types.txt:265
11005
msgid ""
11006
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11007
"setting the ``bzr.transform.orphan_policy`` configuration option."
11008
msgstr ""
11009
11010
#: en/help_topics/conflict-types.txt:268
11011
msgid "There are two possible values for this option:"
11012
msgstr ""
11013
11014
#: en/help_topics/conflict-types.txt:270
11015
msgid ""
11016
"* ``conflict`` (the default): will leave the orphans in place and\n"
11017
" generate a conflicts,"
11018
msgstr ""
11019
11020
#: en/help_topics/conflict-types.txt:273
11021
msgid ""
11022
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11023
"root\n"
11024
" of the working tree with names like ``<file>.~#~``."
11025
msgstr ""
11026
11027
#: en/help_topics/conflict-types.txt:278
11028
msgid ""
11029
"Path conflict\n"
11030
"-------------"
11031
msgstr ""
11032
11033
#: en/help_topics/conflict-types.txt:283
11034
msgid " Path conflict: PATH1 / PATH2"
11035
msgstr ""
11036
11037
#: en/help_topics/conflict-types.txt:285
11038
msgid ""
11039
"This happens when the source and target have each modified the name or "
11040
"parent\n"
11041
"directory of a file. Bazaar will use the path elements from the source."
11042
msgstr ""
11043
11044
#: en/help_topics/conflict-types.txt:288
11045
msgid ""
11046
"To resolve that kind of conflict, you just have to decide what name should "
11047
"be\n"
11048
"retained for the file involved."
11049
msgstr ""
11050
11051
#: en/help_topics/conflict-types.txt:293
11052
msgid ""
11053
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11054
" issuing ``bzr mv PATH2 PATH1``,\n"
11055
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11056
"``PATH2``,\n"
11057
"* ``--action=done`` will just mark the conflict as resolved."
11058
msgstr ""
11059
11060
#: en/help_topics/conflict-types.txt:300
11061
msgid ""
11062
"Parent loop\n"
11063
"-----------"
11064
msgstr ""
11065
11066
#: en/help_topics/conflict-types.txt:305
11067
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11068
msgstr ""
11069
11070
#: en/help_topics/conflict-types.txt:307
11071
msgid ""
11072
"This happens when the source and the target have each moved directories, so\n"
11073
"that, if the change could be applied, a directory would be contained by "
11074
"itself.\n"
11075
"For example::"
11076
msgstr ""
11077
11078
#: en/help_topics/conflict-types.txt:311
11079
msgid ""
11080
" $ bzr init\n"
11081
" $ bzr mkdir white\n"
11082
" $ bzr mkdir black\n"
11083
" $ bzr commit -m \"BASE\"\n"
11084
" $ bzr branch . ../other\n"
11085
" $ bzr mv white black\n"
11086
" $ bzr commit -m \"THIS\"\n"
11087
" $ bzr mv ../other/black ../other/white\n"
11088
" $ bzr commit ../other -m \"OTHER\"\n"
11089
" $ bzr merge ../other"
11090
msgstr ""
11091
11092
#: en/help_topics/conflict-types.txt:322
11093
msgid ""
11094
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11095
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11096
"name should be retained for the directories involved."
11097
msgstr ""
11098
11099
#: en/help_topics/conflict-types.txt:328
11100
msgid ""
11101
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11102
"\n"
11103
" in ``black``,\n"
11104
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11105
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11106
"* ``--action=done`` will just mark the conflict as resolved."
11107
msgstr ""
11108
11109
#: en/help_topics/conflict-types.txt:336
11110
msgid ""
11111
"Non-directory parent\n"
11112
"--------------------"
11113
msgstr ""
11114
11115
#: en/help_topics/conflict-types.txt:341
11116
msgid ""
11117
" Conflict: foo.new is not a directory, but has files in it.\n"
11118
" Created directory."
11119
msgstr ""
11120
11121
#: en/help_topics/conflict-types.txt:344
11122
msgid ""
11123
"This happens when one side has added files to a directory, and the other "
11124
"side\n"
11125
"has changed the directory into a file or symlink. For example::"
11126
msgstr ""
11127
11128
#: en/help_topics/conflict-types.txt:347
11129
msgid ""
11130
" $ bzr init\n"
11131
" $ bzr mkdir foo\n"
11132
" $ bzr commit -m \"BASE\"\n"
11133
" $ bzr branch . ../other\n"
11134
" $ rmdir foo\n"
11135
" $ touch foo\n"
11136
" $ bzr commit -m \"THIS\"\n"
11137
" $ bzr mkdir ../other/foo/bar\n"
11138
" $ bzr commit ../other -m \"OTHER\"\n"
11139
" $ bzr merge ../other"
11140
msgstr ""
11141
11142
#: en/help_topics/conflict-types.txt:358
11143
msgid ""
11144
"To resolve that kind of conflict, you have to decide what name should be\n"
11145
"retained for the file, directory or symlink involved."
11146
msgstr ""
11147
11148
#: en/help_topics/conflict-types.txt:363
11149
msgid ""
11150
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11151
" ``bzr add foo``,\n"
11152
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11153
" ``bzr mv foo.new foo``,\n"
11154
"* ``--action=done`` will just mark the conflict as resolved."
11155
msgstr ""
11156
11157
#: en/help_topics/conflict-types.txt:371
11158
msgid ""
11159
"MalformedTransform\n"
11160
"------------------"
11161
msgstr ""
11162
11163
#: en/help_topics/conflict-types.txt:374
11164
msgid ""
11165
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11166
"exception. This means that Bazaar encountered a filesystem conflict that it "
11167
"was\n"
11168
"unable to resolve. This usually indicates a bug. Please let us know if "
11169
"you\n"
11170
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11171
msgstr ""
11172
11173
#: en/help_topics/content-filters.txt:1
11174
msgid ""
11175
"Content Filters\n"
11176
"==============="
11177
msgstr ""
11178
11179
#: en/help_topics/content-filters.txt:4
11180
msgid ""
11181
"Content formats\n"
11182
"---------------"
11183
msgstr ""
11184
11185
#: en/help_topics/content-filters.txt:7
11186
msgid ""
11187
"Bazaar's content filtering allows you to store files in a different\n"
11188
"format from the copy in your working tree. This lets you, or your\n"
11189
"co-developers, use Windows development tools that expect CRLF files\n"
11190
"on projects that use other line-ending conventions. Among other things,\n"
11191
"content filters also let Unix developers more easily work on projects\n"
11192
"using Windows line-ending conventions, keyword expansion/compression,\n"
11193
"and trailing spaces on lines in text files to be implicitly stripped\n"
11194
"when committed."
11195
msgstr ""
11196
11197
#: en/help_topics/content-filters.txt:16
11198
msgid "To generalize, there are two content formats supported by Bazaar:"
11199
msgstr ""
11200
11201
#: en/help_topics/content-filters.txt:18
11202
msgid ""
11203
"* a canonical format - how files are stored internally\n"
11204
"* a convenience format - how files are created in a working tree."
11205
msgstr ""
11206
11207
#: en/help_topics/content-filters.txt:21
11208
msgid ""
11209
"\n"
11210
"Format conversion\n"
11211
"-----------------"
11212
msgstr ""
11213
11214
#: en/help_topics/content-filters.txt:25
11215
msgid ""
11216
"The conversion between these formats is done by content filters.\n"
11217
"A content filter has two parts:"
11218
msgstr ""
11219
11220
#: en/help_topics/content-filters.txt:28
11221
msgid ""
11222
"* a read converter - converts from convenience to canonical format\n"
11223
"* a write converter - converts from canonical to convenience format."
11224
msgstr ""
11225
11226
#: en/help_topics/content-filters.txt:31
11227
msgid ""
11228
"Many of these converters will provide *round-trip* conversion,\n"
11229
"i.e. applying the read converter followed by the write converter\n"
11230
"gives back the original content. However, others may provide an\n"
11231
"asymmetric conversion. For example, a read converter might strip\n"
11232
"trailing whitespace off lines in source code while the matching\n"
11233
"write converter might pass content through unchanged."
11234
msgstr ""
11235
11236
#: en/help_topics/content-filters.txt:38
11237
msgid ""
11238
"\n"
11239
"Enabling content filters\n"
11240
"------------------------"
11241
msgstr ""
11242
11243
#: en/help_topics/content-filters.txt:42
11244
msgid ""
11245
"Content filters are typically provided by plugins, so the first step\n"
11246
"in using them is to install the relevant plugins and read their\n"
11247
"documentation. Some plugins may be very specific about which files\n"
11248
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11249
"In other cases, the plugin may leave it in the user's hands to\n"
11250
"define which files are to be filtered. This is typically done\n"
11251
"using rule-based preferences. See ``bzr help rules`` for general\n"
11252
"information about defining these."
11253
msgstr ""
11254
11255
#: en/help_topics/content-filters.txt:51
11256
msgid ""
11257
"\n"
11258
"Impact on commands\n"
11259
"------------------"
11260
msgstr ""
11261
11262
#: en/help_topics/content-filters.txt:55
11263
msgid ""
11264
"Read converters are only applied to commands that read content from\n"
11265
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11266
"will apply read converters to files in the working tree, then compare\n"
11267
"the results to the content last committed."
11268
msgstr ""
11269
11270
#: en/help_topics/content-filters.txt:60
11271
msgid ""
11272
"Write converters are only applied by commands that **create files in a\n"
11273
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11274
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11275
"respectively."
11276
msgstr ""
11277
11278
#: en/help_topics/content-filters.txt:65
11279
msgid ""
11280
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11281
"comitting files. If this makes sense for a given plugin providing\n"
11282
"a content filter, the plugin can usually achieve this effect by using a\n"
11283
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11284
"for more information on hooks."
11285
msgstr ""
11286
11287
#: en/help_topics/content-filters.txt:71
11288
msgid ""
11289
"\n"
11290
"Refreshing your working tree\n"
11291
"----------------------------"
11292
msgstr ""
11293
11294
#: en/help_topics/content-filters.txt:75
11295
msgid ""
11296
"For performance reasons, Bazaar caches the timestamps of files in\n"
11297
"a working tree, and assumes files are unchanged if their timestamps\n"
11298
"match the cached values. As a consequence, there are times when\n"
11299
"you may need to explicitly ask for content filtering to be reapplied\n"
11300
"in one or both directions, e.g. after installing or reconfiguring\n"
11301
"plugins providing it."
11302
msgstr ""
11303
11304
#: en/help_topics/content-filters.txt:82
11305
msgid "Here are some general guidelines for doing this:"
11306
msgstr ""
11307
11308
#: en/help_topics/content-filters.txt:84
11309
msgid ""
11310
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11311
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11312
" relevant read converters and compare the end result with the\n"
11313
" canonical format."
11314
msgstr ""
11315
11316
#: en/help_topics/content-filters.txt:89
11317
msgid ""
11318
" * To reapply write converters, ensure there are no local changes,\n"
11319
" delete the relevant files and run ``bzr revert`` on those files."
11320
msgstr ""
11321
11322
#: en/help_topics/content-filters.txt:92
11323
msgid ""
11324
"Note: In the future, it is likely that additional options will be added\n"
11325
"to commands to make this refreshing process faster and safer.\n"
11326
msgstr ""
11327
11328
#: en/help_topics/current-formats.txt:1
11329
msgid "Current Storage Formats"
11330
msgstr ""
11331
11332
#: en/help_topics/current-formats.txt:3
11333
msgid ""
11334
":2a:\n"
11335
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11336
" compress storage. Provides rich roots which are a one-way\n"
11337
" transition."
11338
msgstr ""
11339
11340
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11341
msgid ""
11342
"\n"
11343
"See :doc:`formats-help` for more about storage formats."
11344
msgstr ""
11345
11346
#: en/help_topics/debug-flags.txt:1
11347
msgid ""
11348
"Debug Flags\n"
11349
"==========="
11350
msgstr ""
11351
11352
#: en/help_topics/debug-flags.txt:4
11353
msgid ""
11354
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11355
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11356
msgstr ""
11357
11358
#: en/help_topics/debug-flags.txt:7
11359
msgid ""
11360
"-Dauth Trace authentication sections used.\n"
11361
"-Dbytes Print out how many bytes were transferred\n"
11362
"-Ddirstate Trace dirstate activity (verbose!)\n"
11363
"-Derror Instead of normal error handling, always print a "
11364
"traceback\n"
11365
" on error.\n"
11366
"-Devil Capture call sites that do expensive or badly-scaling\n"
11367
" operations.\n"
11368
"-Dfetch Trace history copying between repositories.\n"
11369
"-Dfilters Emit information for debugging content filtering.\n"
11370
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11371
"fetch.\n"
11372
"-Dgraph Trace graph traversal.\n"
11373
"-Dhashcache Log every time a working file is read to determine its "
11374
"hash.\n"
11375
"-Dhooks Trace hook execution.\n"
11376
"-Dhpss Trace smart protocol requests and responses.\n"
11377
"-Dhpssdetail More hpss details.\n"
11378
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11379
"-Dhttp Trace http connections, requests and responses.\n"
11380
"-Dindex Trace major index operations.\n"
11381
"-Dknit Trace knit operations.\n"
11382
"-Dlock Trace when lockdir locks are taken or released.\n"
11383
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11384
" retrying the request.\n"
11385
"-Dprogress Trace progress bar operations.\n"
11386
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11387
"-Dmerge Emit information for debugging merges.\n"
11388
"-Dno_apport Don't use apport to report crashes.\n"
11389
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11390
"-Dpack Emit information about pack operations.\n"
11391
"-Drelock Emit a message every time a branch or repository object "
11392
"is\n"
11393
" unlocked then relocked the same way.\n"
11394
"-Dsftp Trace SFTP internals.\n"
11395
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11396
"expected\n"
11397
"-Dstream Trace fetch streams.\n"
11398
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11399
"portable\n"
11400
" manner.\n"
11401
"-Dunlock Some errors during unlock are treated as warnings.\n"
11402
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11403
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11404
"appropriate\n"
11405
" for the format, even for non-local fetches.\n"
11406
msgstr ""
11407
11408
#: en/help_topics/diverged-branches.txt:1
11409
msgid ""
11410
"Diverged Branches\n"
11411
"================="
11412
msgstr ""
11413
11414
#: en/help_topics/diverged-branches.txt:4
11415
msgid ""
11416
"When Bazaar tries to push one branch onto another, it requires that the\n"
11417
"destination branch must be ready to receive the source branch. If this "
11418
"isn't\n"
11419
"the case, then we say that the branches have ``diverged``. Branches are\n"
11420
"considered diverged if the destination branch's most recent commit is one "
11421
"that\n"
11422
"has not been merged (directly or indirectly) by the source branch. To "
11423
"recover\n"
11424
"from diverged branches, one must merge the missing revisions into the "
11425
"source\n"
11426
"branch."
11427
msgstr ""
11428
11429
#: en/help_topics/diverged-branches.txt:12
11430
msgid ""
11431
"This situation commonly arises when using a centralized workflow with local\n"
11432
"commits. If someone else has committed new work to the mainline since your\n"
11433
"last pull and you have local commits that have not yet been pushed to the\n"
11434
"mainline, then your local branch and the mainline have diverged."
11435
msgstr ""
11436
11437
#: en/help_topics/diverged-branches.txt:17
11438
msgid ""
11439
"Discovering What Has Diverged\n"
11440
"-----------------------------"
11441
msgstr ""
11442
11443
#: en/help_topics/diverged-branches.txt:20
11444
msgid ""
11445
"The ``bzr missing`` command is used to find out what revisions are in "
11446
"another\n"
11447
"branch that are not present in the current branch, and vice-versa. It shows "
11448
"a\n"
11449
"summary of which extra revisions exist in each branch. If you want to see "
11450
"the\n"
11451
"precise effects of those revisions, you can use ``bzr diff --"
11452
"old=other_branch``\n"
11453
"to show the differences between other_branch and your current branch."
11454
msgstr ""
11455
11456
#: en/help_topics/diverged-branches.txt:26
11457
msgid ""
11458
"A Solution\n"
11459
"----------"
11460
msgstr ""
11461
11462
#: en/help_topics/diverged-branches.txt:29
11463
msgid ""
11464
"The solution is to merge the revisions from the mainline into your local\n"
11465
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11466
"mainline. This merge may result in conflicts if the other developer's "
11467
"changes\n"
11468
"overlap with your changes. These conflicts should be resolved before\n"
11469
"continuing. After any conflicts have been resolved, or even if there were "
11470
"no\n"
11471
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11472
"to your local branch. This requirement gives you an opportunity to test "
11473
"the\n"
11474
"resulting working tree for correctness, since the merged revisions could "
11475
"have\n"
11476
"made arbitrary changes. After testing, you should commit the merge using\n"
11477
"``bzr commit``. This clears up the diverged branches situation. Your "
11478
"local\n"
11479
"branch can now be pushed to the mainline.\n"
11480
msgstr ""
11481
11482
#: en/help_topics/env-variables.txt:1
11483
msgid "Environment Variables"
11484
msgstr ""
11485
11486
#: en/help_topics/env-variables.txt:3
11487
msgid ""
11488
"=================== "
11489
"===========================================================\n"
11490
"BZRPATH Path where bzr is to look for shell plugin external\n"
11491
" commands.\n"
11492
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11493
"EMAIL E-Mail address of the user.\n"
11494
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11495
"EDITOR Editor for editing commit messages.\n"
11496
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11497
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11498
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11499
"BZR_PLUGIN_PATH.\n"
11500
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11501
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11502
"and\n"
11503
" HOME.\n"
11504
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11505
"URLs).\n"
11506
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11507
"sshcorp,\n"
11508
" plink or lsh.\n"
11509
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11510
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11511
"BZR_COLUMNS Override implicit terminal width.\n"
11512
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11513
"(selftest)\n"
11514
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11515
"'text'.\n"
11516
"BZR_PDB Control whether to launch a debugger on error.\n"
11517
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11518
" breakin debugger.\n"
11519
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11520
"(instead\n"
11521
" of char-based).\n"
11522
"=================== "
11523
"===========================================================\n"
11524
msgstr ""
11525
11526
#: en/help_topics/eol.txt:1
11527
msgid ""
11528
"End of Line Conversion\n"
11529
"======================"
11530
msgstr ""
11531
11532
#: en/help_topics/eol.txt:4
11533
msgid ""
11534
"EOL conversion is provided as a content filter where Bazaar internally\n"
11535
"stores a canonical format but outputs a convenience format. See\n"
11536
"``bzr help content-filters`` for general information about using these."
11537
msgstr ""
11538
11539
#: en/help_topics/eol.txt:8
11540
msgid ""
11541
"Note: Content filtering is only supported in recently added formats,\n"
11542
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11543
"in a recent format. (Just setting the format on the repository\n"
11544
"is not enough.) If content filtering does not appear to be working, use\n"
11545
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11546
"or later."
11547
msgstr ""
11548
11549
#: en/help_topics/eol.txt:15
11550
msgid ""
11551
"EOL conversion needs to be enabled for selected file patterns using\n"
11552
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11553
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11554
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11555
"supported in a future verison of Bazaar."
11556
msgstr ""
11557
11558
#: en/help_topics/eol.txt:21
11559
msgid ""
11560
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11561
"(If a value is not set, ``exact`` is the default.)"
11562
msgstr ""
11563
11564
#: en/help_topics/eol.txt:24
11565
msgid ""
11566
" ========== ===================================== ======================\n"
11567
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11568
" ========== ===================================== ======================\n"
11569
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11570
" ---------- ------------------------------------- ----------------------\n"
11571
" ``lf`` ``lf`` ``lf``\n"
11572
" ---------- ------------------------------------- ----------------------\n"
11573
" ``crlf`` ``crlf`` ``lf``\n"
11574
" ---------- ------------------------------------- ----------------------\n"
11575
" ``exact`` No conversion Exactly as in file\n"
11576
" ========== ===================================== ======================"
11577
msgstr ""
11578
11579
#: en/help_topics/eol.txt:36
11580
msgid ""
11581
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11582
"byte is detected in the file."
11583
msgstr ""
11584
11585
#: en/help_topics/eol.txt:39
11586
msgid ""
11587
"For users working on a cross-platform project, here is a suggested rule\n"
11588
"to use as a starting point::"
11589
msgstr ""
11590
11591
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11592
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11593
msgid ""
11594
" [name *]\n"
11595
" eol = native"
11596
msgstr ""
11597
11598
#: en/help_topics/eol.txt:45
11599
msgid ""
11600
"If you have binary files that do not contain a null byte though, be\n"
11601
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11602
"by giving more explicit patterns earlier in the rules file. For example::"
11603
msgstr ""
11604
11605
#: en/help_topics/eol.txt:49
11606
msgid ""
11607
" [name *.png]\n"
11608
" eol = exact"
11609
msgstr ""
11610
11611
#: en/help_topics/eol.txt:55
11612
msgid ""
11613
"If your working tree is on a network drive shared by users on different\n"
11614
"operating systems, you typically want to force certain conventions for\n"
11615
"certain files. In that way, if a file is created with the wrong line\n"
11616
"endings or line endings get mixed during editing, it gets committed\n"
11617
"correctly and gets checked out correctly. For example::"
11618
msgstr ""
11619
11620
#: en/help_topics/eol.txt:61
11621
msgid ""
11622
" [name *.bat]\n"
11623
" eol = crlf"
11624
msgstr ""
11625
11626
#: en/help_topics/eol.txt:64
11627
msgid ""
11628
" [name *.sh]\n"
11629
" eol = lf"
11630
msgstr ""
11631
11632
#: en/help_topics/eol.txt:70
11633
msgid ""
11634
"If you take the care to create files with their required endings, you can\n"
11635
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11636
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11637
"introducing mixed line endings will be corrected during commit for files\n"
11638
"with those settings."
11639
msgstr ""
11640
11641
#: en/help_topics/eol.txt:76
11642
msgid ""
11643
"If you have sample test data that deliberately has text files with mixed\n"
11644
"newline conventions, you can ask for those to be left alone like this::"
11645
msgstr ""
11646
11647
#: en/help_topics/eol.txt:79
11648
msgid ""
11649
" [name test_data/]\n"
11650
" eol = exact"
11651
msgstr ""
11652
11653
#: en/help_topics/eol.txt:85
11654
msgid ""
11655
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11656
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11657
"of content analysis to detect binary files for commands like ``diff``.\n"
11658
"In the future, a ``binary = true`` rule may be added but it is not\n"
11659
"supported yet.)"
11660
msgstr ""
11661
11662
#: en/help_topics/eol.txt:91
11663
msgid ""
11664
"If you have an existing repository with text files already stored using\n"
11665
"Windows newline conventions (``crlf``), then you may want to keep using "
11666
"that\n"
11667
"convention in the repository. Forcing certain files to this convention\n"
11668
"may also help users who do not have rules configured. To do this, set\n"
11669
"``eol`` to one of the values below."
11670
msgstr ""
11671
11672
#: en/help_topics/eol.txt:97
11673
msgid ""
11674
" ============================ ======================== "
11675
"======================\n"
11676
" Value Checkout end-of-lines as Commit end-of-lines "
11677
"as\n"
11678
" ============================ ======================== "
11679
"======================\n"
11680
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11681
" ``lf`` otherwise\n"
11682
" ---------------------------- ------------------------ ----------------------"
11683
"\n"
11684
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11685
" ---------------------------- ------------------------ ----------------------"
11686
"\n"
11687
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11688
" ============================ ======================== ======================"
11689
msgstr ""
11690
11691
#: en/help_topics/eol.txt:108
11692
msgid ""
11693
"For users working on an existing project that uses Windows newline\n"
11694
"conventions in their Bazaar repository, this rule is suggested as a\n"
11695
"starting point::"
11696
msgstr ""
11697
11698
#: en/help_topics/eol.txt:112
11699
msgid ""
11700
" [name *]\n"
11701
" eol = native-with-crlf-in-repo"
11702
msgstr ""
11703
11704
#: en/help_topics/eol.txt:115
11705
msgid ""
11706
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11707
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11708
"``crlf`` and ``exact``."
11709
msgstr ""
11710
11711
#: en/help_topics/eol.txt:119
11712
msgid ""
11713
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11714
"never reject files because a given line ending or mixed line endings\n"
11715
"are found. A precommit hook should be used if you wish to validate\n"
11716
"(and not just convert) content before committing.\n"
11717
msgstr ""
11718
11719
#: en/help_topics/hidden-commands.txt:1
11720
msgid ""
11721
"added List files added in working tree.\n"
11722
"ancestry List all revisions merged into this branch.\n"
11723
"assert-fail Test reporting of assertion failures\n"
11724
"bundle-info Output interesting stats about a bundle\n"
11725
"bundle-revisions Create a merge-directive for submitting changes.\n"
11726
"cat-revision Write out metadata for a revision.\n"
11727
"dump-btree Dump the contents of a btree index file to stdout.\n"
11728
"export-pot Export command helps and error messages in po format.\n"
11729
"file-id Print file_id of a particular file or directory.\n"
11730
"file-path Print path of file_ids to a file or directory.\n"
11731
"find-merge-base Find and print a base revision for merging two "
11732
"branches.\n"
11733
"hooks Show hooks.\n"
11734
"inventory Show inventory of the current working copy or a "
11735
"revision.\n"
11736
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11737
"lookup-revision Lookup the revision-id from a revision-number\n"
11738
"merge-directive Generate a merge directive for auto-merge tools.\n"
11739
"modified List files modified in working tree.\n"
11740
"re-sign Create a digital signature for an existing revision.\n"
11741
"reference list, view and set branch locations for nested trees.\n"
11742
"relpath Show path of a file relative to root\n"
11743
"repair-workingtree Reset the working tree state file.\n"
11744
"revision-history Display the list of revision ids on a branch.\n"
11745
"revision-info Show revision number and revision id for a given "
11746
"revision\n"
11747
" identifier.\n"
11748
"rocks Statement of optimism.\n"
11749
"selftest Run internal test suite.\n"
11750
"shell-complete Show appropriate completions for context.\n"
11751
"test-script Run a shell-like test from a file.\n"
11752
"touching-revisions Return revision-ids which affected a particular file.\n"
11753
"unknowns List unknown files.\n"
11754
"wait-until-signalled Test helper for\n"
11755
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11756
msgstr ""
11757
11758
#: en/help_topics/hooks.txt:1
11759
msgid ""
11760
"\n"
11761
"Hooks\n"
11762
"====="
11763
msgstr ""
11764
11765
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11766
msgid ""
11767
"Introduction\n"
11768
"------------"
11769
msgstr ""
11770
11771
#: en/help_topics/hooks.txt:8
11772
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11773
msgstr ""
11774
11775
#: en/help_topics/hooks.txt:10
11776
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11777
msgstr ""
11778
11779
#: en/help_topics/hooks.txt:12
11780
msgid ""
11781
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11782
msgstr ""
11783
11784
#: en/help_topics/hooks.txt:14
11785
msgid ""
11786
"The class that contains each hook is given before the hooks it supplies. "
11787
"For\n"
11788
"instance, BranchHooks as the class is the hooks class for\n"
11789
"`bzrlib.branch.Branch.hooks`."
11790
msgstr ""
11791
11792
#: en/help_topics/hooks.txt:18
11793
msgid ""
11794
"Each description also indicates whether the hook runs on the client (the\n"
11795
"machine where bzr was invoked) or the server (the machine addressed by\n"
11796
"the branch URL). These may be, but are not necessarily, the same machine."
11797
msgstr ""
11798
11799
#: en/help_topics/hooks.txt:22
11800
msgid ""
11801
"Plugins (including hooks) are run on the server if all of these is true:"
11802
msgstr ""
11803
11804
#: en/help_topics/hooks.txt:24
11805
msgid ""
11806
" * The connection is via a smart server (accessed with a URL starting with\n"
11807
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11808
"\"http://\"\n"
11809
" URL when a smart server is available via HTTP)."
11810
msgstr ""
11811
11812
#: en/help_topics/hooks.txt:28
11813
msgid ""
11814
" * The hook is either server specific or part of general infrastructure "
11815
"rather\n"
11816
" than client specific code (such as commit)."
11817
msgstr ""
11818
11819
#: en/help_topics/hooks.txt:31
11820
msgid ""
11821
"\n"
11822
"BranchHooks\n"
11823
"-----------"
11824
msgstr ""
11825
11826
#: en/help_topics/hooks.txt:35
11827
msgid ""
11828
"automatic_tag_name\n"
11829
"~~~~~~~~~~~~~~~~~~"
11830
msgstr ""
11831
11832
#: 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
11834
msgid "Introduced in: 2.2"
11835
msgstr ""
11836
11837
#: en/help_topics/hooks.txt:40
11838
msgid ""
11839
"Called to determine an automatic tag name for a revision.\n"
11840
"automatic_tag_name is called with (branch, revision_id) and should\n"
11841
"return a tag name or None if no tag name could be determined. The\n"
11842
"first non-None tag name returned will be used."
11843
msgstr ""
11844
11845
#: en/help_topics/hooks.txt:45
11846
msgid ""
11847
"open\n"
11848
"~~~~"
11849
msgstr ""
11850
11851
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11852
#: en/help_topics/hooks.txt:307
11853
msgid "Introduced in: 1.8"
11854
msgstr ""
11855
11856
#: en/help_topics/hooks.txt:50
11857
msgid ""
11858
"Called with the Branch object that has been opened after a branch is\n"
11859
"opened."
11860
msgstr ""
11861
11862
#: en/help_topics/hooks.txt:53
11863
msgid ""
11864
"post_branch_init\n"
11865
"~~~~~~~~~~~~~~~~"
11866
msgstr ""
11867
11868
#: en/help_topics/hooks.txt:58
11869
msgid ""
11870
"Called after new branch initialization completes. post_branch_init is\n"
11871
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11872
"branch and checkout (both heavyweight and lightweight) will all\n"
11873
"trigger this hook."
11874
msgstr ""
11875
11876
#: en/help_topics/hooks.txt:63
11877
msgid ""
11878
"post_change_branch_tip\n"
11879
"~~~~~~~~~~~~~~~~~~~~~~"
11880
msgstr ""
11881
11882
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11883
msgid "Introduced in: 1.4"
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:68
11887
msgid ""
11888
"Called in bzr client and server after a change to the tip of a branch\n"
11889
"is made. post_change_branch_tip is called with a\n"
11890
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11891
"uncommit will all trigger this hook."
11892
msgstr ""
11893
11894
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11895
msgid ""
11896
"post_commit\n"
11897
"~~~~~~~~~~~"
11898
msgstr ""
11899
11900
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11901
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11902
msgid "Introduced in: 0.15"
11903
msgstr ""
11904
11905
#: en/help_topics/hooks.txt:78
11906
msgid ""
11907
"Called in the bzr client after a commit has completed. post_commit is\n"
11908
"called with (local, master, old_revno, old_revid, new_revno,\n"
11909
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11910
"branch."
11911
msgstr ""
11912
11913
#: en/help_topics/hooks.txt:83
11914
msgid ""
11915
"post_pull\n"
11916
"~~~~~~~~~"
11917
msgstr ""
11918
11919
#: en/help_topics/hooks.txt:88
11920
msgid ""
11921
"Called after a pull operation completes. post_pull is called with a\n"
11922
"bzrlib.branch.PullResult object and only runs in the bzr client."
11923
msgstr ""
11924
11925
#: en/help_topics/hooks.txt:91
11926
msgid ""
11927
"post_push\n"
11928
"~~~~~~~~~"
11929
msgstr ""
11930
11931
#: en/help_topics/hooks.txt:96
11932
msgid ""
11933
"Called after a push operation completes. post_push is called with a\n"
11934
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:99
11938
msgid ""
11939
"post_switch\n"
11940
"~~~~~~~~~~~"
11941
msgstr ""
11942
11943
#: en/help_topics/hooks.txt:104
11944
msgid ""
11945
"Called after a checkout switches branch. post_switch is called with a\n"
11946
"bzrlib.branch.SwitchHookParams."
11947
msgstr ""
11948
11949
#: en/help_topics/hooks.txt:107
11950
msgid ""
11951
"post_uncommit\n"
11952
"~~~~~~~~~~~~~"
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:112
11956
msgid ""
11957
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11958
"called with (local, master, old_revno, old_revid, new_revno,\n"
11959
"new_revid) where local is the local branch or None, master is the\n"
11960
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11961
"of None."
11962
msgstr ""
11963
11964
#: en/help_topics/hooks.txt:118
11965
msgid ""
11966
"pre_change_branch_tip\n"
11967
"~~~~~~~~~~~~~~~~~~~~~"
11968
msgstr ""
11969
11970
#: en/help_topics/hooks.txt:121
11971
msgid "Introduced in: 1.6"
11972
msgstr ""
11973
11974
#: en/help_topics/hooks.txt:123
11975
msgid ""
11976
"Called in bzr client and server before a change to the tip of a branch\n"
11977
"is made. pre_change_branch_tip is called with a\n"
11978
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11979
"uncommit will all trigger this hook."
11980
msgstr ""
11981
11982
#: en/help_topics/hooks.txt:128
11983
msgid ""
11984
"pre_commit\n"
11985
"~~~~~~~~~~"
11986
msgstr ""
11987
11988
#: en/help_topics/hooks.txt:131
11989
msgid "Introduced in: 0.91"
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:133
11993
msgid ""
11994
"Called after a commit is calculated but before it is completed.\n"
11995
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11996
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11997
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11998
"TreeDelta object describing changes from the basis revision. hooks\n"
11999
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12000
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12001
"tree."
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:142
12005
msgid ""
12006
"transform_fallback_location\n"
12007
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12008
msgstr ""
12009
12010
#: en/help_topics/hooks.txt:145
12011
msgid "Introduced in: 1.9"
12012
msgstr ""
12013
12014
#: en/help_topics/hooks.txt:147
12015
msgid ""
12016
"Called when a stacked branch is activating its fallback locations.\n"
12017
"transform_fallback_location is called with (branch, url), and should\n"
12018
"return a new url. Returning the same url allows it to be used as-is,\n"
12019
"returning a different one can be used to cause the branch to stack on\n"
12020
"a closer copy of that fallback_location. Note that the branch cannot\n"
12021
"have history accessing methods called on it during this hook because\n"
12022
"the fallback locations have not been activated. When there are\n"
12023
"multiple hooks installed for transform_fallback_location, all are\n"
12024
"called with the url returned from the previous hook.The order is\n"
12025
"however undefined."
12026
msgstr ""
12027
12028
#: en/help_topics/hooks.txt:158
12029
msgid ""
12030
"CommandHooks\n"
12031
"------------"
12032
msgstr ""
12033
12034
#: en/help_topics/hooks.txt:161
12035
msgid ""
12036
"extend_command\n"
12037
"~~~~~~~~~~~~~~"
12038
msgstr ""
12039
12040
#: en/help_topics/hooks.txt:164
12041
msgid "Introduced in: 1.13"
12042
msgstr ""
12043
12044
#: en/help_topics/hooks.txt:166
12045
msgid ""
12046
"Called after creating a command object to allow modifications such as\n"
12047
"adding or removing options, docs etc. Called with the new\n"
12048
"bzrlib.commands.Command object."
12049
msgstr ""
12050
12051
#: en/help_topics/hooks.txt:170
12052
msgid ""
12053
"get_command\n"
12054
"~~~~~~~~~~~"
12055
msgstr ""
12056
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
12059
msgid "Introduced in: 1.17"
12060
msgstr ""
12061
12062
#: en/help_topics/hooks.txt:175
12063
msgid ""
12064
"Called when creating a single command. Called with (cmd_or_None,\n"
12065
"command_name). get_command should either return the cmd_or_None\n"
12066
"parameter, or a replacement Command object that should be used for the\n"
12067
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12068
"Many users will prefer to use bzrlib.commands.register_command or\n"
12069
"plugin_cmds.register_lazy."
12070
msgstr ""
12071
12072
#: en/help_topics/hooks.txt:182
12073
msgid ""
12074
"get_missing_command\n"
12075
"~~~~~~~~~~~~~~~~~~~"
12076
msgstr ""
12077
12078
#: en/help_topics/hooks.txt:187
12079
msgid ""
12080
"Called when creating a single command if no command could be found.\n"
12081
"Called with (command_name). get_missing_command should either return\n"
12082
"None, or a Command object to be used for the command."
12083
msgstr ""
12084
12085
#: en/help_topics/hooks.txt:191
12086
msgid ""
12087
"list_commands\n"
12088
"~~~~~~~~~~~~~"
12089
msgstr ""
12090
12091
#: en/help_topics/hooks.txt:196
12092
msgid ""
12093
"Called when enumerating commands. Called with a set of cmd_name\n"
12094
"strings for all the commands found so far. This set is safe to mutate\n"
12095
"- e.g. to remove a command. list_commands should return the updated\n"
12096
"set of command names."
12097
msgstr ""
12098
12099
#: en/help_topics/hooks.txt:201
12100
msgid ""
12101
"post_command\n"
12102
"~~~~~~~~~~~~"
12103
msgstr ""
12104
12105
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12106
msgid "Introduced in: 2.6"
12107
msgstr ""
12108
12109
#: en/help_topics/hooks.txt:206
12110
msgid "Called after executing a command. Called with the command object."
12111
msgstr ""
12112
12113
#: en/help_topics/hooks.txt:208
12114
msgid ""
12115
"pre_command\n"
12116
"~~~~~~~~~~~"
12117
msgstr ""
12118
12119
#: en/help_topics/hooks.txt:213
12120
msgid "Called prior to executing a command. Called with the command object."
12121
msgstr ""
12122
12123
#: en/help_topics/hooks.txt:215
12124
msgid ""
12125
"_ConfigHooks\n"
12126
"------------"
12127
msgstr ""
12128
12129
#: en/help_topics/hooks.txt:218
12130
msgid ""
12131
"get\n"
12132
"~~~"
12133
msgstr ""
12134
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
12139
msgid "Introduced in: 2.4"
12140
msgstr ""
12141
12142
#: en/help_topics/hooks.txt:223
12143
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
"load\n"
12151
"~~~~"
12152
msgstr ""
12153
12154
#: en/help_topics/hooks.txt:231
12155
msgid "Invoked when a config store is loaded. The signature is (store)."
12156
msgstr ""
12157
12158
#: en/help_topics/hooks.txt:233
12159
msgid ""
12160
"remove\n"
12161
"~~~~~~"
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:238
12165
msgid ""
12166
"Invoked when a config option is removed. The signature is (stack,\n"
12167
"name)."
12168
msgstr ""
12169
12170
#: en/help_topics/hooks.txt:241
12171
msgid ""
12172
"save\n"
12173
"~~~~"
12174
msgstr ""
12175
12176
#: en/help_topics/hooks.txt:246
12177
msgid "Invoked when a config store is saved. The signature is (store)."
12178
msgstr ""
12179
12180
#: en/help_topics/hooks.txt:248
12181
msgid ""
12182
"set\n"
12183
"~~~"
12184
msgstr ""
12185
12186
#: en/help_topics/hooks.txt:253
12187
msgid ""
12188
"Invoked when a config option is set. The signature is (stack, name,\n"
12189
"value)."
12190
msgstr ""
12191
12192
#: en/help_topics/hooks.txt:256
12193
msgid ""
12194
"ControlDirHooks\n"
12195
"---------------"
12196
msgstr ""
12197
12198
#: en/help_topics/hooks.txt:259
12199
msgid ""
12200
"post_repo_init\n"
12201
"~~~~~~~~~~~~~~"
12202
msgstr ""
12203
12204
#: en/help_topics/hooks.txt:264
12205
msgid ""
12206
"Invoked after a repository has been initialized. post_repo_init is\n"
12207
"called with a bzrlib.controldir.RepoInitHookParams."
12208
msgstr ""
12209
12210
#: en/help_topics/hooks.txt:267
12211
msgid ""
12212
"pre_open\n"
12213
"~~~~~~~~"
12214
msgstr ""
12215
12216
#: en/help_topics/hooks.txt:270
12217
msgid "Introduced in: 1.14"
12218
msgstr ""
12219
12220
#: en/help_topics/hooks.txt:272
12221
msgid ""
12222
"Invoked before attempting to open a ControlDir with the transport that\n"
12223
"the open will use."
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:275
12227
msgid ""
12228
"InfoHooks\n"
12229
"---------"
12230
msgstr ""
12231
12232
#: en/help_topics/hooks.txt:278
12233
msgid ""
12234
"repository\n"
12235
"~~~~~~~~~~"
12236
msgstr ""
12237
12238
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12239
#: en/help_topics/hooks.txt:524
12240
msgid "Introduced in: 1.15"
12241
msgstr ""
12242
12243
#: en/help_topics/hooks.txt:283
12244
msgid ""
12245
"Invoked when displaying the statistics for a repository. repository is\n"
12246
"called with a statistics dictionary as returned by the repository and\n"
12247
"a file-like object to write to."
12248
msgstr ""
12249
12250
#: en/help_topics/hooks.txt:287
12251
msgid ""
12252
"LockHooks\n"
12253
"---------"
12254
msgstr ""
12255
12256
#: en/help_topics/hooks.txt:290
12257
msgid ""
12258
"lock_acquired\n"
12259
"~~~~~~~~~~~~~"
12260
msgstr ""
12261
12262
#: en/help_topics/hooks.txt:295
12263
msgid ""
12264
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12265
msgstr ""
12266
12267
#: en/help_topics/hooks.txt:297
12268
msgid ""
12269
"lock_broken\n"
12270
"~~~~~~~~~~~"
12271
msgstr ""
12272
12273
#: en/help_topics/hooks.txt:302
12274
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:304
12278
msgid ""
12279
"lock_released\n"
12280
"~~~~~~~~~~~~~"
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:309
12284
msgid ""
12285
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12286
msgstr ""
12287
12288
#: en/help_topics/hooks.txt:311
12289
msgid ""
12290
"MergeHooks\n"
12291
"----------"
12292
msgstr ""
12293
12294
#: 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
msgid "Introduced in: 2.1"
12302
msgstr ""
12303
12304
#: en/help_topics/hooks.txt:319
12305
msgid ""
12306
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12307
"object when starting a merge. Should return either None or a subclass\n"
12308
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12309
"called per file that needs to be merged (including when one side has\n"
12310
"deleted the file and the other has changed it). See the\n"
12311
"AbstractPerFileMerger API docs for details on how it is used by merge."
12312
msgstr ""
12313
12314
#: en/help_topics/hooks.txt:326
12315
msgid ""
12316
"post_merge\n"
12317
"~~~~~~~~~~"
12318
msgstr ""
12319
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
12323
msgid "Introduced in: 2.5"
12324
msgstr ""
12325
12326
#: en/help_topics/hooks.txt:331
12327
msgid ""
12328
"Called after a merge. Receives a Merger object as the single argument.\n"
12329
"The return value is ignored."
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:334
12333
msgid ""
12334
"pre_merge\n"
12335
"~~~~~~~~~"
12336
msgstr ""
12337
12338
#: en/help_topics/hooks.txt:339
12339
msgid ""
12340
"Called before a merge. Receives a Merger object as the single\n"
12341
"argument."
12342
msgstr ""
12343
12344
#: en/help_topics/hooks.txt:342
12345
msgid ""
12346
"MergeDirectiveHooks\n"
12347
"-------------------"
12348
msgstr ""
12349
12350
#: 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
msgid "Introduced in: 1.15.0"
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:350
12361
msgid ""
12362
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12363
"request. Callbacks must return a body. If more than one callback is\n"
12364
"registered, the output of one callback is provided to the next."
12365
msgstr ""
12366
12367
#: en/help_topics/hooks.txt:354
12368
msgid ""
12369
"MessageEditorHooks\n"
12370
"------------------"
12371
msgstr ""
12372
12373
#: 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
msgid "Introduced in: 1.10"
12381
msgstr ""
12382
12383
#: en/help_topics/hooks.txt:362
12384
msgid ""
12385
"Called when a commit message is being generated.\n"
12386
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12387
"and the message that is known so far. commit_message_template must\n"
12388
"return a new message to use (which could be the same as it was given).\n"
12389
"When there are multiple hooks registered for commit_message_template,\n"
12390
"they are chained with the result from the first passed into the\n"
12391
"second, and so on."
12392
msgstr ""
12393
12394
#: en/help_topics/hooks.txt:370
12395
msgid ""
12396
"set_commit_message\n"
12397
"~~~~~~~~~~~~~~~~~~"
12398
msgstr ""
12399
12400
#: en/help_topics/hooks.txt:375
12401
msgid ""
12402
"Set a fixed commit message. set_commit_message is called with the\n"
12403
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12404
"properties by editing commit.builder._revprops) and the message so\n"
12405
"far. set_commit_message must return the message to use or None if it\n"
12406
"should use the message editor as normal."
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:381
12410
msgid ""
12411
"MutableTreeHooks\n"
12412
"----------------"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:384
12416
msgid ""
12417
"post_build_tree\n"
12418
"~~~~~~~~~~~~~~~"
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:389
12422
msgid ""
12423
"Called after a completely new tree is built. The hook is called with\n"
12424
"the tree as its only argument."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:395
12428
msgid "Introduced in: 2.0"
12429
msgstr ""
12430
12431
#: en/help_topics/hooks.txt:397
12432
msgid ""
12433
"Called after a commit is performed on a tree. The hook is called with\n"
12434
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12435
"commit was performed on is available via the mutable_tree attribute of\n"
12436
"that object."
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:402
12440
msgid ""
12441
"post_transform\n"
12442
"~~~~~~~~~~~~~~"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:407
12446
msgid ""
12447
"Called after a tree transform has been performed on a tree. The hook\n"
12448
"is called with the tree that is being transformed and the transform."
12449
msgstr ""
12450
12451
#: en/help_topics/hooks.txt:410
12452
msgid ""
12453
"pre_transform\n"
12454
"~~~~~~~~~~~~~"
12455
msgstr ""
12456
12457
#: en/help_topics/hooks.txt:415
12458
msgid ""
12459
"Called before a tree transform on this tree. The hook is called with\n"
12460
"the tree that is being transformed and the transform."
12461
msgstr ""
12462
12463
#: en/help_topics/hooks.txt:418
12464
msgid ""
12465
"start_commit\n"
12466
"~~~~~~~~~~~~"
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:423
12470
msgid ""
12471
"Called before a commit is performed on a tree. The start commit hook\n"
12472
"is able to change the tree before the commit takes place. start_commit\n"
12473
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12474
"being performed on."
12475
msgstr ""
12476
12477
#: en/help_topics/hooks.txt:428
12478
msgid ""
12479
"SmartClientHooks\n"
12480
"----------------"
12481
msgstr ""
12482
12483
#: en/help_topics/hooks.txt:431
12484
msgid ""
12485
"call\n"
12486
"~~~~"
12487
msgstr ""
12488
12489
#: en/help_topics/hooks.txt:434
12490
msgid "Introduced in: unknown"
12491
msgstr ""
12492
12493
#: en/help_topics/hooks.txt:436
12494
msgid ""
12495
"Called when the smart client is submitting a request to the smart\n"
12496
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12497
"Streaming request bodies, and responses, are not accessible."
12498
msgstr ""
12499
12500
#: en/help_topics/hooks.txt:440
12501
msgid ""
12502
"SmartServerHooks\n"
12503
"----------------"
12504
msgstr ""
12505
12506
#: en/help_topics/hooks.txt:443
12507
msgid ""
12508
"server_exception\n"
12509
"~~~~~~~~~~~~~~~~"
12510
msgstr ""
12511
12512
#: en/help_topics/hooks.txt:448
12513
msgid ""
12514
"Called by the bzr server when an exception occurs. server_exception is\n"
12515
"called with the sys.exc_info() tuple return true for the hook if the\n"
12516
"exception has been handled, in which case the server will exit\n"
12517
"normally."
12518
msgstr ""
12519
12520
#: en/help_topics/hooks.txt:453
12521
msgid ""
12522
"server_started\n"
12523
"~~~~~~~~~~~~~~"
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12527
msgid "Introduced in: 0.16"
12528
msgstr ""
12529
12530
#: en/help_topics/hooks.txt:458
12531
msgid ""
12532
"Called by the bzr server when it starts serving a directory.\n"
12533
"server_started is called with (backing urls, public url), where\n"
12534
"backing_url is a list of URLs giving the server-specific directory\n"
12535
"locations, and public_url is the public URL for the directory being\n"
12536
"served."
12537
msgstr ""
12538
12539
#: en/help_topics/hooks.txt:464
12540
msgid ""
12541
"server_started_ex\n"
12542
"~~~~~~~~~~~~~~~~~"
12543
msgstr ""
12544
12545
#: en/help_topics/hooks.txt:469
12546
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
"server_stopped\n"
12554
"~~~~~~~~~~~~~~"
12555
msgstr ""
12556
12557
#: en/help_topics/hooks.txt:477
12558
msgid ""
12559
"Called by the bzr server when it stops serving a directory.\n"
12560
"server_stopped is called with the same parameters as the\n"
12561
"server_started hook: (backing_urls, public_url)."
12562
msgstr ""
12563
12564
#: en/help_topics/hooks.txt:481
12565
msgid ""
12566
"StatusHooks\n"
12567
"-----------"
12568
msgstr ""
12569
12570
#: en/help_topics/hooks.txt:484
12571
msgid ""
12572
"post_status\n"
12573
"~~~~~~~~~~~"
12574
msgstr ""
12575
12576
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12577
msgid "Introduced in: 2.3"
12578
msgstr ""
12579
12580
#: en/help_topics/hooks.txt:489
12581
msgid ""
12582
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12583
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12584
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12585
"correspond to the command line options specified by the user for the\n"
12586
"status command. to_file is the output stream for writing."
12587
msgstr ""
12588
12589
#: en/help_topics/hooks.txt:495
12590
msgid ""
12591
"pre_status\n"
12592
"~~~~~~~~~~"
12593
msgstr ""
12594
12595
#: en/help_topics/hooks.txt:500
12596
msgid ""
12597
"Called with argument StatusHookParams before Bazaar displays the\n"
12598
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12599
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12600
"correspond to the command line options specified by the user for the\n"
12601
"status command. to_file is the output stream for writing."
12602
msgstr ""
12603
12604
#: en/help_topics/hooks.txt:506
12605
msgid ""
12606
"TransportHooks\n"
12607
"--------------"
12608
msgstr ""
12609
12610
#: en/help_topics/hooks.txt:509
12611
msgid ""
12612
"post_connect\n"
12613
"~~~~~~~~~~~~"
12614
msgstr ""
12615
12616
#: en/help_topics/hooks.txt:514
12617
msgid ""
12618
"Called after a new connection is established or a reconnect occurs.\n"
12619
"The sole argument passed is either the connected transport or smart\n"
12620
"medium instance."
12621
msgstr ""
12622
12623
#: en/help_topics/hooks.txt:518
12624
msgid ""
12625
"RioVersionInfoBuilderHooks\n"
12626
"--------------------------"
12627
msgstr ""
12628
12629
#: en/help_topics/hooks.txt:521
12630
msgid ""
12631
"revision\n"
12632
"~~~~~~~~"
12633
msgstr ""
12634
12635
#: en/help_topics/hooks.txt:526
12636
msgid ""
12637
"Invoked when adding information about a revision to the RIO stanza\n"
12638
"that is printed. revision is called with a revision object and a RIO\n"
12639
"stanza.\n"
12640
msgstr ""
12641
12642
#: en/help_topics/location-alias.txt:1
12643
msgid ""
12644
"Location aliases\n"
12645
"================"
12646
msgstr ""
12647
12648
#: en/help_topics/location-alias.txt:4
12649
msgid ""
12650
"Bazaar defines several aliases for locations associated with a branch. "
12651
"These\n"
12652
"can be used with most commands that expect a location, such as `bzr push`."
12653
msgstr ""
12654
12655
#: en/help_topics/location-alias.txt:7
12656
msgid "The aliases are::"
12657
msgstr ""
12658
12659
#: en/help_topics/location-alias.txt:9
12660
msgid ""
12661
" :bound The branch this branch is bound to, for bound branches.\n"
12662
" :parent The parent of this branch.\n"
12663
" :public The public location of this branch.\n"
12664
" :push The saved location used for `bzr push` with no arguments.\n"
12665
" :submit The submit branch for this branch.\n"
12666
" :this This branch."
12667
msgstr ""
12668
12669
#: en/help_topics/location-alias.txt:16
12670
msgid "For example, to push to the parent location::"
12671
msgstr ""
12672
12673
#: en/help_topics/location-alias.txt:18
12674
msgid " bzr push :parent\n"
12675
msgstr ""
12676
12677
#: en/help_topics/log-formats.txt:1
12678
msgid ""
12679
"Log Formats\n"
12680
"==========="
12681
msgstr ""
12682
12683
#: en/help_topics/log-formats.txt:4
12684
msgid ""
12685
"A log format controls how information about each revision is displayed.\n"
12686
"The standard log formats are compared below::"
12687
msgstr ""
12688
12689
#: en/help_topics/log-formats.txt:7
12690
msgid ""
12691
" Feature long short line\n"
12692
" ---------------------- ------------- ------------ -------------------\n"
12693
" design goal detailed view concise view 1 revision per line\n"
12694
" committer name+email name only name only\n"
12695
" author name+email - -\n"
12696
" date-time format full date only date only\n"
12697
" commit message full full top line\n"
12698
" tags yes yes yes\n"
12699
" merges indicator - yes -\n"
12700
" status/delta optional optional -\n"
12701
" diff/patch optional optional -\n"
12702
" revision-id optional optional -\n"
12703
" branch nick yes - -\n"
12704
" foreign vcs properties yes yes -\n"
12705
" preferred levels all 1 1\n"
12706
" digital signature optional - -"
12707
msgstr ""
12708
12709
#: en/help_topics/log-formats.txt:24
12710
msgid ""
12711
"The default format is ``long``. To change this, define the ``log_format``\n"
12712
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12713
msgstr ""
12714
12715
#: en/help_topics/log-formats.txt:27
12716
msgid ""
12717
" [DEFAULT]\n"
12718
" log_format = short"
12719
msgstr ""
12720
12721
#: en/help_topics/log-formats.txt:30
12722
msgid ""
12723
"Alternatively, to change the log format used for a given query, use the\n"
12724
"--long, --short or --line options."
12725
msgstr ""
12726
12727
#: en/help_topics/log-formats.txt:33
12728
msgid ""
12729
"If one of the standard log formats does not meet your needs, additional\n"
12730
"formats can be provided by plugins.\n"
12731
msgstr ""
12732
12733
#: en/help_topics/other-formats.txt:1
12734
msgid "Other Storage Formats"
12735
msgstr ""
12736
12737
#: en/help_topics/other-formats.txt:3
12738
msgid "Experimental formats are shown below."
12739
msgstr ""
12740
12741
#: en/help_topics/other-formats.txt:5
12742
msgid ""
12743
":development-colo:\n"
12744
" (native) The 2a format with experimental support for colocated\n"
12745
" branches."
12746
msgstr ""
12747
12748
#: en/help_topics/other-formats.txt:9
12749
msgid ""
12750
"\n"
12751
"Deprecated formats are shown below."
12752
msgstr ""
12753
12754
#: en/help_topics/other-formats.txt:12
12755
msgid ""
12756
":pack-0.92:\n"
12757
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12758
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12759
" by bzr < 0.92."
12760
msgstr ""
12761
12762
#: en/help_topics/patterns.txt:1
12763
msgid ""
12764
"Patterns\n"
12765
"========"
12766
msgstr ""
12767
12768
#: en/help_topics/patterns.txt:4
12769
msgid ""
12770
"Bazaar uses patterns to match files at various times. For example,\n"
12771
"the ``add`` command skips over files that match ignore patterns\n"
12772
"and preferences can be associated with files using rule patterns.\n"
12773
"The pattern syntax is described below."
12774
msgstr ""
12775
12776
#: en/help_topics/patterns.txt:9
12777
msgid ""
12778
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12779
"slash or is a regular expression, it is compared to the whole path\n"
12780
"from the branch root. Otherwise, it is compared to only the last\n"
12781
"component of the path. To match a file only in the root directory,\n"
12782
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12783
msgstr ""
12784
12785
#: en/help_topics/patterns.txt:15
12786
msgid "Patterns may include globbing wildcards such as::"
12787
msgstr ""
12788
12789
#: en/help_topics/patterns.txt:17
12790
msgid ""
12791
" ? - Matches any single character except '/'\n"
12792
" * - Matches 0 or more characters except '/'\n"
12793
" /**/ - Matches 0 or more directories in a path\n"
12794
" [a-z] - Matches a single character from within a group of characters"
12795
msgstr ""
12796
12797
#: en/help_topics/patterns.txt:22
12798
msgid ""
12799
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12800
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12801
"expression. Regular expression patterns may not include named or\n"
12802
"numbered groups."
12803
msgstr ""
12804
12805
#: en/help_topics/patterns.txt:27
12806
msgid ""
12807
"Case insensitive ignore patterns can be specified with regular expressions\n"
12808
"by using the ``i`` (for ignore case) flag in the pattern."
12809
msgstr ""
12810
12811
#: en/help_topics/patterns.txt:30
12812
msgid ""
12813
"For example, a case insensitive match for ``foo`` may be specified as::"
12814
msgstr ""
12815
12816
#: en/help_topics/patterns.txt:32
12817
msgid " RE:(?i)foo"
12818
msgstr ""
12819
12820
#: en/help_topics/patterns.txt:34
12821
msgid ""
12822
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12823
"matched by that pattern will not be ignored."
12824
msgstr ""
12825
12826
#: en/help_topics/patterns.txt:37
12827
msgid ""
12828
".. _Python regular expressions: http://docs.python.org/library/re.html"
12829
msgstr ""
12830
12831
#: en/help_topics/revisionspec.txt:1
12832
msgid "Revision Identifiers"
12833
msgstr ""
12834
12835
#: en/help_topics/revisionspec.txt:3
12836
msgid ""
12837
"A revision identifier refers to a specific state of a branch's history. It\n"
12838
"can be expressed in several ways. It can begin with a keyword to\n"
12839
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12840
"'before:yesterday' and 'submit:'."
12841
msgstr ""
12842
12843
#: en/help_topics/revisionspec.txt:8
12844
msgid ""
12845
"Alternately, it can be given without a keyword, in which case it will be\n"
12846
"checked as a revision number, a tag, a revision id, a date specification, or "
12847
"a\n"
12848
"branch specification, in that order. For example, 'date:today' could be\n"
12849
"written as simply 'today', though if you have a tag called 'today' that "
12850
"will\n"
12851
"be found first."
12852
msgstr ""
12853
12854
#: en/help_topics/revisionspec.txt:14
12855
msgid ""
12856
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12857
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12858
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12859
"or\n"
12860
"spaces around the '..')."
12861
msgstr ""
12862
12863
#: en/help_topics/revisionspec.txt:19
12864
msgid ""
12865
"Ranges are interpreted differently by different commands. To the \"log\" "
12866
"command,\n"
12867
"a range is a sequence of log messages, but to the \"diff\" command, the "
12868
"range\n"
12869
"denotes a change between revisions (and not a sequence of changes). In\n"
12870
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12871
"consider it\n"
12872
"to be open-ended, that is, they include one end but not the other. For "
12873
"example:\n"
12874
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12875
"3649,\n"
12876
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12877
"and\n"
12878
"3649, but not 3647."
12879
msgstr ""
12880
12881
#: en/help_topics/revisionspec.txt:28
12882
msgid "The keywords used as revision selection methods are the following:"
12883
msgstr ""
12884
12885
#: en/help_topics/revisionspec.txt:30
12886
msgid ""
12887
":revid:\n"
12888
"\tSelects a revision using the revision id.\n"
12889
":submit:\n"
12890
"\tSelects a common ancestor with the submit branch.\n"
12891
":ancestor:\n"
12892
"\tSelects a common ancestor with a second branch.\n"
12893
":date:\n"
12894
"\tSelects a revision on the basis of a datestamp.\n"
12895
":branch:\n"
12896
"\tSelects the last revision of a specified branch.\n"
12897
":tag:\n"
12898
"\tSelects a revision identified by a tag name.\n"
12899
":revno:\n"
12900
"\tSelects a revision using a number.\n"
12901
":before:\n"
12902
"\tSelects the parent of the revision specified.\n"
12903
":annotate:\n"
12904
"\tSelect the revision that last modified the specified line.\n"
12905
":mainline:\n"
12906
"\tSelect mainline revision that merged the specified revision.\n"
12907
":last:\n"
12908
"\tSelects the nth revision from the end."
12909
msgstr ""
12910
":revid:\n"
12911
"\tSelezione una revisione usando l'identificativo di revisione.\n"
12912
":submit:\n"
12913
"\tSeleziona un predecessore comune con il branch di invio.\n"
12914
":ancestor:\n"
12915
"\tSeleziona un predecessore comune con un secondo branch.\n"
12916
":date:\n"
12917
"\tSelezione una revisione in base a una marca temporale.\n"
12918
":branch:\n"
12919
"\tSeleziona l'ultima revisione di un branch specifico.\n"
12920
":tag:\n"
12921
"\tSeleziona una revisione identificata da un nome di etichetta.\n"
12922
":revno:\n"
12923
"\tSeleziona una revisione usando un numero.\n"
12924
":before:\n"
12925
"\tSeleziona il predecessore di una revisione specificata.\n"
12926
":annotate:\n"
12927
"\tSeleziona la revisione che ha modificato per ultima la riga specificata.\n"
12928
":mainline:\n"
12929
"\tSeleziona la revisione della linea principale unita alla revisione "
12930
"specificata.\n"
12931
":last:\n"
12932
"\tSeleziona l'ennesima revisione dalla fine."
12933
12934
#: en/help_topics/revisionspec.txt:53
12935
msgid "In addition, plugins can provide other keywords."
12936
msgstr ""
12937
12938
#: en/help_topics/revisionspec.txt:55
12939
msgid "A detailed description of each keyword is given below."
12940
msgstr ""
12941
12942
#: en/help_topics/revisionspec.txt:57
12943
msgid ":revid:"
12944
msgstr ""
12945
12946
#: en/help_topics/revisionspec.txt:59
12947
msgid ""
12948
" Supply a specific revision id, that can be used to specify any\n"
12949
" revision id in the ancestry of the branch.\n"
12950
" Including merges, and pending merges.\n"
12951
" Examples::"
12952
msgstr ""
12953
12954
#: en/help_topics/revisionspec.txt:64
12955
msgid ""
12956
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12957
msgstr ""
12958
12959
#: en/help_topics/revisionspec.txt:66
12960
msgid ":submit:"
12961
msgstr ""
12962
12963
#: en/help_topics/revisionspec.txt:68
12964
msgid ""
12965
" Diffing against this shows all the changes that were made in this "
12966
"branch,\n"
12967
" and is a good predictor of what merge will do. The submit branch is\n"
12968
" used by the bundle and merge directive commands. If no submit branch\n"
12969
" is specified, the parent branch is used instead."
12970
msgstr ""
12971
12972
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12973
msgid ""
12974
" The common ancestor is the last revision that existed in both\n"
12975
" branches. Usually this is the branch point, but it could also be\n"
12976
" a revision that was merged."
12977
msgstr ""
12978
12979
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12980
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12981
#: en/help_topics/revisionspec.txt:153
12982
msgid " Examples::"
12983
msgstr ""
12984
12985
#: en/help_topics/revisionspec.txt:79
12986
msgid " $ bzr diff -r submit:"
12987
msgstr ""
12988
12989
#: en/help_topics/revisionspec.txt:81
12990
msgid ":ancestor:"
12991
msgstr ""
12992
12993
#: en/help_topics/revisionspec.txt:83
12994
msgid " Supply the path to a branch to select the common ancestor."
12995
msgstr ""
12996
12997
#: en/help_topics/revisionspec.txt:89
12998
msgid ""
12999
" This is frequently used with 'diff' to return all of the changes\n"
13000
" that your branch introduces, while excluding the changes that you\n"
13001
" have not merged from the remote branch."
13002
msgstr ""
13003
13004
#: en/help_topics/revisionspec.txt:95
13005
msgid ""
13006
" ancestor:/path/to/branch\n"
13007
" $ bzr diff -r ancestor:../../mainline/branch"
13008
msgstr ""
13009
13010
#: en/help_topics/revisionspec.txt:98
13011
msgid ":date:"
13012
msgstr ""
13013
13014
#: en/help_topics/revisionspec.txt:100
13015
msgid ""
13016
" Supply a datestamp to select the first revision that matches the date.\n"
13017
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13018
" Matches the first entry after a given date (either at midnight or\n"
13019
" at a specified time)."
13020
msgstr ""
13021
13022
#: en/help_topics/revisionspec.txt:105
13023
msgid " One way to display all the changes since yesterday would be::"
13024
msgstr ""
13025
13026
#: en/help_topics/revisionspec.txt:107
13027
msgid " bzr log -r date:yesterday.."
13028
msgstr ""
13029
13030
#: en/help_topics/revisionspec.txt:111
13031
msgid ""
13032
" date:yesterday -> select the first revision since "
13033
"yesterday\n"
13034
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13035
" August 14th, 2006 at 5:10pm."
13036
msgstr ""
13037
13038
#: en/help_topics/revisionspec.txt:115
13039
msgid ":branch:"
13040
msgstr ""
13041
13042
#: en/help_topics/revisionspec.txt:117
13043
msgid " Supply the path to a branch to select its last revision."
13044
msgstr ""
13045
13046
#: en/help_topics/revisionspec.txt:121
13047
msgid " branch:/path/to/branch"
13048
msgstr ""
13049
13050
#: en/help_topics/revisionspec.txt:123
13051
msgid ":tag:"
13052
msgstr ""
13053
13054
#: en/help_topics/revisionspec.txt:125
13055
msgid " Tags are stored in the branch and created by the 'tag' command."
13056
msgstr ""
13057
13058
#: en/help_topics/revisionspec.txt:127
13059
msgid ":revno:"
13060
msgstr ""
13061
13062
#: en/help_topics/revisionspec.txt:129
13063
msgid ""
13064
" Use an integer to specify a revision in the history of the branch.\n"
13065
" Optionally a branch can be specified. A negative number will count\n"
13066
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13067
" one). If the negative number is larger than the branch's history, the\n"
13068
" first revision is returned.\n"
13069
" Examples::"
13070
msgstr ""
13071
13072
#: en/help_topics/revisionspec.txt:136
13073
msgid ""
13074
" revno:1 -> return the first revision of this branch\n"
13075
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13076
" the branch '/path/to/branch'\n"
13077
" revno:-1 -> The last revision in a branch.\n"
13078
" -2:http://other/branch -> The second to last revision in the\n"
13079
" remote branch.\n"
13080
" -1000000 -> Most likely the first revision, unless\n"
13081
" your history is very long."
13082
msgstr ""
13083
13084
#: en/help_topics/revisionspec.txt:145
13085
msgid ":before:"
13086
msgstr ""
13087
13088
#: en/help_topics/revisionspec.txt:147
13089
msgid ""
13090
" Supply any revision spec to return the parent of that revision. This "
13091
"is\n"
13092
" mostly useful when inspecting revisions that are not in the revision "
13093
"history\n"
13094
" of a branch."
13095
msgstr ""
13096
13097
#: en/help_topics/revisionspec.txt:151
13098
msgid ""
13099
" It is an error to request the parent of the null revision (before:0)."
13100
msgstr ""
13101
13102
#: en/help_topics/revisionspec.txt:155
13103
msgid ""
13104
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13105
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13106
" aaaa@bbbb-1234567890\n"
13107
" bzr diff -r before:1913..1913\n"
13108
" -> Find the changes between revision 1913 and its parent "
13109
"(1912).\n"
13110
" (What changes did revision 1913 introduce).\n"
13111
" This is equivalent to: bzr diff -c 1913"
13112
msgstr ""
13113
13114
#: en/help_topics/revisionspec.txt:163
13115
msgid ":annotate:"
13116
msgstr ""
13117
13118
#: en/help_topics/revisionspec.txt:165
13119
msgid ""
13120
" Select the revision that last modified the specified line. Line is\n"
13121
" specified as path:number. Path is a relative path to the file. "
13122
"Numbers\n"
13123
" start at 1, and are relative to the current version, not the last-\n"
13124
" committed version of the file."
13125
msgstr ""
13126
13127
#: en/help_topics/revisionspec.txt:170
13128
msgid ":mainline:"
13129
msgstr ""
13130
13131
#: en/help_topics/revisionspec.txt:172
13132
msgid ""
13133
" Select the revision that merged the specified revision into mainline."
13134
msgstr ""
13135
13136
#: en/help_topics/revisionspec.txt:174
13137
msgid ":last:"
13138
msgstr ""
13139
13140
#: en/help_topics/revisionspec.txt:176
13141
msgid ""
13142
" Supply a positive number to get the nth revision from the end.\n"
13143
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13144
" Examples::"
13145
msgstr ""
13146
13147
#: en/help_topics/revisionspec.txt:180
13148
msgid ""
13149
" last:1 -> return the last revision\n"
13150
" last:3 -> return the revision 2 before the end.\n"
13151
msgstr ""
13152
13153
#: en/help_topics/rules.txt:1
13154
msgid ""
13155
"Rules\n"
13156
"====="
13157
msgstr ""
13158
13159
#: en/help_topics/rules.txt:7
13160
msgid ""
13161
"Rules are defined in ini file format where the sections are file glob\n"
13162
"patterns and the contents of each section are the preferences for files\n"
13163
"matching that pattern(s). For example::"
13164
msgstr ""
13165
13166
#: en/help_topics/rules.txt:11
13167
msgid ""
13168
" [name *.bat]\n"
13169
" eol = native"
13170
msgstr ""
13171
13172
#: en/help_topics/rules.txt:14
13173
msgid ""
13174
" [name *.html *.xml]\n"
13175
" keywords = xml_escape"
13176
msgstr ""
13177
13178
#: en/help_topics/rules.txt:17
13179
msgid ""
13180
"Preferences like these are useful for commands and plugins wishing to\n"
13181
"provide custom behaviour for selected files. For more information on \n"
13182
"end of line conversion see :doc:`eol-help`.\n"
13183
"Keyword support is provided by the `keywords plugin\n"
13184
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13185
msgstr ""
13186
13187
#: en/help_topics/rules.txt:23
13188
msgid ""
13189
"Files\n"
13190
"-----"
13191
msgstr ""
13192
13193
#: en/help_topics/rules.txt:26
13194
msgid ""
13195
"Default rules for all branches are defined in the optional file\n"
13196
"``BZR_HOME/rules``. "
13197
msgstr ""
13198
13199
#: en/help_topics/rules.txt:29
13200
msgid ""
13201
"Rule Patterns\n"
13202
"-------------"
13203
msgstr ""
13204
13205
#: en/help_topics/rules.txt:32
13206
msgid ""
13207
"Patterns are ordered and searching stops as soon as one matches.\n"
13208
"As a consequence, more explicit patterns should be placed towards\n"
13209
"the top of the file. Rule patterns use exactly the same conventions\n"
13210
"as ignore patterns. See :doc:`patterns-help` for details."
13211
msgstr ""
13212
13213
#: en/help_topics/rules.txt:37
13214
msgid ".. note::"
13215
msgstr ""
13216
13217
#: en/help_topics/rules.txt:39
13218
msgid ""
13219
" Patterns containing square brackets or spaces should be\n"
13220
" surrounded in quotes to ensure they are correctly parsed.\n"
13221
msgstr ""
13222
13223
#: en/help_topics/topics.txt:1
13224
msgid ""
13225
"authentication Information on configuring authentication\n"
13226
"basic Basic commands\n"
13227
"branches Information on what a branch is\n"
13228
"bugs Bug tracker settings\n"
13229
"checkouts Information on what a checkout is\n"
13230
"commands Basic help for all commands\n"
13231
"configuration Details on the configuration settings available\n"
13232
"conflict-types Types of conflicts and what to do about them\n"
13233
"content-filters Conversion of content into/from working trees\n"
13234
"criss-cross Information on criss-cross merging\n"
13235
"current-formats Current storage formats\n"
13236
"debug-flags Options to show or record debug information\n"
13237
"diverged-branches How to fix diverged branches\n"
13238
"env-variables Environment variable names and values\n"
13239
"eol Information on end-of-line handling\n"
13240
"files Information on configuration and log files\n"
13241
"formats Information on choosing a storage format\n"
13242
"global-options Options that control how Bazaar runs\n"
13243
"hidden-commands All hidden commands\n"
13244
"hooks Points at which custom processing can be added\n"
13245
"launchpad Using Bazaar with Launchpad.net\n"
13246
"location-alias Aliases for remembered locations\n"
13247
"log-formats Details on the logging formats available\n"
13248
"other-formats Experimental and deprecated storage formats\n"
13249
"patterns Information on the pattern syntax\n"
13250
"repositories Basic information on shared repositories.\n"
13251
"revisionspec Explain how to use --revision\n"
13252
"rules Information on defining rule-based preferences\n"
13253
"standalone-trees Information on what a standalone tree is\n"
13254
"standard-options Options that can be used with any command\n"
13255
"status-flags Help on status flags\n"
13256
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13257
"topics Topics list\n"
13258
"url-special-chars Special character handling in URLs\n"
13259
"urlspec Supported transport protocols\n"
13260
"working-trees Information on working trees\n"
13261
msgstr ""
13262
13263
#: en/help_topics/url-special-chars.txt:1
13264
msgid ""
13265
"Special character handling in URLs\n"
13266
"=================================="
13267
msgstr ""
13268
13269
#: en/help_topics/url-special-chars.txt:4
13270
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13271
msgstr ""
13272
13273
#: en/help_topics/url-special-chars.txt:6
13274
msgid " * Fully qualified URLs"
13275
msgstr ""
13276
13277
#: en/help_topics/url-special-chars.txt:8
13278
msgid " * File system paths, relative or absolute"
13279
msgstr ""
13280
13281
#: en/help_topics/url-special-chars.txt:10
13282
msgid ""
13283
"Internally bzr treats all locations as URLs. For any file system paths\n"
13284
"that are specified it will automatically determine the appropriate URL\n"
13285
"representation, and escape special characters where necessary."
13286
msgstr ""
13287
13288
#: en/help_topics/url-special-chars.txt:14
13289
msgid ""
13290
"There are a few characters which have special meaning in URLs and need "
13291
"careful\n"
13292
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13293
"value in URLs. Any non-ASCII characters in a file path will automatically "
13294
"be\n"
13295
"urlencoded when the path is converted to a URL."
13296
msgstr ""
13297
13298
#: en/help_topics/url-special-chars.txt:19
13299
msgid ""
13300
"URLs represent non-ASCII characters in an encoding defined by the server, "
13301
"but\n"
13302
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13303
"be\n"
13304
"generous in what it accepts as a URL and to print them in a way that\n"
13305
"will be readable."
13306
msgstr ""
13307
13308
#: en/help_topics/url-special-chars.txt:24
13309
msgid ""
13310
"For example, if you have a directory named '/tmp/%2False' these are all "
13311
"valid\n"
13312
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13313
"slash)::"
13314
msgstr ""
13315
13316
#: en/help_topics/url-special-chars.txt:27
13317
msgid ""
13318
" cd /tmp\n"
13319
" bzr log /tmp/%2False\n"
13320
" bzr log %2False\n"
13321
" bzr log file:///tmp/%252False\n"
13322
" bzr log file://localhost/tmp/%252False\n"
13323
" bzr log file:%252False"
13324
msgstr ""
13325
13326
#: en/help_topics/url-special-chars.txt:34
13327
msgid "These are valid but do not refer to the same file::"
13328
msgstr ""
13329
13330
#: en/help_topics/url-special-chars.txt:36
13331
msgid ""
13332
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13333
" bzr log %252False (refers to a file called /tmp/%252False)"
13334
msgstr ""
13335
13336
#: en/help_topics/url-special-chars.txt:39
13337
msgid ""
13338
"Comma also has special meaning in URLs, because it denotes `segment "
13339
"parameters`_"
13340
msgstr ""
13341
13342
#: en/help_topics/url-special-chars.txt:41
13343
msgid ""
13344
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13345
msgstr ""
13346
13347
#: en/help_topics/url-special-chars.txt:43
13348
msgid ""
13349
"Comma is also special in any file system paths that are specified. To use a "
13350
"literal\n"
13351
"comma in a file system path, specify a URL and URL encode the comma::"
13352
msgstr ""
13353
13354
#: en/help_topics/url-special-chars.txt:46
13355
msgid ""
13356
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13357
"\"branch\" set to \"bla\"\n"
13358
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13359
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13360
"\"branch\" set to \"bla\"\n"
13361
msgstr ""
13362
13363
#: en/help_topics/urlspec.txt:1
13364
msgid "URL Identifiers"
13365
msgstr ""
13366
13367
#: en/help_topics/urlspec.txt:3
13368
msgid "Supported URL prefixes::"
13369
msgstr ""
13370
13371
#: en/help_topics/urlspec.txt:5
13372
msgid ""
13373
" aftp:// Access using active FTP.\n"
13374
" bzr:// Fast access using the Bazaar smart server.\n"
13375
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13376
" file:// Access using the standard filesystem (default)\n"
13377
" ftp:// Access using passive FTP.\n"
13378
" http:// Read-only access of branches exported on the web.\n"
13379
" https:// Read-only access of branches exported on the web using "
13380
"SSL.\n"
13381
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13382
msgstr ""
13383
13384
#: en/help_topics/urlspec.txt:14
13385
msgid "Supported modifiers::"
13386
msgstr ""
13387
13388
#: en/help_topics/urlspec.txt:16
13389
msgid " gio+ Access using any GIO supported protocols."
13390
msgstr ""
13391
13392
#: en/help_topics/urlspec.txt:18
13393
msgid "Bazaar supports all of the standard parts within the URL::"
13394
msgstr ""
13395
13396
#: en/help_topics/urlspec.txt:20
13397
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13398
msgstr ""
13399
13400
#: en/help_topics/urlspec.txt:22
13401
msgid "allowing URLs such as::"
13402
msgstr ""
13403
13404
#: en/help_topics/urlspec.txt:24
13405
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13406
msgstr ""
13407
13408
#: en/help_topics/urlspec.txt:26
13409
msgid ""
13410
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13411
"with '~' as meaning that the rest of the path should be interpreted\n"
13412
"relative to the remote user's home directory. For example if the user\n"
13413
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13414
"shell.example.com, then::"
13415
msgstr ""
13416
13417
#: en/help_topics/urlspec.txt:32
13418
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13419
msgstr ""
13420
13421
#: en/help_topics/urlspec.txt:34
13422
msgid "would refer to ``/home/remote/myproject/trunk``."
13423
msgstr ""
13424
13425
#: en/help_topics/urlspec.txt:36
13426
msgid ""
13427
"Many commands that accept URLs also accept location aliases too.\n"
13428
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13429
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1