« back to all changes in this revision
Viewing changes to po/it.po
- browse files at revision 6093.4.212
- compare with another revision
- download diff
- download tarball
- view history from revision 6093.4.212
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2013-05-22 04:30:49 UTC
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20130522043049-ftwpn9fsalb3qk2a
Launchpad automatic translations update.
- files added:
- NEWS
- bzrlib/branchfmt
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/deprecated_graph.py
- 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:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- 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-05-20 11:01+0000\n"
12
"Last-Translator: Gianfranco Frisani <gfrisani@libero.it>\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-05-21 04:30+0000\n"
19
"X-Generator: Launchpad (build 16626)\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 ""
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 ""
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
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 ""
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
78
#: bzrlib/builtins.py:320
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:323
85
msgid ""
86
"removed\n"
87
" Versioned in the previous revision but removed or deleted\n"
88
" in the working copy."
89
msgstr ""
90
91
#: bzrlib/builtins.py:327
92
msgid ""
93
"renamed\n"
94
" Path of this file changed from the previous revision;\n"
95
" the text may also have changed. This includes files whose\n"
96
" parent directory was renamed."
97
msgstr ""
98
99
#: bzrlib/builtins.py:332
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:335
106
msgid ""
107
"kind changed\n"
108
" File kind has been changed (e.g. from file to directory)."
109
msgstr ""
110
111
#: bzrlib/builtins.py:338
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:341
118
msgid ""
119
"Additionally for directories, symlinks and files with a changed\n"
120
"executable bit, Bazaar indicates their type using a trailing\n"
121
"character: '/', '@' or '*' respectively. These decorations can be\n"
122
"disabled using the '--no-classify' option."
123
msgstr ""
124
125
#: bzrlib/builtins.py:346
126
msgid ""
127
"To see ignored files use 'bzr ignored'. For details on the\n"
128
"changes to file texts, use 'bzr diff'."
129
msgstr ""
130
131
#: bzrlib/builtins.py:349
132
msgid ""
133
"Note that --short or -S gives status flags for each item, similar\n"
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
"use bzr status -SV."
136
msgstr ""
137
138
#: bzrlib/builtins.py:353
139
msgid ""
140
"If no arguments are specified, the status of the entire working\n"
141
"directory is shown. Otherwise, only the status of the specified\n"
142
"files or directories is reported. If a directory is given, status\n"
143
"is reported for everything inside that directory."
144
msgstr ""
145
146
#: bzrlib/builtins.py:358
147
msgid ""
148
"Before merges are committed, the pending merge tip revisions are\n"
149
"shown. To see all pending merge revisions, use the -v option.\n"
150
"To skip the display of pending merge information altogether, use\n"
151
"the no-pending option or specify a file/directory."
152
msgstr ""
153
154
#: bzrlib/builtins.py:363
155
msgid ""
156
"To compare the working directory to a specific revision, pass a\n"
157
"single revision to the revision argument."
158
msgstr ""
159
160
#: bzrlib/builtins.py:366
161
msgid ""
162
"To see which files have changed in a specific revision, or between\n"
163
"two revisions, pass a revision range to the revision argument.\n"
164
"This will produce the same results as calling 'bzr diff --summarize'."
165
msgstr ""
166
167
#: bzrlib/builtins.py:375
168
msgid "Use short status indicators."
169
msgstr ""
170
171
#: bzrlib/builtins.py:377
172
msgid "Only show versioned files."
173
msgstr ""
174
175
#: bzrlib/builtins.py:379
176
msgid "Don't show pending merges."
177
msgstr ""
178
179
#: bzrlib/builtins.py:382
180
msgid "Do not mark object type using indicator."
181
msgstr ""
182
183
#: bzrlib/builtins.py:397
184
msgid "bzr status --revision takes exactly one or two revision specifiers"
185
msgstr ""
186
187
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
188
msgid "You can only supply one of revision_id or --revision"
189
msgstr ""
190
191
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
192
msgid "You must supply either --revision or a revision_id"
193
msgstr ""
194
195
#: bzrlib/builtins.py:451
196
#, python-format
197
msgid "Repository %r does not support access to raw revision texts"
198
msgstr ""
199
200
#: bzrlib/builtins.py:462
201
msgid "The repository {0} contains no revision {1}."
202
msgstr ""
203
204
#: bzrlib/builtins.py:469
205
msgid "You cannot specify a NULL revision."
206
msgstr ""
207
208
#: bzrlib/builtins.py:561
209
msgid "Remove the working tree from a given branch/checkout."
210
msgstr ""
211
212
#: bzrlib/builtins.py:563
213
msgid ""
214
"Since a lightweight checkout is little more than a working tree\n"
215
"this will refuse to run against one."
216
msgstr ""
217
"Non è possibile eseguire questo comando su di un checkout leggero, dal\n"
218
"momento che questo è leggermente superiore a un albero di lavoro."
219
220
#: bzrlib/builtins.py:566
221
msgid "To re-create the working tree, use \"bzr checkout\"."
222
msgstr ""
223
224
#: bzrlib/builtins.py:572
225
msgid ""
226
"Remove the working tree even if it has uncommitted or shelved changes."
227
msgstr ""
228
229
#: bzrlib/builtins.py:586
230
msgid "No working tree to remove"
231
msgstr ""
232
233
#: bzrlib/builtins.py:588
234
msgid "You cannot remove the working tree of a remote path"
235
msgstr ""
236
237
#: bzrlib/builtins.py:597
238
msgid "You cannot remove the working tree from a lightweight checkout"
239
msgstr ""
240
241
#: bzrlib/builtins.py:637
242
msgid ""
243
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
244
"instead. Use \"--force\" if you are sure you want to reset the working tree."
245
msgstr ""
246
247
#: bzrlib/builtins.py:648
248
msgid ""
249
", the header appears corrupt, try passing -r -1 to set the state to the last "
250
"commit"
251
msgstr ""
252
253
#: bzrlib/builtins.py:652
254
msgid "failed to reset the tree state{0}"
255
msgstr ""
256
257
#: bzrlib/builtins.py:656
258
msgid "Show current revision number."
259
msgstr ""
260
261
#: bzrlib/builtins.py:658
262
msgid "This is equal to the number of revisions on this branch."
263
msgstr ""
264
265
#: bzrlib/builtins.py:671
266
msgid "--tree and --revision can not be used together"
267
msgstr ""
268
269
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
270
msgid "Tags can only be placed on a single revision, not on a range"
271
msgstr ""
272
273
#: bzrlib/builtins.py:712
274
msgid "Show revno of working tree."
275
msgstr ""
276
277
#: bzrlib/builtins.py:760
278
msgid "Add specified files or directories."
279
msgstr ""
280
281
#: bzrlib/builtins.py:762
282
msgid ""
283
"In non-recursive mode, all the named items are added, regardless\n"
284
"of whether they were previously ignored. A warning is given if\n"
285
"any of the named files are already versioned."
286
msgstr ""
287
288
#: bzrlib/builtins.py:766
289
msgid ""
290
"In recursive mode (the default), files are treated the same way\n"
291
"but the behaviour for directories is different. Directories that\n"
292
"are already versioned do not give a warning. All directories,\n"
293
"whether already versioned or not, are searched for files or\n"
294
"subdirectories that are neither versioned or ignored, and these\n"
295
"are added. This search proceeds recursively into versioned\n"
296
"directories. If no names are given '.' is assumed."
297
msgstr ""
298
299
#: bzrlib/builtins.py:774
300
msgid ""
301
"A warning will be printed when nested trees are encountered,\n"
302
"unless they are explicitly ignored."
303
msgstr ""
304
305
#: bzrlib/builtins.py:777
306
msgid ""
307
"Therefore simply saying 'bzr add' will version all files that\n"
308
"are currently unknown."
309
msgstr ""
310
311
#: bzrlib/builtins.py:780
312
msgid ""
313
"Adding a file whose parent directory is not versioned will\n"
314
"implicitly add the parent, and so on up to the root. This means\n"
315
"you should never need to explicitly add a directory, they'll just\n"
316
"get added when you add a file in the directory."
317
msgstr ""
318
319
#: bzrlib/builtins.py:785
320
msgid ""
321
"--dry-run will show which files would be added, but not actually\n"
322
"add them."
323
msgstr ""
324
325
#: bzrlib/builtins.py:788
326
msgid ""
327
"--file-ids-from will try to use the file ids from the supplied path.\n"
328
"It looks up ids trying to find a matching parent directory with the\n"
329
"same filename, and then by pure path. This option is rarely needed\n"
330
"but can be useful when adding the same logical file into two\n"
331
"branches that will be merged later (without showing the two different\n"
332
"adds as a conflict). It is also useful when merging another project\n"
333
"into a subdirectory of this one."
334
msgstr ""
335
336
#: bzrlib/builtins.py:796
337
msgid ""
338
"Any files matching patterns in the ignore list will not be added\n"
339
"unless they are explicitly mentioned."
340
msgstr ""
341
342
#: bzrlib/builtins.py:799
343
msgid ""
344
"In recursive mode, files larger than the configuration option \n"
345
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
346
"to file size."
347
msgstr ""
348
349
#: bzrlib/builtins.py:806
350
msgid "Don't recursively add the contents of directories."
351
msgstr ""
352
353
#: bzrlib/builtins.py:813
354
msgid "Lookup file ids from this tree."
355
msgstr ""
356
357
#: bzrlib/builtins.py:849
358
msgid "ignored {0} matching \"{1}\"\n"
359
msgstr ""
360
361
#: bzrlib/builtins.py:854
362
msgid "Create a new versioned directory."
363
msgstr ""
364
365
#: bzrlib/builtins.py:856
366
msgid "This is equivalent to creating the directory and then adding it."
367
msgstr ""
368
369
#: bzrlib/builtins.py:863
370
msgid "No error if existing, make parent directories as needed."
371
msgstr ""
372
373
#: bzrlib/builtins.py:897
374
#, python-format
375
msgid "added %s\n"
376
msgstr ""
377
378
#: bzrlib/builtins.py:939
379
#, python-format
380
msgid "invalid kind %r specified"
381
msgstr ""
382
383
#: bzrlib/builtins.py:976
384
msgid "Move or rename a file."
385
msgstr ""
386
387
#: bzrlib/builtins.py:978
388
msgid " bzr mv SOURCE... DESTINATION"
389
msgstr ""
390
391
#: bzrlib/builtins.py:980
392
msgid ""
393
"If the last argument is a versioned directory, all the other names\n"
394
"are moved into it. Otherwise, there must be exactly two arguments\n"
395
"and the file is changed to a new name."
396
msgstr ""
397
398
#: bzrlib/builtins.py:984
399
msgid ""
400
"If OLDNAME does not exist on the filesystem but is versioned and\n"
401
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
402
"assumes that the file has been manually moved and only updates\n"
403
"its internal inventory to reflect that change.\n"
404
"The same is valid when moving many SOURCE files to a DESTINATION."
405
msgstr ""
406
407
#: bzrlib/builtins.py:990
408
msgid "Files cannot be moved between branches."
409
msgstr ""
410
411
#: bzrlib/builtins.py:997
412
msgid ""
413
"Move only the bzr identifier of the file, because the file has already been "
414
"moved."
415
msgstr ""
416
417
#: bzrlib/builtins.py:999
418
msgid "Automatically guess renames."
419
msgstr ""
420
421
#: bzrlib/builtins.py:1000
422
msgid "Avoid making changes when guessing renames."
423
msgstr ""
424
425
#: bzrlib/builtins.py:1009
426
msgid "--dry-run requires --auto."
427
msgstr ""
428
429
#: bzrlib/builtins.py:1013
430
msgid "missing file argument"
431
msgstr ""
432
433
#: bzrlib/builtins.py:1017
434
msgid "can not move root of branch"
435
msgstr ""
436
437
#: bzrlib/builtins.py:1023
438
msgid "Only one path may be specified to --auto."
439
msgstr ""
440
441
#: bzrlib/builtins.py:1026
442
msgid "--after cannot be specified with --auto."
443
msgstr ""
444
445
#: bzrlib/builtins.py:1062
446
msgid "to mv multiple files the destination must be a versioned directory"
447
msgstr ""
448
449
#: bzrlib/builtins.py:1114
450
msgid "Turn this branch into a mirror of another branch."
451
msgstr ""
452
453
#: bzrlib/builtins.py:1116
454
msgid ""
455
"By default, this command only works on branches that have not diverged.\n"
456
"Branches are considered diverged if the destination branch's most recent \n"
457
"commit is one that has not been merged (directly or indirectly) into the \n"
458
"parent."
459
msgstr ""
460
461
#: bzrlib/builtins.py:1121
462
msgid ""
463
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
464
"from one into the other. Once one branch has merged, the other should\n"
465
"be able to pull it again."
466
msgstr ""
467
468
#: bzrlib/builtins.py:1125
469
msgid ""
470
"If you want to replace your local changes and just want your branch to\n"
471
"match the remote one, use pull --overwrite. This will work even if the two\n"
472
"branches have diverged."
473
msgstr ""
474
475
#: bzrlib/builtins.py:1129
476
msgid ""
477
"If there is no default location set, the first pull will set it (use\n"
478
"--no-remember to avoid setting it). After that, you can omit the\n"
479
"location to use the default. To change the default, use --remember. The\n"
480
"value will only be saved if the remote location can be accessed."
481
msgstr ""
482
483
#: bzrlib/builtins.py:1134
484
msgid ""
485
"The --verbose option will display the revisions pulled using the log_format\n"
486
"configuration option. You can use a different format by overriding it with\n"
487
"-Olog_format=<other_format>."
488
msgstr ""
489
490
#: bzrlib/builtins.py:1138
491
msgid ""
492
"Note: The location can be specified either in the form of a branch,\n"
493
"or in the form of a path to a file containing a merge directive generated\n"
494
"with bzr send."
495
msgstr ""
496
497
#: bzrlib/builtins.py:1146
498
msgid "Show logs of pulled revisions."
499
msgstr ""
500
501
#: bzrlib/builtins.py:1148
502
msgid ""
503
"Branch to pull into, rather than the one containing the working directory."
504
msgstr ""
505
506
#: bzrlib/builtins.py:1151
507
msgid ""
508
"Perform a local pull in a bound branch. Local pulls are not applied to the "
509
"master branch."
510
msgstr ""
511
512
#: bzrlib/builtins.py:1189
513
msgid "Need working tree for --show-base."
514
msgstr ""
515
516
#: bzrlib/builtins.py:1205
517
msgid "No pull location known or specified."
518
msgstr ""
519
520
#: bzrlib/builtins.py:1211
521
#, python-format
522
msgid "Using saved parent location: %s\n"
523
msgstr ""
524
525
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
526
msgid "Cannot use -r with merge directives or bundles"
527
msgstr ""
528
529
#: bzrlib/builtins.py:1261
530
msgid "Update a mirror of this branch."
531
msgstr ""
532
533
#: bzrlib/builtins.py:1263
534
msgid ""
535
"The target branch will not have its working tree populated because this\n"
536
"is both expensive, and is not supported on remote file systems."
537
msgstr ""
538
539
#: bzrlib/builtins.py:1266
540
msgid ""
541
"Some smart servers or protocols *may* put the working tree in place in\n"
542
"the future."
543
msgstr ""
544
545
#: bzrlib/builtins.py:1269
546
msgid ""
547
"This command only works on branches that have not diverged. Branches are\n"
548
"considered diverged if the destination branch's most recent commit is one\n"
549
"that has not been merged (directly or indirectly) by the source branch."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1273
553
msgid ""
554
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
555
"the other branch completely, discarding its unmerged changes."
556
msgstr ""
557
558
#: bzrlib/builtins.py:1276
559
msgid ""
560
"If you want to ensure you have the different changes in the other branch,\n"
561
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
562
"After that you will be able to do a push without '--overwrite'."
563
msgstr ""
564
565
#: bzrlib/builtins.py:1280
566
msgid ""
567
"If there is no default push location set, the first push will set it (use\n"
568
"--no-remember to avoid setting it). After that, you can omit the\n"
569
"location to use the default. To change the default, use --remember. The\n"
570
"value will only be saved if the remote location can be accessed."
571
msgstr ""
572
573
#: bzrlib/builtins.py:1285
574
msgid ""
575
"The --verbose option will display the revisions pushed using the log_format\n"
576
"configuration option. You can use a different format by overriding it with\n"
577
"-Olog_format=<other_format>."
578
msgstr ""
579
"L'opzione --verbose visualizza le revisioni per le quali è stato effettuato "
580
"il push\n"
581
"usando l'opzione di configurazione log_format. È possibile usare un diverso\n"
582
"formato sovrascrivendolo con -Olog_format=<altro_formato>."
583
584
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
585
msgid ""
586
"Branch to push from, rather than the one containing the working directory."
587
msgstr ""
588
589
#: bzrlib/builtins.py:1299
590
msgid ""
591
"By default push will fail if the target directory exists, but does not "
592
"already have a control directory. This flag will allow push to proceed."
593
msgstr ""
594
595
#: bzrlib/builtins.py:1304
596
msgid ""
597
"Create a stacked branch that references the public location of the parent "
598
"branch."
599
msgstr ""
600
601
#: bzrlib/builtins.py:1307
602
msgid ""
603
"Create a stacked branch that refers to another branch for the commit "
604
"history. Only the work not present in the referenced branch is included in "
605
"the branch created."
606
msgstr ""
607
608
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
609
msgid ""
610
"Refuse to push if there are uncommitted changes in the working tree, --no-"
611
"strict disables the check."
612
msgstr ""
613
614
#: bzrlib/builtins.py:1315
615
msgid "Don't populate the working tree, even for protocols that support it."
616
msgstr ""
617
618
#: bzrlib/builtins.py:1318
619
msgid "Overwrite tags only."
620
msgstr ""
621
622
#: bzrlib/builtins.py:1369
623
msgid "Could not determine branch to refer to."
624
msgstr ""
625
626
#: bzrlib/builtins.py:1378
627
#, python-format
628
msgid ""
629
"No push location known or specified. To push to the parent branch (at %s), "
630
"use 'bzr push :parent'."
631
msgstr ""
632
633
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
634
msgid "No push location known or specified."
635
msgstr "Non è stata specificata o non è nota una localizzazione per il push."
636
637
#: bzrlib/builtins.py:1388
638
#, python-format
639
msgid "Using saved push location: %s"
640
msgstr "Utilizzo di localizzazione memorizzata per il push: %s"
641
642
#: bzrlib/builtins.py:1398
643
msgid "Create a new branch that is a copy of an existing branch."
644
msgstr ""
645
646
#: bzrlib/builtins.py:1400
647
msgid ""
648
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
649
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
650
"./bar.\n"
651
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
652
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
653
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
654
"create ./foo-bar."
655
msgstr ""
656
"Se viene omesso TO_LOCATION, verrà usato l'ultimo componente del\n"
657
"FROM_LOCATION. In altri termini, «branch ../foo/bar» tenterà di creare "
658
"./bar.\n"
659
"Se non è incorporato nel FROM_LOCATION un «/» o un separatore di percorso,\n"
660
"il TO_LOCATION viene ricavato dal FROM_LOCATION separando uno schema\n"
661
"principale o un identificativo di drive, se esistenti. Per esempio,\n"
662
"«branch lp:foo-bar» tenterà di creare ./foo-bar."
663
664
#: bzrlib/builtins.py:1407
665
msgid ""
666
"To retrieve the branch as of a particular revision, supply the --revision\n"
667
"parameter, as in \"branch foo/bar -r 5\"."
668
msgstr ""
669
670
#: bzrlib/builtins.py:1410
671
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
672
msgstr ""
673
674
#: bzrlib/builtins.py:1420
675
msgid "Create a branch without a working-tree."
676
msgstr ""
677
678
#: bzrlib/builtins.py:1422
679
msgid "Switch the checkout in the current directory to the new branch."
680
msgstr ""
681
682
#: bzrlib/builtins.py:1425
683
msgid ""
684
"Create a stacked branch referring to the source branch. The new branch will "
685
"depend on the availability of the source branch for all operations."
686
msgstr ""
687
688
#: bzrlib/builtins.py:1429
689
msgid "Do not use a shared repository, even if available."
690
msgstr ""
691
692
#: bzrlib/builtins.py:1431
693
msgid ""
694
"By default branch will fail if the target directory exists, but does not "
695
"already have a control directory. This flag will allow branch to proceed."
696
msgstr ""
697
698
#: bzrlib/builtins.py:1436
699
msgid "Bind new branch to from location."
700
msgstr ""
701
702
#: bzrlib/builtins.py:1483
703
#, python-format
704
msgid "Target directory \"%s\" already exists."
705
msgstr ""
706
707
#: bzrlib/builtins.py:1495
708
#, python-format
709
msgid "Parent of \"%s\" does not exist."
710
msgstr ""
711
712
#: bzrlib/builtins.py:1514
713
msgid "The branch {0} has no revision {1}."
714
msgstr ""
715
716
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
717
#, python-format
718
msgid "Created new stacked branch referring to %s."
719
msgstr ""
720
721
#: bzrlib/builtins.py:1533
722
#, python-format
723
msgid "Branched %d revision."
724
msgid_plural "Branched %d revisions."
725
msgstr[0] ""
726
msgstr[1] ""
727
728
#: bzrlib/builtins.py:1538
729
#, python-format
730
msgid "New branch bound to %s"
731
msgstr ""
732
733
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
734
#, python-format
735
msgid "Switched to branch: %s"
736
msgstr ""
737
738
#: bzrlib/builtins.py:1548
739
msgid "List the branches available at the current location."
740
msgstr ""
741
742
#: bzrlib/builtins.py:1550
743
msgid ""
744
"This command will print the names of all the branches at the current\n"
745
"location."
746
msgstr ""
747
748
#: bzrlib/builtins.py:1557
749
msgid ""
750
"Recursively scan for branches rather than just looking in the specified "
751
"location."
752
msgstr ""
753
754
#: bzrlib/builtins.py:1586
755
msgid "(default)"
756
msgstr ""
757
758
#: bzrlib/builtins.py:1598
759
msgid "Create a new checkout of an existing branch."
760
msgstr ""
761
762
#: bzrlib/builtins.py:1600
763
msgid ""
764
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
765
"for\n"
766
"the branch found in '.'. This is useful if you have removed the working "
767
"tree\n"
768
"or if it was never created - i.e. if you pushed the branch to its current\n"
769
"location using SFTP."
770
msgstr ""
771
772
#: bzrlib/builtins.py:1605
773
msgid ""
774
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
775
"will\n"
776
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
777
"./bar.\n"
778
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
779
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
780
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
781
"create ./foo-bar."
782
msgstr ""
783
784
#: bzrlib/builtins.py:1612
785
msgid ""
786
"To retrieve the branch as of a particular revision, supply the --revision\n"
787
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
788
"immediately\n"
789
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
790
"old\n"
791
"code.)"
792
msgstr ""
793
794
#: bzrlib/builtins.py:1622
795
msgid ""
796
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
797
"the branch for every operation. Normal checkouts can perform common "
798
"operations like diff and status without such access, and also support local "
799
"commits."
800
msgstr ""
801
802
#: bzrlib/builtins.py:1629
803
msgid "Get file contents from this tree."
804
msgstr ""
805
806
#: bzrlib/builtins.py:1631
807
msgid "Hard-link working tree files where possible."
808
msgstr ""
809
810
#: bzrlib/builtins.py:1672
811
msgid ""
812
"Show list of renamed files.\n"
813
" "
814
msgstr ""
815
816
#: bzrlib/builtins.py:1700
817
msgid "Update a working tree to a new revision."
818
msgstr ""
819
820
#: bzrlib/builtins.py:1702
821
msgid ""
822
"This will perform a merge of the destination revision (the tip of the\n"
823
"branch, or the specified revision) into the working tree, and then make\n"
824
"that revision the basis revision for the working tree. "
825
msgstr ""
826
827
#: bzrlib/builtins.py:1706
828
msgid ""
829
"You can use this to visit an older revision, or to update a working tree\n"
830
"that is out of date from its branch."
831
msgstr ""
832
833
#: bzrlib/builtins.py:1709
834
msgid ""
835
"If there are any uncommitted changes in the tree, they will be carried\n"
836
"across and remain as uncommitted changes after the update. To discard\n"
837
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
838
"with the changes brought in by the change in basis revision."
839
msgstr ""
840
841
#: bzrlib/builtins.py:1714
842
msgid ""
843
"If the tree's branch is bound to a master branch, bzr will also update\n"
844
"the branch from the master."
845
msgstr ""
846
847
#: bzrlib/builtins.py:1717
848
msgid ""
849
"You cannot update just a single file or directory, because each Bazaar\n"
850
"working tree has just a single basis revision. If you want to restore a\n"
851
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
852
"update'. If you want to restore a file to its state in a previous\n"
853
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
854
"out the old content of that file to a new location."
855
msgstr ""
856
857
#: bzrlib/builtins.py:1724
858
msgid ""
859
"The 'dir' argument, if given, must be the location of the root of a\n"
860
"working tree to update. By default, the working tree that contains the \n"
861
"current working directory is used."
862
msgstr ""
863
864
#: bzrlib/builtins.py:1740
865
msgid "bzr update --revision takes exactly one revision"
866
msgstr "bzr update --revision prende esattamente una revisione"
867
868
#: bzrlib/builtins.py:1748
869
msgid "bzr update can only update a whole tree, not a file or subdirectory"
870
msgstr ""
871
872
#: bzrlib/builtins.py:1779
873
msgid "Tree is up to date at revision {0} of branch {1}"
874
msgstr ""
875
876
#: bzrlib/builtins.py:1795
877
#, python-format
878
msgid ""
879
"branch has no revision %s\n"
880
"bzr update --revision only works for a revision in the branch history"
881
msgstr ""
882
883
#: bzrlib/builtins.py:1801
884
msgid "Updated to revision {0} of branch {1}"
885
msgstr ""
886
887
#: bzrlib/builtins.py:1805
888
msgid ""
889
"Your local commits will now show as pending merges with 'bzr status', and "
890
"can be committed with 'bzr commit'."
891
msgstr ""
892
893
#: bzrlib/builtins.py:1814
894
msgid "Show information about a working tree, branch or repository."
895
msgstr ""
896
897
#: bzrlib/builtins.py:1816
898
msgid ""
899
"This command will show all known locations and formats associated to the\n"
900
"tree, branch or repository."
901
msgstr ""
902
903
#: bzrlib/builtins.py:1819
904
msgid ""
905
"In verbose mode, statistical information is included with each report.\n"
906
"To see extended statistic information, use a verbosity level of 2 or\n"
907
"higher by specifying the verbose option multiple times, e.g. -vv."
908
msgstr ""
909
910
#: bzrlib/builtins.py:1823
911
msgid "Branches and working trees will also report any missing revisions."
912
msgstr ""
913
914
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
915
#: bzrlib/builtins.py:6466
916
msgid ":Examples:"
917
msgstr ""
918
919
#: bzrlib/builtins.py:1827
920
msgid " Display information on the format and related locations:"
921
msgstr ""
922
923
#: bzrlib/builtins.py:1829
924
msgid " bzr info"
925
msgstr ""
926
927
#: bzrlib/builtins.py:1831
928
msgid ""
929
" Display the above together with extended format information and\n"
930
" basic statistics (like the number of files in the working tree and\n"
931
" number of revisions in the branch and repository):"
932
msgstr ""
933
934
#: bzrlib/builtins.py:1835
935
msgid " bzr info -v"
936
msgstr ""
937
938
#: bzrlib/builtins.py:1837
939
msgid " Display the above together with number of committers to the branch:"
940
msgstr ""
941
942
#: bzrlib/builtins.py:1839
943
msgid " bzr info -vv"
944
msgstr ""
945
946
#: bzrlib/builtins.py:1858
947
msgid "Remove files or directories."
948
msgstr ""
949
950
#: bzrlib/builtins.py:1860
951
msgid ""
952
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
953
"delete them if they can easily be recovered using revert otherwise they\n"
954
"will be backed up (adding an extension of the form .~#~). If no options or\n"
955
"parameters are given Bazaar will scan for files that are being tracked by\n"
956
"Bazaar but missing in your tree and stop tracking them for you."
957
msgstr ""
958
959
#: bzrlib/builtins.py:1868
960
msgid "Only remove files that have never been committed."
961
msgstr "Rimuove solo i file sui quali non è mai stato eseguito il commit."
962
963
#: bzrlib/builtins.py:1870
964
msgid "The file deletion mode to be used."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1871
968
msgid "Deletion Strategy"
969
msgstr ""
970
971
#: bzrlib/builtins.py:1872
972
msgid "Backup changed files (default)."
973
msgstr ""
974
975
#: bzrlib/builtins.py:1873
976
msgid "Delete from bzr but leave the working copy."
977
msgstr ""
978
979
#: bzrlib/builtins.py:1874
980
msgid "Don't backup changed files."
981
msgstr ""
982
983
#: bzrlib/builtins.py:1875
984
msgid ""
985
"Delete all the specified files, even if they can not be recovered and even "
986
"if they are non-empty directories. (deprecated, use no-backup)"
987
msgstr ""
988
989
#: bzrlib/builtins.py:1884
990
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
991
msgstr ""
992
993
#: bzrlib/builtins.py:1901
994
msgid "No matching files."
995
msgstr ""
996
997
#: bzrlib/builtins.py:1962
998
msgid "Reconcile bzr metadata in a branch."
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1964
1002
msgid ""
1003
"This can correct data mismatches that may have been caused by\n"
1004
"previous ghost operations or bzr upgrades. You should only\n"
1005
"need to run this command if 'bzr check' or a bzr developer\n"
1006
"advises you to run it."
1007
msgstr ""
1008
1009
#: bzrlib/builtins.py:1969
1010
msgid ""
1011
"If a second branch is provided, cross-branch reconciliation is\n"
1012
"also attempted, which will check that data like the tree root\n"
1013
"id which was not present in very early bzr versions is represented\n"
1014
"correctly in both branches."
1015
msgstr ""
1016
1017
#: bzrlib/builtins.py:1974
1018
msgid ""
1019
"At the same time it is run it may recompress data resulting in\n"
1020
"a potential saving in disk space or performance gain."
1021
msgstr ""
1022
1023
#: bzrlib/builtins.py:1977
1024
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1025
msgstr ""
1026
1027
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1028
msgid ""
1029
"Format for the bzr 2.0 series.\n"
1030
"Uses group-compress storage.\n"
1031
"Provides rich roots which are a one-way transition.\n"
1032
msgstr ""
1033
1034
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1035
msgid ""
1036
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1037
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1038
msgstr ""
1039
1040
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1041
msgid "The 2a format with experimental support for colocated branches.\n"
1042
msgstr ""
1043
1044
#: bzrlib/builtins.py:2045
1045
msgid "Make a directory into a versioned branch."
1046
msgstr ""
1047
1048
#: bzrlib/builtins.py:2047
1049
msgid ""
1050
"Use this to create an empty branch, or before importing an\n"
1051
"existing project."
1052
msgstr ""
1053
1054
#: bzrlib/builtins.py:2050
1055
msgid ""
1056
"If there is a repository in a parent directory of the location, then\n"
1057
"the history of the branch will be stored in the repository. Otherwise\n"
1058
"init creates a standalone branch which carries its own history\n"
1059
"in the .bzr directory."
1060
msgstr ""
1061
1062
#: bzrlib/builtins.py:2055
1063
msgid ""
1064
"If there is already a branch at the location but it has no working tree,\n"
1065
"the tree can be populated with 'bzr checkout'."
1066
msgstr ""
1067
1068
#: bzrlib/builtins.py:2058
1069
msgid "Recipe for importing a tree of files::"
1070
msgstr ""
1071
1072
#: bzrlib/builtins.py:2060
1073
msgid ""
1074
" cd ~/project\n"
1075
" bzr init\n"
1076
" bzr add .\n"
1077
" bzr status\n"
1078
" bzr commit -m \"imported project\""
1079
msgstr ""
1080
1081
#: bzrlib/builtins.py:2071
1082
msgid ""
1083
"Create the path leading up to the branch if it does not already exist."
1084
msgstr ""
1085
1086
#: bzrlib/builtins.py:2074
1087
msgid "Specify a format for this branch. See \"help formats\"."
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:2082
1091
msgid ""
1092
"Never change revnos or the existing log. Append revisions to it only."
1093
msgstr ""
1094
1095
#: bzrlib/builtins.py:2085
1096
msgid "Create a branch without a working tree."
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1100
#, python-format
1101
msgid ""
1102
"Parent directory of %s does not exist.\n"
1103
"You may supply --create-prefix to create all leading parent directories."
1104
msgstr ""
1105
1106
#: bzrlib/builtins.py:2139
1107
msgid ""
1108
"This branch format cannot be set to append-revisions-only. Try --default."
1109
msgstr ""
1110
1111
#: bzrlib/builtins.py:2150
1112
msgid "Created a {0} (format: {1})\n"
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:2159
1116
#, python-format
1117
msgid "Using shared repository: %s\n"
1118
msgstr ""
1119
1120
#: bzrlib/builtins.py:2163
1121
msgid "Create a shared repository for branches to share storage space."
1122
msgstr ""
1123
1124
#: bzrlib/builtins.py:2165
1125
msgid ""
1126
"New branches created under the repository directory will store their\n"
1127
"revisions in the repository, not in the branch directory. For branches\n"
1128
"with shared history, this reduces the amount of storage needed and \n"
1129
"speeds up the creation of new branches."
1130
msgstr ""
1131
1132
#: bzrlib/builtins.py:2170
1133
msgid ""
1134
"If the --no-trees option is given then the branches in the repository\n"
1135
"will not have working trees by default. They will still exist as \n"
1136
"directories on disk, but they will not have separate copies of the \n"
1137
"files at a certain revision. This can be useful for repositories that\n"
1138
"store branches which are interacted with through checkouts or remote\n"
1139
"branches, such as on a server."
1140
msgstr ""
1141
1142
#: bzrlib/builtins.py:2177
1143
msgid ""
1144
":Examples:\n"
1145
" Create a shared repository holding just branches::"
1146
msgstr ""
1147
1148
#: bzrlib/builtins.py:2180
1149
msgid ""
1150
" bzr init-repo --no-trees repo\n"
1151
" bzr init repo/trunk"
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:2183
1155
msgid " Make a lightweight checkout elsewhere::"
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:2185
1159
msgid ""
1160
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1161
" cd trunk-checkout\n"
1162
" (add files here)"
1163
msgstr ""
1164
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1165
" cd trunk-checkout\n"
1166
" (aggiunge file qui)"
1167
1168
#: bzrlib/builtins.py:2193
1169
msgid ""
1170
"Specify a format for this repository. See \"bzr help formats\" for details."
1171
msgstr ""
1172
1173
#: bzrlib/builtins.py:2197
1174
msgid "Repository format"
1175
msgstr ""
1176
1177
#: bzrlib/builtins.py:2199
1178
msgid "Branches in the repository will default to not having a working tree."
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:2225
1182
msgid "Show differences in the working tree, between revisions or branches."
1183
msgstr ""
1184
1185
#: bzrlib/builtins.py:2227
1186
msgid ""
1187
"If no arguments are given, all changes for the current tree are listed.\n"
1188
"If files are given, only the changes in those files are listed.\n"
1189
"Remote and multiple branches can be compared by using the --old and\n"
1190
"--new options. If not provided, the default for both is derived from\n"
1191
"the first argument, if any, or the current tree if no arguments are\n"
1192
"given."
1193
msgstr ""
1194
1195
#: bzrlib/builtins.py:2234
1196
msgid ""
1197
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1198
"produces patches suitable for \"patch -p1\"."
1199
msgstr ""
1200
1201
#: bzrlib/builtins.py:2237
1202
msgid ""
1203
"Note that when using the -r argument with a range of revisions, the\n"
1204
"differences are computed between the two specified revisions. That\n"
1205
"is, the command does not show the changes introduced by the first \n"
1206
"revision in the range. This differs from the interpretation of \n"
1207
"revision ranges used by \"bzr log\" which includes the first revision\n"
1208
"in the range."
1209
msgstr ""
1210
1211
#: bzrlib/builtins.py:2244
1212
msgid ""
1213
":Exit values:\n"
1214
" 1 - changed\n"
1215
" 2 - unrepresentable changes\n"
1216
" 3 - error\n"
1217
" 0 - no change"
1218
msgstr ""
1219
":Valori in uscita:\n"
1220
" 1 - modificato\n"
1221
" 2 - modifiche non rappresentabili\n"
1222
" 3 - errore\n"
1223
" 0 - nessuna modifica"
1224
1225
#: bzrlib/builtins.py:2250
1226
msgid ""
1227
":Examples:\n"
1228
" Shows the difference in the working tree versus the last commit::"
1229
msgstr ""
1230
1231
#: bzrlib/builtins.py:2253
1232
msgid " bzr diff"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2255
1236
msgid " Difference between the working tree and revision 1::"
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2257
1240
msgid " bzr diff -r1"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2259
1244
msgid " Difference between revision 3 and revision 1::"
1245
msgstr ""
1246
1247
#: bzrlib/builtins.py:2261
1248
msgid " bzr diff -r1..3"
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:2263
1252
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1253
msgstr ""
1254
1255
#: bzrlib/builtins.py:2265
1256
msgid " bzr diff -r1..3 xxx"
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2267
1260
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1261
msgstr ""
1262
1263
#: bzrlib/builtins.py:2269
1264
msgid " bzr diff -c2"
1265
msgstr ""
1266
1267
#: bzrlib/builtins.py:2271
1268
msgid ""
1269
" To see the changes introduced by revision X::\n"
1270
" \n"
1271
" bzr diff -cX"
1272
msgstr ""
1273
1274
#: bzrlib/builtins.py:2275
1275
msgid ""
1276
" Note that in the case of a merge, the -c option shows the changes\n"
1277
" compared to the left hand parent. To see the changes against\n"
1278
" another parent, use::"
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2279
1282
msgid " bzr diff -r<chosen_parent>..X"
1283
msgstr ""
1284
1285
#: bzrlib/builtins.py:2281
1286
msgid ""
1287
" The changes between the current revision and the previous revision\n"
1288
" (equivalent to -c-1 and -r-2..-1)"
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2284
1292
msgid " bzr diff -r-2.."
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2286
1296
msgid " Show just the differences for file NEWS::"
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2288
1300
msgid " bzr diff NEWS"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2290
1304
msgid " Show the differences in working tree xxx for file NEWS::"
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2292
1308
msgid " bzr diff xxx/NEWS"
1309
msgstr ""
1310
1311
#: bzrlib/builtins.py:2294
1312
msgid " Show the differences from branch xxx to this working tree:"
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2296
1316
msgid " bzr diff --old xxx"
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2298
1320
msgid " Show the differences between two branches for file NEWS::"
1321
msgstr ""
1322
1323
#: bzrlib/builtins.py:2300
1324
msgid " bzr diff --old xxx --new yyy NEWS"
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2302
1328
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1329
msgstr ""
1330
1331
#: bzrlib/builtins.py:2304
1332
msgid ""
1333
" bzr diff --prefix old/:new/\n"
1334
" \n"
1335
" Show the differences using a custom diff program with options::\n"
1336
" \n"
1337
" bzr diff --using /usr/bin/diff --diff-options -wu"
1338
msgstr ""
1339
1340
#: bzrlib/builtins.py:2314
1341
msgid "Pass these options to the external diff program."
1342
msgstr ""
1343
1344
#: bzrlib/builtins.py:2317
1345
msgid ""
1346
"Set prefixes added to old and new filenames, as two values separated by a "
1347
"colon. (eg \"old/:new/\")."
1348
msgstr ""
1349
1350
#: bzrlib/builtins.py:2320
1351
msgid "Branch/tree to compare from."
1352
msgstr ""
1353
1354
#: bzrlib/builtins.py:2324
1355
msgid "Branch/tree to compare to."
1356
msgstr ""
1357
1358
#: bzrlib/builtins.py:2330
1359
msgid "Use this command to compare files."
1360
msgstr ""
1361
1362
#: bzrlib/builtins.py:2335
1363
msgid "Diff format to use."
1364
msgstr ""
1365
1366
#: bzrlib/builtins.py:2337
1367
msgid "Diff format"
1368
msgstr ""
1369
1370
#: bzrlib/builtins.py:2359
1371
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1372
msgstr ""
1373
1374
#: bzrlib/builtins.py:2363
1375
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1376
msgstr ""
1377
1378
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1379
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1380
msgid "{0} and {1} are mutually exclusive"
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2388
1384
msgid ""
1385
"List files deleted in the working tree.\n"
1386
" "
1387
msgstr ""
1388
1389
#: bzrlib/builtins.py:2465
1390
msgid "Show the tree root directory."
1391
msgstr ""
1392
1393
#: bzrlib/builtins.py:2467
1394
msgid ""
1395
"The root is the nearest enclosing directory with a .bzr control\n"
1396
"directory."
1397
msgstr ""
1398
1399
#: bzrlib/builtins.py:2482
1400
msgid "The limit argument must be an integer."
1401
msgstr ""
1402
1403
#: bzrlib/builtins.py:2490
1404
msgid "The levels argument must be an integer."
1405
msgstr ""
1406
1407
#: bzrlib/builtins.py:2495
1408
msgid "Show historical log for a branch or subset of a branch."
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2497
1412
msgid ""
1413
"log is bzr's default tool for exploring the history of a branch.\n"
1414
"The branch to use is taken from the first parameter. If no parameters\n"
1415
"are given, the branch containing the working directory is logged.\n"
1416
"Here are some simple examples::"
1417
msgstr ""
1418
1419
#: bzrlib/builtins.py:2502
1420
msgid ""
1421
" bzr log log the current branch\n"
1422
" bzr log foo.py log a file in its branch\n"
1423
" bzr log http://server/branch log a branch on a server"
1424
msgstr ""
1425
1426
#: bzrlib/builtins.py:2506
1427
msgid ""
1428
"The filtering, ordering and information shown for each revision can\n"
1429
"be controlled as explained below. By default, all revisions are\n"
1430
"shown sorted (topologically) so that newer revisions appear before\n"
1431
"older ones and descendants always appear before ancestors. If displayed,\n"
1432
"merged revisions are shown indented under the revision in which they\n"
1433
"were merged."
1434
msgstr ""
1435
1436
#: bzrlib/builtins.py:2513
1437
msgid ":Output control:"
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2515
1441
msgid ""
1442
" The log format controls how information about each revision is\n"
1443
" displayed. The standard log formats are called ``long``, ``short``\n"
1444
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1445
" for more details on log formats."
1446
msgstr ""
1447
1448
#: bzrlib/builtins.py:2520
1449
msgid ""
1450
" The following options can be used to control what information is\n"
1451
" displayed::"
1452
msgstr ""
1453
1454
#: bzrlib/builtins.py:2523
1455
msgid ""
1456
" -l N display a maximum of N revisions\n"
1457
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1458
" -v display a status summary (delta) for each revision\n"
1459
" -p display a diff (patch) for each revision\n"
1460
" --show-ids display revision-ids (and file-ids), not just revnos"
1461
msgstr ""
1462
1463
#: bzrlib/builtins.py:2529
1464
msgid ""
1465
" Note that the default number of levels to display is a function of the\n"
1466
" log format. If the -n option is not used, the standard log formats show\n"
1467
" just the top level (mainline)."
1468
msgstr ""
1469
1470
#: bzrlib/builtins.py:2533
1471
msgid ""
1472
" Status summaries are shown using status flags like A, M, etc. To see\n"
1473
" the changes explained using words like ``added`` and ``modified``\n"
1474
" instead, use the -vv option."
1475
msgstr ""
1476
1477
#: bzrlib/builtins.py:2537
1478
msgid ":Ordering control:"
1479
msgstr ""
1480
1481
#: bzrlib/builtins.py:2539
1482
msgid ""
1483
" To display revisions from oldest to newest, use the --forward option.\n"
1484
" In most cases, using this option will have little impact on the total\n"
1485
" time taken to produce a log, though --forward does not incrementally\n"
1486
" display revisions like --reverse does when it can."
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2544
1490
msgid ":Revision filtering:"
1491
msgstr ""
1492
1493
#: bzrlib/builtins.py:2546
1494
msgid ""
1495
" The -r option can be used to specify what revision or range of revisions\n"
1496
" to filter against. The various forms are shown below::"
1497
msgstr ""
1498
1499
#: bzrlib/builtins.py:2549
1500
msgid ""
1501
" -rX display revision X\n"
1502
" -rX.. display revision X and later\n"
1503
" -r..Y display up to and including revision Y\n"
1504
" -rX..Y display from X to Y inclusive"
1505
msgstr ""
1506
1507
#: bzrlib/builtins.py:2554
1508
msgid ""
1509
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1510
" Some common examples are given below::"
1511
msgstr ""
1512
1513
#: bzrlib/builtins.py:2557
1514
msgid ""
1515
" -r-1 show just the tip\n"
1516
" -r-10.. show the last 10 mainline revisions\n"
1517
" -rsubmit:.. show what's new on this branch\n"
1518
" -rancestor:path.. show changes since the common ancestor of this\n"
1519
" branch and the one at location path\n"
1520
" -rdate:yesterday.. show changes since yesterday"
1521
msgstr ""
1522
" -r-1 visualizza solo il suggerimento\n"
1523
" -r-10.. visualizza le ultime 10 revisioni mainline\n"
1524
" -rsubmit:.. visualizza quanto di nuovo c'è sul branch\n"
1525
" -rancestor:path.. visualizza le modifiche rispetto al comune "
1526
"predecessore di questo\n"
1527
" branch e di quello nel percorso di locazione \n"
1528
" -rdate:yesterday.. visualizza le modifiche riespetto al giorno precedente"
1529
1530
#: bzrlib/builtins.py:2564
1531
msgid ""
1532
" When logging a range of revisions using -rX..Y, log starts at\n"
1533
" revision Y and searches back in history through the primary\n"
1534
" (\"left-hand\") parents until it finds X. When logging just the\n"
1535
" top level (using -n1), an error is reported if X is not found\n"
1536
" along the way. If multi-level logging is used (-n0), X may be\n"
1537
" a nested merge revision and the log will be truncated accordingly."
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2571
1541
msgid ":Path filtering:"
1542
msgstr ""
1543
1544
#: bzrlib/builtins.py:2573
1545
msgid ""
1546
" If parameters are given and the first one is not a branch, the log\n"
1547
" will be filtered to show only those revisions that changed the\n"
1548
" nominated files or directories."
1549
msgstr ""
1550
1551
#: bzrlib/builtins.py:2577
1552
msgid ""
1553
" Filenames are interpreted within their historical context. To log a\n"
1554
" deleted file, specify a revision range so that the file existed at\n"
1555
" the end or start of the range."
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2581
1559
msgid ""
1560
" Historical context is also important when interpreting pathnames of\n"
1561
" renamed files/directories. Consider the following example:"
1562
msgstr ""
1563
1564
#: bzrlib/builtins.py:2584
1565
msgid ""
1566
" * revision 1: add tutorial.txt\n"
1567
" * revision 2: modify tutorial.txt\n"
1568
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1569
msgstr ""
1570
" * revision 1: add tutorial.txt\n"
1571
" * revision 2: modify tutorial.txt\n"
1572
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1573
1574
#: bzrlib/builtins.py:2588
1575
msgid " In this case:"
1576
msgstr ""
1577
1578
#: bzrlib/builtins.py:2590
1579
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1580
msgstr ""
1581
1582
#: bzrlib/builtins.py:2592
1583
msgid ""
1584
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1585
msgstr ""
1586
1587
#: bzrlib/builtins.py:2594
1588
msgid ""
1589
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1590
" the original file in revision 2."
1591
msgstr ""
1592
1593
#: bzrlib/builtins.py:2597
1594
msgid ""
1595
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1596
" was no file called guide.txt in revision 2."
1597
msgstr ""
1598
1599
#: bzrlib/builtins.py:2600
1600
msgid ""
1601
" Renames are always followed by log. By design, there is no need to\n"
1602
" explicitly ask for this (and no way to stop logging a file back\n"
1603
" until it was last renamed)."
1604
msgstr ""
1605
1606
#: bzrlib/builtins.py:2604
1607
msgid ":Other filtering:"
1608
msgstr ""
1609
1610
#: bzrlib/builtins.py:2606
1611
msgid ""
1612
" The --match option can be used for finding revisions that match a\n"
1613
" regular expression in a commit message, committer, author or bug.\n"
1614
" Specifying the option several times will match any of the supplied\n"
1615
" expressions. --match-author, --match-bugs, --match-committer and\n"
1616
" --match-message can be used to only match a specific field."
1617
msgstr ""
1618
1619
#: bzrlib/builtins.py:2612
1620
msgid ":Tips & tricks:"
1621
msgstr ""
1622
1623
#: bzrlib/builtins.py:2614
1624
msgid ""
1625
" GUI tools and IDEs are often better at exploring history than command\n"
1626
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1627
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1628
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1629
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1630
msgstr ""
1631
" Nell'esplorazione della cronologia gli strumenti GUI e gli IDE sono spesso "
1632
"migliori\n"
1633
" di quelli da riga di comando: può risultare preferibile qlog o viz da qbzr "
1634
"o bzr_gtk,\n"
1635
" la shell bzr-explorer o l'interfaccia web Loggerhead. Consultare la Guida "
1636
"ai\n"
1637
" plugin <http://doc.bazaar.canonical.com/plugins/en/> e\n"
1638
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1639
1640
#: bzrlib/builtins.py:2620
1641
msgid ""
1642
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1643
msgstr ""
1644
1645
#: bzrlib/builtins.py:2622
1646
msgid ""
1647
" [ALIASES]\n"
1648
" tip = log -r-1\n"
1649
" top = log -l10 --line\n"
1650
" show = log -v -p"
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2627
1654
msgid ""
1655
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1656
" will show the last 10 mainline revisions. To see the details of a\n"
1657
" particular revision X, ``bzr show -rX``."
1658
msgstr ""
1659
1660
#: bzrlib/builtins.py:2631
1661
msgid ""
1662
" If you are interested in looking deeper into a particular merge X,\n"
1663
" use ``bzr log -n0 -rX``."
1664
msgstr ""
1665
1666
#: bzrlib/builtins.py:2634
1667
msgid ""
1668
" ``bzr log -v`` on a branch with lots of history is currently\n"
1669
" very slow. A fix for this issue is currently under development.\n"
1670
" With or without that fix, it is recommended that a revision range\n"
1671
" be given when using the -v option."
1672
msgstr ""
1673
1674
#: bzrlib/builtins.py:2639
1675
msgid ""
1676
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1677
" used to find revisions matching user names, commit messages, etc.\n"
1678
" Among other features, this plugin can find all revisions containing\n"
1679
" a list of words but not others."
1680
msgstr ""
1681
1682
#: bzrlib/builtins.py:2644
1683
msgid ""
1684
" When exploring non-mainline history on large projects with deep\n"
1685
" history, the performance of log can be greatly improved by installing\n"
1686
" the historycache plugin. This plugin buffers historical information\n"
1687
" trading disk space for faster speed."
1688
msgstr ""
1689
1690
#: bzrlib/builtins.py:2653
1691
msgid "Show from oldest to newest."
1692
msgstr ""
1693
1694
#: bzrlib/builtins.py:2656
1695
msgid "Show files changed in each revision."
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:2662
1699
msgid "Show just the specified revision. See also \"help revisionspec\"."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2666
1703
msgid "What names to list as authors - first, all or committer."
1704
msgstr ""
1705
1706
#: bzrlib/builtins.py:2667
1707
msgid "Authors"
1708
msgstr ""
1709
1710
#: bzrlib/builtins.py:2672
1711
msgid "Number of levels to display - 0 for all, 1 for flat."
1712
msgstr ""
1713
1714
#: bzrlib/builtins.py:2682
1715
msgid "Limit the output to the first N revisions."
1716
msgstr ""
1717
1718
#: bzrlib/builtins.py:2687
1719
msgid "Show changes made in each revision as a patch."
1720
msgstr ""
1721
1722
#: bzrlib/builtins.py:2689
1723
msgid "Show merged revisions like --levels 0 does."
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2693
1727
msgid "Do not report commits with more than one parent."
1728
msgstr ""
1729
1730
#: bzrlib/builtins.py:2695
1731
msgid ""
1732
"Display only the revisions that are not part of both ancestries (require -"
1733
"rX..Y)."
1734
msgstr ""
1735
1736
#: bzrlib/builtins.py:2699
1737
msgid "Show digital signature validity."
1738
msgstr ""
1739
1740
#: bzrlib/builtins.py:2702
1741
msgid "Show revisions whose properties match this expression."
1742
msgstr ""
1743
1744
#: bzrlib/builtins.py:2706
1745
msgid "Show revisions whose message matches this expression."
1746
msgstr ""
1747
1748
#: bzrlib/builtins.py:2710
1749
msgid "Show revisions whose committer matches this expression."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2714
1753
msgid "Show revisions whose authors match this expression."
1754
msgstr ""
1755
"Visualizza le revisioni i cui autori corrispondono a questa espressione."
1756
1757
#: bzrlib/builtins.py:2718
1758
msgid "Show revisions whose bugs match this expression."
1759
msgstr ""
1760
"Visualizza le revisioni i cui bug corrispondono a questa espressione."
1761
1762
#: bzrlib/builtins.py:2772
1763
msgid "--exclude-common-ancestry requires -r with two revisions"
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2800
1767
#, python-format
1768
msgid "Path unknown at end or start of revision range: %s"
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2917
1772
#, python-format
1773
msgid "bzr %s doesn't accept two revisions in different branches."
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2933
1777
#, python-format
1778
msgid "bzr %s --revision takes one or two values."
1779
msgstr ""
1780
1781
#: bzrlib/builtins.py:2978
1782
msgid ""
1783
"List files in a tree.\n"
1784
" "
1785
msgstr ""
1786
1787
#: bzrlib/builtins.py:2987
1788
msgid "Recurse into subdirectories."
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:2989
1792
msgid "Print paths relative to the root of the branch."
1793
msgstr ""
1794
1795
#: bzrlib/builtins.py:2991
1796
msgid "Print unknown files."
1797
msgstr ""
1798
1799
#: bzrlib/builtins.py:2992
1800
msgid "Print versioned files."
1801
msgstr ""
1802
1803
#: bzrlib/builtins.py:2995
1804
msgid "Print ignored files."
1805
msgstr ""
1806
1807
#: bzrlib/builtins.py:2997
1808
msgid "List entries of a particular kind: file, directory, symlink."
1809
msgstr ""
1810
1811
#: bzrlib/builtins.py:3010
1812
msgid "invalid kind specified"
1813
msgstr ""
1814
1815
#: bzrlib/builtins.py:3013
1816
msgid "Cannot set both --verbose and --null"
1817
msgstr ""
1818
1819
#: bzrlib/builtins.py:3022
1820
msgid "cannot specify both --from-root and PATH"
1821
msgstr ""
1822
1823
#: bzrlib/builtins.py:3109
1824
msgid "Ignore specified files or patterns."
1825
msgstr ""
1826
1827
#: bzrlib/builtins.py:3111
1828
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1829
msgstr ""
1830
1831
#: bzrlib/builtins.py:3113
1832
msgid ""
1833
"If a .bzrignore file does not exist, the ignore command\n"
1834
"will create one and add the specified files or patterns to the newly\n"
1835
"created file. The ignore command will also automatically add the \n"
1836
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1837
"the use of the ignore command will require an explicit add command."
1838
msgstr ""
1839
1840
#: bzrlib/builtins.py:3119
1841
msgid ""
1842
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1843
"After adding, editing or deleting that file either indirectly by\n"
1844
"using this command or directly by using an editor, be sure to commit\n"
1845
"it."
1846
msgstr ""
1847
1848
#: bzrlib/builtins.py:3124
1849
msgid ""
1850
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1851
"the global ignore file can be found in the application data directory as\n"
1852
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1853
"Global ignores are not touched by this command. The global ignore file\n"
1854
"can be edited directly using an editor."
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:3130
1858
msgid ""
1859
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1860
"precedence over regular ignores. Such exceptions are used to specify\n"
1861
"files that should be versioned which would otherwise be ignored."
1862
msgstr ""
1863
1864
#: bzrlib/builtins.py:3134
1865
msgid ""
1866
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1867
"precedence over the '!' exception patterns."
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:3137
1871
msgid ""
1872
":Notes: \n"
1873
" \n"
1874
"* Ignore patterns containing shell wildcards must be quoted from\n"
1875
" the shell on Unix."
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:3142
1879
msgid ""
1880
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1881
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1882
msgstr ""
1883
1884
#: bzrlib/builtins.py:3145
1885
msgid ""
1886
":Examples:\n"
1887
" Ignore the top level Makefile::"
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3148
1891
msgid " bzr ignore ./Makefile"
1892
msgstr ""
1893
1894
#: bzrlib/builtins.py:3150
1895
msgid " Ignore .class files in all directories...::"
1896
msgstr ""
1897
1898
#: bzrlib/builtins.py:3152
1899
msgid " bzr ignore \"*.class\""
1900
msgstr ""
1901
1902
#: bzrlib/builtins.py:3154
1903
msgid " ...but do not ignore \"special.class\"::"
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3156
1907
msgid " bzr ignore \"!special.class\""
1908
msgstr ""
1909
1910
#: bzrlib/builtins.py:3158
1911
msgid " Ignore files whose name begins with the \"#\" character::"
1912
msgstr ""
1913
1914
#: bzrlib/builtins.py:3160
1915
msgid " bzr ignore \"RE:^#\""
1916
msgstr ""
1917
1918
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1919
msgid " Ignore .o files under the lib directory::"
1920
msgstr ""
1921
1922
#: bzrlib/builtins.py:3164
1923
msgid " bzr ignore \"lib/**/*.o\""
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:3168
1927
msgid " bzr ignore \"RE:lib/.*\\.o\""
1928
msgstr ""
1929
1930
#: bzrlib/builtins.py:3170
1931
msgid " Ignore everything but the \"debian\" toplevel directory::"
1932
msgstr ""
1933
1934
#: bzrlib/builtins.py:3172
1935
msgid ""
1936
" bzr ignore \"RE:(?!debian/).*\"\n"
1937
" \n"
1938
" Ignore everything except the \"local\" toplevel directory,\n"
1939
" but always ignore autosave files ending in ~, even under local/::\n"
1940
" \n"
1941
" bzr ignore \"*\"\n"
1942
" bzr ignore \"!./local\"\n"
1943
" bzr ignore \"!!*~\""
1944
msgstr ""
1945
1946
#: bzrlib/builtins.py:3186
1947
msgid "Display the default ignore rules that bzr uses."
1948
msgstr ""
1949
1950
#: bzrlib/builtins.py:3198
1951
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:3209
1955
#, python-format
1956
msgid "Invalid ignore pattern found. %s"
1957
msgid_plural "Invalid ignore patterns found. %s"
1958
msgstr[0] ""
1959
msgstr[1] ""
1960
1961
#: bzrlib/builtins.py:3218
1962
msgid "NAME_PATTERN should not be an absolute path"
1963
msgstr ""
1964
1965
#: bzrlib/builtins.py:3231
1966
#, python-format
1967
msgid ""
1968
"Warning: the following files are version controlled and match your ignore "
1969
"pattern:\n"
1970
"%s\n"
1971
"These files will continue to be version controlled unless you 'bzr remove' "
1972
"them.\n"
1973
msgstr ""
1974
1975
#: bzrlib/builtins.py:3238
1976
msgid "List ignored files and the patterns that matched them."
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:3240
1980
msgid ""
1981
"List all the ignored files and the ignore pattern that caused the file to\n"
1982
"be ignored."
1983
msgstr ""
1984
1985
#: bzrlib/builtins.py:3243
1986
msgid "Alternatively, to list just the files::"
1987
msgstr ""
1988
1989
#: bzrlib/builtins.py:3245
1990
msgid " bzr ls --ignored"
1991
msgstr ""
1992
1993
#: bzrlib/builtins.py:3279
1994
#, python-format
1995
msgid "not a valid revision-number: %r"
1996
msgstr ""
1997
1998
#: bzrlib/builtins.py:3286
1999
msgid ""
2000
"Export current or past revision to a destination directory or archive."
2001
msgstr ""
2002
2003
#: bzrlib/builtins.py:3288
2004
msgid "If no revision is specified this exports the last committed revision."
2005
msgstr ""
2006
2007
#: bzrlib/builtins.py:3290
2008
msgid ""
2009
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2010
"given, try to find the format with the extension. If no extension\n"
2011
"is found exports to a directory (equivalent to --format=dir)."
2012
msgstr ""
2013
2014
#: bzrlib/builtins.py:3294
2015
msgid ""
2016
"If root is supplied, it will be used as the root directory inside\n"
2017
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2018
"to the exported filename. The root option has no effect for 'dir' format."
2019
msgstr ""
2020
2021
#: bzrlib/builtins.py:3298
2022
msgid ""
2023
"If branch is omitted then the branch containing the current working\n"
2024
"directory will be used."
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3301
2028
msgid ""
2029
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3303
2033
msgid ""
2034
" ================= =========================\n"
2035
" Supported formats Autodetected by extension\n"
2036
" ================= =========================\n"
2037
" dir (none)\n"
2038
" tar .tar\n"
2039
" tbz2 .tar.bz2, .tbz2\n"
2040
" tgz .tar.gz, .tgz\n"
2041
" zip .zip\n"
2042
" ================= ========================="
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3317
2046
msgid "Type of file to export to."
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3320
2050
msgid "Apply content filters to export the convenient form."
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3324
2054
msgid "Name of the root directory inside the exported file."
2055
msgstr ""
2056
2057
#: bzrlib/builtins.py:3326
2058
msgid ""
2059
"Set modification time of files to that of the last revision in which it was "
2060
"changed."
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3329
2064
msgid ""
2065
"Export the working tree contents rather than that of the last revision."
2066
msgstr ""
2067
2068
#: bzrlib/builtins.py:3348
2069
msgid "--uncommitted requires a working tree"
2070
msgstr ""
2071
2072
#: bzrlib/builtins.py:3357
2073
#, python-format
2074
msgid "Unsupported export format: %s"
2075
msgstr ""
2076
2077
#: bzrlib/builtins.py:3361
2078
msgid ""
2079
"Write the contents of a file as of a given revision to standard output."
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3363
2083
msgid "If no revision is nominated, the last revision is used."
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3365
2087
msgid ""
2088
"Note: Take care to redirect standard output when using this command on a\n"
2089
"binary file."
2090
msgstr ""
2091
2092
#: bzrlib/builtins.py:3371
2093
msgid "The path name in the old tree."
2094
msgstr ""
2095
2096
#: bzrlib/builtins.py:3372
2097
msgid "Apply content filters to display the convenience form."
2098
msgstr ""
2099
2100
#: bzrlib/builtins.py:3383
2101
msgid "bzr cat --revision takes exactly one revision specifier"
2102
msgstr ""
2103
2104
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2105
msgid "{0!r} is not present in revision {1}"
2106
msgstr ""
2107
2108
#: bzrlib/builtins.py:3443
2109
msgid "Commit changes into a new revision."
2110
msgstr ""
2111
2112
#: bzrlib/builtins.py:3445
2113
msgid ""
2114
"An explanatory message needs to be given for each commit. This is\n"
2115
"often done by using the --message option (getting the message from the\n"
2116
"command line) or by using the --file option (getting the message from\n"
2117
"a file). If neither of these options is given, an editor is opened for\n"
2118
"the user to enter the message. To see the changed files in the\n"
2119
"boilerplate text loaded into the editor, use the --show-diff option."
2120
msgstr ""
2121
2122
#: bzrlib/builtins.py:3452
2123
msgid ""
2124
"By default, the entire tree is committed and the person doing the\n"
2125
"commit is assumed to be the author. These defaults can be overridden\n"
2126
"as explained below."
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3456
2130
msgid ":Selective commits:"
2131
msgstr ""
2132
2133
#: bzrlib/builtins.py:3458
2134
msgid ""
2135
" If selected files are specified, only changes to those files are\n"
2136
" committed. If a directory is specified then the directory and\n"
2137
" everything within it is committed."
2138
msgstr ""
2139
2140
#: bzrlib/builtins.py:3462
2141
msgid ""
2142
" When excludes are given, they take precedence over selected files.\n"
2143
" For example, to commit only changes within foo, but not changes\n"
2144
" within foo/bar::"
2145
msgstr ""
2146
2147
#: bzrlib/builtins.py:3466
2148
msgid " bzr commit foo -x foo/bar"
2149
msgstr ""
2150
2151
#: bzrlib/builtins.py:3468
2152
msgid " A selective commit after a merge is not yet supported."
2153
msgstr ""
2154
2155
#: bzrlib/builtins.py:3470
2156
msgid ":Custom authors:"
2157
msgstr ""
2158
2159
#: bzrlib/builtins.py:3472
2160
msgid ""
2161
" If the author of the change is not the same person as the committer,\n"
2162
" you can specify the author's name using the --author option. The\n"
2163
" name should be in the same format as a committer-id, e.g.\n"
2164
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2165
" the change you can specify the option multiple times, once for each\n"
2166
" author."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3479
2170
msgid ":Checks:"
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3481
2174
msgid ""
2175
" A common mistake is to forget to add a new file or directory before\n"
2176
" running the commit command. The --strict option checks for unknown\n"
2177
" files and aborts the commit if any are found. More advanced pre-commit\n"
2178
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2179
" for details."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3487
2183
msgid ":Things to note:"
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3489
2187
msgid ""
2188
" If you accidentially commit the wrong changes or make a spelling\n"
2189
" mistake in the commit message say, you can use the uncommit command\n"
2190
" to undo it. See ``bzr help uncommit`` for details."
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3493
2194
msgid ""
2195
" Hooks can also be configured to run after a commit. This allows you\n"
2196
" to trigger updates to external systems like bug trackers. The --fixes\n"
2197
" option can be used to record the association between a revision and\n"
2198
" one or more bugs. See ``bzr help bugs`` for details."
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3503
2202
msgid "Do not consider changes made to a given path."
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3506
2206
msgid "Description of the new revision."
2207
msgstr ""
2208
2209
#: bzrlib/builtins.py:3509
2210
msgid "Commit even if nothing has changed."
2211
msgstr ""
2212
2213
#: bzrlib/builtins.py:3513
2214
msgid "Take commit message from this file."
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3515
2218
msgid "Refuse to commit if there are unknown files in the working tree."
2219
msgstr ""
2220
2221
#: bzrlib/builtins.py:3518
2222
msgid ""
2223
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2224
"08:00:00 +0100'."
2225
msgstr ""
2226
2227
#: bzrlib/builtins.py:3521
2228
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2229
msgstr ""
2230
2231
#: bzrlib/builtins.py:3524
2232
msgid "Set the author's name, if it's different from the committer."
2233
msgstr ""
2234
2235
#: bzrlib/builtins.py:3527
2236
msgid ""
2237
"Perform a local commit in a bound branch. Local commits are not pushed to "
2238
"the master branch until a normal commit is performed."
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:3533
2242
msgid ""
2243
"When no message is supplied, show the diff along with the status summary in "
2244
"the message editor."
2245
msgstr ""
2246
2247
#: bzrlib/builtins.py:3536
2248
msgid ""
2249
"When committing to a foreign version control system do not push data that "
2250
"can not be natively represented."
2251
msgstr ""
2252
2253
#: bzrlib/builtins.py:3554
2254
#, python-format
2255
msgid ""
2256
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2257
"default bug tracker using the `bugtracker` option.\n"
2258
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2259
msgstr ""
2260
2261
#: bzrlib/builtins.py:3563
2262
#, python-format
2263
msgid ""
2264
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2265
"for more information on this feature.\n"
2266
"Commit refused."
2267
msgstr ""
2268
2269
#: bzrlib/builtins.py:3572
2270
#, python-format
2271
msgid "Unrecognized bug %s. Commit refused."
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3575
2275
#, python-format
2276
msgid ""
2277
"%s\n"
2278
"Commit refused."
2279
msgstr ""
2280
2281
#: bzrlib/builtins.py:3599
2282
msgid "Could not parse --commit-time: "
2283
msgstr ""
2284
2285
#: bzrlib/builtins.py:3639
2286
msgid "please specify either --message or --file"
2287
msgstr ""
2288
2289
#: bzrlib/builtins.py:3668
2290
msgid "please specify a commit message with either --message or --file"
2291
msgstr ""
2292
2293
#: bzrlib/builtins.py:3671
2294
msgid ""
2295
"Empty commit message specified. Please specify a commit message with either -"
2296
"-message or --file or leave a blank message with --message \"\"."
2297
msgstr ""
2298
2299
#: bzrlib/builtins.py:3691
2300
msgid ""
2301
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2302
"-unchanged to force an empty commit."
2303
msgstr ""
2304
2305
#: bzrlib/builtins.py:3695
2306
msgid ""
2307
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2308
"resolve FILE\" to resolve."
2309
msgstr ""
2310
2311
#: bzrlib/builtins.py:3699
2312
msgid "Commit refused because there are unknown files in the working tree."
2313
msgstr ""
2314
2315
#: bzrlib/builtins.py:3702
2316
msgid ""
2317
"\n"
2318
"To commit to master branch, run update and then commit.\n"
2319
"You can also pass --local to commit to continue working disconnected."
2320
msgstr ""
2321
2322
#: bzrlib/builtins.py:3710
2323
msgid ""
2324
"Validate working tree structure, branch consistency and repository history."
2325
msgstr ""
2326
2327
#: bzrlib/builtins.py:3712
2328
msgid ""
2329
"This command checks various invariants about branch and repository storage\n"
2330
"to detect data corruption or bzr bugs."
2331
msgstr ""
2332
2333
#: bzrlib/builtins.py:3715
2334
msgid ""
2335
"The working tree and branch checks will only give output if a problem is\n"
2336
"detected. The output fields of the repository check are:"
2337
msgstr ""
2338
2339
#: bzrlib/builtins.py:3718
2340
msgid ""
2341
"revisions\n"
2342
" This is just the number of revisions checked. It doesn't\n"
2343
" indicate a problem."
2344
msgstr ""
2345
2346
#: bzrlib/builtins.py:3722
2347
msgid ""
2348
"versionedfiles\n"
2349
" This is just the number of versionedfiles checked. It\n"
2350
" doesn't indicate a problem."
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3726
2354
msgid ""
2355
"unreferenced ancestors\n"
2356
" Texts that are ancestors of other texts, but\n"
2357
" are not properly referenced by the revision ancestry. This is a\n"
2358
" subtle problem that Bazaar can work around."
2359
msgstr ""
2360
2361
#: bzrlib/builtins.py:3731
2362
msgid ""
2363
"unique file texts\n"
2364
" This is the total number of unique file contents\n"
2365
" seen in the checked revisions. It does not indicate a problem."
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3735
2369
msgid ""
2370
"repeated file texts\n"
2371
" This is the total number of repeated texts seen\n"
2372
" in the checked revisions. Texts can be repeated when their file\n"
2373
" entries are modified, but the file contents are not. It does not\n"
2374
" indicate a problem."
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3741
2378
msgid ""
2379
"If no restrictions are specified, all Bazaar data that is found at the "
2380
"given\n"
2381
"location will be checked."
2382
msgstr ""
2383
2384
#: bzrlib/builtins.py:3746
2385
msgid " Check the tree and branch at 'foo'::"
2386
msgstr ""
2387
2388
#: bzrlib/builtins.py:3748
2389
msgid " bzr check --tree --branch foo"
2390
msgstr ""
2391
2392
#: bzrlib/builtins.py:3750
2393
msgid " Check only the repository at 'bar'::"
2394
msgstr ""
2395
2396
#: bzrlib/builtins.py:3752
2397
msgid " bzr check --repo bar"
2398
msgstr ""
2399
2400
#: bzrlib/builtins.py:3754
2401
msgid " Check everything at 'baz'::"
2402
msgstr ""
2403
2404
#: bzrlib/builtins.py:3756
2405
msgid " bzr check baz"
2406
msgstr ""
2407
2408
#: bzrlib/builtins.py:3762
2409
msgid "Check the branch related to the current directory."
2410
msgstr ""
2411
2412
#: bzrlib/builtins.py:3764
2413
msgid "Check the repository related to the current directory."
2414
msgstr ""
2415
2416
#: bzrlib/builtins.py:3766
2417
msgid "Check the working tree related to the current directory."
2418
msgstr ""
2419
2420
#: bzrlib/builtins.py:3780
2421
msgid "Upgrade a repository, branch or working tree to a newer format."
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:3782
2425
msgid ""
2426
"When the default format has changed after a major new release of\n"
2427
"Bazaar, you may be informed during certain operations that you\n"
2428
"should upgrade. Upgrading to a newer format may improve performance\n"
2429
"or make new features available. It may however limit interoperability\n"
2430
"with older repositories or with older versions of Bazaar."
2431
msgstr ""
2432
2433
#: bzrlib/builtins.py:3788
2434
msgid ""
2435
"If you wish to upgrade to a particular format rather than the\n"
2436
"current default, that can be specified using the --format option.\n"
2437
"As a consequence, you can use the upgrade command this way to\n"
2438
"\"downgrade\" to an earlier format, though some conversions are\n"
2439
"a one way process (e.g. changing from the 1.x default to the\n"
2440
"2.x default) so downgrading is not always possible."
2441
msgstr ""
2442
2443
#: bzrlib/builtins.py:3795
2444
msgid ""
2445
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2446
"process (where # is a number). By default, this is left there on\n"
2447
"completion. If the conversion fails, delete the new .bzr directory\n"
2448
"and rename this one back in its place. Use the --clean option to ask\n"
2449
"for the backup.bzr directory to be removed on successful conversion.\n"
2450
"Alternatively, you can delete it by hand if everything looks good\n"
2451
"afterwards."
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3803
2455
msgid ""
2456
"If the location given is a shared repository, dependent branches\n"
2457
"are also converted provided the repository converts successfully.\n"
2458
"If the conversion of a branch fails, remaining branches are still\n"
2459
"tried."
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3808
2463
msgid ""
2464
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2465
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2466
msgstr ""
2467
2468
#: bzrlib/builtins.py:3816
2469
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2470
msgstr ""
2471
2472
#: bzrlib/builtins.py:3820
2473
msgid "Branch format"
2474
msgstr ""
2475
2476
#: bzrlib/builtins.py:3822
2477
msgid "Remove the backup.bzr directory if successful."
2478
msgstr ""
2479
2480
#: bzrlib/builtins.py:3824
2481
msgid "Show what would be done, but don't actually do anything."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3839
2485
msgid "Show or set bzr user id."
2486
msgstr ""
2487
2488
#: bzrlib/builtins.py:3841
2489
msgid ""
2490
":Examples:\n"
2491
" Show the email of the current user::"
2492
msgstr ""
2493
2494
#: bzrlib/builtins.py:3844
2495
msgid " bzr whoami --email"
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3846
2499
msgid " Set the current user::"
2500
msgstr ""
2501
2502
#: bzrlib/builtins.py:3848
2503
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2504
msgstr ""
2505
2506
#: bzrlib/builtins.py:3852
2507
msgid "Display email address only."
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3854
2511
msgid "Set identity for the current branch instead of globally."
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3880
2515
msgid "--email can only be used to display existing identity"
2516
msgstr ""
2517
2518
#: bzrlib/builtins.py:3904
2519
msgid "Print or set the branch nickname."
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3906
2523
msgid ""
2524
"If unset, the colocated branch name is used for colocated branches, and\n"
2525
"the branch directory name is used for other branches. To print the\n"
2526
"current nickname, execute with no argument."
2527
msgstr ""
2528
2529
#: bzrlib/builtins.py:3910
2530
msgid ""
2531
"Bound branches use the nickname of its master branch unless it is set\n"
2532
"locally."
2533
msgstr ""
2534
2535
#: bzrlib/builtins.py:3930
2536
msgid "Set/unset and display aliases."
2537
msgstr ""
2538
2539
#: bzrlib/builtins.py:3932
2540
msgid ""
2541
":Examples:\n"
2542
" Show the current aliases::"
2543
msgstr ""
2544
2545
#: bzrlib/builtins.py:3935
2546
msgid " bzr alias"
2547
msgstr ""
2548
2549
#: bzrlib/builtins.py:3937
2550
msgid " Show the alias specified for 'll'::"
2551
msgstr ""
2552
2553
#: bzrlib/builtins.py:3939
2554
msgid " bzr alias ll"
2555
msgstr ""
2556
2557
#: bzrlib/builtins.py:3941
2558
msgid " Set an alias for 'll'::"
2559
msgstr ""
2560
2561
#: bzrlib/builtins.py:3943
2562
msgid " bzr alias ll=\"log --line -r-10..-1\""
2563
msgstr ""
2564
2565
#: bzrlib/builtins.py:3945
2566
msgid " To remove an alias for 'll'::"
2567
msgstr ""
2568
2569
#: bzrlib/builtins.py:3947
2570
msgid " bzr alias --remove ll"
2571
msgstr ""
2572
2573
#: bzrlib/builtins.py:3952
2574
msgid "Remove the alias."
2575
msgstr ""
2576
2577
#: bzrlib/builtins.py:3970
2578
msgid "bzr alias --remove expects an alias to remove."
2579
msgstr ""
2580
2581
#: bzrlib/builtins.py:4151
2582
msgid ""
2583
"subunit not available. subunit needs to be installed to use --subunit."
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:4168
2587
msgid ""
2588
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2589
msgstr ""
2590
2591
#: bzrlib/builtins.py:4215
2592
msgid "Show version of bzr."
2593
msgstr ""
2594
2595
#: bzrlib/builtins.py:4219
2596
msgid "Print just the version number."
2597
msgstr ""
2598
2599
#: bzrlib/builtins.py:4238
2600
msgid "It sure does!\n"
2601
msgstr ""
2602
2603
#: bzrlib/builtins.py:4262
2604
#, python-format
2605
msgid "merge base is revision %s\n"
2606
msgstr ""
2607
2608
#: bzrlib/builtins.py:4266
2609
msgid "Perform a three-way merge."
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:4268
2613
msgid ""
2614
"The source of the merge can be specified either in the form of a branch,\n"
2615
"or in the form of a path to a file containing a merge directive generated\n"
2616
"with bzr send. If neither is specified, the default is the upstream branch\n"
2617
"or the branch most recently merged using --remember. The source of the\n"
2618
"merge may also be specified in the form of a path to a file in another\n"
2619
"branch: in this case, only the modifications to that file are merged into\n"
2620
"the current working tree."
2621
msgstr ""
2622
2623
#: bzrlib/builtins.py:4276
2624
msgid ""
2625
"When merging from a branch, by default bzr will try to merge in all new\n"
2626
"work from the other branch, automatically determining an appropriate base\n"
2627
"revision. If this fails, you may need to give an explicit base."
2628
msgstr ""
2629
2630
#: bzrlib/builtins.py:4280
2631
msgid ""
2632
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2633
"try to merge in all new work up to and including revision OTHER."
2634
msgstr ""
2635
2636
#: bzrlib/builtins.py:4283
2637
msgid ""
2638
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2639
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2640
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2641
"not already contain revision BASE, such a merge is commonly referred to as\n"
2642
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2643
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2644
"changes from the other branch is not stored in the commit."
2645
msgstr ""
2646
2647
#: bzrlib/builtins.py:4291
2648
msgid "Revision numbers are always relative to the source branch."
2649
msgstr ""
2650
2651
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2652
msgid ""
2653
"Merge will do its best to combine the changes in two branches, but there\n"
2654
"are some kinds of problems only a human can fix. When it encounters those,\n"
2655
"it will mark a conflict. A conflict means that you need to fix something,\n"
2656
"before you can commit."
2657
msgstr ""
2658
2659
#: bzrlib/builtins.py:4298
2660
msgid ""
2661
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:4300
2665
msgid ""
2666
"If there is no default branch set, the first merge will set it (use\n"
2667
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2668
"to use the default. To change the default, use --remember. The value will\n"
2669
"only be saved if the remote location can be accessed."
2670
msgstr ""
2671
2672
#: bzrlib/builtins.py:4305
2673
msgid ""
2674
"The results of the merge are placed into the destination working\n"
2675
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2676
"committed to record the result of the merge."
2677
msgstr ""
2678
2679
#: bzrlib/builtins.py:4309
2680
msgid ""
2681
"merge refuses to run if there are any uncommitted changes, unless\n"
2682
"--force is given. If --force is given, then the changes from the source \n"
2683
"will be merged with the current working tree, including any uncommitted\n"
2684
"changes in the tree. The --force option can also be used to create a\n"
2685
"merge revision which has more than two parents."
2686
msgstr ""
2687
2688
#: bzrlib/builtins.py:4315
2689
msgid ""
2690
"If one would like to merge changes from the working tree of the other\n"
2691
"branch without merging any committed revisions, the --uncommitted option\n"
2692
"can be given."
2693
msgstr ""
2694
2695
#: bzrlib/builtins.py:4319
2696
msgid ""
2697
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2698
"you to apply each diff hunk and file change, similar to \"shelve\"."
2699
msgstr ""
2700
2701
#: bzrlib/builtins.py:4322
2702
msgid ""
2703
":Examples:\n"
2704
" To merge all new revisions from bzr.dev::"
2705
msgstr ""
2706
2707
#: bzrlib/builtins.py:4325
2708
msgid " bzr merge ../bzr.dev"
2709
msgstr ""
2710
2711
#: bzrlib/builtins.py:4327
2712
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2713
msgstr ""
2714
2715
#: bzrlib/builtins.py:4329
2716
msgid " bzr merge -r 82 ../bzr.dev"
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4331
2720
msgid " To merge the changes introduced by 82, without previous changes::"
2721
msgstr ""
2722
2723
#: bzrlib/builtins.py:4333
2724
msgid " bzr merge -r 81..82 ../bzr.dev"
2725
msgstr ""
2726
2727
#: bzrlib/builtins.py:4335
2728
msgid " To apply a merge directive contained in /tmp/merge::"
2729
msgstr ""
2730
2731
#: bzrlib/builtins.py:4337
2732
msgid " bzr merge /tmp/merge"
2733
msgstr ""
2734
2735
#: bzrlib/builtins.py:4339
2736
msgid ""
2737
" To create a merge revision with three parents from two branches\n"
2738
" feature1a and feature1b:"
2739
msgstr ""
2740
2741
#: bzrlib/builtins.py:4342
2742
msgid ""
2743
" bzr merge ../feature1a\n"
2744
" bzr merge ../feature1b --force\n"
2745
" bzr commit -m 'revision with three parents'"
2746
msgstr ""
2747
2748
#: bzrlib/builtins.py:4354
2749
msgid "Merge even if the destination tree has uncommitted changes."
2750
msgstr ""
2751
2752
#: bzrlib/builtins.py:4360
2753
msgid ""
2754
"Apply uncommitted changes from a working copy, instead of branch changes."
2755
msgstr ""
2756
2757
#: bzrlib/builtins.py:4362
2758
msgid ""
2759
"If the destination is already completely merged into the source, pull from "
2760
"the source rather than merging. When this happens, you do not need to "
2761
"commit the result."
2762
msgstr ""
2763
2764
#: bzrlib/builtins.py:4367
2765
msgid ""
2766
"Branch to merge into, rather than the one containing the working directory."
2767
msgstr ""
2768
2769
#: bzrlib/builtins.py:4369
2770
msgid "Instead of merging, show a diff of the merge."
2771
msgstr ""
2772
2773
#: bzrlib/builtins.py:4371
2774
msgid "Select changes interactively."
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4393
2778
msgid ""
2779
"Merging into empty branches not currently supported, "
2780
"https://bugs.launchpad.net/bzr/+bug/308562"
2781
msgstr ""
2782
2783
#: bzrlib/builtins.py:4420
2784
msgid "Cannot use --uncommitted with bundles or merge directives."
2785
msgstr ""
2786
2787
#: bzrlib/builtins.py:4431
2788
msgid "Cannot use --uncommitted and --revision at the same time."
2789
msgstr ""
2790
2791
#: bzrlib/builtins.py:4451
2792
msgid "merger: "
2793
msgstr ""
2794
2795
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2796
msgid "Nothing to do."
2797
msgstr ""
2798
2799
#: bzrlib/builtins.py:4457
2800
msgid "Cannot pull individual files"
2801
msgstr ""
2802
2803
#: bzrlib/builtins.py:4465
2804
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2805
msgstr ""
2806
2807
#: bzrlib/builtins.py:4523
2808
#, python-format
2809
msgid "Show-base is not supported for this merge type. %s"
2810
msgstr ""
2811
2812
#: bzrlib/builtins.py:4532
2813
#, python-format
2814
msgid "Conflict reduction is not supported for merge type %s."
2815
msgstr ""
2816
2817
#: bzrlib/builtins.py:4536
2818
msgid "Cannot do conflict reduction and show base."
2819
msgstr ""
2820
2821
#: bzrlib/builtins.py:4647
2822
msgid "No location specified or remembered"
2823
msgstr ""
2824
2825
#: bzrlib/builtins.py:4649
2826
msgid "{0} remembered {1} location {2}"
2827
msgstr ""
2828
2829
#: bzrlib/builtins.py:4655
2830
msgid "Redo a merge."
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4657
2834
msgid ""
2835
"Use this if you want to try a different merge technique while resolving\n"
2836
"conflicts. Some merge techniques are better than others, and remerge\n"
2837
"lets you try different ones on different files."
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4661
2841
msgid ""
2842
"The options for remerge have the same meaning and defaults as the ones for\n"
2843
"merge. The difference is that remerge can (only) be run when there is a\n"
2844
"pending merge, and it lets you specify particular files."
2845
msgstr ""
2846
2847
#: bzrlib/builtins.py:4665
2848
msgid ""
2849
":Examples:\n"
2850
" Re-do the merge of all conflicted files, and show the base text in\n"
2851
" conflict regions, in addition to the usual THIS and OTHER texts::"
2852
msgstr ""
2853
2854
#: bzrlib/builtins.py:4669
2855
msgid " bzr remerge --show-base"
2856
msgstr ""
2857
2858
#: bzrlib/builtins.py:4671
2859
msgid ""
2860
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2861
" additional processing to reduce the size of conflict regions::"
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:4674
2865
msgid " bzr remerge --merge-type weave --reprocess foobar"
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:4681
2869
msgid "Show base revision text in conflicts."
2870
msgstr ""
2871
2872
#: bzrlib/builtins.py:4693
2873
msgid ""
2874
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2875
"merges."
2876
msgstr ""
2877
2878
#: bzrlib/builtins.py:4751
2879
msgid ""
2880
"Set files in the working tree back to the contents of a previous revision."
2881
msgstr ""
2882
2883
#: bzrlib/builtins.py:4753
2884
msgid ""
2885
"Giving a list of files will revert only those files. Otherwise, all files\n"
2886
"will be reverted. If the revision is not specified with '--revision', the\n"
2887
"working tree basis revision is used. A revert operation affects only the\n"
2888
"working tree, not any revision history like the branch and repository or\n"
2889
"the working tree basis revision."
2890
msgstr ""
2891
2892
#: bzrlib/builtins.py:4759
2893
msgid ""
2894
"To remove only some changes, without reverting to a prior version, use\n"
2895
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2896
"will remove the changes introduced by the second last commit (-2), without\n"
2897
"affecting the changes introduced by the last commit (-1). To remove\n"
2898
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2899
"To update the branch to a specific revision or the latest revision and\n"
2900
"update the working tree accordingly while preserving local changes, see the\n"
2901
"update command."
2902
msgstr ""
2903
2904
#: bzrlib/builtins.py:4768
2905
msgid ""
2906
"Uncommitted changes to files that are reverted will be discarded.\n"
2907
"Howver, by default, any files that have been manually changed will be\n"
2908
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2909
"files have '.~#~' appended to their name, where # is a number."
2910
msgstr ""
2911
2912
#: bzrlib/builtins.py:4773
2913
msgid ""
2914
"When you provide files, you can use their current pathname or the pathname\n"
2915
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2916
"name. If you name a directory, all the contents of that directory will be\n"
2917
"reverted."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4778
2921
msgid ""
2922
"If you have newly added files since the target revision, they will be\n"
2923
"removed. If the files to be removed have been changed, backups will be\n"
2924
"created as above. Directories containing unknown files will not be\n"
2925
"deleted."
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4783
2929
msgid ""
2930
"The working tree contains a list of revisions that have been merged but\n"
2931
"not yet committed. These revisions will be included as additional parents\n"
2932
"of the next commit. Normally, using revert clears that list as well as\n"
2933
"reverting the files. If any files are specified, revert leaves the list\n"
2934
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2935
".`` in the tree root to revert all files but keep the recorded merges,\n"
2936
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2937
"reverting any files."
2938
msgstr ""
2939
2940
#: bzrlib/builtins.py:4792
2941
msgid ""
2942
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2943
"changes from a branch in a single revision. To do this, perform the merge\n"
2944
"as desired. Then doing revert with the \"--forget-merges\" option will "
2945
"keep\n"
2946
"the content of the tree as it was, but it will clear the list of pending\n"
2947
"merges. The next commit will then contain all of the changes that are\n"
2948
"present in the other branch, but without any other parent revisions.\n"
2949
"Because this technique forgets where these changes originated, it may\n"
2950
"cause additional conflicts on later merges involving the same source and\n"
2951
"target branches."
2952
msgstr ""
2953
2954
#: bzrlib/builtins.py:4806
2955
msgid "Do not save backups of reverted files."
2956
msgstr ""
2957
2958
#: bzrlib/builtins.py:4808
2959
msgid "Remove pending merge marker, without changing any files."
2960
msgstr ""
2961
2962
#: bzrlib/builtins.py:4839
2963
msgid ""
2964
"Show help on a command or other topic.\n"
2965
" "
2966
msgstr ""
2967
2968
#: bzrlib/builtins.py:4844
2969
msgid "Show help on all commands."
2970
msgstr ""
2971
2972
#: bzrlib/builtins.py:4873
2973
msgid "Show unmerged/unpulled revisions between two branches."
2974
msgstr ""
2975
2976
#: bzrlib/builtins.py:4875
2977
msgid "OTHER_BRANCH may be local or remote."
2978
msgstr ""
2979
2980
#: bzrlib/builtins.py:4877
2981
msgid ""
2982
"To filter on a range of revisions, you can use the command -r begin..end\n"
2983
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2984
"also valid.\n"
2985
" \n"
2986
":Exit values:\n"
2987
" 1 - some missing revisions\n"
2988
" 0 - no missing revisions"
2989
msgstr ""
2990
2991
#: bzrlib/builtins.py:4887
2992
msgid ""
2993
" Determine the missing revisions between this and the branch at the\n"
2994
" remembered pull location::"
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4890
2998
msgid " bzr missing"
2999
msgstr ""
3000
3001
#: bzrlib/builtins.py:4892
3002
msgid " Determine the missing revisions between this and another branch::"
3003
msgstr ""
3004
3005
#: bzrlib/builtins.py:4894
3006
msgid " bzr missing http://server/branch"
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4896
3010
msgid ""
3011
" Determine the missing revisions up to a specific revision on the other\n"
3012
" branch::"
3013
msgstr ""
3014
3015
#: bzrlib/builtins.py:4899
3016
msgid " bzr missing -r ..-10"
3017
msgstr ""
3018
3019
#: bzrlib/builtins.py:4901
3020
msgid ""
3021
" Determine the missing revisions up to a specific revision on this\n"
3022
" branch::"
3023
msgstr ""
3024
3025
#: bzrlib/builtins.py:4904
3026
msgid " bzr missing --my-revision ..-10"
3027
msgstr ""
3028
3029
#: bzrlib/builtins.py:4911
3030
msgid "Reverse the order of revisions."
3031
msgstr ""
3032
3033
#: bzrlib/builtins.py:4913
3034
msgid "Display changes in the local branch only."
3035
msgstr ""
3036
3037
#: bzrlib/builtins.py:4914
3038
msgid "Same as --mine-only."
3039
msgstr ""
3040
3041
#: bzrlib/builtins.py:4916
3042
msgid "Display changes in the remote branch only."
3043
msgstr ""
3044
3045
#: bzrlib/builtins.py:4917
3046
msgid "Same as --theirs-only."
3047
msgstr ""
3048
3049
#: bzrlib/builtins.py:4922
3050
msgid ""
3051
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3052
"details."
3053
msgstr ""
3054
3055
#: bzrlib/builtins.py:4926
3056
msgid ""
3057
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3058
"details."
3059
msgstr ""
3060
3061
#: bzrlib/builtins.py:4929
3062
msgid "Show all revisions in addition to the mainline ones."
3063
msgstr ""
3064
3065
#: bzrlib/builtins.py:4983
3066
msgid "No peer location known or specified."
3067
msgstr ""
3068
3069
#: bzrlib/builtins.py:4987
3070
msgid "Using saved parent location: {0}\n"
3071
msgstr ""
3072
3073
#: bzrlib/builtins.py:5020
3074
#, python-format
3075
msgid "You have %d extra revision:\n"
3076
msgid_plural "You have %d extra revisions:\n"
3077
msgstr[0] ""
3078
msgstr[1] ""
3079
3080
#: bzrlib/builtins.py:5040
3081
#, python-format
3082
msgid "You are missing %d revision:\n"
3083
msgid_plural "You are missing %d revisions:\n"
3084
msgstr[0] ""
3085
msgstr[1] ""
3086
3087
#: bzrlib/builtins.py:5055
3088
msgid "This branch has no new revisions.\n"
3089
msgstr ""
3090
3091
#: bzrlib/builtins.py:5058
3092
msgid "Other branch has no new revisions.\n"
3093
msgstr ""
3094
3095
#: bzrlib/builtins.py:5063
3096
msgid "Branches are up to date.\n"
3097
msgstr ""
3098
3099
#: bzrlib/builtins.py:5074
3100
msgid "Compress the data within a repository."
3101
msgstr ""
3102
3103
#: bzrlib/builtins.py:5076
3104
msgid ""
3105
"This operation compresses the data within a bazaar repository. As\n"
3106
"bazaar supports automatic packing of repository, this operation is\n"
3107
"normally not required to be done manually."
3108
msgstr ""
3109
3110
#: bzrlib/builtins.py:5080
3111
msgid ""
3112
"During the pack operation, bazaar takes a backup of existing repository\n"
3113
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3114
"automatically when it is safe to do so. To save disk space by removing\n"
3115
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3116
"used."
3117
msgstr ""
3118
3119
#: bzrlib/builtins.py:5086
3120
msgid ""
3121
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3122
"during or immediately after repacking, you may be left with a state\n"
3123
"where the deletion has been written to disk but the new packs have not\n"
3124
"been. In this case the repository may be unusable."
3125
msgstr ""
3126
3127
#: bzrlib/builtins.py:5095
3128
msgid "Delete obsolete packs to save disk space."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:5109
3132
msgid "List the installed plugins."
3133
msgstr ""
3134
3135
#: bzrlib/builtins.py:5111
3136
msgid ""
3137
"This command displays the list of installed plugins including\n"
3138
"version of plugin and a short description of each."
3139
msgstr ""
3140
3141
#: bzrlib/builtins.py:5114
3142
msgid "--verbose shows the path where each plugin is located."
3143
msgstr ""
3144
3145
#: bzrlib/builtins.py:5116
3146
msgid ""
3147
"A plugin is an external component for Bazaar that extends the\n"
3148
"revision control system, by adding or replacing code in Bazaar.\n"
3149
"Plugins can do a variety of things, including overriding commands,\n"
3150
"adding new commands, providing additional network transports and\n"
3151
"customizing log output."
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:5122
3155
msgid ""
3156
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3157
"for further information on plugins including where to find them and how to\n"
3158
"install them. Instructions are also provided there on how to write new\n"
3159
"plugins using the Python programming language."
3160
msgstr ""
3161
3162
#: bzrlib/builtins.py:5138
3163
msgid "Show testament (signing-form) of a revision."
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:5141
3167
msgid "Produce long-format testament."
3168
msgstr ""
3169
3170
#: bzrlib/builtins.py:5143
3171
msgid "Produce a strict-format testament."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:5169
3175
msgid "Show the origin of each line in a file."
3176
msgstr ""
3177
3178
#: bzrlib/builtins.py:5171
3179
msgid ""
3180
"This prints out the given file with an annotation on the left side\n"
3181
"indicating which revision, author and date introduced the change."
3182
msgstr ""
3183
3184
#: bzrlib/builtins.py:5174
3185
msgid ""
3186
"If the origin is the same for a run of consecutive lines, it is\n"
3187
"shown only at the top, unless the --all option is given."
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:5182
3191
msgid "Show annotations on all lines."
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:5183
3195
msgid "Show commit date in annotations."
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5270
3199
msgid "Cannot sign a range of non-revision-history revisions"
3200
msgstr ""
3201
3202
#: bzrlib/builtins.py:5282
3203
msgid "Please supply either one revision, or a range."
3204
msgstr ""
3205
3206
#: bzrlib/builtins.py:5286
3207
msgid ""
3208
"Convert the current branch into a checkout of the supplied branch.\n"
3209
"If no branch is supplied, rebind to the last bound location."
3210
msgstr ""
3211
3212
#: bzrlib/builtins.py:5289
3213
msgid ""
3214
"Once converted into a checkout, commits must succeed on the master branch\n"
3215
"before they will be applied to the local branch."
3216
msgstr ""
3217
3218
#: bzrlib/builtins.py:5292
3219
msgid ""
3220
"Bound branches use the nickname of its master branch unless it is set\n"
3221
"locally, in which case binding will update the local nickname to be\n"
3222
"that of the master."
3223
msgstr ""
3224
3225
#: bzrlib/builtins.py:5307
3226
msgid "No location supplied. This format does not remember old locations."
3227
msgstr ""
3228
3229
#: bzrlib/builtins.py:5313
3230
msgid "Branch is already bound"
3231
msgstr ""
3232
3233
#: bzrlib/builtins.py:5316
3234
msgid "No location supplied and no previous location known"
3235
msgstr ""
3236
3237
#: bzrlib/builtins.py:5322
3238
msgid "These branches have diverged. Try merging, and then bind again."
3239
msgstr ""
3240
3241
#: bzrlib/builtins.py:5329
3242
msgid "Convert the current checkout into a regular branch."
3243
msgstr ""
3244
3245
#: bzrlib/builtins.py:5331
3246
msgid ""
3247
"After unbinding, the local branch is considered independent and subsequent\n"
3248
"commits will be local only."
3249
msgstr ""
3250
3251
#: bzrlib/builtins.py:5342
3252
msgid "Local branch is not bound"
3253
msgstr ""
3254
3255
#: bzrlib/builtins.py:5346
3256
msgid "Remove the last committed revision."
3257
msgstr ""
3258
3259
#: bzrlib/builtins.py:5348
3260
msgid ""
3261
"--verbose will print out what is being removed.\n"
3262
"--dry-run will go through all the motions, but not actually\n"
3263
"remove anything."
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5352
3267
msgid ""
3268
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3269
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3270
"branch at revision 15."
3271
msgstr ""
3272
3273
#: bzrlib/builtins.py:5356
3274
msgid ""
3275
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3276
"it may make is to restore any pending merges that were present before\n"
3277
"the commit."
3278
msgstr ""
3279
3280
#: bzrlib/builtins.py:5367
3281
msgid "Don't actually make changes."
3282
msgstr ""
3283
3284
#: bzrlib/builtins.py:5368
3285
msgid "Say yes to all questions."
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5370
3289
msgid "Keep tags that point to removed revisions."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5372
3293
msgid "Only remove the commits from the local branch when in a checkout."
3294
msgstr ""
3295
3296
#: bzrlib/builtins.py:5421
3297
msgid "No revisions to uncommit.\n"
3298
msgstr ""
3299
3300
#: bzrlib/builtins.py:5436
3301
msgid "Dry-run, pretending to remove the above revisions.\n"
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:5439
3305
msgid "The above revision(s) will be removed.\n"
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:5443
3309
msgid "Uncommit these revisions"
3310
msgstr ""
3311
3312
#: bzrlib/builtins.py:5446
3313
msgid "Canceled\n"
3314
msgstr ""
3315
3316
#: bzrlib/builtins.py:5453
3317
#, python-format
3318
msgid ""
3319
"You can restore the old tip by running:\n"
3320
" bzr pull . -r revid:%s\n"
3321
msgstr ""
3322
3323
#: bzrlib/builtins.py:5458
3324
msgid "Break a dead lock."
3325
msgstr ""
3326
3327
#: bzrlib/builtins.py:5460
3328
msgid ""
3329
"This command breaks a lock on a repository, branch, working directory or\n"
3330
"config file."
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5463
3334
msgid ""
3335
"CAUTION: Locks should only be broken when you are sure that the process\n"
3336
"holding the lock has been stopped."
3337
msgstr ""
3338
3339
#: bzrlib/builtins.py:5466
3340
msgid ""
3341
"You can get information on what locks are open via the 'bzr info\n"
3342
"[location]' command."
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5469
3346
msgid ""
3347
":Examples:\n"
3348
" bzr break-lock\n"
3349
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3350
" bzr break-lock --conf ~/.bazaar"
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:5478
3354
msgid "LOCATION is the directory where the config lock is."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5480
3358
msgid "Do not ask for confirmation before breaking the lock."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5515
3362
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5516
3366
msgid "Run the bzr server."
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5522
3370
msgid "Serve on stdin/out for use from inetd or sshd."
3371
msgstr ""
3372
3373
#: bzrlib/builtins.py:5523
3374
msgid "protocol"
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:5524
3378
msgid "Protocol to serve."
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:5528
3382
msgid "Listen for connections on nominated address."
3383
msgstr ""
3384
3385
#: bzrlib/builtins.py:5530
3386
msgid ""
3387
"Listen for connections on nominated port. Passing 0 as the port number will "
3388
"result in a dynamically allocated port. The default port depends on the "
3389
"protocol."
3390
msgstr ""
3391
3392
#: bzrlib/builtins.py:5535
3393
msgid "Serve contents of this directory."
3394
msgstr ""
3395
3396
#: bzrlib/builtins.py:5537
3397
msgid ""
3398
"By default the server is a readonly server. Supplying --allow-writes "
3399
"enables write access to the contents of the served directory and below. "
3400
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3401
"of external authentication is arranged supplying this option leads to global "
3402
"uncontrolled write access to your file system."
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5546
3406
msgid "Override the default idle client timeout (5min)."
3407
msgstr ""
3408
3409
#: bzrlib/builtins.py:5564
3410
msgid "Combine a tree into its containing tree."
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5566
3414
msgid "This command requires the target tree to be in a rich-root format."
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:5568
3418
msgid ""
3419
"The TREE argument should be an independent tree, inside another tree, but\n"
3420
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3421
"running \"bzr branch\" with the target inside a tree.)"
3422
msgstr ""
3423
3424
#: bzrlib/builtins.py:5572
3425
msgid ""
3426
"The result is a combined tree, with the subtree no longer an independent\n"
3427
"part. This is marked as a merge of the subtree into the containing tree,\n"
3428
"and all history is preserved."
3429
msgstr ""
3430
3431
#: bzrlib/builtins.py:5590
3432
#, python-format
3433
msgid ""
3434
"Can't join trees because %s doesn't support rich root data.\n"
3435
"You can use bzr upgrade on the repository."
3436
msgstr ""
3437
3438
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3439
msgid "Cannot join {0}. {1}"
3440
msgstr ""
3441
3442
#: bzrlib/builtins.py:5610
3443
msgid "Split a subdirectory of a tree into a separate tree."
3444
msgstr ""
3445
3446
#: bzrlib/builtins.py:5612
3447
msgid ""
3448
"This command will produce a target tree in a format that supports\n"
3449
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3450
"converted into earlier formats like 'dirstate-tags'."
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:5616
3454
msgid ""
3455
"The TREE argument should be a subdirectory of a working tree. That\n"
3456
"subdirectory will be converted into an independent tree, with its own\n"
3457
"branch. Commits in the top-level tree will not apply to the new subtree."
3458
msgstr ""
3459
3460
#: bzrlib/builtins.py:5696
3461
msgid "No submit branch specified or known"
3462
msgstr ""
3463
3464
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3465
msgid "No public branch specified or known"
3466
msgstr ""
3467
3468
#: bzrlib/builtins.py:5710
3469
msgid "bzr merge-directive takes at most two one revision identifiers"
3470
msgstr ""
3471
3472
#: bzrlib/builtins.py:5719
3473
msgid "No revisions to bundle."
3474
msgstr ""
3475
3476
#: bzrlib/builtins.py:5738
3477
msgid "Mail or create a merge-directive for submitting changes."
3478
msgstr ""
3479
3480
#: bzrlib/builtins.py:5740
3481
msgid "A merge directive provides many things needed for requesting merges:"
3482
msgstr ""
3483
3484
#: bzrlib/builtins.py:5742
3485
msgid "* A machine-readable description of the merge to perform"
3486
msgstr ""
3487
3488
#: bzrlib/builtins.py:5744
3489
msgid "* An optional patch that is a preview of the changes requested"
3490
msgstr ""
3491
3492
#: bzrlib/builtins.py:5746
3493
msgid ""
3494
"* An optional bundle of revision data, so that the changes can be applied\n"
3495
" directly from the merge directive, without retrieving data from a\n"
3496
" branch."
3497
msgstr ""
3498
3499
#: bzrlib/builtins.py:5750
3500
msgid ""
3501
"`bzr send` creates a compact data set that, when applied using bzr\n"
3502
"merge, has the same effect as merging from the source branch. "
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:5753
3506
msgid ""
3507
"By default the merge directive is self-contained and can be applied to any\n"
3508
"branch containing submit_branch in its ancestory without needing access to\n"
3509
"the source branch."
3510
msgstr ""
3511
3512
#: bzrlib/builtins.py:5757
3513
msgid ""
3514
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3515
"revisions, but only a structured request to merge from the\n"
3516
"public_location. In that case the public_branch is needed and it must be\n"
3517
"up-to-date and accessible to the recipient. The public_branch is always\n"
3518
"included if known, so that people can check it later."
3519
msgstr ""
3520
3521
#: bzrlib/builtins.py:5763
3522
msgid ""
3523
"The submit branch defaults to the parent of the source branch, but can be\n"
3524
"overridden. Both submit branch and public branch will be remembered in\n"
3525
"branch.conf the first time they are used for a particular branch. The\n"
3526
"source branch defaults to that containing the working directory, but can\n"
3527
"be changed using --from."
3528
msgstr ""
3529
3530
#: bzrlib/builtins.py:5769
3531
msgid ""
3532
"Both the submit branch and the public branch follow the usual behavior with\n"
3533
"respect to --remember: If there is no default location set, the first send\n"
3534
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3535
"omit the location to use the default. To change the default, use\n"
3536
"--remember. The value will only be saved if the location can be accessed."
3537
msgstr ""
3538
3539
#: bzrlib/builtins.py:5775
3540
msgid ""
3541
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3542
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3543
"If a public location is known for the submit_branch, that location is used\n"
3544
"in the merge directive."
3545
msgstr ""
3546
3547
#: bzrlib/builtins.py:5780
3548
msgid ""
3549
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3550
"given, in which case it is sent to a file."
3551
msgstr ""
3552
3553
#: bzrlib/builtins.py:5783
3554
msgid ""
3555
"Mail is sent using your preferred mail program. This should be transparent\n"
3556
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3557
"If the preferred client can't be found (or used), your editor will be used."
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5787
3561
msgid ""
3562
"To use a specific mail program, set the mail_client configuration option.\n"
3563
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3564
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3565
"(MacOS X's\n"
3566
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3567
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3568
"add\n"
3569
"supported clients."
3570
msgstr ""
3571
3572
#: bzrlib/builtins.py:5794
3573
msgid ""
3574
"If mail is being sent, a to address is required. This can be supplied\n"
3575
"either on the commandline, by setting the submit_to configuration\n"
3576
"option in the branch itself or the child_submit_to configuration option\n"
3577
"in the submit branch."
3578
msgstr ""
3579
3580
#: bzrlib/builtins.py:5799
3581
msgid ""
3582
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3583
"and\n"
3584
"merge directive format 2. It is significantly faster and smaller than\n"
3585
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3586
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3587
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3588
msgstr ""
3589
3590
#: bzrlib/builtins.py:5805
3591
msgid ""
3592
"The merge directives created by bzr send may be applied using bzr merge or\n"
3593
"bzr pull by specifying a file containing a merge directive as the location."
3594
msgstr ""
3595
3596
#: bzrlib/builtins.py:5808
3597
msgid ""
3598
"bzr send makes extensive use of public locations to map local locations "
3599
"into\n"
3600
"URLs that can be used by other people. See `bzr help configuration` to\n"
3601
"set them, and use `bzr info` to display them."
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5832
3605
msgid "Write merge directive to this file or directory; use - for stdout."
3606
msgstr ""
3607
3608
#: bzrlib/builtins.py:5836
3609
msgid ""
3610
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3611
"strict disables the check."
3612
msgstr ""
3613
3614
#: bzrlib/builtins.py:5838
3615
msgid "Mail the request to this address."
3616
msgstr ""
3617
3618
#: bzrlib/builtins.py:5842
3619
msgid "Body for the email."
3620
msgstr ""
3621
3622
#: bzrlib/builtins.py:5895
3623
msgid "Do not include a bundle in the merge directive."
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:5896
3627
msgid "Do not include a preview patch in the merge directive."
3628
msgstr ""
3629
3630
#: bzrlib/builtins.py:5899
3631
msgid "Remember submit and public branch."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:5901
3635
msgid ""
3636
"Branch to generate the submission from, rather than the one containing the "
3637
"working directory."
3638
msgstr ""
3639
3640
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3641
msgid "format"
3642
msgstr ""
3643
3644
#: bzrlib/builtins.py:5912
3645
msgid "Use the specified output format."
3646
msgstr ""
3647
3648
#: bzrlib/builtins.py:5934
3649
msgid "Create, remove or modify a tag naming a revision."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5936
3653
msgid ""
3654
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3655
"(--revision) option can be given -rtag:X, where X is any previously\n"
3656
"created tag."
3657
msgstr ""
3658
3659
#: bzrlib/builtins.py:5940
3660
msgid ""
3661
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3662
"along when you branch, push, pull or merge."
3663
msgstr ""
3664
3665
#: bzrlib/builtins.py:5943
3666
msgid ""
3667
"It is an error to give a tag name that already exists unless you pass\n"
3668
"--force, in which case the tag is moved to point to the new revision."
3669
msgstr ""
3670
3671
#: bzrlib/builtins.py:5946
3672
msgid ""
3673
"To rename a tag (change the name but keep it on the same revsion), run "
3674
"``bzr\n"
3675
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3676
msgstr ""
3677
3678
#: bzrlib/builtins.py:5949
3679
msgid ""
3680
"If no tag name is specified it will be determined through the \n"
3681
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3682
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3683
"details."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5959
3687
msgid "Delete this tag rather than placing it."
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:5962
3691
msgid "Branch in which to place the tag."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5964
3695
msgid "Replace existing tags."
3696
msgstr ""
3697
3698
#: bzrlib/builtins.py:5979
3699
msgid "No tag specified to delete."
3700
msgstr ""
3701
3702
#: bzrlib/builtins.py:5981
3703
#, python-format
3704
msgid "Deleted tag %s."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:5995
3708
msgid "Please specify a tag name."
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:6003
3712
#, python-format
3713
msgid "Tag %s already exists for that revision."
3714
msgstr ""
3715
3716
#: bzrlib/builtins.py:6007
3717
#, python-format
3718
msgid "Created tag %s."
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:6009
3722
#, python-format
3723
msgid "Updated tag %s."
3724
msgstr ""
3725
3726
#: bzrlib/builtins.py:6013
3727
msgid "List tags."
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:6015
3731
msgid ""
3732
"This command shows a table of tag names and the revisions they reference."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:6021
3736
msgid "Branch whose tags should be displayed."
3737
msgstr ""
3738
3739
#: bzrlib/builtins.py:6023
3740
msgid "Sort tags by different criteria."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:6023
3744
msgid "Sorting"
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:6092
3748
msgid "Reconfigure the type of a bzr directory."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6094
3752
msgid "A target configuration must be specified."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6096
3756
msgid ""
3757
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3758
"The order of preference is\n"
3759
"1. For a lightweight checkout, the current bound location.\n"
3760
"2. For branches that used to be checkouts, the previously-bound location.\n"
3761
"3. The push location.\n"
3762
"4. The parent location.\n"
3763
"If none of these is available, --bind-to must be specified."
3764
msgstr ""
3765
3766
#: bzrlib/builtins.py:6110
3767
msgid "Tree type"
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:6111
3771
msgid "The relation between branch and tree."
3772
msgstr ""
3773
3774
#: bzrlib/builtins.py:6113
3775
msgid "Reconfigure to be an unbound branch with no working tree."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:6114
3779
msgid "Reconfigure to be an unbound branch with a working tree."
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:6115
3783
msgid "Reconfigure to be a bound branch with a working tree."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:6116
3787
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:6121
3791
msgid "Repository type"
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:6122
3795
msgid "Location fo the repository."
3796
msgstr ""
3797
3798
#: bzrlib/builtins.py:6124
3799
msgid ""
3800
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3801
msgstr ""
3802
3803
#: bzrlib/builtins.py:6126
3804
msgid "Reconfigure to use a shared repository."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6130
3808
msgid "Trees in Repository"
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:6131
3812
msgid "Whether new branches in the repository have trees."
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:6133
3816
msgid ""
3817
"Reconfigure repository to create working trees on branches by default."
3818
msgstr ""
3819
3820
#: bzrlib/builtins.py:6135
3821
msgid ""
3822
"Reconfigure repository to not create working trees on branches by default."
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:6138
3826
msgid "Branch to bind checkout to."
3827
msgstr ""
3828
3829
#: bzrlib/builtins.py:6140
3830
msgid "Perform reconfiguration even if local changes will be lost."
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:6143
3834
msgid "Reconfigure a branch to be stacked on another branch."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:6147
3838
msgid ""
3839
"Reconfigure a branch to be unstacked. This may require copying substantial "
3840
"data into it."
3841
msgstr ""
3842
3843
#: bzrlib/builtins.py:6157
3844
msgid "Can't use both --stacked-on and --unstacked"
3845
msgstr ""
3846
3847
#: bzrlib/builtins.py:6171
3848
msgid "No target configuration specified"
3849
msgstr ""
3850
3851
#: bzrlib/builtins.py:6206
3852
msgid "Set the branch of a checkout and update."
3853
msgstr ""
3854
3855
#: bzrlib/builtins.py:6208
3856
msgid ""
3857
"For lightweight checkouts, this changes the branch being referenced.\n"
3858
"For heavyweight checkouts, this checks that there are no local commits\n"
3859
"versus the current bound branch, then it makes the local branch a mirror\n"
3860
"of the new location and binds to it."
3861
msgstr ""
3862
3863
#: bzrlib/builtins.py:6213
3864
msgid ""
3865
"In both cases, the working tree is updated and uncommitted changes\n"
3866
"are merged. The user can commit or revert these as they desire."
3867
msgstr ""
3868
3869
#: bzrlib/builtins.py:6216
3870
msgid "Pending merges need to be committed or reverted before using switch."
3871
msgstr ""
3872
3873
#: bzrlib/builtins.py:6218
3874
msgid ""
3875
"The path to the branch to switch to can be specified relative to the parent\n"
3876
"directory of the current branch. For example, if you are currently in a\n"
3877
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3878
"/path/to/newbranch."
3879
msgstr ""
3880
3881
#: bzrlib/builtins.py:6223
3882
msgid ""
3883
"Bound branches use the nickname of its master branch unless it is set\n"
3884
"locally, in which case switching will update the local nickname to be\n"
3885
"that of the master."
3886
msgstr ""
3887
3888
#: bzrlib/builtins.py:6231
3889
msgid "Switch even if local commits will be lost."
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6234
3893
msgid "Create the target branch from this one before switching to it."
3894
msgstr ""
3895
3896
#: bzrlib/builtins.py:6248
3897
msgid "You must supply either a revision or a location"
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:6261
3901
msgid "cannot create branch without source branch"
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6286
3905
msgid "Manage filtered views."
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6288
3909
msgid ""
3910
"Views provide a mask over the tree so that users can focus on\n"
3911
"a subset of a tree when doing their work. After creating a view,\n"
3912
"commands that support a list of files - status, diff, commit, etc -\n"
3913
"effectively have that list of files implicitly given each time.\n"
3914
"An explicit list of files can still be given but those files\n"
3915
"must be within the current view."
3916
msgstr ""
3917
3918
#: bzrlib/builtins.py:6295
3919
msgid ""
3920
"In most cases, a view has a short life-span: it is created to make\n"
3921
"a selected change and is deleted once that change is committed.\n"
3922
"At other times, you may wish to create one or more named views\n"
3923
"and switch between them."
3924
msgstr ""
3925
3926
#: bzrlib/builtins.py:6300
3927
msgid ""
3928
"To disable the current view without deleting it, you can switch to\n"
3929
"the pseudo view called ``off``. This can be useful when you need\n"
3930
"to see the whole tree for an operation or two (e.g. merge) but\n"
3931
"want to switch back to your view after that."
3932
msgstr ""
3933
3934
#: bzrlib/builtins.py:6305
3935
msgid ""
3936
":Examples:\n"
3937
" To define the current view::"
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6308
3941
msgid " bzr view file1 dir1 ..."
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6310
3945
msgid " To list the current view::"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:6312
3949
msgid " bzr view"
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:6314
3953
msgid " To delete the current view::"
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6316
3957
msgid " bzr view --delete"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6318
3961
msgid " To disable the current view without deleting it::"
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6320
3965
msgid " bzr view --switch off"
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6322
3969
msgid " To define a named view and switch to it::"
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6324
3973
msgid " bzr view --name view-name file1 dir1 ..."
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6326
3977
msgid " To list a named view::"
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6328
3981
msgid " bzr view --name view-name"
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6330
3985
msgid " To delete a named view::"
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6332
3989
msgid " bzr view --name view-name --delete"
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6334
3993
msgid " To switch to a named view::"
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6336
3997
msgid " bzr view --switch view-name"
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6338
4001
msgid " To list all views defined::"
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6340
4005
msgid " bzr view --all"
4006
msgstr ""
4007
4008
#: bzrlib/builtins.py:6342
4009
msgid " To delete all views::"
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6344
4013
msgid " bzr view --delete --all"
4014
msgstr ""
4015
4016
#: bzrlib/builtins.py:6351
4017
msgid "Apply list or delete action to all views."
4018
msgstr ""
4019
4020
#: bzrlib/builtins.py:6354
4021
msgid "Delete the view."
4022
msgstr ""
4023
4024
#: bzrlib/builtins.py:6357
4025
msgid "Name of the view to define, list or delete."
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6361
4029
msgid "Name of the view to switch to."
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6380
4033
msgid "Both --delete and a file list specified"
4034
msgstr ""
4035
4036
#: bzrlib/builtins.py:6383
4037
msgid "Both --delete and --switch specified"
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6386
4041
msgid "Deleted all views.\n"
4042
msgstr ""
4043
4044
#: bzrlib/builtins.py:6388
4045
msgid "No current view to delete"
4046
msgstr ""
4047
4048
#: bzrlib/builtins.py:6391
4049
#, python-format
4050
msgid "Deleted '%s' view.\n"
4051
msgstr ""
4052
4053
#: bzrlib/builtins.py:6395
4054
msgid "Both --switch and a file list specified"
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:6398
4058
msgid "Both --switch and --all specified"
4059
msgstr ""
4060
4061
#: bzrlib/builtins.py:6401
4062
msgid "No current view to disable"
4063
msgstr ""
4064
4065
#: bzrlib/builtins.py:6403
4066
#, python-format
4067
msgid "Disabled '%s' view.\n"
4068
msgstr "Disabilitata la visualizzazione '%s'.\n"
4069
4070
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4071
msgid "Using '{0}' view: {1}\n"
4072
msgstr ""
4073
4074
#: bzrlib/builtins.py:6410
4075
msgid "Views defined:\n"
4076
msgstr ""
4077
4078
#: bzrlib/builtins.py:6419
4079
msgid "No views defined.\n"
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6426
4083
msgid "Cannot change the 'off' pseudo view"
4084
msgstr ""
4085
4086
#: bzrlib/builtins.py:6434
4087
msgid "No current view.\n"
4088
msgstr ""
4089
4090
#: bzrlib/builtins.py:6437
4091
msgid "'{0}' view is: {1}\n"
4092
msgstr ""
4093
4094
#: bzrlib/builtins.py:6457
4095
msgid " <no hooks installed>\n"
4096
msgstr ""
4097
4098
#: bzrlib/builtins.py:6461
4099
msgid "Remove a branch."
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:6463
4103
msgid ""
4104
"This will remove the branch from the specified location but \n"
4105
"will keep any working tree or repository in place."
4106
msgstr ""
4107
4108
#: bzrlib/builtins.py:6468
4109
msgid " Remove the branch at repo/trunk::"
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:6470
4113
msgid " bzr remove-branch repo/trunk"
4114
msgstr ""
4115
4116
#: bzrlib/builtins.py:6477
4117
msgid "Remove branch even if it is the active branch."
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6491
4121
msgid "Branch is active. Use --force to remove it."
4122
msgstr ""
4123
4124
#: bzrlib/builtins.py:6495
4125
msgid "Plaintext diff output."
4126
msgstr ""
4127
4128
#: bzrlib/builtins.py:6496
4129
msgid "Temporarily set aside some changes from the current tree."
4130
msgstr ""
4131
4132
#: bzrlib/builtins.py:6498
4133
msgid ""
4134
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4135
"ie. out of the way, until a later time when you can bring them back from\n"
4136
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4137
"your working tree, and so they aren't propagated along with your branch nor\n"
4138
"will they survive its deletion."
4139
msgstr ""
4140
4141
#: bzrlib/builtins.py:6504
4142
msgid "If shelve --list is specified, previously-shelved changes are listed."
4143
msgstr ""
4144
4145
#: bzrlib/builtins.py:6506
4146
msgid ""
4147
"Shelve is intended to help separate several sets of changes that have\n"
4148
"been inappropriately mingled. If you just want to get rid of all changes\n"
4149
"and you don't need to restore them later, use revert. If you want to\n"
4150
"shelve all text changes at once, use shelve --all."
4151
msgstr ""
4152
4153
#: bzrlib/builtins.py:6511
4154
msgid ""
4155
"If filenames are specified, only the changes to those files will be\n"
4156
"shelved. Other files will be left untouched."
4157
msgstr ""
4158
4159
#: bzrlib/builtins.py:6514
4160
msgid ""
4161
"If a revision is specified, changes since that revision will be shelved."
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6516
4165
msgid ""
4166
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4167
"restore the most recently shelved changes."
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6519
4171
msgid ""
4172
"For complicated changes, it is possible to edit the changes in a separate\n"
4173
"editor program to decide what the file remaining in the working copy\n"
4174
"should look like. To do this, add the configuration option"
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:6523
4178
msgid " change_editor = PROGRAM @new_path @old_path"
4179
msgstr ""
4180
4181
#: bzrlib/builtins.py:6525
4182
msgid ""
4183
"where @new_path is replaced with the path of the new version of the \n"
4184
"file and @old_path is replaced with the path of the old version of \n"
4185
"the file. The PROGRAM should save the new file with the desired \n"
4186
"contents of the file in the working tree.\n"
4187
" "
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6537
4191
msgid "Shelve all changes."
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6539
4195
msgid "Method to use for writing diffs."
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:6539
4199
msgid "writer"
4200
msgstr ""
4201
4202
#: bzrlib/builtins.py:6543
4203
msgid "List shelved changes."
4204
msgstr ""
4205
4206
#: bzrlib/builtins.py:6545
4207
msgid "Destroy removed changes instead of shelving them."
4208
msgstr ""
4209
4210
#: bzrlib/builtins.py:6574
4211
msgid "No shelved changes."
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6585
4215
msgid "Restore shelved changes."
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6587
4219
msgid ""
4220
"By default, the most recently shelved changes are restored. However if you\n"
4221
"specify a shelf by id those changes will be restored instead. This works\n"
4222
"best when the changes don't depend on each other."
4223
msgstr ""
4224
4225
#: bzrlib/builtins.py:6596
4226
msgid "The action to perform."
4227
msgstr ""
4228
4229
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4230
msgid "action"
4231
msgstr ""
4232
4233
#: bzrlib/builtins.py:6598
4234
msgid "Apply changes and remove from the shelf."
4235
msgstr ""
4236
4237
#: bzrlib/builtins.py:6599
4238
msgid "Show changes, but do not apply or remove them."
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6600
4242
msgid ""
4243
"Instead of unshelving the changes, show the diff that would result from "
4244
"unshelving."
4245
msgstr ""
4246
4247
#: bzrlib/builtins.py:6602
4248
msgid "Delete changes without applying them."
4249
msgstr ""
4250
4251
#: bzrlib/builtins.py:6603
4252
msgid "Apply changes but don't delete them."
4253
msgstr ""
4254
4255
#: bzrlib/builtins.py:6618
4256
msgid "Remove unwanted files from working tree."
4257
msgstr ""
4258
4259
#: bzrlib/builtins.py:6620
4260
msgid ""
4261
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4262
"files are never deleted."
4263
msgstr ""
4264
4265
#: bzrlib/builtins.py:6623
4266
msgid ""
4267
"Another class is 'detritus', which includes files emitted by bzr during\n"
4268
"normal operations and selftests. (The value of these files decreases with\n"
4269
"time.)"
4270
msgstr ""
4271
4272
#: bzrlib/builtins.py:6627
4273
msgid ""
4274
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4275
"flags are respected, and may be combined."
4276
msgstr ""
4277
4278
#: bzrlib/builtins.py:6630
4279
msgid "To check what clean-tree will do, use --dry-run."
4280
msgstr ""
4281
4282
#: bzrlib/builtins.py:6633
4283
msgid "Delete all ignored files."
4284
msgstr ""
4285
4286
#: bzrlib/builtins.py:6634
4287
msgid ""
4288
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4289
msgstr ""
4290
4291
#: bzrlib/builtins.py:6637
4292
msgid "Delete files unknown to bzr (default)."
4293
msgstr ""
4294
4295
#: bzrlib/builtins.py:6638
4296
msgid "Show files to delete instead of deleting them."
4297
msgstr ""
4298
4299
#: bzrlib/builtins.py:6640
4300
msgid "Do not prompt before deleting."
4301
msgstr ""
4302
4303
#: bzrlib/bundle/__init__.py:59
4304
msgid "A directory cannot be a bundle"
4305
msgstr ""
4306
4307
#: bzrlib/bundle/apply_bundle.py:40
4308
msgid "Install revisions"
4309
msgstr ""
4310
4311
#: bzrlib/bundle/commands.py:64
4312
msgid "--verbose requires a merge directive"
4313
msgstr ""
4314
4315
#: bzrlib/bundle/commands.py:67
4316
msgid "Bundle format not supported"
4317
msgstr ""
4318
4319
#: bzrlib/bundle/commands.py:77
4320
msgid "Records\n"
4321
msgstr ""
4322
4323
#: bzrlib/bundle/commands.py:81
4324
msgid "{0}: {1} ({2} multiparent)\n"
4325
msgstr ""
4326
4327
#: bzrlib/bundle/commands.py:83
4328
#, python-format
4329
msgid "unique files: %d\n"
4330
msgstr ""
4331
4332
#: bzrlib/bundle/commands.py:92
4333
msgid "Revisions\n"
4334
msgstr ""
4335
4336
#: bzrlib/bundle/commands.py:93
4337
#, python-format
4338
msgid "nicks: %s\n"
4339
msgstr ""
4340
4341
#: bzrlib/bundle/commands.py:95
4342
#, python-format
4343
msgid ""
4344
"committers: \n"
4345
"%s\n"
4346
msgstr ""
4347
4348
#: bzrlib/bundle/commands.py:103
4349
msgid "Decoded contents\n"
4350
msgstr ""
4351
4352
#: bzrlib/bundle/serializer/v4.py:327
4353
#, python-format
4354
msgid "Bundling %d revision."
4355
msgid_plural "Bundling %d revisions."
4356
msgstr[0] ""
4357
msgstr[1] ""
4358
4359
#: bzrlib/bzrdir.py:487
4360
msgid ""
4361
"making backup of {0}\n"
4362
" to {1}"
4363
msgstr ""
4364
4365
#: bzrlib/bzrdir.py:510
4366
msgid "renamed {0} to {1}"
4367
msgstr ""
4368
4369
#: bzrlib/bzrdir.py:1639
4370
#, python-format
4371
msgid ""
4372
"Source repository format does not support stacking, using format:\n"
4373
" %s"
4374
msgstr ""
4375
4376
#: bzrlib/bzrdir.py:1659
4377
#, python-format
4378
msgid ""
4379
"Source branch format does not support stacking, using format:\n"
4380
" %s"
4381
msgstr ""
4382
"Il formato del branch sorgente non supporta l'effettuazione dello stack, "
4383
"viene usato il formato:\n"
4384
" %s"
4385
4386
#: bzrlib/bzrdir.py:1805
4387
msgid "starting repository conversion"
4388
msgstr ""
4389
4390
#: bzrlib/bzrdir.py:2026
4391
msgid "Using default stacking branch {0} at {1}"
4392
msgstr ""
4393
4394
#: bzrlib/check.py:108
4395
msgid "check"
4396
msgstr ""
4397
4398
#: bzrlib/check.py:110
4399
msgid "checking revisions"
4400
msgstr ""
4401
4402
#: bzrlib/check.py:112
4403
msgid "checking commit contents"
4404
msgstr ""
4405
4406
#: bzrlib/check.py:114
4407
msgid "checking file graphs"
4408
msgstr ""
4409
4410
#: bzrlib/check.py:118
4411
msgid "checking branches and trees"
4412
msgstr ""
4413
4414
#: bzrlib/check.py:205
4415
msgid "checked repository {0} format {1}"
4416
msgstr ""
4417
4418
#: bzrlib/check.py:208
4419
#, python-format
4420
msgid "%6d revisions"
4421
msgstr ""
4422
4423
#: bzrlib/check.py:209
4424
#, python-format
4425
msgid "%6d file-ids"
4426
msgstr ""
4427
4428
#: bzrlib/check.py:211
4429
#, python-format
4430
msgid "%6d unreferenced text versions"
4431
msgstr ""
4432
4433
#: bzrlib/check.py:215
4434
msgid "unreferenced version: {{{0}}} in {1}"
4435
msgstr ""
4436
4437
#: bzrlib/check.py:218
4438
#, python-format
4439
msgid "%6d revisions are missing inventory_sha1"
4440
msgstr ""
4441
4442
#: bzrlib/check.py:221
4443
#, python-format
4444
msgid "%6d revisions are mentioned but not present"
4445
msgstr ""
4446
4447
#: bzrlib/check.py:224
4448
#, python-format
4449
msgid "%6d ghost revisions"
4450
msgstr ""
4451
4452
#: bzrlib/check.py:229
4453
#, python-format
4454
msgid "%6d revisions missing parents in ancestry"
4455
msgstr ""
4456
4457
#: bzrlib/check.py:233
4458
#, python-format
4459
msgid " %s should be in the ancestry for:"
4460
msgstr ""
4461
4462
#: bzrlib/check.py:237
4463
#, python-format
4464
msgid "%6d inconsistent parents"
4465
msgstr ""
4466
4467
#: bzrlib/check.py:241
4468
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4469
msgstr ""
4470
4471
#: bzrlib/check.py:247
4472
#, python-format
4473
msgid "%6d revisions have incorrect parents in the revision index"
4474
msgstr ""
4475
4476
#: bzrlib/check.py:253
4477
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4478
msgstr ""
4479
4480
#: bzrlib/check.py:267
4481
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4482
msgstr ""
4483
4484
#: bzrlib/check.py:296
4485
msgid ""
4486
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4487
"{{{4}}}"
4488
msgstr ""
4489
4490
#: bzrlib/check.py:354
4491
#, python-format
4492
msgid "Checking branch at '%s'."
4493
msgstr ""
4494
4495
#: bzrlib/check.py:374
4496
#, python-format
4497
msgid "Checking working tree at '%s'."
4498
msgstr ""
4499
4500
#: bzrlib/check.py:427 bzrlib/check.py:441
4501
msgid "No branch found at specified location."
4502
msgstr ""
4503
4504
#: bzrlib/check.py:429 bzrlib/check.py:439
4505
msgid "No working tree found at specified location."
4506
msgstr ""
4507
4508
#: bzrlib/check.py:432
4509
#, python-format
4510
msgid "Checking repository at '%s'."
4511
msgstr ""
4512
4513
#: bzrlib/check.py:443
4514
msgid "No repository found at specified location."
4515
msgstr ""
4516
4517
#: bzrlib/clean_tree.py:63
4518
msgid "Nothing to delete."
4519
msgstr ""
4520
4521
#: bzrlib/clean_tree.py:68
4522
msgid "Are you sure you wish to delete these"
4523
msgstr ""
4524
4525
#: bzrlib/clean_tree.py:70
4526
msgid "Canceled"
4527
msgstr ""
4528
4529
#: bzrlib/clean_tree.py:107
4530
#, python-format
4531
msgid "unable to remove %s"
4532
msgstr ""
4533
4534
#: bzrlib/clean_tree.py:111
4535
msgid "deleting paths:"
4536
msgstr ""
4537
4538
#: bzrlib/clean_tree.py:125
4539
msgid "unable to remove \"{0}\": {1}."
4540
msgstr ""
4541
4542
#: bzrlib/clean_tree.py:130
4543
msgid "No files deleted."
4544
msgstr ""
4545
4546
#: bzrlib/cmd_version_info.py:47
4547
msgid "No known version info format {0}. Supported types are: {1}"
4548
msgstr ""
4549
4550
#: bzrlib/cmd_version_info.py:52
4551
msgid "Version info in Custom template-based format."
4552
msgstr ""
4553
4554
#: bzrlib/cmd_version_info.py:52
4555
msgid "Version info in Python format."
4556
msgstr ""
4557
4558
#: bzrlib/cmd_version_info.py:52
4559
msgid "Version info in RIO (simple text) format (default)."
4560
msgstr ""
4561
4562
#: bzrlib/cmd_version_info.py:53
4563
msgid "Show version information about this tree."
4564
msgstr ""
4565
4566
#: bzrlib/cmd_version_info.py:55
4567
msgid ""
4568
"You can use this command to add information about version into\n"
4569
"source code of an application. The output can be in one of the\n"
4570
"supported formats or in a custom format based on a template."
4571
msgstr ""
4572
4573
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4574
#: en/help_topics/configuration.txt:722
4575
msgid "For example::"
4576
msgstr ""
4577
4578
#: bzrlib/cmd_version_info.py:61
4579
msgid ""
4580
" bzr version-info --custom \\\n"
4581
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4582
msgstr ""
4583
4584
#: bzrlib/cmd_version_info.py:64
4585
msgid ""
4586
"will produce a C header file with formatted string containing the\n"
4587
"current revision number. Other supported variables in templates are:"
4588
msgstr ""
4589
4590
#: bzrlib/cmd_version_info.py:67
4591
msgid ""
4592
" * {date} - date of the last revision\n"
4593
" * {build_date} - current date\n"
4594
" * {revno} - revision number\n"
4595
" * {revision_id} - revision id\n"
4596
" * {branch_nick} - branch nickname\n"
4597
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4598
" otherwise 1"
4599
msgstr ""
4600
4601
#: bzrlib/cmd_version_info.py:77
4602
msgid "Select the output format."
4603
msgstr ""
4604
4605
#: bzrlib/cmd_version_info.py:81
4606
msgid "Include all possible information."
4607
msgstr ""
4608
4609
#: bzrlib/cmd_version_info.py:82
4610
msgid "Check if tree is clean."
4611
msgstr ""
4612
4613
#: bzrlib/cmd_version_info.py:84
4614
msgid "Include the revision-history."
4615
msgstr ""
4616
4617
#: bzrlib/cmd_version_info.py:86
4618
msgid "Include the last revision for each file."
4619
msgstr ""
4620
4621
#: bzrlib/cmd_version_info.py:87
4622
msgid "Template for the output."
4623
msgstr ""
4624
4625
#: bzrlib/cmd_version_info.py:101
4626
msgid "bzr version-info --revision takes exactly one revision specifier"
4627
msgstr ""
4628
4629
#: bzrlib/commands.py:229
4630
#, python-format
4631
msgid "unknown command \"%s\""
4632
msgstr ""
4633
4634
#: bzrlib/commands.py:476
4635
msgid "No help for this command."
4636
msgstr ""
4637
4638
#: bzrlib/commands.py:489
4639
#, python-format
4640
msgid ":Purpose: %s\n"
4641
msgstr ""
4642
4643
#: bzrlib/commands.py:491
4644
#, python-format
4645
msgid ""
4646
":Usage:\n"
4647
"%s\n"
4648
msgstr ""
4649
4650
#: bzrlib/commands.py:493
4651
#, python-format
4652
msgid ":Usage: %s\n"
4653
msgstr ""
4654
4655
#: bzrlib/commands.py:512
4656
#, python-format
4657
msgid ":Options:%s"
4658
msgstr ""
4659
4660
#: bzrlib/commands.py:523
4661
#, python-format
4662
msgid ""
4663
":Description:\n"
4664
" %s\n"
4665
"\n"
4666
msgstr ""
4667
4668
#: bzrlib/commands.py:533
4669
#, python-format
4670
msgid ""
4671
"See bzr help %s for more details and examples.\n"
4672
"\n"
4673
msgstr ""
4674
4675
#: bzrlib/commands.py:538
4676
msgid ":Aliases: "
4677
msgstr ""
4678
4679
#: bzrlib/commands.py:542
4680
#, python-format
4681
msgid ":From: plugin \"%s\"\n"
4682
msgstr ""
4683
4684
#: bzrlib/commands.py:554
4685
msgid ":doc:`{0} <{1}-help>`"
4686
msgstr ""
4687
4688
#: bzrlib/commands.py:558
4689
#, python-format
4690
msgid ":See also: %s"
4691
msgstr ""
4692
4693
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4694
msgid "Only ASCII permitted in option names"
4695
msgstr ""
4696
4697
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4698
msgid "command {0!r} needs one or more {1}"
4699
msgstr ""
4700
4701
#: bzrlib/commands.py:868
4702
msgid "command {0!r} requires argument {1}"
4703
msgstr ""
4704
4705
#: bzrlib/commands.py:875
4706
msgid "extra argument to command {0}: {1}"
4707
msgstr ""
4708
4709
#: bzrlib/commands.py:972
4710
#, python-format
4711
msgid "Profile data written to \"%s\"."
4712
msgstr ""
4713
4714
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4715
msgid "added"
4716
msgstr ""
4717
4718
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4719
msgid "modified"
4720
msgstr ""
4721
4722
#: bzrlib/commit.py:131
4723
#, python-format
4724
msgid "Committing%s"
4725
msgstr ""
4726
4727
#: bzrlib/commit.py:134
4728
#, python-format
4729
msgid "Committed revision %d."
4730
msgstr ""
4731
4732
#: bzrlib/commit.py:143
4733
#, python-format
4734
msgid "deleted %s"
4735
msgstr ""
4736
4737
#: bzrlib/commit.py:146
4738
#, python-format
4739
msgid "missing %s"
4740
msgstr ""
4741
4742
#: bzrlib/commit.py:511
4743
msgid ""
4744
"Conflicting tags in bound branch:\n"
4745
"{0}"
4746
msgstr ""
4747
4748
#: bzrlib/commit.py:742
4749
msgid "renamed"
4750
msgstr ""
4751
4752
#: bzrlib/commit.py:976
4753
msgid "unchanged"
4754
msgstr ""
4755
4756
#: bzrlib/commit.py:998
4757
msgid "{0} [{1}] - Stage"
4758
msgstr ""
4759
4760
#: bzrlib/commit.py:1001
4761
#, python-format
4762
msgid "%s - Stage"
4763
msgstr ""
4764
4765
#: bzrlib/commit_signature_commands.py:34
4766
msgid "Sign all commits by a given committer."
4767
msgstr ""
4768
4769
#: bzrlib/commit_signature_commands.py:36
4770
msgid ""
4771
"If location is not specified the local tree is used.\n"
4772
"If committer is not specified the default committer is used."
4773
msgstr ""
4774
4775
#: bzrlib/commit_signature_commands.py:39
4776
msgid "This does not sign commits that already have signatures."
4777
msgstr ""
4778
4779
#: bzrlib/commit_signature_commands.py:47
4780
msgid ""
4781
"Don't actually sign anything, just print the revisions that would be signed."
4782
msgstr ""
4783
4784
#: bzrlib/commit_signature_commands.py:98
4785
#, python-format
4786
msgid "Signed %d revision.\n"
4787
msgid_plural "Signed %d revisions.\n"
4788
msgstr[0] ""
4789
msgstr[1] ""
4790
4791
#: bzrlib/commit_signature_commands.py:103
4792
msgid "Verify all commit signatures."
4793
msgstr ""
4794
4795
#: bzrlib/commit_signature_commands.py:105
4796
msgid ""
4797
"Verifies that all commits in the branch are signed by known GnuPG keys."
4798
msgstr ""
4799
4800
#: bzrlib/commit_signature_commands.py:110
4801
msgid ""
4802
"Comma separated list of GPG key patterns which are acceptable for "
4803
"verification."
4804
msgstr ""
4805
4806
#: bzrlib/commit_signature_commands.py:148
4807
msgid "Cannot verify a range of non-revision-history revisions"
4808
msgstr ""
4809
4810
#: bzrlib/commit_signature_commands.py:166
4811
msgid "All commits signed with verifiable keys"
4812
msgstr ""
4813
4814
#: bzrlib/config.py:436
4815
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4816
msgstr ""
4817
4818
#: bzrlib/config.py:2452
4819
msgid "{0} is not an SI unit."
4820
msgstr ""
4821
4822
#: bzrlib/config.py:2971
4823
msgid ""
4824
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4825
"will be saved."
4826
msgstr ""
4827
4828
#: bzrlib/config.py:3116
4829
#, python-format
4830
msgid "Invalid '%s', should be of the form 'name=value'"
4831
msgstr ""
4832
4833
#: bzrlib/config.py:4018
4834
msgid "Display, set or remove a configuration option."
4835
msgstr ""
4836
4837
#: bzrlib/config.py:4020
4838
msgid "Display the active value for a given option."
4839
msgstr ""
4840
4841
#: bzrlib/config.py:4022
4842
msgid ""
4843
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4844
"matching options are displayed mentioning their scope. The active value\n"
4845
"that bzr will take into account is the first one displayed for each option."
4846
msgstr ""
4847
4848
#: bzrlib/config.py:4026
4849
msgid "If no NAME is given, --all .* is implied."
4850
msgstr ""
4851
4852
#: bzrlib/config.py:4028
4853
msgid ""
4854
"Setting a value is achieved by using name=value without spaces. The value\n"
4855
"is set in the most relevant scope and can be checked by displaying the\n"
4856
"option again."
4857
msgstr ""
4858
4859
#: bzrlib/config.py:4040
4860
msgid "Reduce the scope to the specified configuration file."
4861
msgstr ""
4862
4863
#: bzrlib/config.py:4044
4864
msgid "Display all the defined values for the matching options."
4865
msgstr ""
4866
4867
#: bzrlib/config.py:4046
4868
msgid "Remove the option from the configuration file."
4869
msgstr ""
4870
4871
#: bzrlib/conflicts.py:50
4872
msgid "List files with conflicts."
4873
msgstr ""
4874
4875
#: bzrlib/conflicts.py:57
4876
msgid ""
4877
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4878
"is supplied, the pathnames of files with text conflicts are listed,\n"
4879
"instead. (This is useful for editing all files with text conflicts.)"
4880
msgstr ""
4881
4882
#: bzrlib/conflicts.py:61
4883
msgid "Use bzr resolve when you have fixed a problem."
4884
msgstr ""
4885
4886
#: bzrlib/conflicts.py:66
4887
msgid "List paths of files with text conflicts."
4888
msgstr ""
4889
4890
#: bzrlib/conflicts.py:85
4891
msgid "Marks the conflict as resolved."
4892
msgstr ""
4893
4894
#: bzrlib/conflicts.py:88
4895
msgid "Resolve the conflict preserving the version in the working tree."
4896
msgstr ""
4897
4898
#: bzrlib/conflicts.py:91
4899
msgid "Resolve the conflict taking the merged version into account."
4900
msgstr ""
4901
4902
#: bzrlib/conflicts.py:98
4903
msgid "How to resolve the conflict."
4904
msgstr ""
4905
4906
#: bzrlib/conflicts.py:104
4907
msgid "Mark a conflict as resolved."
4908
msgstr ""
4909
4910
#: bzrlib/conflicts.py:111
4911
msgid ""
4912
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4913
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4914
"as\n"
4915
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4916
msgstr ""
4917
4918
#: bzrlib/conflicts.py:119
4919
msgid "Resolve all conflicts in this tree."
4920
msgstr ""
4921
4922
#: bzrlib/conflicts.py:126
4923
msgid "If --all is specified, no FILE may be provided"
4924
msgstr ""
4925
4926
#: bzrlib/conflicts.py:151
4927
#, python-format
4928
msgid "%d conflict auto-resolved."
4929
msgid_plural "%d conflicts auto-resolved."
4930
msgstr[0] ""
4931
msgstr[1] ""
4932
4933
#: bzrlib/conflicts.py:154
4934
msgid "Remaining conflicts:"
4935
msgstr ""
4936
4937
#: bzrlib/conflicts.py:159
4938
msgid "All conflicts resolved."
4939
msgstr ""
4940
4941
#: bzrlib/conflicts.py:168
4942
msgid "{0} conflict resolved, {1} remaining"
4943
msgid_plural "{0} conflicts resolved, {1} remaining"
4944
msgstr[0] ""
4945
msgstr[1] ""
4946
4947
#: bzrlib/controldir.py:712
4948
msgid "{0} is{1} redirected to {2}"
4949
msgstr ""
4950
4951
#: bzrlib/diff.py:399
4952
#, python-format
4953
msgid "*** Ignoring files outside view. View is %s"
4954
msgstr ""
4955
4956
#: bzrlib/errors.py:157
4957
msgid "The tree builder is already building a tree."
4958
msgstr ""
4959
4960
#: bzrlib/errors.py:178
4961
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4962
msgstr ""
4963
4964
#: bzrlib/errors.py:197
4965
msgid ""
4966
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4967
"versions \"%(minimum)s\" to \"%(current)s\"."
4968
msgstr ""
4969
4970
#: bzrlib/errors.py:209
4971
msgid "The transport '%(transport)s' is only accessible within this process."
4972
msgstr ""
4973
4974
#: bzrlib/errors.py:227
4975
msgid "Invalid revision number %(revno)s"
4976
msgstr ""
4977
4978
#: bzrlib/errors.py:236
4979
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4980
msgstr ""
4981
4982
#: bzrlib/errors.py:247
4983
msgid "Reserved revision-id {%(revision_id)s}"
4984
msgstr ""
4985
4986
#: bzrlib/errors.py:261
4987
msgid "There is no public branch set for \"%(branch_url)s\"."
4988
msgstr ""
4989
4990
#: bzrlib/errors.py:271
4991
msgid ""
4992
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4993
"obtain a list of topics."
4994
msgstr ""
4995
"Non è stata trovata nessuna informazione per '%(topic)s'. Usare «bzr help "
4996
"topics» per ottenere un elenco di argomenti."
4997
4998
#: bzrlib/errors.py:280
4999
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:290
5003
msgid ""
5004
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5005
msgstr ""
5006
5007
#: bzrlib/errors.py:299
5008
msgid "The branch '%(branch)s' is not stacked."
5009
msgstr ""
5010
5011
#: bzrlib/errors.py:313
5012
msgid "No WorkingTree exists for \"%(base)s\"."
5013
msgstr ""
5014
5015
#: bzrlib/errors.py:322
5016
msgid "Not currently building a tree."
5017
msgstr ""
5018
5019
#: bzrlib/errors.py:327
5020
msgid "%(url)s is not a local path."
5021
msgstr ""
5022
5023
#: bzrlib/errors.py:355
5024
msgid "%(not_locked)r is not write locked but needs to be."
5025
msgstr ""
5026
5027
#: bzrlib/errors.py:363
5028
msgid "Error in command line options"
5029
msgstr ""
5030
5031
#: bzrlib/errors.py:368
5032
msgid "%(value)s is not an index of type %(_type)s."
5033
msgstr ""
5034
5035
#: bzrlib/errors.py:378
5036
msgid "Error in data for index %(value)s."
5037
msgstr ""
5038
5039
#: bzrlib/errors.py:387
5040
msgid "The key '%(key)s' is already in index '%(index)s'."
5041
msgstr ""
5042
5043
#: bzrlib/errors.py:397
5044
msgid "The key '%(key)s' is not a valid key."
5045
msgstr ""
5046
5047
#: bzrlib/errors.py:406
5048
msgid "Could not parse options for index %(value)s."
5049
msgstr ""
5050
5051
#: bzrlib/errors.py:415
5052
msgid "The value '%(value)s' is not a valid value."
5053
msgstr ""
5054
5055
#: bzrlib/errors.py:424
5056
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5057
msgstr ""
5058
5059
#: bzrlib/errors.py:443
5060
msgid "Generic path error: %(path)r%(extra)s)"
5061
msgstr ""
5062
5063
#: bzrlib/errors.py:456
5064
msgid "No such file: %(path)r%(extra)s"
5065
msgstr ""
5066
5067
#: bzrlib/errors.py:461
5068
msgid "File exists: %(path)r%(extra)s"
5069
msgstr ""
5070
5071
#: bzrlib/errors.py:467
5072
msgid ""
5073
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5074
"after to tell bzr about a rename that has already happened)%(extra)s"
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:483
5078
msgid "\"%(path)s\" is not a directory %(extra)s"
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:488
5082
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:493
5086
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:498
5090
msgid "Hard-linking \"%(path)s\" is not supported"
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:513
5094
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:518
5098
msgid "Permission denied: \"%(path)s\"%(extra)s"
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:523
5102
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5103
msgstr ""
5104
5105
#: bzrlib/errors.py:528
5106
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5107
msgstr ""
5108
5109
#: bzrlib/errors.py:539
5110
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:561
5114
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5115
msgstr ""
5116
5117
#: bzrlib/errors.py:571
5118
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:579
5122
msgid ""
5123
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5124
"upgrade the branch to permit branch stacking."
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:590
5128
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:600
5132
msgid ""
5133
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5134
"need to upgrade the repository to permit branch stacking."
5135
msgstr ""
5136
5137
#: bzrlib/errors.py:611
5138
msgid "Error reading from %(path)r."
5139
msgstr ""
5140
5141
#: bzrlib/errors.py:630
5142
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5143
msgstr ""
5144
5145
#: bzrlib/errors.py:646
5146
msgid "Path \"%(path)s\" is not unicode normalized"
5147
msgstr ""
5148
5149
#: bzrlib/errors.py:654
5150
msgid "Not a branch: \"%(path)s\"%(detail)s."
5151
msgstr ""
5152
5153
#: bzrlib/errors.py:696
5154
msgid "No submit branch available for branch \"%(path)s\""
5155
msgstr ""
5156
5157
#: bzrlib/errors.py:705
5158
msgid "A control directory already exists: \"%(path)s\"."
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:710
5162
msgid "Already a branch: \"%(path)s\"."
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:715
5166
msgid "Invalid branch name: %(name)s"
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:724
5170
msgid "Parent branch already exists: \"%(path)s\"."
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:730
5174
msgid ""
5175
"Directory contains a branch, but no working tree (use bzr checkout if you "
5176
"wish to build a working tree): \"%(path)s\""
5177
msgstr ""
5178
5179
#: bzrlib/errors.py:735
5180
msgid ""
5181
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5182
msgstr ""
5183
5184
#: bzrlib/errors.py:745
5185
msgid ""
5186
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5187
msgstr ""
5188
5189
#: bzrlib/errors.py:755
5190
msgid "No repository present: \"%(path)s\""
5191
msgstr ""
5192
5193
#: bzrlib/errors.py:762
5194
msgid ""
5195
"Unsupported branch format: %(format)s\n"
5196
"Please run 'bzr upgrade'"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:768
5200
msgid "Unknown %(kind)s format: %(format)r"
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:777
5204
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:787
5208
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:802
5212
msgid ""
5213
"%(target)s\n"
5214
"is not compatible with\n"
5215
"%(source)s\n"
5216
"%(details)s"
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:818
5220
msgid "Revision is not compatible with %(repo_format)s"
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:828
5224
msgid "%(context_info)s%(path)s is already versioned."
5225
msgstr ""
5226
5227
#: bzrlib/errors.py:849
5228
msgid "%(context_info)s%(path)s is not versioned."
5229
msgstr ""
5230
5231
#: bzrlib/errors.py:870
5232
msgid "Path(s) are not versioned: %(paths_as_string)s"
5233
msgstr ""
5234
5235
#: bzrlib/errors.py:881
5236
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:900
5240
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5241
msgstr ""
5242
5243
#: bzrlib/errors.py:908
5244
msgid ""
5245
"Filename %(filename)r is not valid in your current filesystem encoding "
5246
"%(fs_encoding)s"
5247
msgstr ""
5248
5249
#: bzrlib/errors.py:919
5250
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:937
5254
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5255
msgstr ""
5256
5257
#: bzrlib/errors.py:976
5258
msgid "Cannot lock %(lock)s: %(why)s"
5259
msgstr ""
5260
5261
#: bzrlib/errors.py:986
5262
msgid ""
5263
"A transaction related operation was attempted after the transaction finished."
5264
msgstr ""
5265
5266
#: bzrlib/errors.py:1013
5267
msgid "Cannot lock: transport is read only: %(transport)s"
5268
msgstr ""
5269
5270
#: bzrlib/errors.py:1021
5271
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5272
msgstr ""
5273
5274
#: bzrlib/errors.py:1032
5275
msgid ""
5276
"Lock was broken while still open: %(lock)s - check storage consistency!"
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:1043
5280
msgid ""
5281
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5282
"%(holder)r, wanted to break %(target)r"
5283
msgstr ""
5284
5285
#: bzrlib/errors.py:1055
5286
msgid ""
5287
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5288
"Use 'bzr break-lock' to clear it"
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:1068
5292
msgid "Lock not held: %(lock)s"
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:1097
5296
msgid "No changes to commit"
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:1102
5300
msgid ""
5301
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5302
msgstr ""
5303
5304
#: bzrlib/errors.py:1112
5305
msgid ""
5306
"Excluding paths during commit is not supported by repository at "
5307
"%(repository)r."
5308
msgstr ""
5309
5310
#: bzrlib/errors.py:1121
5311
msgid ""
5312
"The specified commit message contains characters unsupported by the current "
5313
"encoding."
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:1127
5317
msgid "Upgrade URL cannot work with readonly URLs."
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:1132
5321
msgid "The branch format %(format)s is already at the most recent format."
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1155
5325
msgid "Option --change does not accept revision ranges"
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:1160
5329
msgid "No namespace registered for string: %(spec)r"
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1179
5333
msgid ""
5334
"Requested revision: '%(spec)s' does not exist in branch: "
5335
"%(branch_url)s%(extra)s"
5336
msgstr ""
5337
5338
#: bzrlib/errors.py:1193
5339
msgid ""
5340
"Operation denied because it would change the main history, which is not "
5341
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:1204
5345
msgid ""
5346
"These branches have diverged. Use the missing command to see how.\n"
5347
"Use the merge command to reconcile them."
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:1224
5351
msgid ""
5352
"Branches have no common ancestor, and no merge base revision was specified."
5353
msgstr ""
5354
5355
#: bzrlib/errors.py:1230
5356
msgid ""
5357
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5358
msgstr ""
5359
5360
#: bzrlib/errors.py:1236
5361
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5362
msgstr ""
5363
5364
#: bzrlib/errors.py:1245
5365
msgid ""
5366
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:1254
5370
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:1263
5374
msgid "Branch %(branch)s has no commits."
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:1281
5378
msgid ""
5379
"Bound branch %(branch)s is out of date with master branch "
5380
"%(master)s.%(extra_help)s"
5381
msgstr ""
5382
5383
#: bzrlib/errors.py:1293
5384
msgid ""
5385
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5386
"bound to %(remote)s."
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:1305
5390
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:1314
5394
msgid ""
5395
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5396
"%(error)s"
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:1326
5400
msgid "Error in processing weave: %(msg)s"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:1335
5404
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:1346
5408
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5409
msgstr ""
5410
5411
#: bzrlib/errors.py:1356
5412
msgid "Weave invariant violated: %(what)s"
5413
msgstr ""
5414
5415
#: bzrlib/errors.py:1365
5416
msgid "Parents are mismatched between two revisions. %(msg)s"
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:1387
5420
msgid ""
5421
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5422
"%(weave_b)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1399
5426
msgid "Versioned file error"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1404
5430
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1414
5434
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1424
5438
msgid "Text did not match its checksum: %(msg)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1550
5442
msgid "Export format %(format)r not supported"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1559
5446
msgid "Transport error: %(msg)s %(orig_error)s"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1585
5450
msgid "Generic bzr smart protocol error: %(details)s"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1593
5454
msgid "Received bad protocol version marker: %(marker)r"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1625
5458
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1630
5462
msgid "Connection error: %(msg)s %(orig_error)s"
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1635
5466
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1656
5470
msgid "Connection closed: %(msg)s %(orig_error)s"
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:1661
5474
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1666
5478
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:1676
5482
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:1691
5486
msgid "Certificate error: %(error)s"
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1699
5490
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:1713
5494
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5495
msgstr ""
5496
5497
#: bzrlib/errors.py:1721
5498
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:1730
5502
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:1744
5506
msgid "Too many redirections"
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1749
5510
msgid "Working tree has conflicts."
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:1753
5514
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:1762
5518
msgid ""
5519
"Error(s) parsing config file %(filename)s:\n"
5520
"%(errors)s"
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:1772
5524
msgid ""
5525
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5526
"See ``bzr help %(name)s``"
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:1782
5530
msgid "%(username)r does not seem to contain a reasonable email address"
5531
msgstr ""
5532
5533
#: bzrlib/errors.py:1791
5534
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5535
msgstr ""
5536
5537
#: bzrlib/errors.py:1799
5538
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5539
msgstr ""
5540
5541
#: bzrlib/errors.py:1807
5542
msgid "Unable to import library \"%(library)s\": %(error)s"
5543
msgstr ""
5544
5545
#: bzrlib/errors.py:1815
5546
msgid "python-gpgme is not installed, it is needed to verify signatures"
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:1823
5550
msgid ""
5551
"The working tree for %(basedir)s has changed since the last commit, but "
5552
"weave merge requires that it be unchanged"
5553
msgstr ""
5554
5555
#: bzrlib/errors.py:1833
5556
msgid ""
5557
"Can't reprocess and show base, because reprocessing obscures the "
5558
"relationship of conflicting lines to the base"
5559
msgstr ""
5560
5561
#: bzrlib/errors.py:1839
5562
msgid "Cycle in graph %(graph)r"
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:1867
5566
msgid "File %(filename)s is not conflicted."
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:1889
5570
msgid "No bundle was found in \"%(filename)s\"."
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:1898
5574
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:1908
5578
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:1921
5582
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:1931
5586
msgid "Key %(key)s is already present in map"
5587
msgstr ""
5588
5589
#: bzrlib/errors.py:1936
5590
msgid "The prefix %(prefix)s is in the help search path twice."
5591
msgstr ""
5592
5593
#: bzrlib/errors.py:1946
5594
msgid ""
5595
"No final name for trans_id %(trans_id)r\n"
5596
"file-id: %(file_id)r\n"
5597
"root trans-id: %(root_trans_id)r\n"
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:1978
5601
msgid "Attempt to reuse a transform that has already been applied."
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:1983
5605
msgid "Moving the root directory is not supported at this time"
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:1988
5609
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5610
msgstr ""
5611
5612
#: bzrlib/errors.py:1999
5613
msgid ""
5614
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5615
msgstr ""
5616
5617
#: bzrlib/errors.py:2035
5618
msgid ""
5619
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:2065
5623
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:2073
5627
msgid "Nothing to merge."
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:2078
5631
msgid "Format %(format)s cannot be initialised by this version of bzr."
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:2087
5635
msgid ""
5636
"Cannot convert from format %(from_format)s to format %(format)s. "
5637
"%(problem)s"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:2099
5641
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:2107
5645
msgid "%(exe_name)s could not be found on this machine"
5646
msgstr ""
5647
5648
#: bzrlib/errors.py:2115
5649
msgid "Diff is not installed on this machine: %(msg)s"
5650
msgstr ""
5651
5652
#: bzrlib/errors.py:2123
5653
msgid "Diff3 is not installed on this machine."
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:2129
5657
msgid "The content being inserted is already present."
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:2134
5661
msgid ""
5662
"This tree contains left-over files from a failed operation.\n"
5663
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5664
"to\n"
5665
" keep, and delete it when you are done."
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:2145
5669
msgid ""
5670
"This tree contains left-over files from a failed operation.\n"
5671
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5672
" wish to keep, and delete it when you are done."
5673
msgstr ""
5674
5675
#: bzrlib/errors.py:2155
5676
msgid ""
5677
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5678
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5679
"to\n"
5680
" keep, and delete it when you are done."
5681
msgstr ""
5682
5683
#: bzrlib/errors.py:2166
5684
msgid ""
5685
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5686
"examine %(pending_deletion)s to see if it contains any files you wish to "
5687
"keep, and delete it when you are done."
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:2176
5691
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2190
5695
msgid ""
5696
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:2203
5700
msgid "Error in merge modified format"
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:2208
5704
msgid "Format error in conflict listings"
5705
msgstr ""
5706
5707
#: bzrlib/errors.py:2212
5708
msgid ""
5709
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5710
"Error: %(description)s"
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:2223
5714
msgid ""
5715
"An error has been detected in the repository %(repo_path)s.\n"
5716
"Please run bzr reconcile on this repository."
5717
msgstr ""
5718
5719
#: bzrlib/errors.py:2234
5720
msgid ""
5721
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5722
"reason: %(reason)s"
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2247
5726
msgid ""
5727
"An inconsistent delta was supplied: %(delta)r\n"
5728
"reason: %(reason)s"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:2259
5732
msgid "To use this feature you must upgrade your branch at %(path)s."
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:2268
5736
msgid "To use this feature you must upgrade your repository at %(path)s."
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:2273
5740
msgid ""
5741
"To use this feature you must upgrade your branch at %(path)s to a format "
5742
"which supports rich roots."
5743
msgstr ""
5744
5745
#: bzrlib/errors.py:2279
5746
msgid "Cannot perform local-only commits on unbound branches."
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:2284
5750
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:2305
5754
msgid "Ghost tags not supported by format %(format)r."
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:2313
5758
msgid "File is binary but should be text."
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:2318
5762
msgid "The path %(path)s is not permitted on this platform"
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:2327
5766
msgid ""
5767
"Testament did not match expected value.\n"
5768
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5769
" {%(measured)s}"
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:2339
5773
msgid "Not a bzr revision-bundle: %(text)r"
5774
msgstr ""
5775
5776
#: bzrlib/errors.py:2348
5777
msgid "Bad bzr revision-bundle: %(text)r"
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:2357
5781
msgid "Malformed bzr revision-bundle header: %(text)r"
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:2362
5785
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:2367
5789
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5790
msgstr ""
5791
5792
#: bzrlib/errors.py:2372
5793
msgid "End of line marker was not \\n in bzr revision-bundle"
5794
msgstr ""
5795
5796
#: bzrlib/errors.py:2382
5797
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5798
msgstr ""
5799
5800
#: bzrlib/errors.py:2392
5801
msgid "Root class for inventory serialization errors"
5802
msgstr ""
5803
5804
#: bzrlib/errors.py:2396
5805
msgid ""
5806
"The inventory was not in the expected format:\n"
5807
" %(msg)s"
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2405
5811
msgid "This operation requires rich root data storage"
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2418
5815
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5816
msgstr ""
5817
5818
#: bzrlib/errors.py:2427
5819
msgid ""
5820
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5821
"variable."
5822
msgstr ""
5823
5824
#: bzrlib/errors.py:2434
5825
msgid ""
5826
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5827
"ghost at {%(ghost_revision_id)s}"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:2444
5831
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:2495
5835
msgid ""
5836
"A merge directive must provide either a bundle or a public branch location."
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:2502
5840
msgid "Bad merge directive payload %(start)r"
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2512
5844
msgid "Preview patch does not match requested changes."
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2518
5848
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2528
5852
msgid ""
5853
"Your branch does not have all of the revisions required in order to merge "
5854
"this merge directive and the target location specified in the merge "
5855
"directive is not a branch: %(location)s."
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2540
5859
msgid "Unsupported entry kind %(kind)s"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2548
5863
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2558
5867
msgid "Subsume target %(other_tree)s needs to be upgraded."
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2577
5871
msgid "No such tag: %(tag_name)s"
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2585
5875
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:2594
5879
msgid "Tag %(tag_name)s already exists."
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2602
5883
msgid ""
5884
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5885
"bugs\" for more information on this feature."
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:2612
5889
msgid ""
5890
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2622
5894
msgid ""
5895
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2632
5899
msgid "Invalid line in bugs property: '%(line)s'"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2640
5903
msgid "Invalid bug status: '%(status)s'"
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2648
5907
msgid "Could not understand response from smart server: %(response_tuple)r"
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2687
5911
msgid "Server sent an unexpected error: %(error_tuple)r"
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2706
5915
msgid "Unrecognised container format: %(container_format)r"
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2714
5919
msgid "Unexpected end of container stream"
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2719
5923
msgid "Unknown record type: %(record_type)r"
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2727
5927
msgid "Invalid record: %(reason)s"
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:2735
5931
msgid "Container has data after end marker: %(excess)r"
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:2743
5935
msgid "Container has multiple records with the same name: %(name)s"
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2756
5939
msgid "Corrupt or incompatible data stream: %(reason)s"
5940
msgstr ""
5941
5942
#: bzrlib/errors.py:2764
5943
msgid "SMTP error: %(error)s"
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:2772
5947
msgid "No message supplied."
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:2777
5951
msgid "No mail-to address (--mail-to) or output (-o) specified."
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2782
5955
msgid ""
5956
"Unable to find mail client with the following names: "
5957
"%(mail_command_list_string)s"
5958
msgstr ""
5959
5960
#: bzrlib/errors.py:2792
5961
msgid "SMTP connection to %(host)s refused"
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:2801
5965
msgid "Please specify smtp_server. No server at default %(host)s."
5966
msgstr ""
5967
5968
#: bzrlib/errors.py:2815
5969
msgid ""
5970
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5971
"reconfigure."
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2827
5975
msgid "'%(display_url)s' is already a branch."
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2832
5979
msgid "'%(display_url)s' is already a tree."
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2837
5983
msgid "'%(display_url)s' is already a checkout."
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:2842
5987
msgid "'%(display_url)s' is already a lightweight checkout."
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2847
5991
msgid "'%(display_url)s' is already using a shared repository."
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:2852
5995
msgid "'%(display_url)s' is already standalone."
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:2857
5999
msgid "Shared repository '%(display_url)s' already creates working trees."
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:2863
6003
msgid ""
6004
"Shared repository '%(display_url)s' already doesn't create working trees."
6005
msgstr ""
6006
6007
#: bzrlib/errors.py:2869
6008
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6009
msgstr ""
6010
6011
#: bzrlib/errors.py:2874
6012
msgid "No location could be found to bind to at %(display_url)s."
6013
msgstr ""
6014
6015
#: bzrlib/errors.py:2879
6016
msgid ""
6017
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6018
"status).%(more)s"
6019
msgstr ""
6020
6021
#: bzrlib/errors.py:2898
6022
msgid ""
6023
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6024
"list).%(more)s"
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:2904
6028
msgid "Variable {%(name)s} is not available."
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:2912
6032
msgid "No template specified."
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:2917
6036
msgid "Unable to create symlink %(path_str)son this platform"
6037
msgstr ""
6038
6039
#: bzrlib/errors.py:2932
6040
msgid ""
6041
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6042
"\"original\", \"local\"."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:2966
6046
msgid ""
6047
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:2978
6051
msgid "The \"%(config_id)s\" configuration does not exist."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:2986
6055
msgid "The \"%(option_name)s\" configuration option does not exist."
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:2994
6059
msgid "The alias \"%(alias_name)s\" does not exist."
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:3008
6063
msgid "\"%(alias_name)s\" is not a valid location alias."
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:3016
6067
msgid "No %(alias_name)s location assigned."
6068
msgstr ""
6069
6070
#: bzrlib/errors.py:3024
6071
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6072
msgstr ""
6073
6074
#: bzrlib/errors.py:3034
6075
msgid "Unknown rules detected: %(unknowns_str)s."
6076
msgstr ""
6077
6078
#: bzrlib/errors.py:3045
6079
msgid "Tip change rejected: %(msg)s"
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:3053
6083
msgid "Shelf corrupt."
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:3058
6087
msgid "Corruption while decompressing repository file%(orig_error)s"
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:3070
6091
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:3078
6095
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:3086
6099
msgid ""
6100
"An attempt to access a url outside the server jail was made: '%(url)s'."
6101
msgstr ""
6102
6103
#: bzrlib/errors.py:3094
6104
msgid "The user aborted the operation."
6105
msgstr ""
6106
6107
#: bzrlib/errors.py:3099
6108
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6109
msgstr ""
6110
6111
#: bzrlib/errors.py:3109
6112
msgid "No such view: %(view_name)s."
6113
msgstr ""
6114
6115
#: bzrlib/errors.py:3119
6116
msgid ""
6117
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6118
"to a later format."
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:3128
6122
msgid ""
6123
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:3195
6127
msgid "%(bzrdir)r does not support co-located branches."
6128
msgstr ""
6129
6130
#: bzrlib/errors.py:3201
6131
msgid ""
6132
"Unable to determine your name.\n"
6133
"Please, set your name with the 'whoami' command.\n"
6134
"E.g. bzr whoami \"Your Name <name@example.com>\""
6135
msgstr ""
6136
6137
#: bzrlib/errors.py:3210
6138
msgid "Invalid pattern(s) found. %(msg)s"
6139
msgstr ""
6140
6141
#: bzrlib/errors.py:3218
6142
msgid ""
6143
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6144
"unbind` to fix."
6145
msgstr ""
6146
6147
#: bzrlib/errors.py:3229
6148
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6149
msgstr ""
6150
6151
#: bzrlib/errors.py:3238
6152
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6153
msgstr ""
6154
6155
#: bzrlib/errors.py:3247
6156
msgid ""
6157
"No compatible object available for operations from %(source)r to %(target)r."
6158
msgstr ""
6159
6160
#: bzrlib/errors.py:3257
6161
msgid ""
6162
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6163
"%(arguments)s."
6164
msgstr ""
6165
6166
#: bzrlib/errors.py:3267
6167
msgid ""
6168
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6169
"format %(format)r"
6170
msgstr ""
6171
6172
#: bzrlib/errors.py:3279
6173
msgid ""
6174
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6175
"plugin."
6176
msgstr ""
6177
6178
#: bzrlib/errors.py:3292
6179
msgid "Binary files section encountered."
6180
msgstr ""
6181
6182
#: bzrlib/errors.py:3300
6183
msgid ""
6184
"Malformed patch header. %(desc)s\n"
6185
"%(line)r"
6186
msgstr ""
6187
6188
#: bzrlib/errors.py:3309
6189
msgid ""
6190
"Malformed hunk header. %(desc)s\n"
6191
"%(line)r"
6192
msgstr ""
6193
6194
#: bzrlib/errors.py:3318
6195
msgid ""
6196
"Malformed line. %(desc)s\n"
6197
"%(line)r"
6198
msgstr ""
6199
6200
#: bzrlib/errors.py:3328
6201
msgid ""
6202
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6203
"but patch says it should be \"%(patch_line)s\""
6204
msgstr ""
6205
6206
#: bzrlib/errors.py:3339
6207
msgid "The feature %(feature)s has already been registered."
6208
msgstr ""
6209
6210
#: bzrlib/export_pot.py:252
6211
#, python-format
6212
msgid "Exporting messages from builtin command: %s"
6213
msgstr ""
6214
6215
#: bzrlib/export_pot.py:271
6216
msgid "Exporting messages from plugin command: {0} in {1}"
6217
msgstr ""
6218
6219
#: bzrlib/export_pot.py:292
6220
#, python-format
6221
msgid "Exporting message from error: %s"
6222
msgstr ""
6223
6224
#: bzrlib/fetch.py:98
6225
msgid "Finding revisions"
6226
msgstr ""
6227
6228
#: bzrlib/fetch.py:103
6229
msgid "Fetching revisions"
6230
msgstr ""
6231
6232
#: bzrlib/foreign.py:262
6233
msgid "Push into a different VCS without any custom bzr metadata."
6234
msgstr ""
6235
6236
#: bzrlib/foreign.py:264
6237
msgid ""
6238
"This will afterwards rebase the local branch on the remote\n"
6239
"branch unless the --no-rebase option is used, in which case \n"
6240
"the two branches will be out of sync after the push. "
6241
msgstr ""
6242
6243
#: bzrlib/foreign.py:277
6244
msgid "Do not rebase after push."
6245
msgstr ""
6246
6247
#: bzrlib/foreign.py:311
6248
#, python-format
6249
msgid "Using saved location: %s\n"
6250
msgstr ""
6251
6252
#: bzrlib/foreign.py:321
6253
msgid ""
6254
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6255
"regular push."
6256
msgstr ""
6257
6258
#: bzrlib/gpg.py:366
6259
msgid "No GnuPG key results for pattern: {0}"
6260
msgstr ""
6261
6262
#: bzrlib/gpg.py:439
6263
msgid "{0} commits with valid signatures"
6264
msgstr ""
6265
6266
#: bzrlib/gpg.py:445
6267
msgid "{0} commit with unknown key"
6268
msgid_plural "{0} commits with unknown keys"
6269
msgstr[0] ""
6270
msgstr[1] ""
6271
6272
#: bzrlib/gpg.py:453
6273
msgid "{0} commit not valid"
6274
msgid_plural "{0} commits not valid"
6275
msgstr[0] ""
6276
msgstr[1] ""
6277
6278
#: bzrlib/gpg.py:461
6279
msgid "{0} commit not signed"
6280
msgid_plural "{0} commits not signed"
6281
msgstr[0] ""
6282
msgstr[1] ""
6283
6284
#: bzrlib/gpg.py:469
6285
msgid "{0} commit with key now expired"
6286
msgid_plural "{0} commits with key now expired"
6287
msgstr[0] ""
6288
msgstr[1] ""
6289
6290
#: bzrlib/gpg.py:489
6291
msgid "{0} commit by author {1} with key {2} now expired"
6292
msgid_plural "{0} commits by author {1} with key {2} now expired"
6293
msgstr[0] ""
6294
msgstr[1] ""
6295
6296
#: bzrlib/gpg.py:505
6297
msgid "{0} signed {1} commit"
6298
msgid_plural "{0} signed {1} commits"
6299
msgstr[0] ""
6300
msgstr[1] ""
6301
6302
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6303
msgid "{0} commit by author {1}"
6304
msgid_plural "{0} commits by author {1}"
6305
msgstr[0] ""
6306
msgstr[1] ""
6307
6308
#: bzrlib/gpg.py:554
6309
msgid "Unknown key {0} signed {1} commit"
6310
msgid_plural "Unknown key {0} signed {1} commits"
6311
msgstr[0] ""
6312
msgstr[1] ""
6313
6314
#: bzrlib/groupcompress.py:1739
6315
#, python-format
6316
msgid "Insert claimed random_id=True, but then inserted %r two times"
6317
msgstr ""
6318
6319
#: bzrlib/hooks.py:313
6320
#, python-format
6321
msgid "Introduced in: %s"
6322
msgstr ""
6323
6324
#: bzrlib/hooks.py:316
6325
#, python-format
6326
msgid "Deprecated in: %s"
6327
msgstr ""
6328
6329
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6330
msgid "Walking content"
6331
msgstr ""
6332
6333
#: bzrlib/knit.py:3330
6334
msgid "annotating"
6335
msgstr ""
6336
6337
#: bzrlib/lock.py:548
6338
msgid "{0!r} was {1} locked again"
6339
msgstr ""
6340
6341
#: bzrlib/lockdir.py:321
6342
#, python-format
6343
msgid "error removing pending lock: %s"
6344
msgstr ""
6345
6346
#: bzrlib/lockdir.py:616
6347
msgid "Unable to obtain"
6348
msgstr ""
6349
6350
#: bzrlib/lockdir.py:618
6351
msgid "Lock owner changed for"
6352
msgstr ""
6353
6354
#: bzrlib/lockdir.py:620
6355
msgid "{0} lock {1} {2}."
6356
msgstr ""
6357
6358
#: bzrlib/lockdir.py:627
6359
#, python-format
6360
msgid "Will continue to try until %s, unless you press Ctrl-C."
6361
msgstr ""
6362
6363
#: bzrlib/lockdir.py:629
6364
msgid "See \"bzr help break-lock\" for more."
6365
msgstr ""
6366
6367
#: bzrlib/lockdir.py:739
6368
#, python-format
6369
msgid ""
6370
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6371
msgstr ""
6372
6373
#: bzrlib/log.py:563
6374
msgid "--exclude-common-ancestry requires two different revisions"
6375
msgstr ""
6376
6377
#: bzrlib/log.py:565
6378
#, python-format
6379
msgid "invalid direction %r"
6380
msgstr ""
6381
6382
#: bzrlib/log.py:653
6383
msgid "Start revision not found in history of end revision."
6384
msgstr ""
6385
6386
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6387
msgid "Logging revision 0 is invalid."
6388
msgstr ""
6389
6390
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6391
msgid "Start revision must be older than the end revision."
6392
msgstr ""
6393
6394
#: bzrlib/log.py:1818
6395
#, python-format
6396
msgid "unknown log formatter: %r"
6397
msgstr ""
6398
6399
#: bzrlib/log.py:2114
6400
msgid "fixes bug"
6401
msgid_plural "fixes bugs"
6402
msgstr[0] ""
6403
msgstr[1] ""
6404
6405
#: bzrlib/merge.py:689
6406
msgid "All changes applied successfully."
6407
msgstr ""
6408
6409
#: bzrlib/merge.py:691
6410
#, python-format
6411
msgid "%d conflicts encountered."
6412
msgstr ""
6413
6414
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6415
msgid "Preparing file merge"
6416
msgstr ""
6417
6418
#: bzrlib/multiparent.py:426
6419
msgid "Importing revisions"
6420
msgstr ""
6421
6422
#: bzrlib/option.py:526
6423
msgid "Show help message."
6424
msgstr ""
6425
6426
#: bzrlib/option.py:528
6427
msgid "Only display errors and warnings."
6428
msgstr ""
6429
6430
#: bzrlib/option.py:531
6431
msgid "Show usage message and options."
6432
msgstr ""
6433
6434
#: bzrlib/option.py:533
6435
msgid "Display more information."
6436
msgstr ""
6437
6438
#: bzrlib/option.py:541
6439
msgid ""
6440
"Select changes introduced by the specified revision. See also \"help "
6441
"revisionspec\"."
6442
msgstr ""
6443
6444
#: bzrlib/option.py:543
6445
msgid "Branch to operate on, instead of working directory."
6446
msgstr ""
6447
6448
#: bzrlib/option.py:545
6449
msgid "Detailed log format."
6450
msgstr ""
6451
6452
#: bzrlib/option.py:545
6453
msgid "Format used by GNU ChangeLog files."
6454
msgstr ""
6455
6456
#: bzrlib/option.py:545
6457
msgid "Log format with one line per revision."
6458
msgstr ""
6459
6460
#: bzrlib/option.py:545
6461
msgid "Moderately short log format."
6462
msgstr ""
6463
6464
#: bzrlib/option.py:545
6465
msgid "Use specified log format."
6466
msgstr ""
6467
6468
#: bzrlib/option.py:547
6469
msgid "Log format"
6470
msgstr ""
6471
6472
#: bzrlib/option.py:549
6473
msgid "LCA-newness merge."
6474
msgstr ""
6475
6476
#: bzrlib/option.py:549
6477
msgid "Merge using external diff3."
6478
msgstr ""
6479
6480
#: bzrlib/option.py:549
6481
msgid "Native diff3-style merge."
6482
msgstr ""
6483
6484
#: bzrlib/option.py:549
6485
msgid "Select a particular merge algorithm."
6486
msgstr ""
6487
6488
#: bzrlib/option.py:549
6489
msgid "Weave-based merge."
6490
msgstr ""
6491
6492
#: bzrlib/option.py:551
6493
msgid "Merge algorithm"
6494
msgstr ""
6495
6496
#: bzrlib/option.py:554
6497
msgid "Message string."
6498
msgstr ""
6499
6500
#: bzrlib/option.py:556
6501
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6502
msgstr ""
6503
6504
#: bzrlib/option.py:558
6505
msgid "Ignore differences between branches and overwrite unconditionally."
6506
msgstr ""
6507
6508
#: bzrlib/option.py:560
6509
msgid "Remember the specified location as a default."
6510
msgstr ""
6511
6512
#: bzrlib/option.py:562
6513
msgid "Reprocess to reduce spurious conflicts."
6514
msgstr ""
6515
6516
#: bzrlib/option.py:566
6517
msgid "See \"help revisionspec\" for details."
6518
msgstr ""
6519
6520
#: bzrlib/option.py:568
6521
msgid "Show internal object ids."
6522
msgstr ""
6523
6524
#: bzrlib/option.py:571
6525
msgid "Display timezone as local, original, or utc."
6526
msgstr ""
6527
6528
#: bzrlib/osutils.py:100
6529
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6530
msgstr ""
6531
6532
#: bzrlib/osutils.py:220
6533
msgid "lstat/stat of ({0!r}): {1!r}"
6534
msgstr ""
6535
6536
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6537
#, python-format
6538
msgid "sorry, %r not allowed in path"
6539
msgstr ""
6540
6541
#: bzrlib/osutils.py:1259
6542
#, python-format
6543
msgid "%r is too short to calculate a relative path"
6544
msgstr "%r è troppo breve per calcolare un percorso relativo"
6545
6546
#: bzrlib/plugin.py:143
6547
#, python-format
6548
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6549
msgstr ""
6550
6551
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6552
msgid "Enable completions for the selected plugin (default: all plugins)"
6553
msgstr ""
6554
6555
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6556
msgid "Generate a shell function for bash command line completion."
6557
msgstr ""
6558
6559
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6560
msgid ""
6561
"This command generates a shell function which can be used by bash to\n"
6562
"automatically complete the currently typed command when the user presses\n"
6563
"the completion key (usually tab)."
6564
msgstr ""
6565
6566
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6567
msgid ""
6568
"Commonly used like this:\n"
6569
" eval \"`bzr bash-completion`\""
6570
msgstr ""
6571
6572
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6573
msgid "Name of the generated function (default: _bzr)"
6574
msgstr ""
6575
6576
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6577
msgid "Generate only the shell function, don't enable it"
6578
msgstr ""
6579
6580
#: bzrlib/plugins/launchpad/account.py:66
6581
msgid "Setting ssh/sftp usernames for launchpad.net."
6582
msgstr ""
6583
6584
#: bzrlib/plugins/launchpad/cmds.py:44
6585
msgid "Register a branch with launchpad.net."
6586
msgstr ""
6587
6588
#: bzrlib/plugins/launchpad/cmds.py:46
6589
msgid ""
6590
"This command lists a bzr branch in the directory of branches on\n"
6591
"launchpad.net. Registration allows the branch to be associated with\n"
6592
"bugs or specifications."
6593
msgstr ""
6594
6595
#: bzrlib/plugins/launchpad/cmds.py:50
6596
msgid ""
6597
"Before using this command you must register the project to which the\n"
6598
"branch belongs, and create an account for yourself on launchpad.net."
6599
msgstr ""
6600
6601
#: bzrlib/plugins/launchpad/cmds.py:53
6602
msgid ""
6603
"arguments:\n"
6604
" public_url: The publicly visible url for the branch to register.\n"
6605
" This must be an http or https url (which Launchpad can read\n"
6606
" from to access the branch). Local file urls, SFTP urls, and\n"
6607
" bzr+ssh urls will not work.\n"
6608
" If no public_url is provided, bzr will use the configured\n"
6609
" public_url if there is one for the current branch, and\n"
6610
" otherwise error."
6611
msgstr ""
6612
6613
#: bzrlib/plugins/launchpad/cmds.py:62
6614
msgid ""
6615
"example:\n"
6616
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6617
" --project fooproject"
6618
msgstr ""
6619
6620
#: bzrlib/plugins/launchpad/cmds.py:69
6621
msgid "Launchpad project short name to associate with the branch."
6622
msgstr ""
6623
6624
#: bzrlib/plugins/launchpad/cmds.py:76
6625
msgid ""
6626
"Short name for the branch; by default taken from the last component of the "
6627
"url."
6628
msgstr ""
6629
6630
#: bzrlib/plugins/launchpad/cmds.py:80
6631
msgid "One-sentence description of the branch."
6632
msgstr ""
6633
6634
#: bzrlib/plugins/launchpad/cmds.py:83
6635
msgid "Longer description of the purpose or contents of the branch."
6636
msgstr ""
6637
6638
#: bzrlib/plugins/launchpad/cmds.py:86
6639
msgid "Branch author's email address, if not yourself."
6640
msgstr ""
6641
6642
#: bzrlib/plugins/launchpad/cmds.py:89
6643
msgid "The bug this branch fixes."
6644
msgstr ""
6645
6646
#: bzrlib/plugins/launchpad/cmds.py:92
6647
msgid "Prepare the request but don't actually send it."
6648
msgstr ""
6649
6650
#: bzrlib/plugins/launchpad/cmds.py:114
6651
msgid ""
6652
"register-branch requires a public branch url - see bzr help register-branch."
6653
msgstr ""
6654
6655
#: bzrlib/plugins/launchpad/cmds.py:122
6656
msgid "--product is deprecated; please use --project."
6657
msgstr ""
6658
6659
#: bzrlib/plugins/launchpad/cmds.py:152
6660
msgid "Open a Launchpad branch page in your web browser."
6661
msgstr ""
6662
6663
#: bzrlib/plugins/launchpad/cmds.py:157
6664
msgid "Do not actually open the browser. Just say the URL we would use."
6665
msgstr ""
6666
6667
#: bzrlib/plugins/launchpad/cmds.py:192
6668
#, python-format
6669
msgid "Opening %s in web browser"
6670
msgstr ""
6671
6672
#: bzrlib/plugins/launchpad/cmds.py:200
6673
msgid "Show or set the Launchpad user ID."
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/cmds.py:202
6677
msgid ""
6678
"When communicating with Launchpad, some commands need to know your\n"
6679
"Launchpad user ID. This command can be used to set or show the\n"
6680
"user ID that Bazaar will use for such communication."
6681
msgstr ""
6682
6683
#: bzrlib/plugins/launchpad/cmds.py:206
6684
msgid ""
6685
":Examples:\n"
6686
" Show the Launchpad ID of the current user::"
6687
msgstr ""
6688
6689
#: bzrlib/plugins/launchpad/cmds.py:209
6690
msgid " bzr launchpad-login"
6691
msgstr ""
6692
6693
#: bzrlib/plugins/launchpad/cmds.py:211
6694
msgid " Set the Launchpad ID of the current user to 'bob'::"
6695
msgstr ""
6696
6697
#: bzrlib/plugins/launchpad/cmds.py:213
6698
msgid " bzr launchpad-login bob"
6699
msgstr ""
6700
6701
#: bzrlib/plugins/launchpad/cmds.py:220
6702
msgid "Don't check that the user name is valid."
6703
msgstr ""
6704
6705
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6706
msgid "Launchpad user ID exists and has SSH keys.\n"
6707
msgstr ""
6708
6709
#: bzrlib/plugins/launchpad/cmds.py:238
6710
msgid "No Launchpad user ID configured.\n"
6711
msgstr ""
6712
6713
#: bzrlib/plugins/launchpad/cmds.py:249
6714
#, python-format
6715
msgid "Launchpad user ID set to '%s'.\n"
6716
msgstr ""
6717
6718
#: bzrlib/plugins/launchpad/cmds.py:255
6719
msgid "Ask Launchpad to mirror a branch now."
6720
msgstr ""
6721
6722
#: bzrlib/plugins/launchpad/cmds.py:272
6723
msgid "Propose merging a branch on Launchpad."
6724
msgstr ""
6725
6726
#: bzrlib/plugins/launchpad/cmds.py:274
6727
msgid ""
6728
"This will open your usual editor to provide the initial comment. When it\n"
6729
"has created the proposal, it will open it in your default web browser."
6730
msgstr ""
6731
6732
#: bzrlib/plugins/launchpad/cmds.py:277
6733
msgid ""
6734
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6735
"is not supplied, the remembered submit branch will be used. If no submit\n"
6736
"branch is remembered, the development focus will be used."
6737
msgstr ""
6738
6739
#: bzrlib/plugins/launchpad/cmds.py:281
6740
msgid ""
6741
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6742
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6743
"The parameter the launchpad account name of the desired reviewer. This\n"
6744
"may optionally be followed by '=' and the review type. For example:"
6745
msgstr ""
6746
6747
#: bzrlib/plugins/launchpad/cmds.py:286
6748
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/cmds.py:288
6752
msgid ""
6753
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6754
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6755
msgstr ""
6756
6757
#: bzrlib/plugins/launchpad/cmds.py:293
6758
msgid "Propose the merge on staging."
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/cmds.py:295
6762
msgid "Commit message."
6763
msgstr ""
6764
6765
#: bzrlib/plugins/launchpad/cmds.py:297
6766
msgid "Mark the proposal as approved immediately."
6767
msgstr ""
6768
6769
#: bzrlib/plugins/launchpad/cmds.py:298
6770
msgid "The bug this proposal fixes."
6771
msgstr ""
6772
6773
#: bzrlib/plugins/launchpad/cmds.py:300
6774
msgid "Requested reviewer and optional type."
6775
msgstr ""
6776
6777
#: bzrlib/plugins/launchpad/cmds.py:335
6778
msgid "Find the proposal to merge this revision."
6779
msgstr ""
6780
6781
#: bzrlib/plugins/launchpad/cmds.py:337
6782
msgid ""
6783
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6784
"This works only if the selected branch was the merge proposal target, and\n"
6785
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6786
"are opened in a web browser."
6787
msgstr ""
6788
6789
#: bzrlib/plugins/launchpad/cmds.py:342
6790
msgid ""
6791
"Any revision involved in the merge may be specified-- the revision in\n"
6792
"which the merge was performed, or one of the revisions that was merged."
6793
msgstr ""
6794
6795
#: bzrlib/plugins/launchpad/cmds.py:345
6796
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6797
msgstr ""
6798
6799
#: bzrlib/plugins/launchpad/cmds.py:347
6800
msgid " bzr lp-find-proposal -r annotate:README:1"
6801
msgstr ""
6802
6803
#: bzrlib/plugins/launchpad/cmds.py:363
6804
msgid "No review found."
6805
msgstr ""
6806
6807
#: bzrlib/plugins/launchpad/cmds.py:364
6808
#, python-format
6809
msgid "%d proposals(s) found."
6810
msgstr ""
6811
6812
#: bzrlib/plugins/launchpad/cmds.py:374
6813
msgid "Finding revision-id"
6814
msgstr ""
6815
6816
#: bzrlib/plugins/launchpad/cmds.py:381
6817
msgid "Finding merge"
6818
msgstr ""
6819
6820
#: bzrlib/plugins/launchpad/cmds.py:386
6821
msgid "Finding revno"
6822
msgstr ""
6823
6824
#: bzrlib/plugins/launchpad/cmds.py:392
6825
msgid "Finding Launchpad branch"
6826
msgstr ""
6827
6828
#: bzrlib/plugins/launchpad/cmds.py:395
6829
msgid "Finding proposals"
6830
msgstr ""
6831
6832
#: bzrlib/plugins/launchpad/lp_api.py:241
6833
#: bzrlib/plugins/launchpad/lp_api.py:246
6834
#, python-format
6835
msgid "%s is not registered on Launchpad"
6836
msgstr ""
6837
6838
#: bzrlib/plugins/launchpad/lp_api.py:256
6839
#, python-format
6840
msgid "%s has no development focus."
6841
msgstr ""
6842
6843
#: bzrlib/plugins/launchpad/lp_api.py:261
6844
#, python-format
6845
msgid "development focus %s has no branch."
6846
msgstr ""
6847
6848
#: bzrlib/plugins/launchpad/lp_api.py:266
6849
#, python-format
6850
msgid "source package %s has no branch."
6851
msgstr ""
6852
6853
#: bzrlib/plugins/launchpad/lp_api.py:270
6854
#, python-format
6855
msgid "%s has no associated product or source package."
6856
msgstr ""
6857
6858
#: bzrlib/plugins/launchpad/lp_api.py:282
6859
#, python-format
6860
msgid "%s is already up-to-date."
6861
msgstr ""
6862
6863
#: bzrlib/plugins/launchpad/lp_api.py:289
6864
#, python-format
6865
msgid "Pushing to %s"
6866
msgstr ""
6867
6868
#: bzrlib/plugins/launchpad/lp_directory.py:170
6869
msgid ""
6870
"resolution for {0}\n"
6871
" local: {1}\n"
6872
" remote: {2}"
6873
msgstr ""
6874
6875
#: bzrlib/plugins/launchpad/lp_propose.py:150
6876
#, python-format
6877
msgid "There is already a branch merge proposal: %s"
6878
msgstr ""
6879
6880
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6881
msgid "pb parameter to convert() is deprecated"
6882
msgstr ""
6883
6884
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6885
msgid "starting upgrade from format 4 to 5"
6886
msgstr ""
6887
6888
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6889
msgid "note: upgrade may be faster if all store files are ungzipped first"
6890
msgstr ""
6891
6892
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6893
msgid "converting revision"
6894
msgstr ""
6895
6896
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6897
msgid "upgraded to weaves:"
6898
msgstr ""
6899
6900
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6901
#, python-format
6902
msgid "%6d revisions and inventories"
6903
msgstr "%6d revisioni e inventari"
6904
6905
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6906
#, python-format
6907
msgid "%6d revisions not present"
6908
msgstr "%6d revisioni non presenti"
6909
6910
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6911
#, python-format
6912
msgid "%6d texts"
6913
msgstr "%6d testi"
6914
6915
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6916
msgid "writing weave"
6917
msgstr ""
6918
6919
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6920
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6921
msgid "inventory"
6922
msgstr ""
6923
6924
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6925
msgid "write revision"
6926
msgstr ""
6927
6928
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6929
msgid "loading revision"
6930
msgstr ""
6931
6932
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6933
#, python-format
6934
msgid "revision {%s} not present in branch; will be converted as a ghost"
6935
msgstr ""
6936
6937
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6938
msgid "starting upgrade from format 5 to 6"
6939
msgstr ""
6940
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6942
#, python-format
6943
msgid "adding prefixes to %s"
6944
msgstr ""
6945
6946
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6947
msgid "starting upgrade from format 6 to metadir"
6948
msgstr ""
6949
6950
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6951
msgid "Removing ancestry.weave"
6952
msgstr ""
6953
6954
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6955
msgid "Finding branch files"
6956
msgstr ""
6957
6958
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6959
msgid "Upgrading repository"
6960
msgstr ""
6961
6962
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6963
msgid "Upgrading branch"
6964
msgstr ""
6965
6966
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6967
msgid "No working tree."
6968
msgstr ""
6969
6970
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6971
msgid "Upgrading working tree"
6972
msgstr ""
6973
6974
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6975
#, python-format
6976
msgid "Make %s lock"
6977
msgstr ""
6978
6979
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6980
#, python-format
6981
msgid "Moving %s"
6982
msgstr ""
6983
6984
#: bzrlib/push.py:56
6985
msgid "Created new branch."
6986
msgstr ""
6987
6988
#: bzrlib/push.py:97
6989
#, python-format
6990
msgid ""
6991
"Target directory %s already contains a .bzr directory, but it is not valid."
6992
msgstr ""
6993
6994
#: bzrlib/push.py:101
6995
#, python-format
6996
msgid ""
6997
"Target directory %s already exists, but does not have a .bzr directory. "
6998
"Supply --use-existing-dir to push there anyway."
6999
msgstr ""
7000
7001
#: bzrlib/push.py:122
7002
#, python-format
7003
msgid "Too many redirections trying to make %s."
7004
msgstr ""
7005
7006
#: bzrlib/push.py:148
7007
msgid ""
7008
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7009
"information."
7010
msgstr ""
7011
7012
#: bzrlib/push.py:152
7013
#, python-format
7014
msgid ""
7015
"It is not possible to losslessly push to %s. You may want to use dpush "
7016
"instead."
7017
msgstr ""
7018
7019
#: bzrlib/push.py:158
7020
#, python-format
7021
msgid ""
7022
"At %s you have a valid .bzr control directory, but not a branch or "
7023
"repository. This is an unsupported configuration. Please move the target "
7024
"directory out of the way and try again."
7025
msgstr ""
7026
7027
#: bzrlib/reconcile.py:97
7028
#, python-format
7029
msgid "Reconciling branch %s"
7030
msgstr ""
7031
7032
#: bzrlib/reconcile.py:103
7033
#, python-format
7034
msgid "Reconciling repository %s"
7035
msgstr ""
7036
7037
#: bzrlib/reconcile.py:105
7038
msgid "Reconciling repository"
7039
msgstr ""
7040
7041
#: bzrlib/reconcile.py:111
7042
#, python-format
7043
msgid "%s cannot canonicalize CHKs."
7044
msgstr ""
7045
7046
#: bzrlib/reconcile.py:119
7047
msgid "Reconcile aborted: revision index has inconsistent parents."
7048
msgstr ""
7049
7050
#: bzrlib/reconcile.py:121
7051
msgid "Run \"bzr check\" for more details."
7052
msgstr ""
7053
7054
#: bzrlib/reconcile.py:123
7055
msgid "Reconciliation complete."
7056
msgstr ""
7057
7058
#: bzrlib/reconcile.py:166
7059
msgid "Fixing last revision info {0} => {1}"
7060
msgstr ""
7061
7062
#: bzrlib/reconcile.py:173
7063
msgid "revision_history ok."
7064
msgstr ""
7065
7066
#: bzrlib/reconcile.py:234
7067
msgid "Reading inventory data"
7068
msgstr ""
7069
7070
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7071
msgid "Inventory ok."
7072
msgstr ""
7073
7074
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7075
msgid "Backing up inventory"
7076
msgstr ""
7077
7078
#: bzrlib/reconcile.py:258
7079
msgid "Backup inventory created."
7080
msgstr ""
7081
7082
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7083
msgid "Writing weave"
7084
msgstr ""
7085
7086
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7087
msgid "Inventory regenerated."
7088
msgstr ""
7089
7090
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7091
msgid "Reading indexes"
7092
msgstr ""
7093
7094
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7095
msgid "Checking unused inventories"
7096
msgstr ""
7097
7098
#: bzrlib/reconcile.py:388
7099
msgid "Backup Inventory created"
7100
msgstr ""
7101
7102
#: bzrlib/reconcile.py:446
7103
msgid "Fixing text parents"
7104
msgstr ""
7105
7106
#: bzrlib/reconfigure.py:54
7107
msgid "{0} is now stacked on {1}\n"
7108
msgstr ""
7109
7110
#: bzrlib/reconfigure.py:69
7111
#, python-format
7112
msgid "%s is now not stacked\n"
7113
msgstr "%s ora non è in stack\n"
7114
7115
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7116
#, python-format
7117
msgid "bzr: ERROR (ignored): %s"
7118
msgstr ""
7119
7120
#: bzrlib/remote.py:2534
7121
msgid "Copying repository content as tarball..."
7122
msgstr ""
7123
7124
#: bzrlib/rename_map.py:69
7125
msgid "Calculating hashes"
7126
msgstr ""
7127
7128
#: bzrlib/rename_map.py:107
7129
msgid "Determining hash hits"
7130
msgstr ""
7131
7132
#: bzrlib/rename_map.py:242
7133
msgid "{0} => {1}"
7134
msgstr ""
7135
7136
#: bzrlib/repository.py:1738
7137
msgid "Moving repository to repository.backup"
7138
msgstr ""
7139
7140
#: bzrlib/repository.py:1745
7141
msgid "Creating new repository"
7142
msgstr ""
7143
7144
#: bzrlib/repository.py:1750
7145
msgid "Copying content"
7146
msgstr ""
7147
7148
#: bzrlib/repository.py:1754
7149
msgid "Deleting old repository content"
7150
msgstr ""
7151
7152
#: bzrlib/repository.py:1756
7153
msgid "repository converted"
7154
msgstr ""
7155
7156
#: bzrlib/revisionspec.py:903
7157
msgid "Using {0} {1}"
7158
msgstr ""
7159
7160
#: bzrlib/send.py:59
7161
#, python-format
7162
msgid "Mail client \"%s\" does not support specifying body"
7163
msgstr ""
7164
7165
#: bzrlib/send.py:63
7166
msgid "--remember requires a branch to be specified."
7167
msgstr ""
7168
7169
#: bzrlib/send.py:78
7170
msgid "No submit branch known or specified"
7171
msgstr ""
7172
7173
#: bzrlib/send.py:81
7174
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7175
msgstr ""
7176
7177
#: bzrlib/send.py:99
7178
#, python-format
7179
msgid "No such send format '%s'."
7180
msgstr ""
7181
7182
#: bzrlib/send.py:115
7183
msgid "bzr send takes at most two one revision identifiers"
7184
msgstr ""
7185
7186
#: bzrlib/send.py:128
7187
msgid "No revisions to submit."
7188
msgstr ""
7189
7190
#: bzrlib/send.py:140
7191
msgid ""
7192
"- not supported for merge directives that use more than one output file."
7193
msgstr ""
7194
7195
#: bzrlib/send.py:186
7196
msgid "Format 0.9 does not permit bundle with no patch"
7197
msgstr ""
7198
7199
#: bzrlib/shelf_ui.py:46
7200
#, python-format
7201
msgid "Shelve adding file \"%(path)s\"?"
7202
msgstr ""
7203
7204
#: bzrlib/shelf_ui.py:47
7205
msgid "Shelve binary changes?"
7206
msgstr ""
7207
7208
#: bzrlib/shelf_ui.py:48
7209
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7210
msgstr ""
7211
7212
#: bzrlib/shelf_ui.py:50
7213
#, python-format
7214
msgid "Shelve removing file \"%(path)s\"?"
7215
msgstr ""
7216
7217
#: bzrlib/shelf_ui.py:51
7218
#, python-format
7219
msgid "Shelve %d change(s)?"
7220
msgstr ""
7221
7222
#: bzrlib/shelf_ui.py:52
7223
msgid "Shelve?"
7224
msgstr ""
7225
7226
#: bzrlib/shelf_ui.py:53
7227
#, python-format
7228
msgid ""
7229
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7230
msgstr ""
7231
7232
#: bzrlib/shelf_ui.py:55
7233
#, python-format
7234
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7235
msgstr ""
7236
7237
#: bzrlib/shelf_ui.py:70
7238
#, python-format
7239
msgid "Changes shelved with id \"%d\"."
7240
msgstr ""
7241
7242
#: bzrlib/shelf_ui.py:74
7243
msgid "Selected changes destroyed."
7244
msgstr ""
7245
7246
#: bzrlib/shelf_ui.py:78
7247
msgid "Selected changes:"
7248
msgstr ""
7249
7250
#: bzrlib/shelf_ui.py:98
7251
#, python-format
7252
msgid "Delete file \"%(path)s\"?"
7253
msgstr ""
7254
7255
#: bzrlib/shelf_ui.py:99
7256
msgid "Apply binary changes?"
7257
msgstr ""
7258
7259
#: bzrlib/shelf_ui.py:100
7260
#, python-format
7261
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7262
msgstr ""
7263
7264
#: bzrlib/shelf_ui.py:102
7265
#, python-format
7266
msgid "Add file \"%(path)s\"?"
7267
msgstr ""
7268
7269
#: bzrlib/shelf_ui.py:103
7270
#, python-format
7271
msgid "Apply %d change(s)?"
7272
msgstr ""
7273
7274
#: bzrlib/shelf_ui.py:104
7275
msgid "Apply change?"
7276
msgstr ""
7277
7278
#: bzrlib/shelf_ui.py:105
7279
#, python-format
7280
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7281
msgstr ""
7282
7283
#: bzrlib/shelf_ui.py:107
7284
#, python-format
7285
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7286
msgstr ""
7287
7288
#: bzrlib/shelf_ui.py:402
7289
msgid "No changes are shelved."
7290
msgstr ""
7291
7292
#: bzrlib/shelf_ui.py:460
7293
#, python-format
7294
msgid "Using changes with id \"%d\"."
7295
msgstr ""
7296
7297
#: bzrlib/shelf_ui.py:464
7298
#, python-format
7299
msgid "Message: %s"
7300
msgstr ""
7301
7302
#: bzrlib/shelf_ui.py:476
7303
#, python-format
7304
msgid "Deleted changes with id \"%d\"."
7305
msgstr ""
7306
7307
#: bzrlib/smart/medium.py:714
7308
msgid "HPSS calls: {0} ({1} vfs) {2}"
7309
msgstr ""
7310
7311
#: bzrlib/smart/server.py:169
7312
msgid "Requested to stop gracefully"
7313
msgstr ""
7314
7315
#: bzrlib/smart/server.py:179
7316
#, python-format
7317
msgid "Waiting for %d client(s) to finish"
7318
msgstr ""
7319
7320
#: bzrlib/smart/server.py:185
7321
#, python-format
7322
msgid "Still waiting for %d client(s) to finish"
7323
msgstr ""
7324
7325
#: bzrlib/smart/server.py:219
7326
#, python-format
7327
msgid "listening socket error: %s"
7328
msgstr ""
7329
7330
#: bzrlib/smart/server.py:452
7331
#, python-format
7332
msgid "listening on port: %s"
7333
msgstr ""
7334
7335
#: bzrlib/switch.py:73
7336
msgid "Pending merges must be committed or reverted before using switch."
7337
msgstr ""
7338
7339
#: bzrlib/switch.py:100
7340
msgid ""
7341
"Cannot switch as local commits found in the checkout. Commit these to the "
7342
"bound branch or use --force to throw them away."
7343
msgstr ""
7344
7345
#: bzrlib/switch.py:105
7346
#, python-format
7347
msgid ""
7348
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7349
"anyway, use --force."
7350
msgstr ""
7351
7352
#: bzrlib/switch.py:129
7353
msgid "Cannot switch a branch, only a checkout."
7354
msgstr ""
7355
7356
#: bzrlib/switch.py:167
7357
#, python-format
7358
msgid "Tree is up to date at revision %d."
7359
msgstr ""
7360
7361
#: bzrlib/switch.py:173
7362
#, python-format
7363
msgid "Updated to revision %d."
7364
msgstr ""
7365
7366
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7367
msgid "Apply phase"
7368
msgstr ""
7369
7370
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7371
msgid "removing file"
7372
msgstr ""
7373
7374
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7375
msgid "adding file"
7376
msgstr ""
7377
7378
#: bzrlib/transform.py:2598
7379
msgid "Building tree"
7380
msgstr ""
7381
7382
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7383
msgid "Adding file contents"
7384
msgstr ""
7385
7386
#: bzrlib/transform.py:3017
7387
msgid "Resolution pass"
7388
msgstr ""
7389
7390
#: bzrlib/transport/ftp/_gssapi.py:88
7391
#, python-format
7392
msgid "Authenticated as %s"
7393
msgstr ""
7394
7395
#: bzrlib/tree.py:647
7396
msgid "*** {0} content-filter: {1} => {2!r}"
7397
msgstr ""
7398
7399
#: bzrlib/upgrade.py:77
7400
#, python-format
7401
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7402
msgstr ""
7403
7404
#: bzrlib/upgrade.py:100
7405
#, python-format
7406
msgid "cannot upgrade from bzrdir format %s"
7407
msgstr ""
7408
7409
#: bzrlib/upgrade.py:103
7410
#, python-format
7411
msgid "starting upgrade of %s"
7412
msgstr ""
7413
7414
#: bzrlib/upgrade.py:110
7415
msgid "finished"
7416
msgstr ""
7417
7418
#: bzrlib/upgrade.py:120
7419
msgid "Deleting backup.bzr"
7420
msgstr ""
7421
7422
#: bzrlib/upgrade.py:151
7423
msgid ""
7424
"\n"
7425
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7426
msgstr ""
7427
7428
#: bzrlib/upgrade.py:208
7429
#, python-format
7430
msgid "Found %d dependent branches - upgrading ..."
7431
msgstr ""
7432
7433
#: bzrlib/upgrade.py:276
7434
msgid "Upgrading bzrdirs"
7435
msgstr ""
7436
7437
#: bzrlib/upgrade.py:282
7438
#, python-format
7439
msgid "Upgrading %s"
7440
msgstr ""
7441
7442
#: bzrlib/upgrade.py:283
7443
msgid "Upgrading {0} {1} ..."
7444
msgstr ""
7445
7446
#: bzrlib/upgrade.py:301
7447
msgid "Removing backup ..."
7448
msgstr ""
7449
7450
#: bzrlib/upgrade.py:305
7451
msgid "failed to clean-up {0}: {1}"
7452
msgstr ""
7453
7454
#: bzrlib/vf_repository.py:1091
7455
msgid "inventories"
7456
msgstr ""
7457
7458
#: bzrlib/vf_repository.py:1117
7459
msgid "texts"
7460
msgstr ""
7461
7462
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7463
msgid "Calculating text parents"
7464
msgstr ""
7465
7466
#: bzrlib/vf_repository.py:1707
7467
msgid "Fetch texts"
7468
msgstr ""
7469
7470
#: bzrlib/vf_repository.py:2536
7471
msgid "loading text store"
7472
msgstr ""
7473
7474
#: bzrlib/vf_repository.py:2542
7475
msgid "checking text graph"
7476
msgstr ""
7477
7478
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7479
#: bzrlib/vf_repository.py:3127
7480
msgid "Transferring revisions"
7481
msgstr ""
7482
7483
#: bzrlib/win32utils.py:146
7484
msgid "Failed to GetProcessMemoryInfo()"
7485
msgstr "GetProcessMemoryInfo() non riuscito"
7486
7487
#: bzrlib/win32utils.py:167
7488
msgid "Cannot debug memory on win32 without ctypes or win32process"
7489
msgstr ""
7490
7491
#: bzrlib/win32utils.py:172
7492
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7493
msgstr ""
7494
7495
#: bzrlib/win32utils.py:180
7496
#, python-format
7497
msgid "WorkingSize %8d KiB"
7498
msgstr ""
7499
7500
#: bzrlib/win32utils.py:181
7501
#, python-format
7502
msgid "PeakWorking %8d KiB"
7503
msgstr ""
7504
7505
#: bzrlib/win32utils.py:182
7506
#, python-format
7507
msgid "PagefileUsage %8d KiB"
7508
msgstr ""
7509
7510
#: bzrlib/win32utils.py:183
7511
#, python-format
7512
msgid "PeakPagefileUsage %8d KiB"
7513
msgstr ""
7514
7515
#: bzrlib/win32utils.py:185
7516
#, python-format
7517
msgid "PrivateUsage %8d KiB"
7518
msgstr ""
7519
7520
#: bzrlib/win32utils.py:186
7521
#, python-format
7522
msgid "PageFaultCount %8d"
7523
msgstr ""
7524
7525
#: bzrlib/workingtree.py:1482
7526
msgid "Rerun update after fixing the conflicts."
7527
msgstr ""
7528
7529
#: dummy/help_topics/authentication/summary.txt:1
7530
msgid "Information on configuring authentication"
7531
msgstr ""
7532
7533
#: dummy/help_topics/basic/detail.txt:1
7534
msgid ""
7535
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7536
"http://bazaar.canonical.com/"
7537
msgstr ""
7538
7539
#: dummy/help_topics/basic/detail.txt:4
7540
msgid ""
7541
"Basic commands:\n"
7542
" bzr init makes this directory a versioned branch\n"
7543
" bzr branch make a copy of another branch"
7544
msgstr ""
7545
7546
#: dummy/help_topics/basic/detail.txt:8
7547
msgid ""
7548
" bzr add make files or directories versioned\n"
7549
" bzr ignore ignore a file or pattern\n"
7550
" bzr mv move or rename a versioned file"
7551
msgstr ""
7552
7553
#: dummy/help_topics/basic/detail.txt:12
7554
msgid ""
7555
" bzr status summarize changes in working copy\n"
7556
" bzr diff show detailed diffs"
7557
msgstr ""
7558
7559
#: dummy/help_topics/basic/detail.txt:15
7560
msgid ""
7561
" bzr merge pull in changes from another branch\n"
7562
" bzr commit save some or all changes\n"
7563
" bzr send send changes via email"
7564
msgstr ""
7565
7566
#: dummy/help_topics/basic/detail.txt:19
7567
msgid ""
7568
" bzr log show history of changes\n"
7569
" bzr check validate storage"
7570
msgstr ""
7571
7572
#: dummy/help_topics/basic/detail.txt:22
7573
msgid ""
7574
" bzr help init more help on e.g. init command\n"
7575
" bzr help commands list all commands\n"
7576
" bzr help topics list all help topics\n"
7577
msgstr ""
7578
7579
#: dummy/help_topics/basic/summary.txt:1
7580
msgid "Basic commands"
7581
msgstr ""
7582
7583
#: dummy/help_topics/branches/detail.txt:1
7584
msgid "Branches"
7585
msgstr ""
7586
7587
#: dummy/help_topics/branches/detail.txt:3
7588
msgid ""
7589
"A branch consists of the state of a project, including all of its\n"
7590
"history. All branches have a repository associated (which is where the\n"
7591
"branch history is stored), but multiple branches may share the same\n"
7592
"repository (a shared repository). Branches can be copied and merged."
7593
msgstr ""
7594
7595
#: dummy/help_topics/branches/detail.txt:8
7596
msgid ""
7597
"In addition, one branch may be bound to another one. Binding to another\n"
7598
"branch indicates that commits which happen in this branch must also \n"
7599
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7600
"commits when the two branches are out of date. In order for a commit \n"
7601
"to succeed, it may be necessary to update the current branch using \n"
7602
"``bzr update``."
7603
msgstr ""
7604
7605
#: dummy/help_topics/branches/detail.txt:15
7606
#: dummy/help_topics/checkouts/detail.txt:66
7607
#: dummy/help_topics/repositories/detail.txt:36
7608
msgid "Related commands::"
7609
msgstr ""
7610
7611
#: dummy/help_topics/branches/detail.txt:17
7612
msgid ""
7613
" init Change a directory into a versioned branch.\n"
7614
" branch Create a new branch that is a copy of an existing branch.\n"
7615
" merge Perform a three-way merge.\n"
7616
" bind Bind a branch to another one.\n"
7617
msgstr ""
7618
7619
#: dummy/help_topics/branches/summary.txt:1
7620
msgid "Information on what a branch is"
7621
msgstr ""
7622
7623
#: dummy/help_topics/bugs/summary.txt:1
7624
msgid "Bug tracker settings"
7625
msgstr ""
7626
7627
#: dummy/help_topics/checkouts/detail.txt:1
7628
msgid "Checkouts"
7629
msgstr ""
7630
7631
#: dummy/help_topics/checkouts/detail.txt:3
7632
msgid ""
7633
"Checkouts are source trees that are connected to a branch, so that when\n"
7634
"you commit in the source tree, the commit goes into that branch. They\n"
7635
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7636
"Bazaar's decentralized features until you want them. Using checkouts\n"
7637
"with shared repositories is very similar to working with SVN or CVS, but\n"
7638
"doesn't have the same restrictions. And using checkouts still allows\n"
7639
"others working on the project to use whatever workflow they like."
7640
msgstr ""
7641
7642
#: dummy/help_topics/checkouts/detail.txt:11
7643
msgid ""
7644
"A checkout is created with the bzr checkout command (see \"help "
7645
"checkout\").\n"
7646
"You pass it a reference to another branch, and it will create a local copy\n"
7647
"for you that still contains a reference to the branch you created the\n"
7648
"checkout from (the master branch). Then if you make any commits they will "
7649
"be\n"
7650
"made on the other branch first. This creates an instant mirror of your work, "
7651
"or\n"
7652
"facilitates lockstep development, where each developer is working together,\n"
7653
"continuously integrating the changes of others."
7654
msgstr ""
7655
7656
#: dummy/help_topics/checkouts/detail.txt:19
7657
msgid ""
7658
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7659
"you have the full history locally. As you have a first class branch you "
7660
"can\n"
7661
"also commit locally if you want, for instance due to the temporary loss af "
7662
"a\n"
7663
"network connection. Use the --local option to commit to do this. All the "
7664
"local\n"
7665
"commits will then be made on the master branch the next time you do a non-"
7666
"local\n"
7667
"commit."
7668
msgstr ""
7669
7670
#: dummy/help_topics/checkouts/detail.txt:26
7671
msgid ""
7672
"If you are using a checkout from a shared branch you will periodically want "
7673
"to\n"
7674
"pull in all the changes made by others. This is done using the \"update\"\n"
7675
"command. The changes need to be applied before any non-local commit, but\n"
7676
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7677
"command when needed."
7678
msgstr ""
7679
7680
#: dummy/help_topics/checkouts/detail.txt:32
7681
msgid ""
7682
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7683
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7684
"SVN checkout in that it is not a first class branch, it mainly consists of "
7685
"the\n"
7686
"working tree. This means that any history operations must query the master\n"
7687
"branch, which could be slow if a network connection is involved. Also, as "
7688
"you\n"
7689
"don't have a local branch, then you cannot commit locally."
7690
msgstr ""
7691
7692
#: dummy/help_topics/checkouts/detail.txt:39
7693
msgid ""
7694
"Lightweight checkouts work best when you have fast reliable access to the\n"
7695
"master branch. This means that if the master branch is on the same disk or "
7696
"LAN\n"
7697
"a lightweight checkout will be faster than a heavyweight one for any "
7698
"commands\n"
7699
"that modify the revision history (as only one copy of the branch needs to\n"
7700
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7701
"that uses the history but does not change it, but if the master branch is "
7702
"on\n"
7703
"the same disk then there won't be a noticeable difference."
7704
msgstr ""
7705
7706
#: dummy/help_topics/checkouts/detail.txt:47
7707
msgid ""
7708
"Another possible use for a checkout is to use it with a treeless repository\n"
7709
"containing your branches, where you maintain only one working tree by\n"
7710
"switching the master branch that the checkout points to when you want to\n"
7711
"work on a different branch."
7712
msgstr ""
7713
7714
#: dummy/help_topics/checkouts/detail.txt:52
7715
msgid ""
7716
"Obviously to commit on a checkout you need to be able to write to the "
7717
"master\n"
7718
"branch. This means that the master branch must be accessible over a "
7719
"writeable\n"
7720
"protocol , such as sftp://, and that you have write permissions at the "
7721
"other\n"
7722
"end. Checkouts also work on the local file system, so that all that matters "
7723
"is\n"
7724
"file permissions."
7725
msgstr ""
7726
7727
#: dummy/help_topics/checkouts/detail.txt:58
7728
msgid ""
7729
"You can change the master of a checkout by using the \"switch\" command "
7730
"(see\n"
7731
"\"help switch\"). This will change the location that the commits are sent "
7732
"to.\n"
7733
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7734
"checkout. If you would like to convert your heavy checkout into a normal\n"
7735
"branch so that every commit is local, you can use the \"unbind\" command. To "
7736
"see\n"
7737
"whether or not a branch is bound or not you can use the \"info\" command. If "
7738
"the\n"
7739
"branch is bound it will tell you the location of the bound branch."
7740
msgstr ""
7741
7742
#: dummy/help_topics/checkouts/detail.txt:68
7743
msgid ""
7744
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7745
" checkout\n"
7746
" update Pull any changes in the master branch in to your checkout\n"
7747
" commit Make a commit that is sent to the master branch. If you have\n"
7748
" a heavy checkout then the --local option will commit to the\n"
7749
" checkout without sending the commit to the master\n"
7750
" switch Change the master branch that the commits in the checkout "
7751
"will\n"
7752
" be sent to\n"
7753
" bind Turn a standalone branch into a heavy checkout so that any\n"
7754
" commits will be sent to the master branch\n"
7755
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7756
" commits are only made locally\n"
7757
" info Displays whether a branch is bound or unbound. If the branch "
7758
"is\n"
7759
" bound, then it will also display the location of the bound "
7760
"branch\n"
7761
msgstr ""
7762
7763
#: dummy/help_topics/checkouts/summary.txt:1
7764
msgid "Information on what a checkout is"
7765
msgstr ""
7766
7767
#: dummy/help_topics/commands/summary.txt:1
7768
msgid "Basic help for all commands"
7769
msgstr ""
7770
7771
#: dummy/help_topics/configuration/summary.txt:1
7772
msgid "Details on the configuration settings available"
7773
msgstr ""
7774
7775
#: dummy/help_topics/conflict-types/summary.txt:1
7776
msgid "Types of conflicts and what to do about them"
7777
msgstr ""
7778
7779
#: dummy/help_topics/content-filters/summary.txt:1
7780
msgid "Conversion of content into/from working trees"
7781
msgstr ""
7782
7783
#: dummy/help_topics/criss-cross/detail.txt:1
7784
msgid "Criss-Cross"
7785
msgstr ""
7786
7787
#: dummy/help_topics/criss-cross/detail.txt:3
7788
msgid ""
7789
"A criss-cross in the branch history can cause the default merge technique\n"
7790
"to emit more conflicts than would normally be expected."
7791
msgstr ""
7792
7793
#: dummy/help_topics/criss-cross/detail.txt:6
7794
msgid ""
7795
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7796
"give\n"
7797
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7798
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7799
msgstr ""
7800
7801
#: dummy/help_topics/criss-cross/detail.txt:10
7802
msgid ""
7803
"Criss-crosses occur in a branch's history if two branches merge the same "
7804
"thing\n"
7805
"and then merge one another, or if two branches merge one another at the "
7806
"same\n"
7807
"time. They can be avoided by having each branch only merge from or into a\n"
7808
"designated central branch (a \"star topology\")."
7809
msgstr ""
7810
7811
#: dummy/help_topics/criss-cross/detail.txt:15
7812
msgid ""
7813
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7814
"default\n"
7815
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7816
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7817
"differences between THIS and OTHER are due to one side adding lines, or\n"
7818
"from another side removing lines."
7819
msgstr ""
7820
7821
#: dummy/help_topics/criss-cross/detail.txt:21
7822
msgid ""
7823
"Criss-crosses mean there is no good choice for a base. Selecting the "
7824
"recent\n"
7825
"merge points could cause one side's changes to be silently discarded.\n"
7826
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7827
"are emitted."
7828
msgstr ""
7829
7830
#: dummy/help_topics/criss-cross/detail.txt:26
7831
msgid ""
7832
"The ``weave`` merge type is not affected by this problem because it uses\n"
7833
"line-origin detection instead of a basis revision to determine the cause of\n"
7834
"differences.\n"
7835
msgstr ""
7836
7837
#: dummy/help_topics/criss-cross/summary.txt:1
7838
msgid "Information on criss-cross merging"
7839
msgstr ""
7840
7841
#: dummy/help_topics/current-formats/summary.txt:1
7842
msgid "Current storage formats"
7843
msgstr ""
7844
7845
#: dummy/help_topics/debug-flags/summary.txt:1
7846
msgid "Options to show or record debug information"
7847
msgstr ""
7848
7849
#: dummy/help_topics/diverged-branches/summary.txt:1
7850
msgid "How to fix diverged branches"
7851
msgstr ""
7852
7853
#: dummy/help_topics/env-variables/summary.txt:1
7854
msgid "Environment variable names and values"
7855
msgstr ""
7856
7857
#: dummy/help_topics/eol/summary.txt:1
7858
msgid "Information on end-of-line handling"
7859
msgstr ""
7860
7861
#: dummy/help_topics/files/detail.txt:1
7862
msgid "Files"
7863
msgstr ""
7864
7865
#: dummy/help_topics/files/detail.txt:3
7866
msgid ""
7867
":On Unix: ~/.bazaar/bazaar.conf\n"
7868
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7869
"bazaar\\\\2.0\\\\bazaar.conf"
7870
msgstr ""
7871
7872
#: dummy/help_topics/files/detail.txt:6
7873
msgid ""
7874
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7875
"used to define general configuration that will be applied everywhere.\n"
7876
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7877
"commonly used options."
7878
msgstr ""
7879
7880
#: dummy/help_topics/files/detail.txt:11
7881
msgid "A typical config file might look something like::"
7882
msgstr ""
7883
7884
#: dummy/help_topics/files/detail.txt:13
7885
msgid ""
7886
" [DEFAULT]\n"
7887
" email=John Doe <jdoe@isp.com>"
7888
msgstr ""
7889
7890
#: dummy/help_topics/files/detail.txt:16
7891
msgid ""
7892
" [ALIASES]\n"
7893
" commit = commit --strict\n"
7894
" log10 = log --short -r -10..-1\n"
7895
msgstr ""
7896
7897
#: dummy/help_topics/files/summary.txt:1
7898
msgid "Information on configuration and log files"
7899
msgstr ""
7900
7901
#: dummy/help_topics/formats/detail.txt:1
7902
msgid "Storage Formats"
7903
msgstr ""
7904
7905
#: dummy/help_topics/formats/detail.txt:3
7906
msgid ""
7907
"To ensure that older clients do not access data incorrectly,\n"
7908
"Bazaar's policy is to introduce a new storage format whenever\n"
7909
"new features requiring new metadata are added. New storage\n"
7910
"formats may also be introduced to improve performance and\n"
7911
"scalability."
7912
msgstr ""
7913
7914
#: dummy/help_topics/formats/detail.txt:9
7915
msgid ""
7916
"The newest format, 2a, is highly recommended. If your\n"
7917
"project is not using 2a, then you should suggest to the\n"
7918
"project owner to upgrade."
7919
msgstr ""
7920
7921
#: dummy/help_topics/formats/detail.txt:13
7922
msgid ""
7923
"\n"
7924
".. note::"
7925
msgstr ""
7926
7927
#: dummy/help_topics/formats/detail.txt:16
7928
msgid ""
7929
" Some of the older formats have two variants:\n"
7930
" a plain one and a rich-root one. The latter include an additional\n"
7931
" field about the root of the tree. There is no performance cost\n"
7932
" for using a rich-root format but you cannot easily merge changes\n"
7933
" from a rich-root format into a plain format. As a consequence,\n"
7934
" moving a project to a rich-root format takes some co-ordination\n"
7935
" in that all contributors need to upgrade their repositories\n"
7936
" around the same time. 2a and all future formats will be\n"
7937
" implicitly rich-root."
7938
msgstr ""
7939
7940
#: dummy/help_topics/formats/detail.txt:26
7941
msgid ""
7942
"See :doc:`current-formats-help` for the complete list of\n"
7943
"currently supported formats. See :doc:`other-formats-help` for\n"
7944
"descriptions of any available experimental and deprecated formats.\n"
7945
msgstr ""
7946
7947
#: dummy/help_topics/formats/summary.txt:1
7948
msgid "Information on choosing a storage format"
7949
msgstr ""
7950
7951
#: dummy/help_topics/global-options/detail.txt:1
7952
msgid "Global Options"
7953
msgstr ""
7954
7955
#: dummy/help_topics/global-options/detail.txt:3
7956
msgid ""
7957
"These options may be used with any command, and may appear in front of any\n"
7958
"command. (e.g. ``bzr --profile help``)."
7959
msgstr ""
7960
7961
#: dummy/help_topics/global-options/detail.txt:6
7962
msgid ""
7963
"--version Print the version number. Must be supplied before the "
7964
"command.\n"
7965
"--no-aliases Do not process command aliases when running this command.\n"
7966
"--builtin Use the built-in version of a command, not the plugin "
7967
"version.\n"
7968
" This does not suppress other plugin effects.\n"
7969
"--no-plugins Do not process any plugins.\n"
7970
"--no-l10n Do not translate messages.\n"
7971
"--concurrency Number of processes that can be run concurrently (selftest)."
7972
msgstr ""
7973
7974
#: dummy/help_topics/global-options/detail.txt:14
7975
msgid ""
7976
"--profile Profile execution using the hotshot profiler.\n"
7977
"--lsprof Profile execution using the lsprof profiler.\n"
7978
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7979
" results to a specified file. If the filename ends with "
7980
"\".txt\",\n"
7981
" text format will be used. If the filename either starts "
7982
"with\n"
7983
" \"callgrind.out\" or end with \".callgrind\", the output will "
7984
"be\n"
7985
" formatted for use with KCacheGrind. Otherwise, the output\n"
7986
" will be a pickle.\n"
7987
"--coverage Generate line coverage report in the specified directory."
7988
msgstr ""
7989
7990
#: dummy/help_topics/global-options/detail.txt:24
7991
msgid ""
7992
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7993
"for\n"
7994
" the duration of the command. This can be used multiple times "
7995
"if\n"
7996
" several options need to be overridden."
7997
msgstr ""
7998
7999
#: dummy/help_topics/global-options/detail.txt:28
8000
msgid ""
8001
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8002
"information on profiling."
8003
msgstr ""
8004
8005
#: dummy/help_topics/global-options/detail.txt:31
8006
msgid ""
8007
"A number of debug flags are also available to assist troubleshooting and\n"
8008
"development. See :doc:`debug-flags-help`.\n"
8009
msgstr ""
8010
8011
#: dummy/help_topics/global-options/summary.txt:1
8012
msgid "Options that control how Bazaar runs"
8013
msgstr ""
8014
8015
#: dummy/help_topics/hidden-commands/summary.txt:1
8016
msgid "All hidden commands"
8017
msgstr ""
8018
8019
#: dummy/help_topics/hooks/summary.txt:1
8020
msgid "Points at which custom processing can be added"
8021
msgstr ""
8022
8023
#: dummy/help_topics/launchpad/detail.txt:1
8024
msgid "Integration with Launchpad.net"
8025
msgstr ""
8026
8027
#: dummy/help_topics/launchpad/detail.txt:3
8028
msgid ""
8029
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8030
"specification tracking."
8031
msgstr ""
8032
8033
#: dummy/help_topics/launchpad/detail.txt:6
8034
msgid ""
8035
"The bzr client (through the plugin called 'launchpad') has special\n"
8036
"features to communicate with Launchpad:"
8037
msgstr ""
8038
8039
#: dummy/help_topics/launchpad/detail.txt:9
8040
msgid ""
8041
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8042
"This\n"
8043
" is then used by the 'lp:' transport to download your branches using\n"
8044
" bzr+ssh://."
8045
msgstr ""
8046
8047
#: dummy/help_topics/launchpad/detail.txt:13
8048
msgid ""
8049
" * The 'lp:' transport uses Launchpad as a directory service: for "
8050
"example\n"
8051
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8052
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8053
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8054
msgstr ""
8055
8056
#: dummy/help_topics/launchpad/detail.txt:18
8057
msgid ""
8058
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8059
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8060
"lp:12345'\n"
8061
" will record a revision property that marks that revision as fixing\n"
8062
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8063
" automatically be linked to the bug report."
8064
msgstr ""
8065
8066
#: dummy/help_topics/launchpad/detail.txt:24
8067
msgid ""
8068
" * The register-branch command tells Launchpad about the url of a\n"
8069
" public branch. Launchpad will then mirror the branch, display\n"
8070
" its contents and allow it to be attached to bugs and other\n"
8071
" objects."
8072
msgstr ""
8073
8074
#: dummy/help_topics/launchpad/detail.txt:29
8075
msgid "For more information see http://help.launchpad.net/\n"
8076
msgstr ""
8077
8078
#: dummy/help_topics/launchpad/summary.txt:1
8079
msgid "Using Bazaar with Launchpad.net"
8080
msgstr ""
8081
8082
#: dummy/help_topics/location-alias/summary.txt:1
8083
msgid "Aliases for remembered locations"
8084
msgstr ""
8085
8086
#: dummy/help_topics/log-formats/summary.txt:1
8087
msgid "Details on the logging formats available"
8088
msgstr ""
8089
8090
#: dummy/help_topics/other-formats/summary.txt:1
8091
msgid "Experimental and deprecated storage formats"
8092
msgstr ""
8093
8094
#: dummy/help_topics/patterns/summary.txt:1
8095
msgid "Information on the pattern syntax"
8096
msgstr ""
8097
8098
#: dummy/help_topics/repositories/detail.txt:1
8099
msgid "Repositories"
8100
msgstr ""
8101
8102
#: dummy/help_topics/repositories/detail.txt:3
8103
msgid ""
8104
"Repositories in Bazaar are where committed information is stored. There is\n"
8105
"a repository associated with every branch."
8106
msgstr ""
8107
8108
#: dummy/help_topics/repositories/detail.txt:6
8109
msgid ""
8110
"Repositories are a form of database. Bzr will usually maintain this for\n"
8111
"good performance automatically, but in some situations (e.g. when doing\n"
8112
"very many commits in a short time period) you may want to ask bzr to\n"
8113
"optimise the database indices. This can be done by the 'bzr pack' command."
8114
msgstr ""
8115
8116
#: dummy/help_topics/repositories/detail.txt:11
8117
msgid ""
8118
"By default just running 'bzr init' will create a repository within the new\n"
8119
"branch but it is possible to create a shared repository which allows "
8120
"multiple\n"
8121
"branches to share their information in the same location. When a new branch "
8122
"is\n"
8123
"created it will first look to see if there is a containing shared repository "
8124
"it\n"
8125
"can use."
8126
msgstr ""
8127
8128
#: dummy/help_topics/repositories/detail.txt:17
8129
msgid ""
8130
"When two branches of the same project share a repository, there is\n"
8131
"generally a large space saving. For some operations (e.g. branching\n"
8132
"within the repository) this translates in to a large time saving."
8133
msgstr ""
8134
8135
#: dummy/help_topics/repositories/detail.txt:21
8136
msgid ""
8137
"To create a shared repository use the init-repository command (or the alias\n"
8138
"init-repo). This command takes the location of the repository to create. "
8139
"This\n"
8140
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8141
"which contains a shared repository. Any new branches that are created in "
8142
"this\n"
8143
"directory will then use it for storage."
8144
msgstr ""
8145
8146
#: dummy/help_topics/repositories/detail.txt:27
8147
msgid ""
8148
"It is a good idea to create a repository whenever you might create more\n"
8149
"than one branch of a project. This is true for both working areas where you\n"
8150
"are doing the development, and any server areas that you use for hosting\n"
8151
"projects. In the latter case, it is common to want branches without working\n"
8152
"trees. Since the files in the branch will not be edited directly there is "
8153
"no\n"
8154
"need to use up disk space for a working tree. To create a repository in "
8155
"which\n"
8156
"the branches will not have working trees pass the '--no-trees' option to\n"
8157
"'init-repository'."
8158
msgstr ""
8159
8160
#: dummy/help_topics/repositories/detail.txt:38
8161
msgid ""
8162
" init-repository Create a shared repository. Use --no-trees to create "
8163
"one\n"
8164
" in which new branches won't get a working tree.\n"
8165
msgstr ""
8166
8167
#: dummy/help_topics/repositories/summary.txt:1
8168
msgid "Basic information on shared repositories."
8169
msgstr ""
8170
8171
#: dummy/help_topics/revisionspec/summary.txt:1
8172
msgid "Explain how to use --revision"
8173
msgstr ""
8174
8175
#: dummy/help_topics/rules/summary.txt:1
8176
msgid "Information on defining rule-based preferences"
8177
msgstr ""
8178
8179
#: dummy/help_topics/standalone-trees/detail.txt:1
8180
msgid "Standalone Trees"
8181
msgstr ""
8182
8183
#: dummy/help_topics/standalone-trees/detail.txt:3
8184
msgid ""
8185
"A standalone tree is a working tree with an associated repository. It\n"
8186
"is an independently usable branch, with no dependencies on any other.\n"
8187
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8188
"an existing project under version control."
8189
msgstr ""
8190
8191
#: dummy/help_topics/standalone-trees/detail.txt:8
8192
msgid "Related Commands::"
8193
msgstr ""
8194
8195
#: dummy/help_topics/standalone-trees/detail.txt:10
8196
msgid " init Make a directory into a versioned branch.\n"
8197
msgstr ""
8198
8199
#: dummy/help_topics/standalone-trees/summary.txt:1
8200
msgid "Information on what a standalone tree is"
8201
msgstr ""
8202
8203
#: dummy/help_topics/standard-options/detail.txt:1
8204
msgid "Standard Options"
8205
msgstr ""
8206
8207
#: dummy/help_topics/standard-options/detail.txt:3
8208
msgid "Standard options are legal for all commands."
8209
msgstr ""
8210
8211
#: dummy/help_topics/standard-options/detail.txt:5
8212
msgid ""
8213
"--help, -h Show help message.\n"
8214
"--verbose, -v Display more information.\n"
8215
"--quiet, -q Only display errors and warnings."
8216
msgstr ""
8217
8218
#: dummy/help_topics/standard-options/detail.txt:9
8219
msgid "Unlike global options, standard options can be used in aliases.\n"
8220
msgstr ""
8221
8222
#: dummy/help_topics/standard-options/summary.txt:1
8223
msgid "Options that can be used with any command"
8224
msgstr ""
8225
8226
#: dummy/help_topics/status-flags/detail.txt:1
8227
msgid "Status Flags"
8228
msgstr ""
8229
8230
#: dummy/help_topics/status-flags/detail.txt:3
8231
msgid ""
8232
"Status flags are used to summarise changes to the working tree in a concise\n"
8233
"manner. They are in the form::"
8234
msgstr ""
8235
8236
#: dummy/help_topics/status-flags/detail.txt:6
8237
msgid " xxx <filename>"
8238
msgstr ""
8239
8240
#: dummy/help_topics/status-flags/detail.txt:8
8241
msgid "where the columns' meanings are as follows."
8242
msgstr ""
8243
8244
#: dummy/help_topics/status-flags/detail.txt:10
8245
msgid "Column 1 - versioning/renames::"
8246
msgstr ""
8247
8248
#: dummy/help_topics/status-flags/detail.txt:12
8249
msgid ""
8250
" + File versioned\n"
8251
" - File unversioned\n"
8252
" R File renamed\n"
8253
" ? File unknown\n"
8254
" X File nonexistent (and unknown to bzr)\n"
8255
" C File has conflicts\n"
8256
" P Entry for a pending merge (not a file)"
8257
msgstr ""
8258
8259
#: dummy/help_topics/status-flags/detail.txt:20
8260
msgid "Column 2 - contents::"
8261
msgstr ""
8262
8263
#: dummy/help_topics/status-flags/detail.txt:22
8264
msgid ""
8265
" N File created\n"
8266
" D File deleted\n"
8267
" K File kind changed\n"
8268
" M File modified"
8269
msgstr ""
8270
8271
#: dummy/help_topics/status-flags/detail.txt:27
8272
msgid "Column 3 - execute::"
8273
msgstr ""
8274
8275
#: dummy/help_topics/status-flags/detail.txt:29
8276
msgid " * The execute bit was changed\n"
8277
msgstr ""
8278
8279
#: dummy/help_topics/status-flags/summary.txt:1
8280
msgid "Help on status flags"
8281
msgstr ""
8282
8283
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8284
msgid "Branches Out of Sync"
8285
msgstr ""
8286
8287
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8288
msgid ""
8289
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8290
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8291
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8292
"have the same last revision as the new reference branch for the lightweight\n"
8293
"checkout, data could be lost, so Bazaar refuses."
8294
msgstr ""
8295
8296
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8297
msgid "How you deal with this depends on *why* the branches are out of sync."
8298
msgstr ""
8299
8300
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8301
msgid ""
8302
"If you have a checkout and have done local commits, you can get back in "
8303
"sync\n"
8304
"by running \"bzr update\" (and possibly \"bzr commit\")."
8305
msgstr ""
8306
8307
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8308
msgid ""
8309
"If you have a branch and the remote branch is out-of-date, you can push\n"
8310
"the local changes using \"bzr push\". If the local branch is out of date, "
8311
"you\n"
8312
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8313
"commit\n"
8314
"and then push your changes. If you decide that some of the changes aren't\n"
8315
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8316
msgstr ""
8317
8318
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8319
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8320
msgstr ""
8321
8322
#: dummy/help_topics/topics/summary.txt:1
8323
msgid "Topics list"
8324
msgstr ""
8325
8326
#: dummy/help_topics/url-special-chars/summary.txt:1
8327
msgid "Special character handling in URLs"
8328
msgstr ""
8329
8330
#: dummy/help_topics/urlspec/summary.txt:1
8331
msgid "Supported transport protocols"
8332
msgstr ""
8333
8334
#: dummy/help_topics/working-trees/detail.txt:1
8335
msgid "Working Trees"
8336
msgstr ""
8337
8338
#: dummy/help_topics/working-trees/detail.txt:3
8339
msgid ""
8340
"A working tree is the contents of a branch placed on disk so that you can\n"
8341
"see the files and edit them. The working tree is where you make changes to "
8342
"a\n"
8343
"branch, and when you commit the current state of the working tree is the\n"
8344
"snapshot that is recorded in the commit."
8345
msgstr ""
8346
8347
#: dummy/help_topics/working-trees/detail.txt:8
8348
msgid ""
8349
"When you push a branch to a remote system, a working tree will not be\n"
8350
"created. If one is already present the files will not be updated. The\n"
8351
"branch information will be updated and the working tree will be marked\n"
8352
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8353
"may be uncommitted changes or the update may cause content conflicts that "
8354
"are\n"
8355
"difficult to deal with remotely."
8356
msgstr ""
8357
8358
#: dummy/help_topics/working-trees/detail.txt:15
8359
msgid ""
8360
"If you have a branch with no working tree you can use the 'checkout' "
8361
"command\n"
8362
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8363
"will\n"
8364
"create the working tree. If the branch is updated remotely, you can update "
8365
"the\n"
8366
"working tree by running 'bzr update' in that directory."
8367
msgstr ""
8368
8369
#: dummy/help_topics/working-trees/detail.txt:20
8370
msgid ""
8371
"If you have a branch with a working tree that you do not want the 'remove-"
8372
"tree'\n"
8373
"command will remove the tree if it is safe. This can be done to avoid the\n"
8374
"warning about the remote working tree not being updated when pushing to the\n"
8375
"branch. It can also be useful when working with a '--no-trees' repository\n"
8376
"(see 'bzr help repositories')."
8377
msgstr ""
8378
8379
#: dummy/help_topics/working-trees/detail.txt:26
8380
msgid ""
8381
"If you want to have a working tree on a remote machine that you push to you\n"
8382
"can either run 'bzr update' in the remote branch after each push, or use "
8383
"some\n"
8384
"other method to update the tree during the push. There is an 'rspush' "
8385
"plugin\n"
8386
"that will update the working tree using rsync as well as doing a push. "
8387
"There\n"
8388
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8389
"SSH\n"
8390
"after each push."
8391
msgstr ""
8392
8393
#: dummy/help_topics/working-trees/detail.txt:33
8394
msgid "Useful commands::"
8395
msgstr ""
8396
8397
#: dummy/help_topics/working-trees/detail.txt:35
8398
msgid ""
8399
" checkout Create a working tree when a branch does not have one.\n"
8400
" remove-tree Removes the working tree from a branch when it is safe to do "
8401
"so.\n"
8402
" update When a working tree is out of sync with its associated "
8403
"branch\n"
8404
" this will update the tree to match the branch.\n"
8405
msgstr ""
8406
8407
#: dummy/help_topics/working-trees/summary.txt:1
8408
msgid "Information on working trees"
8409
msgstr ""
8410
8411
#: en/help_topics/authentication.txt:1
8412
msgid ""
8413
"Authentication Settings\n"
8414
"======================="
8415
msgstr ""
8416
8417
#: en/help_topics/authentication.txt:4
8418
msgid ""
8419
"\n"
8420
"Intent\n"
8421
"------"
8422
msgstr ""
8423
8424
#: en/help_topics/authentication.txt:8
8425
msgid ""
8426
"Many different authentication policies can be described in the\n"
8427
"``authentication.conf`` file but a particular user should need only a few\n"
8428
"definitions to cover his needs without having to specify a user and a "
8429
"password\n"
8430
"for every branch he uses."
8431
msgstr ""
8432
8433
#: en/help_topics/authentication.txt:13
8434
msgid ""
8435
"The definitions found in this file are used to find the credentials to use "
8436
"for\n"
8437
"a given url. The same credentials can generally be used for as many branches "
8438
"as\n"
8439
"possible by grouping their declaration around the remote servers that need\n"
8440
"them. It's even possible to declare credentials that will be used by "
8441
"different\n"
8442
"servers."
8443
msgstr ""
8444
8445
#: en/help_topics/authentication.txt:19
8446
msgid ""
8447
"The intent is to make this file as small as possible to minimize maintenance."
8448
msgstr ""
8449
8450
#: en/help_topics/authentication.txt:21
8451
msgid ""
8452
"Once the relevant credentials are declared in this file you may use branch "
8453
"urls\n"
8454
"without embedding passwords (security hazard) or even users (enabling "
8455
"sharing\n"
8456
"of your urls with others)."
8457
msgstr ""
8458
8459
#: en/help_topics/authentication.txt:25
8460
msgid "Instead of using::"
8461
msgstr ""
8462
8463
#: en/help_topics/authentication.txt:27
8464
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8465
msgstr ""
8466
8467
#: en/help_topics/authentication.txt:29
8468
msgid "you simply use::"
8469
msgstr ""
8470
8471
#: en/help_topics/authentication.txt:31
8472
msgid " bzr branch ftp://host.com/path/to/my/branch"
8473
msgstr ""
8474
8475
#: en/help_topics/authentication.txt:33
8476
msgid ""
8477
"provided you have created the following ``authentication.conf`` file::"
8478
msgstr ""
8479
8480
#: en/help_topics/authentication.txt:35
8481
msgid ""
8482
" [myprojects]\n"
8483
" scheme=ftp\n"
8484
" host=host.com\n"
8485
" user=joe\n"
8486
" password=secret\n"
8487
" "
8488
msgstr ""
8489
8490
#: en/help_topics/authentication.txt:42
8491
msgid ""
8492
"Authentication definitions\n"
8493
"--------------------------"
8494
msgstr ""
8495
8496
#: en/help_topics/authentication.txt:45
8497
msgid ""
8498
"There are two kinds of authentication used by the various schemes supported "
8499
"by\n"
8500
"bzr:"
8501
msgstr ""
8502
8503
#: en/help_topics/authentication.txt:48
8504
msgid "1. user and password"
8505
msgstr ""
8506
8507
#: en/help_topics/authentication.txt:50
8508
msgid ""
8509
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8510
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8511
"ssh agents are a better, more secure solution. So we have chosen to not "
8512
"provide\n"
8513
"our own less secure method."
8514
msgstr ""
8515
8516
#: en/help_topics/authentication.txt:55
8517
msgid "2. user, realm and password"
8518
msgstr ""
8519
8520
#: en/help_topics/authentication.txt:57
8521
msgid ""
8522
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8523
"against a host. But, by using ``.htaccess`` files, for example, it is "
8524
"possible\n"
8525
"to define several (``user, realm, password``) for a given ``host``. So what "
8526
"is\n"
8527
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8528
"is\n"
8529
"not taken into account in the definitions, but will displayed if bzr "
8530
"prompts\n"
8531
"you for a password."
8532
msgstr ""
8533
8534
#: en/help_topics/authentication.txt:64
8535
msgid ""
8536
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8537
"specifying the appropriate port."
8538
msgstr ""
8539
8540
#: en/help_topics/authentication.txt:67
8541
msgid ""
8542
"To take all schemes into account, the password will be deduced from a set "
8543
"of\n"
8544
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8545
"``user``,\n"
8546
"``password``)."
8547
msgstr ""
8548
8549
#: en/help_topics/authentication.txt:71
8550
msgid ""
8551
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8552
"used\n"
8553
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8554
"``ssh``\n"
8555
" should be used instead since this is the real scheme regarding\n"
8556
" authentication,"
8557
msgstr ""
8558
8559
#: en/help_topics/authentication.txt:76
8560
msgid " * ``host``: can be empty (to act as a default for any host),"
8561
msgstr ""
8562
8563
#: en/help_topics/authentication.txt:78
8564
msgid ""
8565
" * ``port`` can be empty (useful when an host provides several servers for "
8566
"the\n"
8567
" same scheme), only numerical values are allowed, this should be used "
8568
"only\n"
8569
" when the server uses a port different than the scheme standard port,"
8570
msgstr ""
8571
8572
#: en/help_topics/authentication.txt:82
8573
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8574
msgstr ""
8575
8576
#: en/help_topics/authentication.txt:84
8577
msgid ""
8578
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8579
" ``getpass.get_user()``),"
8580
msgstr ""
8581
8582
#: en/help_topics/authentication.txt:87
8583
msgid ""
8584
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8585
" password."
8586
msgstr ""
8587
8588
#: en/help_topics/authentication.txt:90
8589
msgid ""
8590
"Multiple definitions can be provided and, for a given URL, bzr will select "
8591
"a\n"
8592
"(``user`` [, ``password``]) based on the following rules :"
8593
msgstr ""
8594
8595
#: en/help_topics/authentication.txt:93
8596
msgid " 1. the first match wins,"
8597
msgstr ""
8598
8599
#: en/help_topics/authentication.txt:95
8600
msgid " 2. empty fields match everything,"
8601
msgstr ""
8602
8603
#: en/help_topics/authentication.txt:97
8604
msgid ""
8605
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8606
msgstr ""
8607
8608
#: en/help_topics/authentication.txt:99
8609
msgid ""
8610
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8611
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8612
"``projectbzr.sf.net``\n"
8613
" will not match ``bzr.sf.net``)."
8614
msgstr ""
8615
8616
#: en/help_topics/authentication.txt:103
8617
msgid ""
8618
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8619
msgstr ""
8620
8621
#: en/help_topics/authentication.txt:105
8622
msgid ""
8623
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8624
"above,\n"
8625
" empty paths will match any provided path)."
8626
msgstr ""
8627
8628
#: en/help_topics/authentication.txt:110
8629
msgid ""
8630
"File format\n"
8631
"-----------"
8632
msgstr ""
8633
8634
#: en/help_topics/authentication.txt:113
8635
msgid ""
8636
"The general rules for :doc:`configuration files <configuration-help>`\n"
8637
"apply except for the variable policies."
8638
msgstr ""
8639
8640
#: en/help_topics/authentication.txt:116
8641
msgid "Each section describes an authentication definition."
8642
msgstr ""
8643
8644
#: en/help_topics/authentication.txt:118
8645
msgid ""
8646
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8647
"reserved\n"
8648
"and should appear as the *last* section."
8649
msgstr ""
8650
8651
#: en/help_topics/authentication.txt:121
8652
msgid "Each section should define:"
8653
msgstr ""
8654
8655
#: en/help_topics/authentication.txt:123
8656
msgid "* ``user``: the login to be used,"
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:125
8660
msgid "Each section could define:"
8661
msgstr ""
8662
8663
#: en/help_topics/authentication.txt:127
8664
msgid "* ``host``: the remote server,"
8665
msgstr ""
8666
8667
#: en/help_topics/authentication.txt:129
8668
msgid "* ``port``: the port the server is listening,"
8669
msgstr ""
8670
8671
#: en/help_topics/authentication.txt:131
8672
msgid "* ``path``: the branch location,"
8673
msgstr ""
8674
8675
#: en/help_topics/authentication.txt:133
8676
msgid "* ``password``: the password."
8677
msgstr ""
8678
8679
#: en/help_topics/authentication.txt:135
8680
msgid ""
8681
"\n"
8682
"Examples\n"
8683
"--------"
8684
msgstr ""
8685
8686
#: en/help_topics/authentication.txt:139
8687
msgid ""
8688
"\n"
8689
"Personal projects hosted outside\n"
8690
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8691
msgstr ""
8692
8693
#: en/help_topics/authentication.txt:143
8694
msgid ""
8695
"All connections are done with the same ``user`` (the remote one for which "
8696
"the\n"
8697
"default bzr one is not appropriate) and the password is always prompted "
8698
"with\n"
8699
"some exceptions::"
8700
msgstr ""
8701
8702
#: en/help_topics/authentication.txt:147
8703
msgid ""
8704
" # Pet projects on hobby.net\n"
8705
" [hobby]\n"
8706
" host=r.hobby.net\n"
8707
" user=jim\n"
8708
" password=obvious1234\n"
8709
" \n"
8710
" # Home server\n"
8711
" [home]\n"
8712
" scheme=https\n"
8713
" host=home.net\n"
8714
" user=joe\n"
8715
" password=1essobV10us\n"
8716
" \n"
8717
" [DEFAULT]\n"
8718
" # Our local user is barbaz, on all remote sites we're known as "
8719
"foobar\n"
8720
" user=foobar"
8721
msgstr ""
8722
8723
#: en/help_topics/authentication.txt:164
8724
msgid ""
8725
"\n"
8726
"Source hosting provider\n"
8727
"~~~~~~~~~~~~~~~~~~~~~~~"
8728
msgstr ""
8729
"\n"
8730
"Provider sorgente del servizio di host\n"
8731
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8732
8733
#: en/help_topics/authentication.txt:168
8734
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8735
msgstr ""
8736
8737
#: en/help_topics/authentication.txt:170
8738
msgid ""
8739
" [shpnet domain]\n"
8740
" # we use sftp, but ssh is the scheme used for authentication\n"
8741
" scheme=ssh\n"
8742
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8743
" host=.shp.net\n"
8744
" user=joe\n"
8745
" # bzr don't support supplying a password for sftp,\n"
8746
" # consider using an ssh agent if you don't want to supply\n"
8747
" # a password interactively. (pageant, ssh-agent, etc)"
8748
msgstr ""
8749
8750
#: en/help_topics/authentication.txt:180
8751
msgid ""
8752
"HTTPS, SFTP servers and their proxy\n"
8753
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8754
msgstr ""
8755
8756
#: en/help_topics/authentication.txt:183
8757
msgid ""
8758
"At company.com, the server hosting release and integration branches is "
8759
"behind a\n"
8760
"proxy, and the two branches use different authentication policies::"
8761
msgstr ""
8762
8763
#: en/help_topics/authentication.txt:186
8764
msgid ""
8765
" [reference code]\n"
8766
" scheme=https\n"
8767
" host=dev.company.com\n"
8768
" path=/dev\n"
8769
" user=user1\n"
8770
" password=pass1"
8771
msgstr ""
8772
8773
#: en/help_topics/authentication.txt:193
8774
msgid ""
8775
" # development branches on dev server\n"
8776
" [dev]\n"
8777
" scheme=ssh # bzr+ssh and sftp are available here\n"
8778
" host=dev.company.com\n"
8779
" path=/dev/integration\n"
8780
" user=user2\n"
8781
" \n"
8782
" # proxy\n"
8783
" [proxy]\n"
8784
" scheme=http\n"
8785
" host=proxy.company.com\n"
8786
" port=3128\n"
8787
" user=proxyuser1\n"
8788
" password=proxypass1"
8789
msgstr ""
8790
8791
#: en/help_topics/authentication.txt:208
8792
msgid ""
8793
"\n"
8794
"Planned enhancements\n"
8795
"--------------------"
8796
msgstr ""
8797
8798
#: en/help_topics/authentication.txt:212
8799
msgid ""
8800
"The following are not yet implemented but planned as parts of a work in\n"
8801
"progress:"
8802
msgstr ""
8803
8804
#: en/help_topics/authentication.txt:215
8805
msgid "* add a ``password_encoding`` field allowing:"
8806
msgstr ""
8807
8808
#: en/help_topics/authentication.txt:217
8809
msgid ""
8810
" - storing the passwords in various obfuscating encodings (base64 for one),"
8811
msgstr ""
8812
8813
#: en/help_topics/authentication.txt:219
8814
msgid " - delegate password storage to plugins (.netrc for example)."
8815
msgstr ""
8816
8817
#: en/help_topics/authentication.txt:221
8818
msgid ""
8819
"* update the credentials when the user is prompted for user or password,"
8820
msgstr ""
8821
8822
#: en/help_topics/authentication.txt:223
8823
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8824
msgstr ""
8825
8826
#: en/help_topics/authentication.txt:225
8827
msgid ""
8828
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8829
"but\n"
8830
"ignored in the actual implementation.\n"
8831
msgstr ""
8832
8833
#: en/help_topics/bugs.txt:1
8834
msgid "Bug Tracker Settings"
8835
msgstr ""
8836
8837
#: en/help_topics/bugs.txt:3
8838
msgid ""
8839
"When making a commit, metadata about bugs fixed by that change can be\n"
8840
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8841
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8842
"(The only ``status`` value currently supported is ``fixed.``)"
8843
msgstr ""
8844
8845
#: en/help_topics/bugs.txt:8
8846
msgid ""
8847
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8848
"identifier\n"
8849
"rather than a full URL. This looks like::"
8850
msgstr ""
8851
8852
#: en/help_topics/bugs.txt:11
8853
msgid " bzr commit --fixes <tracker>:<id>"
8854
msgstr ""
8855
8856
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8857
msgid "or::"
8858
msgstr ""
8859
8860
#: en/help_topics/bugs.txt:15
8861
msgid " bzr commit --fixes <id>"
8862
msgstr ""
8863
8864
#: en/help_topics/bugs.txt:17
8865
msgid ""
8866
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8867
"the\n"
8868
"identifier for that bug within the bugtracker, usually the bug number.\n"
8869
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8870
"or global configuration is used."
8871
msgstr ""
8872
8873
#: en/help_topics/bugs.txt:22
8874
msgid ""
8875
"Bazaar knows about a few bug trackers that have many users. If\n"
8876
"you use one of these bug trackers then there is no setup required to\n"
8877
"use this feature, you just need to know the tracker identifier to use.\n"
8878
"These are the bugtrackers that are built in:"
8879
msgstr ""
8880
8881
#: en/help_topics/bugs.txt:27
8882
msgid ""
8883
" ============================ ============ ============\n"
8884
" URL Abbreviation Example\n"
8885
" ============================ ============ ============\n"
8886
" https://bugs.launchpad.net/ lp lp:12345\n"
8887
" http://bugs.debian.org/ deb deb:12345\n"
8888
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8889
" ============================ ============ ============"
8890
msgstr ""
8891
8892
#: en/help_topics/bugs.txt:35
8893
msgid ""
8894
"For the bug trackers not listed above configuration is required.\n"
8895
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8896
"is built in, along with a template mechanism for other bugtrackers with\n"
8897
"simple URL schemes. If your bug tracker can't be described by one\n"
8898
"of the schemes described below then you can write a plugin to support\n"
8899
"it."
8900
msgstr ""
8901
8902
#: en/help_topics/bugs.txt:42
8903
msgid ""
8904
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8905
"variable which contains the base URL of the bug tracker. These options\n"
8906
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8907
"configuration section in ``locations.conf``. You can set up these values\n"
8908
"for each of the projects you work on."
8909
msgstr ""
8910
8911
#: en/help_topics/bugs.txt:48
8912
msgid ""
8913
"Note: As you provide a short name for each tracker, you can specify one or\n"
8914
"more bugs in one or more trackers at commit time if you wish."
8915
msgstr ""
8916
8917
#: en/help_topics/bugs.txt:51
8918
msgid ""
8919
"Launchpad\n"
8920
"---------"
8921
msgstr ""
8922
8923
#: en/help_topics/bugs.txt:54
8924
msgid ""
8925
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8926
msgstr ""
8927
8928
#: en/help_topics/bugs.txt:56
8929
msgid ""
8930
"bugzilla_<tracker>_url\n"
8931
"----------------------"
8932
msgstr ""
8933
8934
#: en/help_topics/bugs.txt:59
8935
msgid ""
8936
"If present, the location of the Bugzilla bug tracker referred to by\n"
8937
"<tracker>. This option can then be used together with ``bzr commit\n"
8938
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8939
"example::"
8940
msgstr ""
8941
8942
#: en/help_topics/bugs.txt:64
8943
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8944
msgstr ""
8945
8946
#: en/help_topics/bugs.txt:66
8947
msgid ""
8948
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8949
"fixed."
8950
msgstr ""
8951
8952
#: en/help_topics/bugs.txt:69
8953
msgid ""
8954
"trac_<tracker>_url\n"
8955
"------------------"
8956
msgstr ""
8957
8958
#: en/help_topics/bugs.txt:72
8959
msgid ""
8960
"If present, the location of the Trac instance referred to by\n"
8961
"<tracker>. This option can then be used together with ``bzr commit\n"
8962
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8963
"example::"
8964
msgstr ""
8965
8966
#: en/help_topics/bugs.txt:77
8967
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8968
msgstr ""
8969
8970
#: en/help_topics/bugs.txt:79
8971
msgid ""
8972
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8973
"as\n"
8974
"fixed."
8975
msgstr ""
8976
8977
#: en/help_topics/bugs.txt:82
8978
msgid ""
8979
"bugtracker_<tracker>_url\n"
8980
"------------------------"
8981
msgstr ""
8982
8983
#: en/help_topics/bugs.txt:85
8984
msgid ""
8985
"If present, the location of a generic bug tracker instance referred to by\n"
8986
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8987
"which will be replaced by a specific bug ID. This option can then be used\n"
8988
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8989
"fixed by that commit. For example::"
8990
msgstr ""
8991
8992
#: en/help_topics/bugs.txt:91
8993
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8994
msgstr ""
8995
8996
#: en/help_topics/bugs.txt:93
8997
msgid ""
8998
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8999
"Roundup bug tracker as fixed, or::"
9000
msgstr ""
9001
9002
#: en/help_topics/bugs.txt:96
9003
msgid ""
9004
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9005
msgstr ""
9006
9007
#: en/help_topics/bugs.txt:98
9008
msgid ""
9009
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9010
"RT bug tracker as fixed, or::"
9011
msgstr ""
9012
9013
#: en/help_topics/bugs.txt:101
9014
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9015
msgstr ""
9016
9017
#: en/help_topics/bugs.txt:103
9018
msgid ""
9019
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9020
"1234\n"
9021
"in Hudson's JIRA bug tracker as fixed.\n"
9022
msgstr ""
9023
9024
#: en/help_topics/commands.txt:1
9025
msgid ""
9026
"add Add specified files or directories.\n"
9027
"alias Set/unset and display aliases.\n"
9028
"annotate Show the origin of each line in a file.\n"
9029
"bash-completion Generate a shell function for bash command line "
9030
"completion.\n"
9031
" [bash_completion]\n"
9032
"bind Convert the current branch into a checkout of the "
9033
"supplied\n"
9034
" branch.\n"
9035
"branch Create a new branch that is a copy of an existing branch.\n"
9036
"branches List the branches available at the current location.\n"
9037
"break-lock Break a dead lock.\n"
9038
"cat Write the contents of a file as of a given revision to\n"
9039
" standard output.\n"
9040
"check Validate working tree structure, branch consistency and\n"
9041
" repository history.\n"
9042
"checkout Create a new checkout of an existing branch.\n"
9043
"clean-tree Remove unwanted files from working tree.\n"
9044
"commit Commit changes into a new revision.\n"
9045
"config Display, set or remove a configuration option.\n"
9046
"conflicts List files with conflicts.\n"
9047
"deleted List files deleted in the working tree.\n"
9048
"diff Show differences in the working tree, between revisions "
9049
"or\n"
9050
" branches.\n"
9051
"dpush Push into a different VCS without any custom bzr "
9052
"metadata.\n"
9053
"export Export current or past revision to a destination directory "
9054
"or\n"
9055
" archive.\n"
9056
"help Show help on a command or other topic.\n"
9057
"ignore Ignore specified files or patterns.\n"
9058
"ignored List ignored files and the patterns that matched them.\n"
9059
"info Show information about a working tree, branch or "
9060
"repository.\n"
9061
"init Make a directory into a versioned branch.\n"
9062
"init-repository Create a shared repository for branches to share storage\n"
9063
" space.\n"
9064
"join Combine a tree into its containing tree.\n"
9065
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9066
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9067
"launchpad-open Open a Launchpad branch page in your web browser. "
9068
"[launchpad]\n"
9069
"log Show historical log for a branch or subset of a branch.\n"
9070
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9071
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9072
"ls List files in a tree.\n"
9073
"merge Perform a three-way merge.\n"
9074
"missing Show unmerged/unpulled revisions between two branches.\n"
9075
"mkdir Create a new versioned directory.\n"
9076
"mv Move or rename a file.\n"
9077
"nick Print or set the branch nickname.\n"
9078
"pack Compress the data within a repository.\n"
9079
"plugins List the installed plugins.\n"
9080
"pull Turn this branch into a mirror of another branch.\n"
9081
"push Update a mirror of this branch.\n"
9082
"reconcile Reconcile bzr metadata in a branch.\n"
9083
"reconfigure Reconfigure the type of a bzr directory.\n"
9084
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9085
"remerge Redo a merge.\n"
9086
"remove Remove files or directories.\n"
9087
"remove-branch Remove a branch.\n"
9088
"remove-tree Remove the working tree from a given branch/checkout.\n"
9089
"renames Show list of renamed files.\n"
9090
"resolve Mark a conflict as resolved.\n"
9091
"revert Set files in the working tree back to the contents of a\n"
9092
" previous revision.\n"
9093
"revno Show current revision number.\n"
9094
"root Show the tree root directory.\n"
9095
"send Mail or create a merge-directive for submitting changes.\n"
9096
"serve Run the bzr server.\n"
9097
"shelve Temporarily set aside some changes from the current tree.\n"
9098
"sign-my-commits Sign all commits by a given committer.\n"
9099
"split Split a subdirectory of a tree into a separate tree.\n"
9100
"status Display status summary.\n"
9101
"switch Set the branch of a checkout and update.\n"
9102
"tag Create, remove or modify a tag naming a revision.\n"
9103
"tags List tags.\n"
9104
"testament Show testament (signing-form) of a revision.\n"
9105
"unbind Convert the current checkout into a regular branch.\n"
9106
"uncommit Remove the last committed revision.\n"
9107
"unshelve Restore shelved changes.\n"
9108
"update Update a working tree to a new revision.\n"
9109
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9110
" format.\n"
9111
"verify-signatures Verify all commit signatures.\n"
9112
"version Show version of bzr.\n"
9113
"version-info Show version information about this tree.\n"
9114
"view Manage filtered views.\n"
9115
"whoami Show or set bzr user id.\n"
9116
msgstr ""
9117
9118
#: en/help_topics/configuration.txt:1
9119
msgid ""
9120
"Configuration Settings\n"
9121
"======================="
9122
msgstr ""
9123
9124
#: en/help_topics/configuration.txt:4
9125
msgid ""
9126
"Environment settings\n"
9127
"---------------------"
9128
msgstr ""
9129
9130
#: en/help_topics/configuration.txt:7
9131
msgid ""
9132
"While most configuration is handled by configuration files, some options\n"
9133
"which may be semi-permanent can also be controlled through the environment."
9134
msgstr ""
9135
9136
#: en/help_topics/configuration.txt:10
9137
msgid ""
9138
"BZR_EMAIL\n"
9139
"~~~~~~~~~"
9140
msgstr ""
9141
9142
#: en/help_topics/configuration.txt:13
9143
msgid "Override the email id used by Bazaar. Typical format::"
9144
msgstr ""
9145
9146
#: en/help_topics/configuration.txt:15
9147
msgid " \"John Doe <jdoe@example.com>\""
9148
msgstr ""
9149
9150
#: en/help_topics/configuration.txt:17
9151
msgid "See also the ``email`` configuration option."
9152
msgstr ""
9153
9154
#: en/help_topics/configuration.txt:19
9155
msgid ""
9156
"BZR_PROGRESS_BAR\n"
9157
"~~~~~~~~~~~~~~~~"
9158
msgstr ""
9159
9160
#: en/help_topics/configuration.txt:22
9161
msgid ""
9162
"Override the progress display. Possible values are \"none\" or \"text\". "
9163
"If\n"
9164
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9165
"draws\n"
9166
"the ordinary command line progress bar."
9167
msgstr ""
9168
9169
#: en/help_topics/configuration.txt:26
9170
msgid ""
9171
"BZR_SIGQUIT_PDB\n"
9172
"~~~~~~~~~~~~~~~"
9173
msgstr ""
9174
9175
#: en/help_topics/configuration.txt:29
9176
msgid ""
9177
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9178
msgstr ""
9179
9180
#: en/help_topics/configuration.txt:31
9181
msgid ""
9182
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9183
"* 1 = Invoke breakin debugger (default)"
9184
msgstr ""
9185
9186
#: en/help_topics/configuration.txt:34
9187
msgid ""
9188
"BZR_HOME\n"
9189
"~~~~~~~~"
9190
msgstr ""
9191
9192
#: en/help_topics/configuration.txt:37
9193
msgid "Override the home directory used by Bazaar."
9194
msgstr ""
9195
9196
#: en/help_topics/configuration.txt:39
9197
msgid ""
9198
"BZR_SSH\n"
9199
"~~~~~~~"
9200
msgstr ""
9201
9202
#: en/help_topics/configuration.txt:42
9203
msgid "Select a different SSH implementation."
9204
msgstr ""
9205
9206
#: en/help_topics/configuration.txt:44
9207
msgid ""
9208
"BZR_PDB\n"
9209
"~~~~~~~"
9210
msgstr ""
9211
9212
#: en/help_topics/configuration.txt:47
9213
msgid "Control whether to launch a debugger on error."
9214
msgstr ""
9215
9216
#: en/help_topics/configuration.txt:49
9217
msgid ""
9218
"* 0 = Standard behavior\n"
9219
"* 1 = Launch debugger"
9220
msgstr ""
9221
9222
#: en/help_topics/configuration.txt:52
9223
msgid ""
9224
"BZR_REMOTE_PATH\n"
9225
"~~~~~~~~~~~~~~~"
9226
msgstr ""
9227
9228
#: en/help_topics/configuration.txt:55
9229
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9230
msgstr ""
9231
9232
#: en/help_topics/configuration.txt:57
9233
msgid "See also the ``bzr_remote_path`` configuration option."
9234
msgstr ""
9235
9236
#: en/help_topics/configuration.txt:59
9237
msgid ""
9238
"BZR_EDITOR\n"
9239
"~~~~~~~~~~"
9240
msgstr ""
9241
9242
#: en/help_topics/configuration.txt:62
9243
msgid "Path to the editor Bazaar should use for commit messages, etc."
9244
msgstr ""
9245
9246
#: en/help_topics/configuration.txt:64
9247
msgid ""
9248
"BZR_LOG\n"
9249
"~~~~~~~"
9250
msgstr ""
9251
9252
#: en/help_topics/configuration.txt:67
9253
msgid ""
9254
"Location of the Bazaar log file. You can check the current location by\n"
9255
"running ``bzr version``."
9256
msgstr ""
9257
9258
#: en/help_topics/configuration.txt:70
9259
msgid ""
9260
"The log file contains debug information that is useful for diagnosing or\n"
9261
"reporting problems with Bazaar."
9262
msgstr ""
9263
9264
#: en/help_topics/configuration.txt:73
9265
msgid ""
9266
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9267
"will disable logging."
9268
msgstr ""
9269
9270
#: en/help_topics/configuration.txt:76
9271
msgid ""
9272
"\n"
9273
"BZR_PLUGIN_PATH\n"
9274
"~~~~~~~~~~~~~~~"
9275
msgstr ""
9276
9277
#: en/help_topics/configuration.txt:80
9278
msgid ""
9279
"The path to the plugins directory that Bazaar should use.\n"
9280
"If not set, Bazaar will search for plugins in:"
9281
msgstr ""
9282
9283
#: en/help_topics/configuration.txt:83
9284
msgid ""
9285
"* the user specific plugin directory (containing the ``user`` plugins),"
9286
msgstr ""
9287
"* nella directory specifica per i plugin dell'utente (contenente i plugin "
9288
"dell'«utente»),"
9289
9290
#: en/help_topics/configuration.txt:85
9291
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9292
msgstr ""
9293
9294
#: en/help_topics/configuration.txt:87
9295
msgid ""
9296
"* the site specific plugin directory if applicable (containing\n"
9297
" the ``site`` plugins)."
9298
msgstr ""
9299
9300
#: en/help_topics/configuration.txt:90
9301
msgid ""
9302
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9303
"the way the plugin are searched. "
9304
msgstr ""
9305
9306
#: en/help_topics/configuration.txt:93
9307
msgid ""
9308
"As for the ``PATH`` variables, if multiple directories are\n"
9309
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9310
"platform specific appropriate character (':' on Unix,\n"
9311
"';' on windows)"
9312
msgstr ""
9313
9314
#: en/help_topics/configuration.txt:98
9315
msgid ""
9316
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9317
"in ``user``. However it will continue to search in ``core`` and\n"
9318
"``site`` unless they are explicitly removed."
9319
msgstr ""
9320
9321
#: en/help_topics/configuration.txt:102
9322
msgid ""
9323
"If you need to change the order or remove one of these\n"
9324
"directories, you should use special values:"
9325
msgstr ""
9326
9327
#: en/help_topics/configuration.txt:105
9328
msgid ""
9329
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9330
" path from the default values,"
9331
msgstr ""
9332
9333
#: en/help_topics/configuration.txt:108
9334
msgid ""
9335
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9336
" before the remaining default values (and also remove it from\n"
9337
" the default values)."
9338
msgstr ""
9339
9340
#: en/help_topics/configuration.txt:112
9341
msgid ""
9342
"Note that the special values 'user', 'core' and 'site' should be\n"
9343
"used literally, they will be substituted by the corresponding,\n"
9344
"platform specific, values."
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:116
9348
msgid ""
9349
"The examples below use ':' as the separator, windows users\n"
9350
"should use ';'."
9351
msgstr ""
9352
9353
#: en/help_topics/configuration.txt:119
9354
msgid "Overriding the default user plugin directory::"
9355
msgstr ""
9356
9357
#: en/help_topics/configuration.txt:121
9358
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:123
9362
msgid "Disabling the site directory while retaining the user directory::"
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:125
9366
msgid " BZR_PLUGIN_PATH='-site:+user'"
9367
msgstr ""
9368
9369
#: en/help_topics/configuration.txt:127
9370
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9371
msgstr ""
9372
9373
#: en/help_topics/configuration.txt:129
9374
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9375
msgstr ""
9376
9377
#: en/help_topics/configuration.txt:131
9378
msgid "Overriding the default site plugin directory::"
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:133
9382
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9383
msgstr ""
9384
9385
#: en/help_topics/configuration.txt:135
9386
msgid ""
9387
"BZR_DISABLE_PLUGINS\n"
9388
"~~~~~~~~~~~~~~~~~~~"
9389
msgstr ""
9390
9391
#: en/help_topics/configuration.txt:138
9392
msgid ""
9393
"Under special circumstances (mostly when trying to diagnose a\n"
9394
"bug), it's better to disable a plugin (or several) rather than\n"
9395
"uninstalling them completely. Such plugins can be specified in\n"
9396
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9397
msgstr ""
9398
9399
#: en/help_topics/configuration.txt:143
9400
msgid ""
9401
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9402
"will raise an import error if they are explicitly imported (by\n"
9403
"another plugin that depends on them for example)."
9404
msgstr ""
9405
9406
#: en/help_topics/configuration.txt:147
9407
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9408
msgstr ""
9409
9410
#: en/help_topics/configuration.txt:149
9411
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9412
msgstr ""
9413
9414
#: en/help_topics/configuration.txt:151
9415
msgid ""
9416
"BZR_PLUGINS_AT\n"
9417
"~~~~~~~~~~~~~~"
9418
msgstr ""
9419
9420
#: en/help_topics/configuration.txt:154
9421
msgid ""
9422
"When adding a new feature or working on a bug in a plugin,\n"
9423
"developers often need to use a specific version of a given\n"
9424
"plugin. Since python requires that the directory containing the\n"
9425
"code is named like the plugin itself this make it impossible to\n"
9426
"use arbitrary directory names (using a two-level directory scheme\n"
9427
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9428
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9429
msgstr ""
9430
9431
#: en/help_topics/configuration.txt:162
9432
msgid ""
9433
"Plugins specified in this environment variable takes precedence\n"
9434
"over the ones in ``BZR_PLUGIN_PATH``."
9435
msgstr ""
9436
9437
#: en/help_topics/configuration.txt:165
9438
msgid ""
9439
"The variable specified a list of ``plugin_name@plugin path``,\n"
9440
"``plugin_name`` being the name of the plugin as it appears in\n"
9441
"python module paths, ``plugin_path`` being the path to the\n"
9442
"directory containing the plugin code itself\n"
9443
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9444
"separator, use ';' on windows."
9445
msgstr ""
9446
9447
#: en/help_topics/configuration.txt:172
9448
msgid ""
9449
"Example:\n"
9450
"~~~~~~~~"
9451
msgstr ""
9452
9453
#: en/help_topics/configuration.txt:175
9454
msgid ""
9455
"Using a specific version of ``myplugin``:\n"
9456
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9457
msgstr ""
9458
9459
#: en/help_topics/configuration.txt:178
9460
msgid ""
9461
"BZRPATH\n"
9462
"~~~~~~~"
9463
msgstr ""
9464
9465
#: en/help_topics/configuration.txt:181
9466
msgid "The path where Bazaar should look for shell plugin external commands."
9467
msgstr ""
9468
9469
#: en/help_topics/configuration.txt:183
9470
msgid ""
9471
"\n"
9472
"http_proxy, https_proxy\n"
9473
"~~~~~~~~~~~~~~~~~~~~~~~"
9474
msgstr ""
9475
9476
#: en/help_topics/configuration.txt:187
9477
msgid "Specifies the network proxy for outgoing connections, for example::"
9478
msgstr ""
9479
9480
#: en/help_topics/configuration.txt:189
9481
msgid ""
9482
" http_proxy=http://proxy.example.com:3128/ \n"
9483
" https_proxy=http://proxy.example.com:3128/"
9484
msgstr ""
9485
9486
#: en/help_topics/configuration.txt:192
9487
msgid ""
9488
"\n"
9489
"Configuration files\n"
9490
"-------------------"
9491
msgstr ""
9492
9493
#: en/help_topics/configuration.txt:196
9494
msgid ""
9495
"Location\n"
9496
"~~~~~~~~"
9497
msgstr ""
9498
9499
#: en/help_topics/configuration.txt:199
9500
msgid ""
9501
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9502
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9503
"on\n"
9504
"Windows. (You can check the location for your system by using\n"
9505
"``bzr version``.)"
9506
msgstr ""
9507
9508
#: en/help_topics/configuration.txt:204
9509
msgid "There are three primary configuration files in this location:"
9510
msgstr ""
9511
9512
#: en/help_topics/configuration.txt:206
9513
msgid "* ``bazaar.conf`` describes default configuration options,"
9514
msgstr ""
9515
9516
#: en/help_topics/configuration.txt:208
9517
msgid ""
9518
"* ``locations.conf`` describes configuration information for\n"
9519
" specific branch locations,"
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:211
9523
msgid ""
9524
"* ``authentication.conf`` describes credential information for\n"
9525
" remote servers."
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:214
9529
msgid ""
9530
"Each branch can also contain a configuration file that sets values specific\n"
9531
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9532
"the\n"
9533
"branch. This file is visible to all users of a branch, if you wish to "
9534
"override\n"
9535
"one of the values for a branch with a setting that is specific to you then "
9536
"you\n"
9537
"can do so in ``locations.conf``."
9538
msgstr ""
9539
9540
#: en/help_topics/configuration.txt:220
9541
msgid ""
9542
"General format\n"
9543
"~~~~~~~~~~~~~~"
9544
msgstr ""
9545
9546
#: en/help_topics/configuration.txt:223
9547
msgid ""
9548
"An ini file has three types of contructs: section headers, section\n"
9549
"options and comments."
9550
msgstr ""
9551
9552
#: en/help_topics/configuration.txt:226
9553
msgid ""
9554
"Comments\n"
9555
"^^^^^^^^"
9556
msgstr ""
9557
9558
#: en/help_topics/configuration.txt:229
9559
msgid ""
9560
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9561
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9562
"Bazaar when parsing ini files."
9563
msgstr ""
9564
9565
#: en/help_topics/configuration.txt:233
9566
msgid ""
9567
"Section headers\n"
9568
"^^^^^^^^^^^^^^^"
9569
msgstr ""
9570
9571
#: en/help_topics/configuration.txt:236
9572
msgid ""
9573
"A section header is a word enclosed in brackets that starts at the begining\n"
9574
"of a line. A typical section header looks like this::"
9575
msgstr ""
9576
9577
#: en/help_topics/configuration.txt:239
9578
msgid " [DEFAULT]"
9579
msgstr ""
9580
9581
#: en/help_topics/configuration.txt:241
9582
msgid ""
9583
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9584
"[ALIASES]. Section headers are case sensitive. The default section provides "
9585
"for\n"
9586
"setting options which can be overridden with the branch config file."
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:245
9590
msgid ""
9591
"For ``locations.conf``, the options from the section with the\n"
9592
"longest matching section header are used to the exclusion of other\n"
9593
"potentially valid section headers. A section header uses the path for\n"
9594
"the branch as the section header. Some examples include::"
9595
msgstr ""
9596
9597
#: en/help_topics/configuration.txt:250
9598
msgid ""
9599
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9600
" [/home/jdoe/branches/]"
9601
msgstr ""
9602
9603
#: en/help_topics/configuration.txt:253
9604
msgid ""
9605
"\n"
9606
"Section options\n"
9607
"^^^^^^^^^^^^^^^"
9608
msgstr ""
9609
"\n"
9610
"Opzioni di sezione\n"
9611
"^^^^^^^^^^^^^^^^^^"
9612
9613
#: en/help_topics/configuration.txt:257
9614
msgid ""
9615
"A section option resides within a section. A section option contains an\n"
9616
"option name, an equals sign and a value. For example::"
9617
msgstr ""
9618
9619
#: en/help_topics/configuration.txt:260
9620
msgid ""
9621
" email = John Doe <jdoe@isp.com>\n"
9622
" gpg_signing_key = Amy Pond <amy@example.com>"
9623
msgstr ""
9624
9625
#: en/help_topics/configuration.txt:263
9626
msgid ""
9627
"A option can reference other options by enclosing them in curly brackets::"
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:265
9631
msgid ""
9632
" my_branch_name = feature_x\n"
9633
" my_server = bzr+ssh://example.com\n"
9634
" push_location = {my_server}/project/{my_branch_name}"
9635
msgstr ""
9636
9637
#: en/help_topics/configuration.txt:269
9638
msgid ""
9639
"Option policies\n"
9640
"^^^^^^^^^^^^^^^"
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:272
9644
msgid ""
9645
"Options defined in a section affect the named directory or URL plus\n"
9646
"any locations they contain. Policies can be used to change how an\n"
9647
"option value is interpreted for contained locations. Currently\n"
9648
"there are three policies available:"
9649
msgstr ""
9650
9651
#: en/help_topics/configuration.txt:277
9652
msgid ""
9653
" none:\n"
9654
" the value is interpreted the same for contained locations. This is\n"
9655
" the default behaviour.\n"
9656
" norecurse:\n"
9657
" the value is only used for the exact location specified by the\n"
9658
" section name.\n"
9659
" appendpath:\n"
9660
" for contained locations, any additional path components are\n"
9661
" appended to the value."
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:287
9665
msgid ""
9666
"Policies are specified by keys with names of the form "
9667
"\"<option_name>:policy\".\n"
9668
"For example, to define the push location for a tree of branches, the\n"
9669
"following could be used::"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:291
9673
msgid ""
9674
" [/top/location]\n"
9675
" push_location = sftp://example.com/location\n"
9676
" push_location:policy = appendpath"
9677
msgstr ""
9678
9679
#: en/help_topics/configuration.txt:295
9680
msgid ""
9681
"With this configuration, the push location for ``/top/location/branch1``\n"
9682
"would be ``sftp://example.com/location/branch1``."
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:298
9686
msgid ""
9687
"Section local options\n"
9688
"^^^^^^^^^^^^^^^^^^^^^"
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:301
9692
msgid ""
9693
"Some options are defined automatically inside a given section and can be\n"
9694
"refered to in this section only. "
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:304
9698
msgid "For example, the ``appendpath`` policy can be used like this::"
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:306
9702
msgid ""
9703
" [/home/vila/src/bzr/bugs]\n"
9704
" mypush = lp:~vila/bzr\n"
9705
" mypush:policy=appendpath"
9706
msgstr ""
9707
9708
#: en/help_topics/configuration.txt:310
9709
msgid "Using ``relpath`` to achieve the same result is done like this::"
9710
msgstr ""
9711
9712
#: en/help_topics/configuration.txt:312
9713
msgid ""
9714
" [/home/vila/src/bzr/bugs]\n"
9715
" mypush = lp:~vila/bzr/{relpath}"
9716
msgstr ""
9717
9718
#: en/help_topics/configuration.txt:315
9719
msgid ""
9720
"In both cases, when used in a directory like\n"
9721
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9722
msgstr ""
9723
9724
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9725
msgid ""
9726
" $ bzr config mypush\n"
9727
" lp:~vila/bzr/832013-expand-in-stack"
9728
msgstr ""
9729
9730
#: en/help_topics/configuration.txt:321
9731
msgid "Another such option is ``basename`` which can be used like this::"
9732
msgstr ""
9733
9734
#: en/help_topics/configuration.txt:323
9735
msgid ""
9736
" [/home/vila/src/bzr]\n"
9737
" mypush = lp:~vila/bzr/{basename}"
9738
msgstr ""
9739
9740
#: en/help_topics/configuration.txt:326
9741
msgid ""
9742
"When used in a directory like\n"
9743
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9744
msgstr ""
9745
9746
#: en/help_topics/configuration.txt:332
9747
msgid ""
9748
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9749
"itself is defined as the relative path between the section name and the\n"
9750
"location it matches."
9751
msgstr ""
9752
9753
#: en/help_topics/configuration.txt:336
9754
msgid ""
9755
"Another such option is ``branchname``, which refers to the name of a "
9756
"colocated\n"
9757
"branch. For non-colocated branches, it behaves like basename. It can be "
9758
"used\n"
9759
"like this::"
9760
msgstr ""
9761
9762
#: en/help_topics/configuration.txt:340
9763
msgid ""
9764
" [/home/vila/src/bzr/bugs]\n"
9765
" mypush = lp:~vila/bzr/{branchname}"
9766
msgstr ""
9767
9768
#: en/help_topics/configuration.txt:343
9769
msgid ""
9770
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9771
"get::"
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:345
9775
msgid ""
9776
" bzr config mypush\n"
9777
" lp:~vila/bzr/832013-expand-in-stack"
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:348
9781
msgid ""
9782
"When an option is local to a Section, it cannot be referred to from option\n"
9783
"values in any other section from the same ``Store`` nor from any other\n"
9784
"``Store``."
9785
msgstr ""
9786
9787
#: en/help_topics/configuration.txt:352
9788
msgid ""
9789
"\n"
9790
"The main configuration file, bazaar.conf\n"
9791
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9792
msgstr ""
9793
9794
#: en/help_topics/configuration.txt:356
9795
msgid ""
9796
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9797
"The default section contains the default\n"
9798
"configuration options for all branches. The default section can be\n"
9799
"overriden by providing a branch-specific section in ``locations.conf``."
9800
msgstr ""
9801
9802
#: en/help_topics/configuration.txt:361
9803
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9804
msgstr ""
9805
9806
#: en/help_topics/configuration.txt:363
9807
msgid ""
9808
" [DEFAULT]\n"
9809
" email = John Doe <jdoe@isp.com>\n"
9810
" editor = /usr/bin/vim\n"
9811
" create_signatures = when-required"
9812
msgstr ""
9813
9814
#: en/help_topics/configuration.txt:368
9815
msgid ""
9816
"\n"
9817
"The branch location configuration file, locations.conf\n"
9818
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9819
msgstr ""
9820
"\n"
9821
"Il file di configurazione di posizione del branch, locations.conf\n"
9822
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9823
9824
#: en/help_topics/configuration.txt:372
9825
msgid ""
9826
"``locations.conf`` allows one to specify overriding settings for\n"
9827
"a specific branch. The format is almost identical to the default section in\n"
9828
"bazaar.conf with one significant change: The section header, instead of "
9829
"saying\n"
9830
"default, will be the path to a branch that you wish to override a value\n"
9831
"for. The '?' and '*' wildcards are supported::"
9832
msgstr ""
9833
9834
#: en/help_topics/configuration.txt:378
9835
msgid ""
9836
" [/home/jdoe/branches/nethack]\n"
9837
" email = Nethack Admin <nethack@nethack.com>"
9838
msgstr ""
9839
9840
#: en/help_topics/configuration.txt:381
9841
msgid ""
9842
" [http://hypothetical.site.com/branches/devel-branch]\n"
9843
" create_signatures = always"
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:384
9847
msgid ""
9848
"The authentication configuration file, authentication.conf\n"
9849
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9850
msgstr ""
9851
9852
#: en/help_topics/configuration.txt:387
9853
msgid ""
9854
"``authentication.conf`` allows one to specify credentials for\n"
9855
"remote servers. This can be used for all the supported transports and any "
9856
"part\n"
9857
"of bzr that requires authentication (smtp for example)."
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:391
9861
msgid ""
9862
"The syntax of the file obeys the same rules as the others except for the\n"
9863
"option policies which don't apply."
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:394
9867
msgid ""
9868
"For more information on the possible uses of the authentication "
9869
"configuration\n"
9870
"file see :doc:`authentication-help`."
9871
msgstr ""
9872
9873
#: en/help_topics/configuration.txt:397
9874
msgid ""
9875
"\n"
9876
"Common options\n"
9877
"--------------"
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:401
9881
msgid ""
9882
"debug_flags\n"
9883
"~~~~~~~~~~~"
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:404
9887
msgid ""
9888
"A comma-separated list of debugging options to turn on. The same values\n"
9889
"can be used as with the -D command-line option (see `help global-options`).\n"
9890
"For example::"
9891
msgstr ""
9892
9893
#: en/help_topics/configuration.txt:408
9894
msgid " debug_flags = hpss"
9895
msgstr ""
9896
9897
#: en/help_topics/configuration.txt:412
9898
msgid " debug_flags = hpss,evil"
9899
msgstr ""
9900
9901
#: en/help_topics/configuration.txt:414
9902
msgid ""
9903
"email\n"
9904
"~~~~~"
9905
msgstr ""
9906
9907
#: en/help_topics/configuration.txt:417
9908
msgid ""
9909
"The email address to use when committing a branch. Typically takes the form\n"
9910
"of::"
9911
msgstr ""
9912
9913
#: en/help_topics/configuration.txt:420
9914
msgid " email = Full Name <account@hostname.tld>"
9915
msgstr ""
9916
9917
#: en/help_topics/configuration.txt:422
9918
msgid ""
9919
"editor\n"
9920
"~~~~~~"
9921
msgstr ""
9922
9923
#: en/help_topics/configuration.txt:425
9924
msgid ""
9925
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9926
"a commit message. This setting is trumped by the environment variable\n"
9927
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9928
"variables."
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:430
9932
msgid ""
9933
"log_format\n"
9934
"~~~~~~~~~~"
9935
msgstr ""
9936
9937
#: en/help_topics/configuration.txt:433
9938
msgid ""
9939
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9940
"and ``line``. Additional formats may be provided by plugins. The default\n"
9941
"value is ``long``."
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:437
9945
msgid ""
9946
"check_signatures\n"
9947
"~~~~~~~~~~~~~~~~"
9948
msgstr ""
9949
9950
#: en/help_topics/configuration.txt:440
9951
msgid ""
9952
"Reserved for future use. These options will allow a policy for branches to\n"
9953
"require signatures."
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:443
9957
msgid ""
9958
"require\n"
9959
" The gnupg signature for revisions must be present and must be valid."
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:446
9963
msgid ""
9964
"ignore\n"
9965
" Do not check gnupg signatures of revisions."
9966
msgstr ""
9967
9968
#: en/help_topics/configuration.txt:449
9969
msgid ""
9970
"check-available\n"
9971
" (default) If gnupg signatures for revisions are present, check them.\n"
9972
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9973
" no signature is present."
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:454
9977
msgid ""
9978
"create_signatures\n"
9979
"~~~~~~~~~~~~~~~~~"
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:457
9983
msgid ""
9984
"Defines the behaviour of signing revisions on commits. By default bzr will "
9985
"not\n"
9986
"sign new commits."
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:460
9990
msgid ""
9991
"always\n"
9992
" Sign every new revision that is committed. If the signing fails then "
9993
"the\n"
9994
" commit will not be made."
9995
msgstr ""
9996
9997
#: en/help_topics/configuration.txt:464
9998
msgid ""
9999
"when-required\n"
10000
" Reserved for future use."
10001
msgstr ""
10002
10003
#: en/help_topics/configuration.txt:467
10004
msgid ""
10005
"never\n"
10006
" Reserved for future use."
10007
msgstr ""
10008
10009
#: en/help_topics/configuration.txt:470
10010
msgid ""
10011
"In future it is planned that ``when-required`` will sign newly\n"
10012
"committed revisions only when the branch requires them. ``never`` will "
10013
"refuse\n"
10014
"to sign newly committed revisions, even if the branch requires signatures."
10015
msgstr ""
10016
10017
#: en/help_topics/configuration.txt:474
10018
msgid ""
10019
"dirstate.fdatasync\n"
10020
"~~~~~~~~~~~~~~~~~~"
10021
msgstr ""
10022
10023
#: en/help_topics/configuration.txt:477
10024
msgid ""
10025
"If true (default), working tree metadata changes are flushed through the\n"
10026
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10027
"should not be lost if the machine crashes. See also repository.fdatasync."
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:481
10031
msgid ""
10032
"gpg_signing_key\n"
10033
"~~~~~~~~~~~~~~~"
10034
msgstr ""
10035
10036
#: en/help_topics/configuration.txt:484
10037
msgid ""
10038
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10039
"address, key fingerprint or full key ID. When unset or when set to\n"
10040
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10041
msgstr ""
10042
10043
#: en/help_topics/configuration.txt:488
10044
msgid ""
10045
"recurse\n"
10046
"~~~~~~~"
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:491
10050
msgid ""
10051
"Only useful in ``locations.conf``. Defines whether or not the\n"
10052
"configuration for this section applies to subdirectories:"
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:494
10056
msgid ""
10057
"true\n"
10058
" (default) This section applies to subdirectories as well."
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:497
10062
msgid ""
10063
"false\n"
10064
" This section only applies to the branch at this directory and not\n"
10065
" branches below it."
10066
msgstr ""
10067
10068
#: en/help_topics/configuration.txt:501
10069
msgid ""
10070
"gpg_signing_command\n"
10071
"~~~~~~~~~~~~~~~~~~~"
10072
msgstr ""
10073
10074
#: en/help_topics/configuration.txt:504
10075
msgid ""
10076
"(Default: \"gpg\"). Which program should be used to sign and check "
10077
"revisions.\n"
10078
"For example::"
10079
msgstr ""
10080
10081
#: en/help_topics/configuration.txt:507
10082
msgid " gpg_signing_command = /usr/bin/gnpg"
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:509
10086
msgid ""
10087
"The specified command must accept the options \"--clearsign\" and \"-u "
10088
"<email>\"."
10089
msgstr ""
10090
10091
#: en/help_topics/configuration.txt:511
10092
msgid ""
10093
"bzr_remote_path\n"
10094
"~~~~~~~~~~~~~~~"
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:514
10098
msgid ""
10099
"(Default: \"bzr\"). The path to the command that should be used to run the "
10100
"smart\n"
10101
"server for bzr. This value may only be specified in locations.conf, because:"
10102
msgstr ""
10103
10104
#: en/help_topics/configuration.txt:517
10105
msgid ""
10106
"- it's needed before branch.conf is accessible\n"
10107
"- allowing remote branch.conf files to specify commands would be a security\n"
10108
" risk"
10109
msgstr ""
10110
10111
#: en/help_topics/configuration.txt:521
10112
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10113
msgstr ""
10114
10115
#: en/help_topics/configuration.txt:523
10116
msgid ""
10117
"smtp_server\n"
10118
"~~~~~~~~~~~"
10119
msgstr ""
10120
10121
#: en/help_topics/configuration.txt:526
10122
msgid ""
10123
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10124
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10125
msgstr ""
10126
10127
#: en/help_topics/configuration.txt:529
10128
msgid ""
10129
"smtp_username, smtp_password\n"
10130
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10131
msgstr ""
10132
10133
#: en/help_topics/configuration.txt:532
10134
msgid ""
10135
"User and password to authenticate to the SMTP server. If smtp_username\n"
10136
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10137
"These settings are only needed if the SMTP server requires authentication\n"
10138
"to send mail."
10139
msgstr ""
10140
10141
#: en/help_topics/configuration.txt:537
10142
msgid ""
10143
"locks.steal_dead\n"
10144
"~~~~~~~~~~~~~~~~"
10145
msgstr ""
10146
10147
#: en/help_topics/configuration.txt:540
10148
msgid ""
10149
"If set to true, bzr will automatically break locks held by processes from\n"
10150
"the same machine and user that are no longer alive. Otherwise, it will\n"
10151
"print a message and you can break the lock manually, if you are satisfied\n"
10152
"the object is no longer in use."
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:545
10156
msgid ""
10157
"mail_client\n"
10158
"~~~~~~~~~~~"
10159
msgstr ""
10160
10161
#: en/help_topics/configuration.txt:548
10162
msgid ""
10163
"A mail client to use for sending merge requests.\n"
10164
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10165
"it\n"
10166
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10167
"``editor``."
10168
msgstr ""
10169
10170
#: en/help_topics/configuration.txt:553
10171
msgid "Supported values for specific clients:"
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:555
10175
msgid ""
10176
":claws: Use Claws. This skips a dialog for attaching files.\n"
10177
":evolution: Use Evolution.\n"
10178
":kmail: Use KMail.\n"
10179
":mutt: Use Mutt.\n"
10180
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10181
"1.5,\n"
10182
" this works around some bugs that xdg-email doesn't handle."
10183
msgstr ""
10184
10185
#: en/help_topics/configuration.txt:562
10186
msgid "Supported generic values are:"
10187
msgstr ""
10188
10189
#: en/help_topics/configuration.txt:564
10190
msgid ""
10191
":default: See above.\n"
10192
":editor: Use your editor to compose the merge request. This also uses\n"
10193
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10194
" smtp_username and smtp_password.\n"
10195
":mapi: Use your preferred e-mail client on Windows.\n"
10196
":xdg-email: Use xdg-email to run your preferred mail program"
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:571
10200
msgid ""
10201
"repository.fdatasync\n"
10202
"~~~~~~~~~~~~~~~~~~~~"
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:574
10206
msgid ""
10207
"If true (default), repository changes are flushed through the OS buffers\n"
10208
"to physical disk. This is somewhat slower, but means data should not be\n"
10209
"lost if the machine crashes. See also dirstate.fdatasync."
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:578
10213
msgid ""
10214
"submit_branch\n"
10215
"~~~~~~~~~~~~~"
10216
msgstr ""
10217
10218
#: en/help_topics/configuration.txt:581
10219
msgid ""
10220
"The branch you intend to submit your current work to. This is "
10221
"automatically\n"
10222
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10223
"This\n"
10224
"should usually be set on a per-branch or per-location basis."
10225
msgstr ""
10226
10227
#: en/help_topics/configuration.txt:585
10228
msgid ""
10229
"public_branch\n"
10230
"~~~~~~~~~~~~~"
10231
msgstr ""
10232
10233
#: en/help_topics/configuration.txt:588
10234
msgid ""
10235
"A publically-accessible version of this branch (implying that this version "
10236
"is\n"
10237
"not publically-accessible). Used (and set) by ``bzr send``."
10238
msgstr ""
10239
10240
#: en/help_topics/configuration.txt:591
10241
msgid ""
10242
"suppress_warnings\n"
10243
"~~~~~~~~~~~~~~~~~"
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:594
10247
msgid ""
10248
"A list of strings, each string represent a warning that can be emitted by\n"
10249
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10250
msgstr ""
10251
10252
#: en/help_topics/configuration.txt:597
10253
msgid "Valid values:"
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:599
10257
msgid ""
10258
"* ``format_deprecation``:\n"
10259
" whether the format deprecation warning is shown on repositories that "
10260
"are\n"
10261
" using deprecated formats."
10262
msgstr ""
10263
10264
#: en/help_topics/configuration.txt:603
10265
msgid ""
10266
"default_format\n"
10267
"~~~~~~~~~~~~~~"
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:606
10271
msgid ""
10272
"A format name for the default format used when creating branches. See "
10273
"``bzr\n"
10274
"help formats`` for possible values."
10275
msgstr ""
10276
10277
#: en/help_topics/configuration.txt:609
10278
msgid ""
10279
"\n"
10280
"Unicode options\n"
10281
"---------------"
10282
msgstr ""
10283
10284
#: en/help_topics/configuration.txt:613
10285
msgid ""
10286
"output_encoding\n"
10287
"~~~~~~~~~~~~~~~"
10288
msgstr ""
10289
10290
#: en/help_topics/configuration.txt:616
10291
msgid ""
10292
"A Python unicode encoding name for text output from bzr, such as log\n"
10293
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10294
"is the terminal encoding prefered by the operating system."
10295
msgstr ""
10296
10297
#: en/help_topics/configuration.txt:620
10298
msgid ""
10299
"\n"
10300
"Branch type specific options\n"
10301
"----------------------------"
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:624
10305
msgid ""
10306
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10307
"later format. They\n"
10308
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10309
"manually set in ``locations.conf`` or ``bazaar.conf``."
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:629
10313
msgid ""
10314
"append_revisions_only\n"
10315
"~~~~~~~~~~~~~~~~~~~~~"
10316
msgstr ""
10317
10318
#: en/help_topics/configuration.txt:632
10319
msgid ""
10320
"If set to \"True\" then revisions can only be appended to the log, not\n"
10321
"removed. A branch with this setting enabled can only pull from another\n"
10322
"branch if the other branch's log is a longer version of its own. This is\n"
10323
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10324
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10325
"compatibility with previous bzr versions (older than 2.2)."
10326
msgstr ""
10327
10328
#: en/help_topics/configuration.txt:639
10329
msgid ""
10330
"parent_location\n"
10331
"~~~~~~~~~~~~~~~"
10332
msgstr ""
10333
10334
#: en/help_topics/configuration.txt:642
10335
msgid ""
10336
"If present, the location of the default branch for pull or merge. This "
10337
"option\n"
10338
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10339
"--remember``."
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:646
10343
msgid ""
10344
"push_location\n"
10345
"~~~~~~~~~~~~~"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:649
10349
msgid ""
10350
"If present, the location of the default branch for push. This option\n"
10351
"is normally set by the first ``push`` or ``push --remember``."
10352
msgstr ""
10353
10354
#: en/help_topics/configuration.txt:652
10355
msgid ""
10356
"push_strict\n"
10357
"~~~~~~~~~~~"
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:655
10361
msgid ""
10362
"If present, defines the ``--strict`` option default value for checking\n"
10363
"uncommitted changes before pushing."
10364
msgstr ""
10365
10366
#: en/help_topics/configuration.txt:658
10367
msgid ""
10368
"dpush_strict\n"
10369
"~~~~~~~~~~~~"
10370
msgstr ""
10371
10372
#: en/help_topics/configuration.txt:661
10373
msgid ""
10374
"If present, defines the ``--strict`` option default value for checking\n"
10375
"uncommitted changes before pushing into a different VCS without any\n"
10376
"custom bzr metadata."
10377
msgstr ""
10378
10379
#: en/help_topics/configuration.txt:665
10380
msgid ""
10381
"bound_location\n"
10382
"~~~~~~~~~~~~~~"
10383
msgstr ""
10384
10385
#: en/help_topics/configuration.txt:668
10386
msgid ""
10387
"The location that commits should go to when acting as a checkout.\n"
10388
"This option is normally set by ``bind``."
10389
msgstr ""
10390
10391
#: en/help_topics/configuration.txt:671
10392
msgid ""
10393
"bound\n"
10394
"~~~~~"
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:674
10398
msgid ""
10399
"If set to \"True\", the branch should act as a checkout, and push each "
10400
"commit to\n"
10401
"the bound_location. This option is normally set by ``bind``/``unbind``."
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:677
10405
msgid ""
10406
"send_strict\n"
10407
"~~~~~~~~~~~"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:680
10411
msgid ""
10412
"If present, defines the ``--strict`` option default value for checking\n"
10413
"uncommitted changes before sending a merge directive."
10414
msgstr ""
10415
10416
#: en/help_topics/configuration.txt:683
10417
msgid ""
10418
"add.maximum_file_size\n"
10419
"~~~~~~~~~~~~~~~~~~~~~"
10420
msgstr ""
10421
10422
#: en/help_topics/configuration.txt:686
10423
msgid ""
10424
"Defines the maximum file size the command line \"add\" operation will allow\n"
10425
"in recursive mode, with files larger than this value being skipped. You may "
10426
"\n"
10427
"specify this value as an integer (in which case it is interpreted as bytes), "
10428
"\n"
10429
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10430
"0 \n"
10431
"will disable skipping."
10432
msgstr ""
10433
10434
#: en/help_topics/configuration.txt:692
10435
msgid ""
10436
"External Merge Tools\n"
10437
"--------------------"
10438
msgstr ""
10439
10440
#: en/help_topics/configuration.txt:695
10441
msgid ""
10442
"bzr.mergetool.<name>\n"
10443
"~~~~~~~~~~~~~~~~~~~~"
10444
msgstr ""
10445
10446
#: en/help_topics/configuration.txt:698
10447
msgid ""
10448
"Defines an external merge tool called <name> with the given command-line.\n"
10449
"Arguments containing spaces should be quoted using single or double quotes. "
10450
"The\n"
10451
"executable may omit its path if it can be found on the PATH."
10452
msgstr ""
10453
10454
#: en/help_topics/configuration.txt:702
10455
msgid ""
10456
"The following markers can be used in the command-line to substitute "
10457
"filenames\n"
10458
"involved in the merge conflict::"
10459
msgstr ""
10460
10461
#: en/help_topics/configuration.txt:705
10462
msgid ""
10463
" {base} file.BASE\n"
10464
" {this} file.THIS\n"
10465
" {other} file.OTHER\n"
10466
" {result} output file\n"
10467
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10468
"merge\n"
10469
" succeeds."
10470
msgstr ""
10471
10472
#: en/help_topics/configuration.txt:714
10473
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10474
msgstr ""
10475
10476
#: en/help_topics/configuration.txt:716
10477
msgid ""
10478
"bzr.default_mergetool\n"
10479
"~~~~~~~~~~~~~~~~~~~~~"
10480
msgstr ""
10481
10482
#: en/help_topics/configuration.txt:719
10483
msgid ""
10484
"Specifies which external merge tool (as defined above) should be selected "
10485
"by\n"
10486
"default in tools such as ``bzr qconflicts``."
10487
msgstr ""
10488
10489
#: en/help_topics/configuration.txt:724
10490
msgid " bzr.default_mergetool = kdiff3\n"
10491
msgstr ""
10492
10493
#: en/help_topics/conflict-types.txt:1
10494
msgid ""
10495
"Conflict Types\n"
10496
"=============="
10497
msgstr ""
10498
10499
#: en/help_topics/conflict-types.txt:4
10500
msgid ""
10501
"Some operations, like merge, revert and pull, modify the contents of your\n"
10502
"working tree. These modifications are programmatically generated, and so "
10503
"they\n"
10504
"may conflict with the current state of your working tree. "
10505
msgstr ""
10506
10507
#: en/help_topics/conflict-types.txt:8
10508
msgid ""
10509
"When conflicts are present in your working tree (as shown by ``bzr\n"
10510
"conflicts``), you should resolve them and then inform bzr that the "
10511
"conflicts\n"
10512
"have been resolved."
10513
msgstr ""
10514
10515
#: en/help_topics/conflict-types.txt:12
10516
msgid ""
10517
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10518
"should resolve them is not the one responsible for their occurrence, as is "
10519
"the\n"
10520
"case when merging other people's work or because some conflicts are "
10521
"presented\n"
10522
"in a way that is not easy to understand."
10523
msgstr ""
10524
10525
#: en/help_topics/conflict-types.txt:17
10526
msgid ""
10527
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10528
"conflict if and only if there's an actual conceptual conflict in the source\n"
10529
"tree. Because Bazaar doesn't understand the real meaning of the files "
10530
"being\n"
10531
"versioned, it can, when faced with ambiguities, fall short in either "
10532
"direction\n"
10533
"trying to resolve the conflict itself. Many kinds of changes can be "
10534
"combined\n"
10535
"programmatically, but sometimes only a human can determine the right thing "
10536
"to\n"
10537
"do."
10538
msgstr ""
10539
10540
#: en/help_topics/conflict-types.txt:25
10541
msgid ""
10542
"When Bazaar generates a conflict, it adds information into the working tree "
10543
"to\n"
10544
"present the conflicting versions, and it's up to you to find the correct\n"
10545
"resolution."
10546
msgstr ""
10547
10548
#: en/help_topics/conflict-types.txt:29
10549
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10550
msgstr ""
10551
10552
#: en/help_topics/conflict-types.txt:31
10553
msgid ""
10554
"1. Modify the working tree content so that the conflicted item is now in "
10555
"the\n"
10556
" state you want to keep, then"
10557
msgstr ""
10558
10559
#: en/help_topics/conflict-types.txt:34
10560
msgid ""
10561
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10562
" remaining generated information (``bzr resolve <item>``)."
10563
msgstr ""
10564
10565
#: en/help_topics/conflict-types.txt:37
10566
msgid ""
10567
"For most conflict types, there are some obvious ways to modify the working\n"
10568
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10569
"itself already made a choice, when possible."
10570
msgstr ""
10571
10572
#: en/help_topics/conflict-types.txt:41
10573
msgid ""
10574
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10575
"different ways to resolve the conflict."
10576
msgstr ""
10577
10578
#: en/help_topics/conflict-types.txt:44
10579
msgid ""
10580
"Each type of conflict is explained below, and the action which must be done "
10581
"to\n"
10582
"resolve the conflict is outlined."
10583
msgstr ""
10584
10585
#: en/help_topics/conflict-types.txt:47
10586
msgid ""
10587
"Various actions are available depending on the kind of conflict, for some "
10588
"of\n"
10589
"these actions, Bazaar can provide some help. In the end you should at least\n"
10590
"inform Bazaar that you're done with the conflict with::"
10591
msgstr ""
10592
10593
#: en/help_topics/conflict-types.txt:51
10594
msgid " ``bzr resolve FILE --action=done'"
10595
msgstr ""
10596
10597
#: en/help_topics/conflict-types.txt:53
10598
msgid ""
10599
"Note that this is the default action when a single file is involved so you "
10600
"can\n"
10601
"simply use::"
10602
msgstr ""
10603
10604
#: en/help_topics/conflict-types.txt:56
10605
msgid " ``bzr resolve FILE``"
10606
msgstr ""
10607
10608
#: en/help_topics/conflict-types.txt:58
10609
msgid "See ``bzr help resolve`` for more details."
10610
msgstr ""
10611
10612
#: en/help_topics/conflict-types.txt:60
10613
msgid ""
10614
"Text conflicts\n"
10615
"--------------"
10616
msgstr ""
10617
10618
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10619
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10620
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10621
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10622
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10623
msgid "Typical message::"
10624
msgstr ""
10625
10626
#: en/help_topics/conflict-types.txt:65
10627
msgid " Text conflict in FILE"
10628
msgstr ""
10629
10630
#: en/help_topics/conflict-types.txt:67
10631
msgid ""
10632
"These are produced when a text merge cannot completely reconcile two sets "
10633
"of\n"
10634
"text changes. Bazaar will emit files for each version with the extensions\n"
10635
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10636
"tree,\n"
10637
"i.e. the tree that you are merging changes into. OTHER is the version that "
10638
"you\n"
10639
"are merging into the target. BASE is an older version that is used as a "
10640
"basis\n"
10641
"for comparison."
10642
msgstr ""
10643
10644
#: en/help_topics/conflict-types.txt:74
10645
msgid ""
10646
"In the main copy of the file, Bazaar will include all the changes that it\n"
10647
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10648
"\"herringbone\" markers like ``<<<<<<<``."
10649
msgstr ""
10650
10651
#: en/help_topics/conflict-types.txt:78
10652
msgid ""
10653
"Say the initial text is \"The project leader released it.\", and THIS "
10654
"modifies it\n"
10655
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10656
"leader\n"
10657
"released Bazaar.\" A conflict would look like this::"
10658
msgstr ""
10659
10660
#: en/help_topics/conflict-types.txt:82
10661
msgid ""
10662
" <<<<<<< TREE\n"
10663
" Martin Pool released it.\n"
10664
" =======\n"
10665
" The project leader released Bazaar.\n"
10666
" >>>>>>> MERGE-SOURCE"
10667
msgstr ""
10668
10669
#: en/help_topics/conflict-types.txt:88
10670
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10671
msgstr ""
10672
10673
#: en/help_topics/conflict-types.txt:90
10674
msgid ""
10675
"You can handle text conflicts either by editing the main copy of the file,\n"
10676
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10677
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10678
"set of changes over the other (but see below when you encounter these\n"
10679
"cases). More often, the two sets of changes must be intelligently combined."
10680
msgstr ""
10681
10682
#: en/help_topics/conflict-types.txt:96
10683
msgid ""
10684
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10685
"you are done editing, the file should look like it never had a conflict, and "
10686
"be\n"
10687
"ready to commit."
10688
msgstr ""
10689
10690
#: en/help_topics/conflict-types.txt:100
10691
msgid ""
10692
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10693
"Bazaar will auto-detect which conflicts you have resolved."
10694
msgstr ""
10695
10696
#: en/help_topics/conflict-types.txt:103
10697
msgid ""
10698
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10699
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10700
"working tree."
10701
msgstr ""
10702
10703
#: en/help_topics/conflict-types.txt:107
10704
msgid ""
10705
"\n"
10706
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10707
"resolve`` with one of the following actions:"
10708
msgstr ""
10709
10710
#: en/help_topics/conflict-types.txt:111
10711
msgid ""
10712
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10713
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10714
msgstr ""
10715
10716
#: en/help_topics/conflict-types.txt:114
10717
msgid ""
10718
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10719
"modifications will be taken into account."
10720
msgstr ""
10721
10722
#: en/help_topics/conflict-types.txt:117
10723
msgid ""
10724
"Content conflicts\n"
10725
"-----------------"
10726
msgstr ""
10727
10728
#: en/help_topics/conflict-types.txt:122
10729
msgid " Contents conflict in FILE"
10730
msgstr ""
10731
10732
#: en/help_topics/conflict-types.txt:124
10733
msgid ""
10734
"This conflict happens when there are conflicting changes in the working "
10735
"tree\n"
10736
"and the merge source, but the conflicted items are not text files. They "
10737
"may\n"
10738
"be binary files, or symlinks, or directories. It can even happen with "
10739
"files\n"
10740
"that are deleted on one side, and modified on the other."
10741
msgstr ""
10742
10743
#: en/help_topics/conflict-types.txt:129
10744
msgid ""
10745
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10746
"be\n"
10747
"regular files, symlinks or directories). But it will not include a \"main "
10748
"copy\"\n"
10749
"of the file with herringbone conflict markers. It will appear that the "
10750
"\"main\n"
10751
"copy\" has been renamed to THIS or OTHER."
10752
msgstr ""
10753
10754
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10755
msgid ""
10756
"To resolve that kind of conflict, you should rebuild FILE from either "
10757
"version\n"
10758
"or a combination of both."
10759
msgstr ""
10760
10761
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10762
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10763
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10764
#: en/help_topics/conflict-types.txt:361
10765
msgid "``bzr resolve`` recognizes the following actions:"
10766
msgstr ""
10767
10768
#: en/help_topics/conflict-types.txt:139
10769
msgid ""
10770
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10771
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10772
"* ``--action=done`` will just mark the conflict as resolved."
10773
msgstr ""
10774
10775
#: en/help_topics/conflict-types.txt:143
10776
msgid ""
10777
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10778
"and\n"
10779
"``.OTHER`` files if they are still present in the working tree."
10780
msgstr ""
10781
10782
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10783
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10784
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10785
#: en/help_topics/conflict-types.txt:369
10786
msgid ""
10787
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10788
msgstr ""
10789
10790
#: en/help_topics/conflict-types.txt:148
10791
msgid ""
10792
"Tag conflicts\n"
10793
"-------------"
10794
msgstr ""
10795
10796
#: en/help_topics/conflict-types.txt:153
10797
msgid ""
10798
" Conflicting tags:\n"
10799
" version-0.1"
10800
msgstr ""
10801
10802
#: en/help_topics/conflict-types.txt:156
10803
msgid ""
10804
"When pulling from or pushing to another branch, Bazaar informs you about "
10805
"tags\n"
10806
"that conflict between the two branches; that is the same tag points to two\n"
10807
"different revisions. You need not resolve these conflicts, but subsequent\n"
10808
"uses of pull or push will result in the same message."
10809
msgstr ""
10810
10811
#: en/help_topics/conflict-types.txt:161
10812
msgid ""
10813
"To resolve the conflict, you must apply the correct tags to either the "
10814
"target\n"
10815
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10816
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10817
"target branch's tags match the source branch, then in the target branch do\n"
10818
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10819
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10820
"source\n"
10821
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10822
"favor of the target branch, you need to similarly use ``tag --force`` in "
10823
"the\n"
10824
"source branch. (Note that pulling or pushing using --overwrite will "
10825
"overwrite\n"
10826
"all tags as well.)"
10827
msgstr ""
10828
10829
#: en/help_topics/conflict-types.txt:172
10830
msgid ""
10831
"Duplicate paths\n"
10832
"---------------"
10833
msgstr ""
10834
10835
#: en/help_topics/conflict-types.txt:177
10836
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10837
msgstr ""
10838
10839
#: en/help_topics/conflict-types.txt:179
10840
msgid ""
10841
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10842
"already been used. The existing file will be renamed to \"FILE.moved\". "
10843
msgstr ""
10844
10845
#: en/help_topics/conflict-types.txt:187
10846
msgid ""
10847
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10848
"FILE``,\n"
10849
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10850
"* ``--action=done`` will just mark the conflict as resolved."
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:191
10854
msgid ""
10855
"Note that you must get rid of FILE.moved before using ``--action=done``."
10856
msgstr ""
10857
10858
#: en/help_topics/conflict-types.txt:195
10859
msgid ""
10860
"Unversioned parent\n"
10861
"------------------"
10862
msgstr ""
10863
10864
#: en/help_topics/conflict-types.txt:200
10865
msgid ""
10866
" Conflict because FILE is not versioned, but has versioned children."
10867
msgstr ""
10868
10869
#: en/help_topics/conflict-types.txt:202
10870
msgid ""
10871
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10872
"not\n"
10873
"versioned. This happens when the directory has been deleted in the target,\n"
10874
"but has a new child in the source, or vice versa. In this situation, "
10875
"Bazaar\n"
10876
"will version the parent directory as well. Resolving this issue depends\n"
10877
"very much on the particular scenario. You may wish to rename or delete "
10878
"either\n"
10879
"the file or the directory. When you are satisfied, you can run \"bzr "
10880
"resolve\n"
10881
"FILE\" to mark the conflict as resolved."
10882
msgstr ""
10883
10884
#: en/help_topics/conflict-types.txt:210
10885
msgid ""
10886
"Missing parent\n"
10887
"--------------"
10888
msgstr ""
10889
10890
#: en/help_topics/conflict-types.txt:215
10891
msgid " Conflict adding files to FILE. Created directory."
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:217
10895
msgid ""
10896
"This happens when a directory has been deleted in the target, but has new\n"
10897
"children in the source. This is similar to the \"unversioned parent\" "
10898
"conflict,\n"
10899
"except that the parent directory does not *exist*, instead of just being\n"
10900
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10901
"Resolving this issue depends very much on the particular scenario."
10902
msgstr ""
10903
10904
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10905
msgid ""
10906
"To resolve that kind of conflict, you should either remove or rename the\n"
10907
"children or the directory or a combination of both."
10908
msgstr ""
10909
10910
#: en/help_topics/conflict-types.txt:228
10911
msgid ""
10912
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10913
" children,\n"
10914
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10915
"children\n"
10916
" and restoring the directory,\n"
10917
"* ``--action=done`` will just mark the conflict as resolved."
10918
msgstr ""
10919
10920
#: en/help_topics/conflict-types.txt:236
10921
msgid ""
10922
"Deleting parent\n"
10923
"---------------"
10924
msgstr ""
10925
10926
#: en/help_topics/conflict-types.txt:241
10927
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10928
msgstr ""
10929
10930
#: en/help_topics/conflict-types.txt:243
10931
msgid ""
10932
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10933
"source, but has new children in the target (either because a directory\n"
10934
"deletion is merged or because the merge introduce new children). Bazaar\n"
10935
"will retain the directory. Resolving this issue depends very much on the\n"
10936
"particular scenario."
10937
msgstr ""
10938
10939
#: en/help_topics/conflict-types.txt:254
10940
msgid ""
10941
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10942
"directory,"
10943
msgstr ""
10944
10945
#: en/help_topics/conflict-types.txt:256
10946
msgid ""
10947
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10948
" children,"
10949
msgstr ""
10950
10951
#: en/help_topics/conflict-types.txt:259
10952
msgid "* ``--action=done`` will just mark the conflict as resolved."
10953
msgstr ""
10954
10955
#: en/help_topics/conflict-types.txt:261
10956
msgid ""
10957
"Note that when merging a directory deletion, if unversioned files are\n"
10958
"present, they become potential orphans has they don't have a directory\n"
10959
"parent anymore."
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:265
10963
msgid ""
10964
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10965
"setting the ``bzr.transform.orphan_policy`` configuration option."
10966
msgstr ""
10967
10968
#: en/help_topics/conflict-types.txt:268
10969
msgid "There are two possible values for this option:"
10970
msgstr ""
10971
10972
#: en/help_topics/conflict-types.txt:270
10973
msgid ""
10974
"* ``conflict`` (the default): will leave the orphans in place and\n"
10975
" generate a conflicts,"
10976
msgstr ""
10977
10978
#: en/help_topics/conflict-types.txt:273
10979
msgid ""
10980
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10981
"root\n"
10982
" of the working tree with names like ``<file>.~#~``."
10983
msgstr ""
10984
10985
#: en/help_topics/conflict-types.txt:278
10986
msgid ""
10987
"Path conflict\n"
10988
"-------------"
10989
msgstr ""
10990
10991
#: en/help_topics/conflict-types.txt:283
10992
msgid " Path conflict: PATH1 / PATH2"
10993
msgstr ""
10994
10995
#: en/help_topics/conflict-types.txt:285
10996
msgid ""
10997
"This happens when the source and target have each modified the name or "
10998
"parent\n"
10999
"directory of a file. Bazaar will use the path elements from the source."
11000
msgstr ""
11001
11002
#: en/help_topics/conflict-types.txt:288
11003
msgid ""
11004
"To resolve that kind of conflict, you just have to decide what name should "
11005
"be\n"
11006
"retained for the file involved."
11007
msgstr ""
11008
11009
#: en/help_topics/conflict-types.txt:293
11010
msgid ""
11011
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11012
" issuing ``bzr mv PATH2 PATH1``,\n"
11013
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11014
"``PATH2``,\n"
11015
"* ``--action=done`` will just mark the conflict as resolved."
11016
msgstr ""
11017
11018
#: en/help_topics/conflict-types.txt:300
11019
msgid ""
11020
"Parent loop\n"
11021
"-----------"
11022
msgstr ""
11023
11024
#: en/help_topics/conflict-types.txt:305
11025
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11026
msgstr ""
11027
11028
#: en/help_topics/conflict-types.txt:307
11029
msgid ""
11030
"This happens when the source and the target have each moved directories, so\n"
11031
"that, if the change could be applied, a directory would be contained by "
11032
"itself.\n"
11033
"For example::"
11034
msgstr ""
11035
11036
#: en/help_topics/conflict-types.txt:311
11037
msgid ""
11038
" $ bzr init\n"
11039
" $ bzr mkdir white\n"
11040
" $ bzr mkdir black\n"
11041
" $ bzr commit -m \"BASE\"\n"
11042
" $ bzr branch . ../other\n"
11043
" $ bzr mv white black\n"
11044
" $ bzr commit -m \"THIS\"\n"
11045
" $ bzr mv ../other/black ../other/white\n"
11046
" $ bzr commit ../other -m \"OTHER\"\n"
11047
" $ bzr merge ../other"
11048
msgstr ""
11049
11050
#: en/help_topics/conflict-types.txt:322
11051
msgid ""
11052
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11053
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11054
"name should be retained for the directories involved."
11055
msgstr ""
11056
11057
#: en/help_topics/conflict-types.txt:328
11058
msgid ""
11059
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11060
"\n"
11061
" in ``black``,\n"
11062
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11063
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11064
"* ``--action=done`` will just mark the conflict as resolved."
11065
msgstr ""
11066
11067
#: en/help_topics/conflict-types.txt:336
11068
msgid ""
11069
"Non-directory parent\n"
11070
"--------------------"
11071
msgstr ""
11072
11073
#: en/help_topics/conflict-types.txt:341
11074
msgid ""
11075
" Conflict: foo.new is not a directory, but has files in it.\n"
11076
" Created directory."
11077
msgstr ""
11078
11079
#: en/help_topics/conflict-types.txt:344
11080
msgid ""
11081
"This happens when one side has added files to a directory, and the other "
11082
"side\n"
11083
"has changed the directory into a file or symlink. For example::"
11084
msgstr ""
11085
11086
#: en/help_topics/conflict-types.txt:347
11087
msgid ""
11088
" $ bzr init\n"
11089
" $ bzr mkdir foo\n"
11090
" $ bzr commit -m \"BASE\"\n"
11091
" $ bzr branch . ../other\n"
11092
" $ rmdir foo\n"
11093
" $ touch foo\n"
11094
" $ bzr commit -m \"THIS\"\n"
11095
" $ bzr mkdir ../other/foo/bar\n"
11096
" $ bzr commit ../other -m \"OTHER\"\n"
11097
" $ bzr merge ../other"
11098
msgstr ""
11099
11100
#: en/help_topics/conflict-types.txt:358
11101
msgid ""
11102
"To resolve that kind of conflict, you have to decide what name should be\n"
11103
"retained for the file, directory or symlink involved."
11104
msgstr ""
11105
11106
#: en/help_topics/conflict-types.txt:363
11107
msgid ""
11108
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11109
" ``bzr add foo``,\n"
11110
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11111
" ``bzr mv foo.new foo``,\n"
11112
"* ``--action=done`` will just mark the conflict as resolved."
11113
msgstr ""
11114
11115
#: en/help_topics/conflict-types.txt:371
11116
msgid ""
11117
"MalformedTransform\n"
11118
"------------------"
11119
msgstr ""
11120
11121
#: en/help_topics/conflict-types.txt:374
11122
msgid ""
11123
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11124
"exception. This means that Bazaar encountered a filesystem conflict that it "
11125
"was\n"
11126
"unable to resolve. This usually indicates a bug. Please let us know if "
11127
"you\n"
11128
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11129
msgstr ""
11130
11131
#: en/help_topics/content-filters.txt:1
11132
msgid ""
11133
"Content Filters\n"
11134
"==============="
11135
msgstr ""
11136
11137
#: en/help_topics/content-filters.txt:4
11138
msgid ""
11139
"Content formats\n"
11140
"---------------"
11141
msgstr ""
11142
11143
#: en/help_topics/content-filters.txt:7
11144
msgid ""
11145
"Bazaar's content filtering allows you to store files in a different\n"
11146
"format from the copy in your working tree. This lets you, or your\n"
11147
"co-developers, use Windows development tools that expect CRLF files\n"
11148
"on projects that use other line-ending conventions. Among other things,\n"
11149
"content filters also let Unix developers more easily work on projects\n"
11150
"using Windows line-ending conventions, keyword expansion/compression,\n"
11151
"and trailing spaces on lines in text files to be implicitly stripped\n"
11152
"when committed."
11153
msgstr ""
11154
11155
#: en/help_topics/content-filters.txt:16
11156
msgid "To generalize, there are two content formats supported by Bazaar:"
11157
msgstr ""
11158
11159
#: en/help_topics/content-filters.txt:18
11160
msgid ""
11161
"* a canonical format - how files are stored internally\n"
11162
"* a convenience format - how files are created in a working tree."
11163
msgstr ""
11164
11165
#: en/help_topics/content-filters.txt:21
11166
msgid ""
11167
"\n"
11168
"Format conversion\n"
11169
"-----------------"
11170
msgstr ""
11171
11172
#: en/help_topics/content-filters.txt:25
11173
msgid ""
11174
"The conversion between these formats is done by content filters.\n"
11175
"A content filter has two parts:"
11176
msgstr ""
11177
11178
#: en/help_topics/content-filters.txt:28
11179
msgid ""
11180
"* a read converter - converts from convenience to canonical format\n"
11181
"* a write converter - converts from canonical to convenience format."
11182
msgstr ""
11183
11184
#: en/help_topics/content-filters.txt:31
11185
msgid ""
11186
"Many of these converters will provide *round-trip* conversion,\n"
11187
"i.e. applying the read converter followed by the write converter\n"
11188
"gives back the original content. However, others may provide an\n"
11189
"asymmetric conversion. For example, a read converter might strip\n"
11190
"trailing whitespace off lines in source code while the matching\n"
11191
"write converter might pass content through unchanged."
11192
msgstr ""
11193
11194
#: en/help_topics/content-filters.txt:38
11195
msgid ""
11196
"\n"
11197
"Enabling content filters\n"
11198
"------------------------"
11199
msgstr ""
11200
11201
#: en/help_topics/content-filters.txt:42
11202
msgid ""
11203
"Content filters are typically provided by plugins, so the first step\n"
11204
"in using them is to install the relevant plugins and read their\n"
11205
"documentation. Some plugins may be very specific about which files\n"
11206
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11207
"In other cases, the plugin may leave it in the user's hands to\n"
11208
"define which files are to be filtered. This is typically done\n"
11209
"using rule-based preferences. See ``bzr help rules`` for general\n"
11210
"information about defining these."
11211
msgstr ""
11212
11213
#: en/help_topics/content-filters.txt:51
11214
msgid ""
11215
"\n"
11216
"Impact on commands\n"
11217
"------------------"
11218
msgstr ""
11219
11220
#: en/help_topics/content-filters.txt:55
11221
msgid ""
11222
"Read converters are only applied to commands that read content from\n"
11223
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11224
"will apply read converters to files in the working tree, then compare\n"
11225
"the results to the content last committed."
11226
msgstr ""
11227
11228
#: en/help_topics/content-filters.txt:60
11229
msgid ""
11230
"Write converters are only applied by commands that **create files in a\n"
11231
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11232
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11233
"respectively."
11234
msgstr ""
11235
11236
#: en/help_topics/content-filters.txt:65
11237
msgid ""
11238
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11239
"comitting files. If this makes sense for a given plugin providing\n"
11240
"a content filter, the plugin can usually achieve this effect by using a\n"
11241
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11242
"for more information on hooks."
11243
msgstr ""
11244
11245
#: en/help_topics/content-filters.txt:71
11246
msgid ""
11247
"\n"
11248
"Refreshing your working tree\n"
11249
"----------------------------"
11250
msgstr ""
11251
11252
#: en/help_topics/content-filters.txt:75
11253
msgid ""
11254
"For performance reasons, Bazaar caches the timestamps of files in\n"
11255
"a working tree, and assumes files are unchanged if their timestamps\n"
11256
"match the cached values. As a consequence, there are times when\n"
11257
"you may need to explicitly ask for content filtering to be reapplied\n"
11258
"in one or both directions, e.g. after installing or reconfiguring\n"
11259
"plugins providing it."
11260
msgstr ""
11261
11262
#: en/help_topics/content-filters.txt:82
11263
msgid "Here are some general guidelines for doing this:"
11264
msgstr ""
11265
11266
#: en/help_topics/content-filters.txt:84
11267
msgid ""
11268
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11269
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11270
" relevant read converters and compare the end result with the\n"
11271
" canonical format."
11272
msgstr ""
11273
11274
#: en/help_topics/content-filters.txt:89
11275
msgid ""
11276
" * To reapply write converters, ensure there are no local changes,\n"
11277
" delete the relevant files and run ``bzr revert`` on those files."
11278
msgstr ""
11279
11280
#: en/help_topics/content-filters.txt:92
11281
msgid ""
11282
"Note: In the future, it is likely that additional options will be added\n"
11283
"to commands to make this refreshing process faster and safer.\n"
11284
msgstr ""
11285
11286
#: en/help_topics/current-formats.txt:1
11287
msgid "Current Storage Formats"
11288
msgstr ""
11289
11290
#: en/help_topics/current-formats.txt:3
11291
msgid ""
11292
":2a:\n"
11293
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11294
" compress storage. Provides rich roots which are a one-way\n"
11295
" transition."
11296
msgstr ""
11297
11298
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11299
msgid ""
11300
"\n"
11301
"See :doc:`formats-help` for more about storage formats."
11302
msgstr ""
11303
11304
#: en/help_topics/debug-flags.txt:1
11305
msgid ""
11306
"Debug Flags\n"
11307
"==========="
11308
msgstr ""
11309
11310
#: en/help_topics/debug-flags.txt:4
11311
msgid ""
11312
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11313
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11314
msgstr ""
11315
11316
#: en/help_topics/debug-flags.txt:7
11317
msgid ""
11318
"-Dauth Trace authentication sections used.\n"
11319
"-Dbytes Print out how many bytes were transferred\n"
11320
"-Ddirstate Trace dirstate activity (verbose!)\n"
11321
"-Derror Instead of normal error handling, always print a "
11322
"traceback\n"
11323
" on error.\n"
11324
"-Devil Capture call sites that do expensive or badly-scaling\n"
11325
" operations.\n"
11326
"-Dfetch Trace history copying between repositories.\n"
11327
"-Dfilters Emit information for debugging content filtering.\n"
11328
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11329
"fetch.\n"
11330
"-Dgraph Trace graph traversal.\n"
11331
"-Dhashcache Log every time a working file is read to determine its "
11332
"hash.\n"
11333
"-Dhooks Trace hook execution.\n"
11334
"-Dhpss Trace smart protocol requests and responses.\n"
11335
"-Dhpssdetail More hpss details.\n"
11336
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11337
"-Dhttp Trace http connections, requests and responses.\n"
11338
"-Dindex Trace major index operations.\n"
11339
"-Dknit Trace knit operations.\n"
11340
"-Dlock Trace when lockdir locks are taken or released.\n"
11341
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11342
" retrying the request.\n"
11343
"-Dprogress Trace progress bar operations.\n"
11344
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11345
"-Dmerge Emit information for debugging merges.\n"
11346
"-Dno_apport Don't use apport to report crashes.\n"
11347
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11348
"-Dpack Emit information about pack operations.\n"
11349
"-Drelock Emit a message every time a branch or repository object "
11350
"is\n"
11351
" unlocked then relocked the same way.\n"
11352
"-Dsftp Trace SFTP internals.\n"
11353
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11354
"expected\n"
11355
"-Dstream Trace fetch streams.\n"
11356
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11357
"portable\n"
11358
" manner.\n"
11359
"-Dunlock Some errors during unlock are treated as warnings.\n"
11360
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11361
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11362
"appropriate\n"
11363
" for the format, even for non-local fetches.\n"
11364
msgstr ""
11365
11366
#: en/help_topics/diverged-branches.txt:1
11367
msgid ""
11368
"Diverged Branches\n"
11369
"================="
11370
msgstr ""
11371
11372
#: en/help_topics/diverged-branches.txt:4
11373
msgid ""
11374
"When Bazaar tries to push one branch onto another, it requires that the\n"
11375
"destination branch must be ready to receive the source branch. If this "
11376
"isn't\n"
11377
"the case, then we say that the branches have ``diverged``. Branches are\n"
11378
"considered diverged if the destination branch's most recent commit is one "
11379
"that\n"
11380
"has not been merged (directly or indirectly) by the source branch. To "
11381
"recover\n"
11382
"from diverged branches, one must merge the missing revisions into the "
11383
"source\n"
11384
"branch."
11385
msgstr ""
11386
11387
#: en/help_topics/diverged-branches.txt:12
11388
msgid ""
11389
"This situation commonly arises when using a centralized workflow with local\n"
11390
"commits. If someone else has committed new work to the mainline since your\n"
11391
"last pull and you have local commits that have not yet been pushed to the\n"
11392
"mainline, then your local branch and the mainline have diverged."
11393
msgstr ""
11394
11395
#: en/help_topics/diverged-branches.txt:17
11396
msgid ""
11397
"Discovering What Has Diverged\n"
11398
"-----------------------------"
11399
msgstr ""
11400
11401
#: en/help_topics/diverged-branches.txt:20
11402
msgid ""
11403
"The ``bzr missing`` command is used to find out what revisions are in "
11404
"another\n"
11405
"branch that are not present in the current branch, and vice-versa. It shows "
11406
"a\n"
11407
"summary of which extra revisions exist in each branch. If you want to see "
11408
"the\n"
11409
"precise effects of those revisions, you can use ``bzr diff --"
11410
"old=other_branch``\n"
11411
"to show the differences between other_branch and your current branch."
11412
msgstr ""
11413
11414
#: en/help_topics/diverged-branches.txt:26
11415
msgid ""
11416
"A Solution\n"
11417
"----------"
11418
msgstr ""
11419
11420
#: en/help_topics/diverged-branches.txt:29
11421
msgid ""
11422
"The solution is to merge the revisions from the mainline into your local\n"
11423
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11424
"mainline. This merge may result in conflicts if the other developer's "
11425
"changes\n"
11426
"overlap with your changes. These conflicts should be resolved before\n"
11427
"continuing. After any conflicts have been resolved, or even if there were "
11428
"no\n"
11429
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11430
"to your local branch. This requirement gives you an opportunity to test "
11431
"the\n"
11432
"resulting working tree for correctness, since the merged revisions could "
11433
"have\n"
11434
"made arbitrary changes. After testing, you should commit the merge using\n"
11435
"``bzr commit``. This clears up the diverged branches situation. Your "
11436
"local\n"
11437
"branch can now be pushed to the mainline.\n"
11438
msgstr ""
11439
11440
#: en/help_topics/env-variables.txt:1
11441
msgid "Environment Variables"
11442
msgstr ""
11443
11444
#: en/help_topics/env-variables.txt:3
11445
msgid ""
11446
"=================== "
11447
"===========================================================\n"
11448
"BZRPATH Path where bzr is to look for shell plugin external\n"
11449
" commands.\n"
11450
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11451
"EMAIL E-Mail address of the user.\n"
11452
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11453
"EDITOR Editor for editing commit messages.\n"
11454
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11455
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11456
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11457
"BZR_PLUGIN_PATH.\n"
11458
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11459
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11460
"and\n"
11461
" HOME.\n"
11462
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11463
"URLs).\n"
11464
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11465
"sshcorp,\n"
11466
" plink or lsh.\n"
11467
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11468
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11469
"BZR_COLUMNS Override implicit terminal width.\n"
11470
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11471
"(selftest)\n"
11472
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11473
"'text'.\n"
11474
"BZR_PDB Control whether to launch a debugger on error.\n"
11475
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11476
" breakin debugger.\n"
11477
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11478
"(instead\n"
11479
" of char-based).\n"
11480
"=================== "
11481
"===========================================================\n"
11482
msgstr ""
11483
11484
#: en/help_topics/eol.txt:1
11485
msgid ""
11486
"End of Line Conversion\n"
11487
"======================"
11488
msgstr ""
11489
11490
#: en/help_topics/eol.txt:4
11491
msgid ""
11492
"EOL conversion is provided as a content filter where Bazaar internally\n"
11493
"stores a canonical format but outputs a convenience format. See\n"
11494
"``bzr help content-filters`` for general information about using these."
11495
msgstr ""
11496
11497
#: en/help_topics/eol.txt:8
11498
msgid ""
11499
"Note: Content filtering is only supported in recently added formats,\n"
11500
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11501
"in a recent format. (Just setting the format on the repository\n"
11502
"is not enough.) If content filtering does not appear to be working, use\n"
11503
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11504
"or later."
11505
msgstr ""
11506
11507
#: en/help_topics/eol.txt:15
11508
msgid ""
11509
"EOL conversion needs to be enabled for selected file patterns using\n"
11510
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11511
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11512
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11513
"supported in a future verison of Bazaar."
11514
msgstr ""
11515
11516
#: en/help_topics/eol.txt:21
11517
msgid ""
11518
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11519
"(If a value is not set, ``exact`` is the default.)"
11520
msgstr ""
11521
11522
#: en/help_topics/eol.txt:24
11523
msgid ""
11524
" ========== ===================================== ======================\n"
11525
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11526
" ========== ===================================== ======================\n"
11527
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11528
" ---------- ------------------------------------- ----------------------\n"
11529
" ``lf`` ``lf`` ``lf``\n"
11530
" ---------- ------------------------------------- ----------------------\n"
11531
" ``crlf`` ``crlf`` ``lf``\n"
11532
" ---------- ------------------------------------- ----------------------\n"
11533
" ``exact`` No conversion Exactly as in file\n"
11534
" ========== ===================================== ======================"
11535
msgstr ""
11536
11537
#: en/help_topics/eol.txt:36
11538
msgid ""
11539
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11540
"byte is detected in the file."
11541
msgstr ""
11542
11543
#: en/help_topics/eol.txt:39
11544
msgid ""
11545
"For users working on a cross-platform project, here is a suggested rule\n"
11546
"to use as a starting point::"
11547
msgstr ""
11548
11549
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11550
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11551
msgid ""
11552
" [name *]\n"
11553
" eol = native"
11554
msgstr ""
11555
11556
#: en/help_topics/eol.txt:45
11557
msgid ""
11558
"If you have binary files that do not contain a null byte though, be\n"
11559
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11560
"by giving more explicit patterns earlier in the rules file. For example::"
11561
msgstr ""
11562
11563
#: en/help_topics/eol.txt:49
11564
msgid ""
11565
" [name *.png]\n"
11566
" eol = exact"
11567
msgstr ""
11568
11569
#: en/help_topics/eol.txt:55
11570
msgid ""
11571
"If your working tree is on a network drive shared by users on different\n"
11572
"operating systems, you typically want to force certain conventions for\n"
11573
"certain files. In that way, if a file is created with the wrong line\n"
11574
"endings or line endings get mixed during editing, it gets committed\n"
11575
"correctly and gets checked out correctly. For example::"
11576
msgstr ""
11577
11578
#: en/help_topics/eol.txt:61
11579
msgid ""
11580
" [name *.bat]\n"
11581
" eol = crlf"
11582
msgstr ""
11583
11584
#: en/help_topics/eol.txt:64
11585
msgid ""
11586
" [name *.sh]\n"
11587
" eol = lf"
11588
msgstr ""
11589
11590
#: en/help_topics/eol.txt:70
11591
msgid ""
11592
"If you take the care to create files with their required endings, you can\n"
11593
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11594
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11595
"introducing mixed line endings will be corrected during commit for files\n"
11596
"with those settings."
11597
msgstr ""
11598
11599
#: en/help_topics/eol.txt:76
11600
msgid ""
11601
"If you have sample test data that deliberately has text files with mixed\n"
11602
"newline conventions, you can ask for those to be left alone like this::"
11603
msgstr ""
11604
11605
#: en/help_topics/eol.txt:79
11606
msgid ""
11607
" [name test_data/]\n"
11608
" eol = exact"
11609
msgstr ""
11610
11611
#: en/help_topics/eol.txt:85
11612
msgid ""
11613
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11614
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11615
"of content analysis to detect binary files for commands like ``diff``.\n"
11616
"In the future, a ``binary = true`` rule may be added but it is not\n"
11617
"supported yet.)"
11618
msgstr ""
11619
11620
#: en/help_topics/eol.txt:91
11621
msgid ""
11622
"If you have an existing repository with text files already stored using\n"
11623
"Windows newline conventions (``crlf``), then you may want to keep using "
11624
"that\n"
11625
"convention in the repository. Forcing certain files to this convention\n"
11626
"may also help users who do not have rules configured. To do this, set\n"
11627
"``eol`` to one of the values below."
11628
msgstr ""
11629
11630
#: en/help_topics/eol.txt:97
11631
msgid ""
11632
" ============================ ======================== "
11633
"======================\n"
11634
" Value Checkout end-of-lines as Commit end-of-lines "
11635
"as\n"
11636
" ============================ ======================== "
11637
"======================\n"
11638
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11639
" ``lf`` otherwise\n"
11640
" ---------------------------- ------------------------ ----------------------"
11641
"\n"
11642
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11643
" ---------------------------- ------------------------ ----------------------"
11644
"\n"
11645
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11646
" ============================ ======================== ======================"
11647
msgstr ""
11648
11649
#: en/help_topics/eol.txt:108
11650
msgid ""
11651
"For users working on an existing project that uses Windows newline\n"
11652
"conventions in their Bazaar repository, this rule is suggested as a\n"
11653
"starting point::"
11654
msgstr ""
11655
11656
#: en/help_topics/eol.txt:112
11657
msgid ""
11658
" [name *]\n"
11659
" eol = native-with-crlf-in-repo"
11660
msgstr ""
11661
11662
#: en/help_topics/eol.txt:115
11663
msgid ""
11664
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11665
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11666
"``crlf`` and ``exact``."
11667
msgstr ""
11668
11669
#: en/help_topics/eol.txt:119
11670
msgid ""
11671
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11672
"never reject files because a given line ending or mixed line endings\n"
11673
"are found. A precommit hook should be used if you wish to validate\n"
11674
"(and not just convert) content before committing.\n"
11675
msgstr ""
11676
11677
#: en/help_topics/hidden-commands.txt:1
11678
msgid ""
11679
"added List files added in working tree.\n"
11680
"ancestry List all revisions merged into this branch.\n"
11681
"assert-fail Test reporting of assertion failures\n"
11682
"bundle-info Output interesting stats about a bundle\n"
11683
"bundle-revisions Create a merge-directive for submitting changes.\n"
11684
"cat-revision Write out metadata for a revision.\n"
11685
"dump-btree Dump the contents of a btree index file to stdout.\n"
11686
"export-pot Export command helps and error messages in po format.\n"
11687
"file-id Print file_id of a particular file or directory.\n"
11688
"file-path Print path of file_ids to a file or directory.\n"
11689
"find-merge-base Find and print a base revision for merging two "
11690
"branches.\n"
11691
"hooks Show hooks.\n"
11692
"inventory Show inventory of the current working copy or a "
11693
"revision.\n"
11694
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11695
"lookup-revision Lookup the revision-id from a revision-number\n"
11696
"merge-directive Generate a merge directive for auto-merge tools.\n"
11697
"modified List files modified in working tree.\n"
11698
"re-sign Create a digital signature for an existing revision.\n"
11699
"reference list, view and set branch locations for nested trees.\n"
11700
"relpath Show path of a file relative to root\n"
11701
"repair-workingtree Reset the working tree state file.\n"
11702
"revision-history Display the list of revision ids on a branch.\n"
11703
"revision-info Show revision number and revision id for a given "
11704
"revision\n"
11705
" identifier.\n"
11706
"rocks Statement of optimism.\n"
11707
"selftest Run internal test suite.\n"
11708
"shell-complete Show appropriate completions for context.\n"
11709
"test-script Run a shell-like test from a file.\n"
11710
"touching-revisions Return revision-ids which affected a particular file.\n"
11711
"unknowns List unknown files.\n"
11712
"wait-until-signalled Test helper for\n"
11713
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11714
msgstr ""
11715
11716
#: en/help_topics/hooks.txt:1
11717
msgid ""
11718
"\n"
11719
"Hooks\n"
11720
"====="
11721
msgstr ""
11722
11723
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11724
msgid ""
11725
"Introduction\n"
11726
"------------"
11727
msgstr ""
11728
11729
#: en/help_topics/hooks.txt:8
11730
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11731
msgstr ""
11732
11733
#: en/help_topics/hooks.txt:10
11734
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11735
msgstr ""
11736
11737
#: en/help_topics/hooks.txt:12
11738
msgid ""
11739
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11740
msgstr ""
11741
11742
#: en/help_topics/hooks.txt:14
11743
msgid ""
11744
"The class that contains each hook is given before the hooks it supplies. "
11745
"For\n"
11746
"instance, BranchHooks as the class is the hooks class for\n"
11747
"`bzrlib.branch.Branch.hooks`."
11748
msgstr ""
11749
11750
#: en/help_topics/hooks.txt:18
11751
msgid ""
11752
"Each description also indicates whether the hook runs on the client (the\n"
11753
"machine where bzr was invoked) or the server (the machine addressed by\n"
11754
"the branch URL). These may be, but are not necessarily, the same machine."
11755
msgstr ""
11756
11757
#: en/help_topics/hooks.txt:22
11758
msgid ""
11759
"Plugins (including hooks) are run on the server if all of these is true:"
11760
msgstr ""
11761
11762
#: en/help_topics/hooks.txt:24
11763
msgid ""
11764
" * The connection is via a smart server (accessed with a URL starting with\n"
11765
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11766
"\"http://\"\n"
11767
" URL when a smart server is available via HTTP)."
11768
msgstr ""
11769
11770
#: en/help_topics/hooks.txt:28
11771
msgid ""
11772
" * The hook is either server specific or part of general infrastructure "
11773
"rather\n"
11774
" than client specific code (such as commit)."
11775
msgstr ""
11776
11777
#: en/help_topics/hooks.txt:31
11778
msgid ""
11779
"\n"
11780
"BranchHooks\n"
11781
"-----------"
11782
msgstr ""
11783
11784
#: en/help_topics/hooks.txt:35
11785
msgid ""
11786
"automatic_tag_name\n"
11787
"~~~~~~~~~~~~~~~~~~"
11788
msgstr ""
11789
11790
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11791
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11792
msgid "Introduced in: 2.2"
11793
msgstr ""
11794
11795
#: en/help_topics/hooks.txt:40
11796
msgid ""
11797
"Called to determine an automatic tag name for a revision.\n"
11798
"automatic_tag_name is called with (branch, revision_id) and should\n"
11799
"return a tag name or None if no tag name could be determined. The\n"
11800
"first non-None tag name returned will be used."
11801
msgstr ""
11802
11803
#: en/help_topics/hooks.txt:45
11804
msgid ""
11805
"open\n"
11806
"~~~~"
11807
msgstr ""
11808
11809
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11810
#: en/help_topics/hooks.txt:307
11811
msgid "Introduced in: 1.8"
11812
msgstr ""
11813
11814
#: en/help_topics/hooks.txt:50
11815
msgid ""
11816
"Called with the Branch object that has been opened after a branch is\n"
11817
"opened."
11818
msgstr ""
11819
11820
#: en/help_topics/hooks.txt:53
11821
msgid ""
11822
"post_branch_init\n"
11823
"~~~~~~~~~~~~~~~~"
11824
msgstr ""
11825
11826
#: en/help_topics/hooks.txt:58
11827
msgid ""
11828
"Called after new branch initialization completes. post_branch_init is\n"
11829
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11830
"branch and checkout (both heavyweight and lightweight) will all\n"
11831
"trigger this hook."
11832
msgstr ""
11833
11834
#: en/help_topics/hooks.txt:63
11835
msgid ""
11836
"post_change_branch_tip\n"
11837
"~~~~~~~~~~~~~~~~~~~~~~"
11838
msgstr ""
11839
11840
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11841
msgid "Introduced in: 1.4"
11842
msgstr ""
11843
11844
#: en/help_topics/hooks.txt:68
11845
msgid ""
11846
"Called in bzr client and server after a change to the tip of a branch\n"
11847
"is made. post_change_branch_tip is called with a\n"
11848
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11849
"uncommit will all trigger this hook."
11850
msgstr ""
11851
11852
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11853
msgid ""
11854
"post_commit\n"
11855
"~~~~~~~~~~~"
11856
msgstr ""
11857
11858
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11859
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11860
msgid "Introduced in: 0.15"
11861
msgstr ""
11862
11863
#: en/help_topics/hooks.txt:78
11864
msgid ""
11865
"Called in the bzr client after a commit has completed. post_commit is\n"
11866
"called with (local, master, old_revno, old_revid, new_revno,\n"
11867
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11868
"branch."
11869
msgstr ""
11870
11871
#: en/help_topics/hooks.txt:83
11872
msgid ""
11873
"post_pull\n"
11874
"~~~~~~~~~"
11875
msgstr ""
11876
11877
#: en/help_topics/hooks.txt:88
11878
msgid ""
11879
"Called after a pull operation completes. post_pull is called with a\n"
11880
"bzrlib.branch.PullResult object and only runs in the bzr client."
11881
msgstr ""
11882
11883
#: en/help_topics/hooks.txt:91
11884
msgid ""
11885
"post_push\n"
11886
"~~~~~~~~~"
11887
msgstr ""
11888
11889
#: en/help_topics/hooks.txt:96
11890
msgid ""
11891
"Called after a push operation completes. post_push is called with a\n"
11892
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11893
msgstr ""
11894
11895
#: en/help_topics/hooks.txt:99
11896
msgid ""
11897
"post_switch\n"
11898
"~~~~~~~~~~~"
11899
msgstr ""
11900
11901
#: en/help_topics/hooks.txt:104
11902
msgid ""
11903
"Called after a checkout switches branch. post_switch is called with a\n"
11904
"bzrlib.branch.SwitchHookParams."
11905
msgstr ""
11906
11907
#: en/help_topics/hooks.txt:107
11908
msgid ""
11909
"post_uncommit\n"
11910
"~~~~~~~~~~~~~"
11911
msgstr ""
11912
11913
#: en/help_topics/hooks.txt:112
11914
msgid ""
11915
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11916
"called with (local, master, old_revno, old_revid, new_revno,\n"
11917
"new_revid) where local is the local branch or None, master is the\n"
11918
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11919
"of None."
11920
msgstr ""
11921
11922
#: en/help_topics/hooks.txt:118
11923
msgid ""
11924
"pre_change_branch_tip\n"
11925
"~~~~~~~~~~~~~~~~~~~~~"
11926
msgstr ""
11927
11928
#: en/help_topics/hooks.txt:121
11929
msgid "Introduced in: 1.6"
11930
msgstr ""
11931
11932
#: en/help_topics/hooks.txt:123
11933
msgid ""
11934
"Called in bzr client and server before a change to the tip of a branch\n"
11935
"is made. pre_change_branch_tip is called with a\n"
11936
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11937
"uncommit will all trigger this hook."
11938
msgstr ""
11939
11940
#: en/help_topics/hooks.txt:128
11941
msgid ""
11942
"pre_commit\n"
11943
"~~~~~~~~~~"
11944
msgstr ""
11945
11946
#: en/help_topics/hooks.txt:131
11947
msgid "Introduced in: 0.91"
11948
msgstr ""
11949
11950
#: en/help_topics/hooks.txt:133
11951
msgid ""
11952
"Called after a commit is calculated but before it is completed.\n"
11953
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11954
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11955
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11956
"TreeDelta object describing changes from the basis revision. hooks\n"
11957
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11958
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11959
"tree."
11960
msgstr ""
11961
11962
#: en/help_topics/hooks.txt:142
11963
msgid ""
11964
"transform_fallback_location\n"
11965
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11966
msgstr ""
11967
11968
#: en/help_topics/hooks.txt:145
11969
msgid "Introduced in: 1.9"
11970
msgstr ""
11971
11972
#: en/help_topics/hooks.txt:147
11973
msgid ""
11974
"Called when a stacked branch is activating its fallback locations.\n"
11975
"transform_fallback_location is called with (branch, url), and should\n"
11976
"return a new url. Returning the same url allows it to be used as-is,\n"
11977
"returning a different one can be used to cause the branch to stack on\n"
11978
"a closer copy of that fallback_location. Note that the branch cannot\n"
11979
"have history accessing methods called on it during this hook because\n"
11980
"the fallback locations have not been activated. When there are\n"
11981
"multiple hooks installed for transform_fallback_location, all are\n"
11982
"called with the url returned from the previous hook.The order is\n"
11983
"however undefined."
11984
msgstr ""
11985
11986
#: en/help_topics/hooks.txt:158
11987
msgid ""
11988
"CommandHooks\n"
11989
"------------"
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:161
11993
msgid ""
11994
"extend_command\n"
11995
"~~~~~~~~~~~~~~"
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:164
11999
msgid "Introduced in: 1.13"
12000
msgstr ""
12001
12002
#: en/help_topics/hooks.txt:166
12003
msgid ""
12004
"Called after creating a command object to allow modifications such as\n"
12005
"adding or removing options, docs etc. Called with the new\n"
12006
"bzrlib.commands.Command object."
12007
msgstr ""
12008
12009
#: en/help_topics/hooks.txt:170
12010
msgid ""
12011
"get_command\n"
12012
"~~~~~~~~~~~"
12013
msgstr ""
12014
12015
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12016
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12017
msgid "Introduced in: 1.17"
12018
msgstr ""
12019
12020
#: en/help_topics/hooks.txt:175
12021
msgid ""
12022
"Called when creating a single command. Called with (cmd_or_None,\n"
12023
"command_name). get_command should either return the cmd_or_None\n"
12024
"parameter, or a replacement Command object that should be used for the\n"
12025
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12026
"Many users will prefer to use bzrlib.commands.register_command or\n"
12027
"plugin_cmds.register_lazy."
12028
msgstr ""
12029
12030
#: en/help_topics/hooks.txt:182
12031
msgid ""
12032
"get_missing_command\n"
12033
"~~~~~~~~~~~~~~~~~~~"
12034
msgstr ""
12035
12036
#: en/help_topics/hooks.txt:187
12037
msgid ""
12038
"Called when creating a single command if no command could be found.\n"
12039
"Called with (command_name). get_missing_command should either return\n"
12040
"None, or a Command object to be used for the command."
12041
msgstr ""
12042
12043
#: en/help_topics/hooks.txt:191
12044
msgid ""
12045
"list_commands\n"
12046
"~~~~~~~~~~~~~"
12047
msgstr ""
12048
12049
#: en/help_topics/hooks.txt:196
12050
msgid ""
12051
"Called when enumerating commands. Called with a set of cmd_name\n"
12052
"strings for all the commands found so far. This set is safe to mutate\n"
12053
"- e.g. to remove a command. list_commands should return the updated\n"
12054
"set of command names."
12055
msgstr ""
12056
12057
#: en/help_topics/hooks.txt:201
12058
msgid ""
12059
"post_command\n"
12060
"~~~~~~~~~~~~"
12061
msgstr ""
12062
12063
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12064
msgid "Introduced in: 2.6"
12065
msgstr ""
12066
12067
#: en/help_topics/hooks.txt:206
12068
msgid "Called after executing a command. Called with the command object."
12069
msgstr ""
12070
12071
#: en/help_topics/hooks.txt:208
12072
msgid ""
12073
"pre_command\n"
12074
"~~~~~~~~~~~"
12075
msgstr ""
12076
12077
#: en/help_topics/hooks.txt:213
12078
msgid "Called prior to executing a command. Called with the command object."
12079
msgstr ""
12080
12081
#: en/help_topics/hooks.txt:215
12082
msgid ""
12083
"_ConfigHooks\n"
12084
"------------"
12085
msgstr ""
12086
12087
#: en/help_topics/hooks.txt:218
12088
msgid ""
12089
"get\n"
12090
"~~~"
12091
msgstr ""
12092
12093
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12094
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12095
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12096
#: en/help_topics/hooks.txt:446
12097
msgid "Introduced in: 2.4"
12098
msgstr ""
12099
12100
#: en/help_topics/hooks.txt:223
12101
msgid ""
12102
"Invoked when a config option is read. The signature is (stack, name,\n"
12103
"value)."
12104
msgstr ""
12105
12106
#: en/help_topics/hooks.txt:226
12107
msgid ""
12108
"load\n"
12109
"~~~~"
12110
msgstr ""
12111
12112
#: en/help_topics/hooks.txt:231
12113
msgid "Invoked when a config store is loaded. The signature is (store)."
12114
msgstr ""
12115
12116
#: en/help_topics/hooks.txt:233
12117
msgid ""
12118
"remove\n"
12119
"~~~~~~"
12120
msgstr ""
12121
12122
#: en/help_topics/hooks.txt:238
12123
msgid ""
12124
"Invoked when a config option is removed. The signature is (stack,\n"
12125
"name)."
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:241
12129
msgid ""
12130
"save\n"
12131
"~~~~"
12132
msgstr ""
12133
12134
#: en/help_topics/hooks.txt:246
12135
msgid "Invoked when a config store is saved. The signature is (store)."
12136
msgstr ""
12137
12138
#: en/help_topics/hooks.txt:248
12139
msgid ""
12140
"set\n"
12141
"~~~"
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:253
12145
msgid ""
12146
"Invoked when a config option is set. The signature is (stack, name,\n"
12147
"value)."
12148
msgstr ""
12149
12150
#: en/help_topics/hooks.txt:256
12151
msgid ""
12152
"ControlDirHooks\n"
12153
"---------------"
12154
msgstr ""
12155
12156
#: en/help_topics/hooks.txt:259
12157
msgid ""
12158
"post_repo_init\n"
12159
"~~~~~~~~~~~~~~"
12160
msgstr ""
12161
12162
#: en/help_topics/hooks.txt:264
12163
msgid ""
12164
"Invoked after a repository has been initialized. post_repo_init is\n"
12165
"called with a bzrlib.controldir.RepoInitHookParams."
12166
msgstr ""
12167
12168
#: en/help_topics/hooks.txt:267
12169
msgid ""
12170
"pre_open\n"
12171
"~~~~~~~~"
12172
msgstr ""
12173
12174
#: en/help_topics/hooks.txt:270
12175
msgid "Introduced in: 1.14"
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:272
12179
msgid ""
12180
"Invoked before attempting to open a ControlDir with the transport that\n"
12181
"the open will use."
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:275
12185
msgid ""
12186
"InfoHooks\n"
12187
"---------"
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:278
12191
msgid ""
12192
"repository\n"
12193
"~~~~~~~~~~"
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12197
#: en/help_topics/hooks.txt:524
12198
msgid "Introduced in: 1.15"
12199
msgstr ""
12200
12201
#: en/help_topics/hooks.txt:283
12202
msgid ""
12203
"Invoked when displaying the statistics for a repository. repository is\n"
12204
"called with a statistics dictionary as returned by the repository and\n"
12205
"a file-like object to write to."
12206
msgstr ""
12207
12208
#: en/help_topics/hooks.txt:287
12209
msgid ""
12210
"LockHooks\n"
12211
"---------"
12212
msgstr ""
12213
12214
#: en/help_topics/hooks.txt:290
12215
msgid ""
12216
"lock_acquired\n"
12217
"~~~~~~~~~~~~~"
12218
msgstr ""
12219
12220
#: en/help_topics/hooks.txt:295
12221
msgid ""
12222
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12223
msgstr ""
12224
12225
#: en/help_topics/hooks.txt:297
12226
msgid ""
12227
"lock_broken\n"
12228
"~~~~~~~~~~~"
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:302
12232
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12233
msgstr ""
12234
12235
#: en/help_topics/hooks.txt:304
12236
msgid ""
12237
"lock_released\n"
12238
"~~~~~~~~~~~~~"
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:309
12242
msgid ""
12243
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12244
msgstr ""
12245
12246
#: en/help_topics/hooks.txt:311
12247
msgid ""
12248
"MergeHooks\n"
12249
"----------"
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:314
12253
msgid ""
12254
"merge_file_content\n"
12255
"~~~~~~~~~~~~~~~~~~"
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:317
12259
msgid "Introduced in: 2.1"
12260
msgstr ""
12261
12262
#: en/help_topics/hooks.txt:319
12263
msgid ""
12264
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12265
"object when starting a merge. Should return either None or a subclass\n"
12266
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12267
"called per file that needs to be merged (including when one side has\n"
12268
"deleted the file and the other has changed it). See the\n"
12269
"AbstractPerFileMerger API docs for details on how it is used by merge."
12270
msgstr ""
12271
12272
#: en/help_topics/hooks.txt:326
12273
msgid ""
12274
"post_merge\n"
12275
"~~~~~~~~~~"
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12279
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12280
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12281
msgid "Introduced in: 2.5"
12282
msgstr ""
12283
12284
#: en/help_topics/hooks.txt:331
12285
msgid ""
12286
"Called after a merge. Receives a Merger object as the single argument.\n"
12287
"The return value is ignored."
12288
msgstr ""
12289
12290
#: en/help_topics/hooks.txt:334
12291
msgid ""
12292
"pre_merge\n"
12293
"~~~~~~~~~"
12294
msgstr ""
12295
12296
#: en/help_topics/hooks.txt:339
12297
msgid ""
12298
"Called before a merge. Receives a Merger object as the single\n"
12299
"argument."
12300
msgstr ""
12301
12302
#: en/help_topics/hooks.txt:342
12303
msgid ""
12304
"MergeDirectiveHooks\n"
12305
"-------------------"
12306
msgstr ""
12307
12308
#: en/help_topics/hooks.txt:345
12309
msgid ""
12310
"merge_request_body\n"
12311
"~~~~~~~~~~~~~~~~~~"
12312
msgstr ""
12313
12314
#: en/help_topics/hooks.txt:348
12315
msgid "Introduced in: 1.15.0"
12316
msgstr ""
12317
12318
#: en/help_topics/hooks.txt:350
12319
msgid ""
12320
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12321
"request. Callbacks must return a body. If more than one callback is\n"
12322
"registered, the output of one callback is provided to the next."
12323
msgstr ""
12324
12325
#: en/help_topics/hooks.txt:354
12326
msgid ""
12327
"MessageEditorHooks\n"
12328
"------------------"
12329
msgstr ""
12330
12331
#: en/help_topics/hooks.txt:357
12332
msgid ""
12333
"commit_message_template\n"
12334
"~~~~~~~~~~~~~~~~~~~~~~~"
12335
msgstr ""
12336
12337
#: en/help_topics/hooks.txt:360
12338
msgid "Introduced in: 1.10"
12339
msgstr ""
12340
12341
#: en/help_topics/hooks.txt:362
12342
msgid ""
12343
"Called when a commit message is being generated.\n"
12344
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12345
"and the message that is known so far. commit_message_template must\n"
12346
"return a new message to use (which could be the same as it was given).\n"
12347
"When there are multiple hooks registered for commit_message_template,\n"
12348
"they are chained with the result from the first passed into the\n"
12349
"second, and so on."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:370
12353
msgid ""
12354
"set_commit_message\n"
12355
"~~~~~~~~~~~~~~~~~~"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:375
12359
msgid ""
12360
"Set a fixed commit message. set_commit_message is called with the\n"
12361
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12362
"properties by editing commit.builder._revprops) and the message so\n"
12363
"far. set_commit_message must return the message to use or None if it\n"
12364
"should use the message editor as normal."
12365
msgstr ""
12366
12367
#: en/help_topics/hooks.txt:381
12368
msgid ""
12369
"MutableTreeHooks\n"
12370
"----------------"
12371
msgstr ""
12372
12373
#: en/help_topics/hooks.txt:384
12374
msgid ""
12375
"post_build_tree\n"
12376
"~~~~~~~~~~~~~~~"
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:389
12380
msgid ""
12381
"Called after a completely new tree is built. The hook is called with\n"
12382
"the tree as its only argument."
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:395
12386
msgid "Introduced in: 2.0"
12387
msgstr ""
12388
12389
#: en/help_topics/hooks.txt:397
12390
msgid ""
12391
"Called after a commit is performed on a tree. The hook is called with\n"
12392
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12393
"commit was performed on is available via the mutable_tree attribute of\n"
12394
"that object."
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:402
12398
msgid ""
12399
"post_transform\n"
12400
"~~~~~~~~~~~~~~"
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:407
12404
msgid ""
12405
"Called after a tree transform has been performed on a tree. The hook\n"
12406
"is called with the tree that is being transformed and the transform."
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:410
12410
msgid ""
12411
"pre_transform\n"
12412
"~~~~~~~~~~~~~"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:415
12416
msgid ""
12417
"Called before a tree transform on this tree. The hook is called with\n"
12418
"the tree that is being transformed and the transform."
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:418
12422
msgid ""
12423
"start_commit\n"
12424
"~~~~~~~~~~~~"
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:423
12428
msgid ""
12429
"Called before a commit is performed on a tree. The start commit hook\n"
12430
"is able to change the tree before the commit takes place. start_commit\n"
12431
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12432
"being performed on."
12433
msgstr ""
12434
12435
#: en/help_topics/hooks.txt:428
12436
msgid ""
12437
"SmartClientHooks\n"
12438
"----------------"
12439
msgstr ""
12440
12441
#: en/help_topics/hooks.txt:431
12442
msgid ""
12443
"call\n"
12444
"~~~~"
12445
msgstr ""
12446
12447
#: en/help_topics/hooks.txt:434
12448
msgid "Introduced in: unknown"
12449
msgstr ""
12450
12451
#: en/help_topics/hooks.txt:436
12452
msgid ""
12453
"Called when the smart client is submitting a request to the smart\n"
12454
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12455
"Streaming request bodies, and responses, are not accessible."
12456
msgstr ""
12457
12458
#: en/help_topics/hooks.txt:440
12459
msgid ""
12460
"SmartServerHooks\n"
12461
"----------------"
12462
msgstr ""
12463
12464
#: en/help_topics/hooks.txt:443
12465
msgid ""
12466
"server_exception\n"
12467
"~~~~~~~~~~~~~~~~"
12468
msgstr ""
12469
12470
#: en/help_topics/hooks.txt:448
12471
msgid ""
12472
"Called by the bzr server when an exception occurs. server_exception is\n"
12473
"called with the sys.exc_info() tuple return true for the hook if the\n"
12474
"exception has been handled, in which case the server will exit\n"
12475
"normally."
12476
msgstr ""
12477
12478
#: en/help_topics/hooks.txt:453
12479
msgid ""
12480
"server_started\n"
12481
"~~~~~~~~~~~~~~"
12482
msgstr ""
12483
12484
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12485
msgid "Introduced in: 0.16"
12486
msgstr ""
12487
12488
#: en/help_topics/hooks.txt:458
12489
msgid ""
12490
"Called by the bzr server when it starts serving a directory.\n"
12491
"server_started is called with (backing urls, public url), where\n"
12492
"backing_url is a list of URLs giving the server-specific directory\n"
12493
"locations, and public_url is the public URL for the directory being\n"
12494
"served."
12495
msgstr ""
12496
12497
#: en/help_topics/hooks.txt:464
12498
msgid ""
12499
"server_started_ex\n"
12500
"~~~~~~~~~~~~~~~~~"
12501
msgstr ""
12502
12503
#: en/help_topics/hooks.txt:469
12504
msgid ""
12505
"Called by the bzr server when it starts serving a directory.\n"
12506
"server_started is called with (backing_urls, server_obj)."
12507
msgstr ""
12508
12509
#: en/help_topics/hooks.txt:472
12510
msgid ""
12511
"server_stopped\n"
12512
"~~~~~~~~~~~~~~"
12513
msgstr ""
12514
12515
#: en/help_topics/hooks.txt:477
12516
msgid ""
12517
"Called by the bzr server when it stops serving a directory.\n"
12518
"server_stopped is called with the same parameters as the\n"
12519
"server_started hook: (backing_urls, public_url)."
12520
msgstr ""
12521
12522
#: en/help_topics/hooks.txt:481
12523
msgid ""
12524
"StatusHooks\n"
12525
"-----------"
12526
msgstr ""
12527
12528
#: en/help_topics/hooks.txt:484
12529
msgid ""
12530
"post_status\n"
12531
"~~~~~~~~~~~"
12532
msgstr ""
12533
12534
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12535
msgid "Introduced in: 2.3"
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:489
12539
msgid ""
12540
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12541
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12542
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12543
"correspond to the command line options specified by the user for the\n"
12544
"status command. to_file is the output stream for writing."
12545
msgstr ""
12546
12547
#: en/help_topics/hooks.txt:495
12548
msgid ""
12549
"pre_status\n"
12550
"~~~~~~~~~~"
12551
msgstr ""
12552
12553
#: en/help_topics/hooks.txt:500
12554
msgid ""
12555
"Called with argument StatusHookParams before Bazaar displays the\n"
12556
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12557
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12558
"correspond to the command line options specified by the user for the\n"
12559
"status command. to_file is the output stream for writing."
12560
msgstr ""
12561
12562
#: en/help_topics/hooks.txt:506
12563
msgid ""
12564
"TransportHooks\n"
12565
"--------------"
12566
msgstr ""
12567
12568
#: en/help_topics/hooks.txt:509
12569
msgid ""
12570
"post_connect\n"
12571
"~~~~~~~~~~~~"
12572
msgstr ""
12573
12574
#: en/help_topics/hooks.txt:514
12575
msgid ""
12576
"Called after a new connection is established or a reconnect occurs.\n"
12577
"The sole argument passed is either the connected transport or smart\n"
12578
"medium instance."
12579
msgstr ""
12580
12581
#: en/help_topics/hooks.txt:518
12582
msgid ""
12583
"RioVersionInfoBuilderHooks\n"
12584
"--------------------------"
12585
msgstr ""
12586
12587
#: en/help_topics/hooks.txt:521
12588
msgid ""
12589
"revision\n"
12590
"~~~~~~~~"
12591
msgstr ""
12592
12593
#: en/help_topics/hooks.txt:526
12594
msgid ""
12595
"Invoked when adding information about a revision to the RIO stanza\n"
12596
"that is printed. revision is called with a revision object and a RIO\n"
12597
"stanza.\n"
12598
msgstr ""
12599
12600
#: en/help_topics/location-alias.txt:1
12601
msgid ""
12602
"Location aliases\n"
12603
"================"
12604
msgstr ""
12605
12606
#: en/help_topics/location-alias.txt:4
12607
msgid ""
12608
"Bazaar defines several aliases for locations associated with a branch. "
12609
"These\n"
12610
"can be used with most commands that expect a location, such as `bzr push`."
12611
msgstr ""
12612
12613
#: en/help_topics/location-alias.txt:7
12614
msgid "The aliases are::"
12615
msgstr ""
12616
12617
#: en/help_topics/location-alias.txt:9
12618
msgid ""
12619
" :bound The branch this branch is bound to, for bound branches.\n"
12620
" :parent The parent of this branch.\n"
12621
" :public The public location of this branch.\n"
12622
" :push The saved location used for `bzr push` with no arguments.\n"
12623
" :submit The submit branch for this branch.\n"
12624
" :this This branch."
12625
msgstr ""
12626
12627
#: en/help_topics/location-alias.txt:16
12628
msgid "For example, to push to the parent location::"
12629
msgstr ""
12630
12631
#: en/help_topics/location-alias.txt:18
12632
msgid " bzr push :parent\n"
12633
msgstr ""
12634
12635
#: en/help_topics/log-formats.txt:1
12636
msgid ""
12637
"Log Formats\n"
12638
"==========="
12639
msgstr ""
12640
12641
#: en/help_topics/log-formats.txt:4
12642
msgid ""
12643
"A log format controls how information about each revision is displayed.\n"
12644
"The standard log formats are compared below::"
12645
msgstr ""
12646
12647
#: en/help_topics/log-formats.txt:7
12648
msgid ""
12649
" Feature long short line\n"
12650
" ---------------------- ------------- ------------ -------------------\n"
12651
" design goal detailed view concise view 1 revision per line\n"
12652
" committer name+email name only name only\n"
12653
" author name+email - -\n"
12654
" date-time format full date only date only\n"
12655
" commit message full full top line\n"
12656
" tags yes yes yes\n"
12657
" merges indicator - yes -\n"
12658
" status/delta optional optional -\n"
12659
" diff/patch optional optional -\n"
12660
" revision-id optional optional -\n"
12661
" branch nick yes - -\n"
12662
" foreign vcs properties yes yes -\n"
12663
" preferred levels all 1 1\n"
12664
" digital signature optional - -"
12665
msgstr ""
12666
12667
#: en/help_topics/log-formats.txt:24
12668
msgid ""
12669
"The default format is ``long``. To change this, define the ``log_format``\n"
12670
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12671
msgstr ""
12672
12673
#: en/help_topics/log-formats.txt:27
12674
msgid ""
12675
" [DEFAULT]\n"
12676
" log_format = short"
12677
msgstr ""
12678
12679
#: en/help_topics/log-formats.txt:30
12680
msgid ""
12681
"Alternatively, to change the log format used for a given query, use the\n"
12682
"--long, --short or --line options."
12683
msgstr ""
12684
12685
#: en/help_topics/log-formats.txt:33
12686
msgid ""
12687
"If one of the standard log formats does not meet your needs, additional\n"
12688
"formats can be provided by plugins.\n"
12689
msgstr ""
12690
12691
#: en/help_topics/other-formats.txt:1
12692
msgid "Other Storage Formats"
12693
msgstr ""
12694
12695
#: en/help_topics/other-formats.txt:3
12696
msgid "Experimental formats are shown below."
12697
msgstr ""
12698
12699
#: en/help_topics/other-formats.txt:5
12700
msgid ""
12701
":development-colo:\n"
12702
" (native) The 2a format with experimental support for colocated\n"
12703
" branches."
12704
msgstr ""
12705
12706
#: en/help_topics/other-formats.txt:9
12707
msgid ""
12708
"\n"
12709
"Deprecated formats are shown below."
12710
msgstr ""
12711
12712
#: en/help_topics/other-formats.txt:12
12713
msgid ""
12714
":pack-0.92:\n"
12715
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12716
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12717
" by bzr < 0.92."
12718
msgstr ""
12719
12720
#: en/help_topics/patterns.txt:1
12721
msgid ""
12722
"Patterns\n"
12723
"========"
12724
msgstr ""
12725
12726
#: en/help_topics/patterns.txt:4
12727
msgid ""
12728
"Bazaar uses patterns to match files at various times. For example,\n"
12729
"the ``add`` command skips over files that match ignore patterns\n"
12730
"and preferences can be associated with files using rule patterns.\n"
12731
"The pattern syntax is described below."
12732
msgstr ""
12733
12734
#: en/help_topics/patterns.txt:9
12735
msgid ""
12736
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12737
"slash or is a regular expression, it is compared to the whole path\n"
12738
"from the branch root. Otherwise, it is compared to only the last\n"
12739
"component of the path. To match a file only in the root directory,\n"
12740
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12741
msgstr ""
12742
12743
#: en/help_topics/patterns.txt:15
12744
msgid "Patterns may include globbing wildcards such as::"
12745
msgstr ""
12746
12747
#: en/help_topics/patterns.txt:17
12748
msgid ""
12749
" ? - Matches any single character except '/'\n"
12750
" * - Matches 0 or more characters except '/'\n"
12751
" /**/ - Matches 0 or more directories in a path\n"
12752
" [a-z] - Matches a single character from within a group of characters"
12753
msgstr ""
12754
12755
#: en/help_topics/patterns.txt:22
12756
msgid ""
12757
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12758
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12759
"expression. Regular expression patterns may not include named or\n"
12760
"numbered groups."
12761
msgstr ""
12762
12763
#: en/help_topics/patterns.txt:27
12764
msgid ""
12765
"Case insensitive ignore patterns can be specified with regular expressions\n"
12766
"by using the ``i`` (for ignore case) flag in the pattern."
12767
msgstr ""
12768
12769
#: en/help_topics/patterns.txt:30
12770
msgid ""
12771
"For example, a case insensitive match for ``foo`` may be specified as::"
12772
msgstr ""
12773
12774
#: en/help_topics/patterns.txt:32
12775
msgid " RE:(?i)foo"
12776
msgstr ""
12777
12778
#: en/help_topics/patterns.txt:34
12779
msgid ""
12780
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12781
"matched by that pattern will not be ignored."
12782
msgstr ""
12783
12784
#: en/help_topics/patterns.txt:37
12785
msgid ""
12786
".. _Python regular expressions: http://docs.python.org/library/re.html"
12787
msgstr ""
12788
12789
#: en/help_topics/revisionspec.txt:1
12790
msgid "Revision Identifiers"
12791
msgstr ""
12792
12793
#: en/help_topics/revisionspec.txt:3
12794
msgid ""
12795
"A revision identifier refers to a specific state of a branch's history. It\n"
12796
"can be expressed in several ways. It can begin with a keyword to\n"
12797
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12798
"'before:yesterday' and 'submit:'."
12799
msgstr ""
12800
12801
#: en/help_topics/revisionspec.txt:8
12802
msgid ""
12803
"Alternately, it can be given without a keyword, in which case it will be\n"
12804
"checked as a revision number, a tag, a revision id, a date specification, or "
12805
"a\n"
12806
"branch specification, in that order. For example, 'date:today' could be\n"
12807
"written as simply 'today', though if you have a tag called 'today' that "
12808
"will\n"
12809
"be found first."
12810
msgstr ""
12811
12812
#: en/help_topics/revisionspec.txt:14
12813
msgid ""
12814
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12815
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12816
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12817
"or\n"
12818
"spaces around the '..')."
12819
msgstr ""
12820
12821
#: en/help_topics/revisionspec.txt:19
12822
msgid ""
12823
"Ranges are interpreted differently by different commands. To the \"log\" "
12824
"command,\n"
12825
"a range is a sequence of log messages, but to the \"diff\" command, the "
12826
"range\n"
12827
"denotes a change between revisions (and not a sequence of changes). In\n"
12828
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12829
"consider it\n"
12830
"to be open-ended, that is, they include one end but not the other. For "
12831
"example:\n"
12832
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12833
"3649,\n"
12834
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12835
"and\n"
12836
"3649, but not 3647."
12837
msgstr ""
12838
12839
#: en/help_topics/revisionspec.txt:28
12840
msgid "The keywords used as revision selection methods are the following:"
12841
msgstr ""
12842
12843
#: en/help_topics/revisionspec.txt:30
12844
msgid ""
12845
":revid:\n"
12846
"\tSelects a revision using the revision id.\n"
12847
":submit:\n"
12848
"\tSelects a common ancestor with the submit branch.\n"
12849
":ancestor:\n"
12850
"\tSelects a common ancestor with a second branch.\n"
12851
":date:\n"
12852
"\tSelects a revision on the basis of a datestamp.\n"
12853
":branch:\n"
12854
"\tSelects the last revision of a specified branch.\n"
12855
":tag:\n"
12856
"\tSelects a revision identified by a tag name.\n"
12857
":revno:\n"
12858
"\tSelects a revision using a number.\n"
12859
":before:\n"
12860
"\tSelects the parent of the revision specified.\n"
12861
":annotate:\n"
12862
"\tSelect the revision that last modified the specified line.\n"
12863
":mainline:\n"
12864
"\tSelect mainline revision that merged the specified revision.\n"
12865
":last:\n"
12866
"\tSelects the nth revision from the end."
12867
msgstr ""
12868
12869
#: en/help_topics/revisionspec.txt:53
12870
msgid "In addition, plugins can provide other keywords."
12871
msgstr ""
12872
12873
#: en/help_topics/revisionspec.txt:55
12874
msgid "A detailed description of each keyword is given below."
12875
msgstr ""
12876
12877
#: en/help_topics/revisionspec.txt:57
12878
msgid ":revid:"
12879
msgstr ""
12880
12881
#: en/help_topics/revisionspec.txt:59
12882
msgid ""
12883
" Supply a specific revision id, that can be used to specify any\n"
12884
" revision id in the ancestry of the branch.\n"
12885
" Including merges, and pending merges.\n"
12886
" Examples::"
12887
msgstr ""
12888
12889
#: en/help_topics/revisionspec.txt:64
12890
msgid ""
12891
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12892
msgstr ""
12893
12894
#: en/help_topics/revisionspec.txt:66
12895
msgid ":submit:"
12896
msgstr ""
12897
12898
#: en/help_topics/revisionspec.txt:68
12899
msgid ""
12900
" Diffing against this shows all the changes that were made in this "
12901
"branch,\n"
12902
" and is a good predictor of what merge will do. The submit branch is\n"
12903
" used by the bundle and merge directive commands. If no submit branch\n"
12904
" is specified, the parent branch is used instead."
12905
msgstr ""
12906
12907
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12908
msgid ""
12909
" The common ancestor is the last revision that existed in both\n"
12910
" branches. Usually this is the branch point, but it could also be\n"
12911
" a revision that was merged."
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12915
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12916
#: en/help_topics/revisionspec.txt:153
12917
msgid " Examples::"
12918
msgstr ""
12919
12920
#: en/help_topics/revisionspec.txt:79
12921
msgid " $ bzr diff -r submit:"
12922
msgstr ""
12923
12924
#: en/help_topics/revisionspec.txt:81
12925
msgid ":ancestor:"
12926
msgstr ""
12927
12928
#: en/help_topics/revisionspec.txt:83
12929
msgid " Supply the path to a branch to select the common ancestor."
12930
msgstr ""
12931
12932
#: en/help_topics/revisionspec.txt:89
12933
msgid ""
12934
" This is frequently used with 'diff' to return all of the changes\n"
12935
" that your branch introduces, while excluding the changes that you\n"
12936
" have not merged from the remote branch."
12937
msgstr ""
12938
12939
#: en/help_topics/revisionspec.txt:95
12940
msgid ""
12941
" ancestor:/path/to/branch\n"
12942
" $ bzr diff -r ancestor:../../mainline/branch"
12943
msgstr ""
12944
12945
#: en/help_topics/revisionspec.txt:98
12946
msgid ":date:"
12947
msgstr ""
12948
12949
#: en/help_topics/revisionspec.txt:100
12950
msgid ""
12951
" Supply a datestamp to select the first revision that matches the date.\n"
12952
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12953
" Matches the first entry after a given date (either at midnight or\n"
12954
" at a specified time)."
12955
msgstr ""
12956
12957
#: en/help_topics/revisionspec.txt:105
12958
msgid " One way to display all the changes since yesterday would be::"
12959
msgstr ""
12960
12961
#: en/help_topics/revisionspec.txt:107
12962
msgid " bzr log -r date:yesterday.."
12963
msgstr ""
12964
12965
#: en/help_topics/revisionspec.txt:111
12966
msgid ""
12967
" date:yesterday -> select the first revision since "
12968
"yesterday\n"
12969
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12970
" August 14th, 2006 at 5:10pm."
12971
msgstr ""
12972
12973
#: en/help_topics/revisionspec.txt:115
12974
msgid ":branch:"
12975
msgstr ""
12976
12977
#: en/help_topics/revisionspec.txt:117
12978
msgid " Supply the path to a branch to select its last revision."
12979
msgstr ""
12980
12981
#: en/help_topics/revisionspec.txt:121
12982
msgid " branch:/path/to/branch"
12983
msgstr ""
12984
12985
#: en/help_topics/revisionspec.txt:123
12986
msgid ":tag:"
12987
msgstr ""
12988
12989
#: en/help_topics/revisionspec.txt:125
12990
msgid " Tags are stored in the branch and created by the 'tag' command."
12991
msgstr ""
12992
12993
#: en/help_topics/revisionspec.txt:127
12994
msgid ":revno:"
12995
msgstr ""
12996
12997
#: en/help_topics/revisionspec.txt:129
12998
msgid ""
12999
" Use an integer to specify a revision in the history of the branch.\n"
13000
" Optionally a branch can be specified. A negative number will count\n"
13001
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13002
" one). If the negative number is larger than the branch's history, the\n"
13003
" first revision is returned.\n"
13004
" Examples::"
13005
msgstr ""
13006
13007
#: en/help_topics/revisionspec.txt:136
13008
msgid ""
13009
" revno:1 -> return the first revision of this branch\n"
13010
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13011
" the branch '/path/to/branch'\n"
13012
" revno:-1 -> The last revision in a branch.\n"
13013
" -2:http://other/branch -> The second to last revision in the\n"
13014
" remote branch.\n"
13015
" -1000000 -> Most likely the first revision, unless\n"
13016
" your history is very long."
13017
msgstr ""
13018
13019
#: en/help_topics/revisionspec.txt:145
13020
msgid ":before:"
13021
msgstr ""
13022
13023
#: en/help_topics/revisionspec.txt:147
13024
msgid ""
13025
" Supply any revision spec to return the parent of that revision. This "
13026
"is\n"
13027
" mostly useful when inspecting revisions that are not in the revision "
13028
"history\n"
13029
" of a branch."
13030
msgstr ""
13031
13032
#: en/help_topics/revisionspec.txt:151
13033
msgid ""
13034
" It is an error to request the parent of the null revision (before:0)."
13035
msgstr ""
13036
13037
#: en/help_topics/revisionspec.txt:155
13038
msgid ""
13039
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13040
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13041
" aaaa@bbbb-1234567890\n"
13042
" bzr diff -r before:1913..1913\n"
13043
" -> Find the changes between revision 1913 and its parent "
13044
"(1912).\n"
13045
" (What changes did revision 1913 introduce).\n"
13046
" This is equivalent to: bzr diff -c 1913"
13047
msgstr ""
13048
13049
#: en/help_topics/revisionspec.txt:163
13050
msgid ":annotate:"
13051
msgstr ""
13052
13053
#: en/help_topics/revisionspec.txt:165
13054
msgid ""
13055
" Select the revision that last modified the specified line. Line is\n"
13056
" specified as path:number. Path is a relative path to the file. "
13057
"Numbers\n"
13058
" start at 1, and are relative to the current version, not the last-\n"
13059
" committed version of the file."
13060
msgstr ""
13061
13062
#: en/help_topics/revisionspec.txt:170
13063
msgid ":mainline:"
13064
msgstr ""
13065
13066
#: en/help_topics/revisionspec.txt:172
13067
msgid ""
13068
" Select the revision that merged the specified revision into mainline."
13069
msgstr ""
13070
13071
#: en/help_topics/revisionspec.txt:174
13072
msgid ":last:"
13073
msgstr ""
13074
13075
#: en/help_topics/revisionspec.txt:176
13076
msgid ""
13077
" Supply a positive number to get the nth revision from the end.\n"
13078
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13079
" Examples::"
13080
msgstr ""
13081
13082
#: en/help_topics/revisionspec.txt:180
13083
msgid ""
13084
" last:1 -> return the last revision\n"
13085
" last:3 -> return the revision 2 before the end.\n"
13086
msgstr ""
13087
13088
#: en/help_topics/rules.txt:1
13089
msgid ""
13090
"Rules\n"
13091
"====="
13092
msgstr ""
13093
13094
#: en/help_topics/rules.txt:7
13095
msgid ""
13096
"Rules are defined in ini file format where the sections are file glob\n"
13097
"patterns and the contents of each section are the preferences for files\n"
13098
"matching that pattern(s). For example::"
13099
msgstr ""
13100
13101
#: en/help_topics/rules.txt:11
13102
msgid ""
13103
" [name *.bat]\n"
13104
" eol = native"
13105
msgstr ""
13106
13107
#: en/help_topics/rules.txt:14
13108
msgid ""
13109
" [name *.html *.xml]\n"
13110
" keywords = xml_escape"
13111
msgstr ""
13112
13113
#: en/help_topics/rules.txt:17
13114
msgid ""
13115
"Preferences like these are useful for commands and plugins wishing to\n"
13116
"provide custom behaviour for selected files. For more information on \n"
13117
"end of line conversion see :doc:`eol-help`.\n"
13118
"Keyword support is provided by the `keywords plugin\n"
13119
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13120
msgstr ""
13121
13122
#: en/help_topics/rules.txt:23
13123
msgid ""
13124
"Files\n"
13125
"-----"
13126
msgstr ""
13127
13128
#: en/help_topics/rules.txt:26
13129
msgid ""
13130
"Default rules for all branches are defined in the optional file\n"
13131
"``BZR_HOME/rules``. "
13132
msgstr ""
13133
13134
#: en/help_topics/rules.txt:29
13135
msgid ""
13136
"Rule Patterns\n"
13137
"-------------"
13138
msgstr ""
13139
13140
#: en/help_topics/rules.txt:32
13141
msgid ""
13142
"Patterns are ordered and searching stops as soon as one matches.\n"
13143
"As a consequence, more explicit patterns should be placed towards\n"
13144
"the top of the file. Rule patterns use exactly the same conventions\n"
13145
"as ignore patterns. See :doc:`patterns-help` for details."
13146
msgstr ""
13147
13148
#: en/help_topics/rules.txt:37
13149
msgid ".. note::"
13150
msgstr ""
13151
13152
#: en/help_topics/rules.txt:39
13153
msgid ""
13154
" Patterns containing square brackets or spaces should be\n"
13155
" surrounded in quotes to ensure they are correctly parsed.\n"
13156
msgstr ""
13157
13158
#: en/help_topics/topics.txt:1
13159
msgid ""
13160
"authentication Information on configuring authentication\n"
13161
"basic Basic commands\n"
13162
"branches Information on what a branch is\n"
13163
"bugs Bug tracker settings\n"
13164
"checkouts Information on what a checkout is\n"
13165
"commands Basic help for all commands\n"
13166
"configuration Details on the configuration settings available\n"
13167
"conflict-types Types of conflicts and what to do about them\n"
13168
"content-filters Conversion of content into/from working trees\n"
13169
"criss-cross Information on criss-cross merging\n"
13170
"current-formats Current storage formats\n"
13171
"debug-flags Options to show or record debug information\n"
13172
"diverged-branches How to fix diverged branches\n"
13173
"env-variables Environment variable names and values\n"
13174
"eol Information on end-of-line handling\n"
13175
"files Information on configuration and log files\n"
13176
"formats Information on choosing a storage format\n"
13177
"global-options Options that control how Bazaar runs\n"
13178
"hidden-commands All hidden commands\n"
13179
"hooks Points at which custom processing can be added\n"
13180
"launchpad Using Bazaar with Launchpad.net\n"
13181
"location-alias Aliases for remembered locations\n"
13182
"log-formats Details on the logging formats available\n"
13183
"other-formats Experimental and deprecated storage formats\n"
13184
"patterns Information on the pattern syntax\n"
13185
"repositories Basic information on shared repositories.\n"
13186
"revisionspec Explain how to use --revision\n"
13187
"rules Information on defining rule-based preferences\n"
13188
"standalone-trees Information on what a standalone tree is\n"
13189
"standard-options Options that can be used with any command\n"
13190
"status-flags Help on status flags\n"
13191
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13192
"topics Topics list\n"
13193
"url-special-chars Special character handling in URLs\n"
13194
"urlspec Supported transport protocols\n"
13195
"working-trees Information on working trees\n"
13196
msgstr ""
13197
13198
#: en/help_topics/url-special-chars.txt:1
13199
msgid ""
13200
"Special character handling in URLs\n"
13201
"=================================="
13202
msgstr ""
13203
13204
#: en/help_topics/url-special-chars.txt:4
13205
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13206
msgstr ""
13207
13208
#: en/help_topics/url-special-chars.txt:6
13209
msgid " * Fully qualified URLs"
13210
msgstr ""
13211
13212
#: en/help_topics/url-special-chars.txt:8
13213
msgid " * File system paths, relative or absolute"
13214
msgstr ""
13215
13216
#: en/help_topics/url-special-chars.txt:10
13217
msgid ""
13218
"Internally bzr treats all locations as URLs. For any file system paths\n"
13219
"that are specified it will automatically determine the appropriate URL\n"
13220
"representation, and escape special characters where necessary."
13221
msgstr ""
13222
13223
#: en/help_topics/url-special-chars.txt:14
13224
msgid ""
13225
"There are a few characters which have special meaning in URLs and need "
13226
"careful\n"
13227
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13228
"value in URLs. Any non-ASCII characters in a file path will automatically "
13229
"be\n"
13230
"urlencoded when the path is converted to a URL."
13231
msgstr ""
13232
13233
#: en/help_topics/url-special-chars.txt:19
13234
msgid ""
13235
"URLs represent non-ASCII characters in an encoding defined by the server, "
13236
"but\n"
13237
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13238
"be\n"
13239
"generous in what it accepts as a URL and to print them in a way that\n"
13240
"will be readable."
13241
msgstr ""
13242
13243
#: en/help_topics/url-special-chars.txt:24
13244
msgid ""
13245
"For example, if you have a directory named '/tmp/%2False' these are all "
13246
"valid\n"
13247
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13248
"slash)::"
13249
msgstr ""
13250
13251
#: en/help_topics/url-special-chars.txt:27
13252
msgid ""
13253
" cd /tmp\n"
13254
" bzr log /tmp/%2False\n"
13255
" bzr log %2False\n"
13256
" bzr log file:///tmp/%252False\n"
13257
" bzr log file://localhost/tmp/%252False\n"
13258
" bzr log file:%252False"
13259
msgstr ""
13260
13261
#: en/help_topics/url-special-chars.txt:34
13262
msgid "These are valid but do not refer to the same file::"
13263
msgstr ""
13264
13265
#: en/help_topics/url-special-chars.txt:36
13266
msgid ""
13267
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13268
" bzr log %252False (refers to a file called /tmp/%252False)"
13269
msgstr ""
13270
13271
#: en/help_topics/url-special-chars.txt:39
13272
msgid ""
13273
"Comma also has special meaning in URLs, because it denotes `segment "
13274
"parameters`_"
13275
msgstr ""
13276
13277
#: en/help_topics/url-special-chars.txt:41
13278
msgid ""
13279
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13280
msgstr ""
13281
13282
#: en/help_topics/url-special-chars.txt:43
13283
msgid ""
13284
"Comma is also special in any file system paths that are specified. To use a "
13285
"literal\n"
13286
"comma in a file system path, specify a URL and URL encode the comma::"
13287
msgstr ""
13288
13289
#: en/help_topics/url-special-chars.txt:46
13290
msgid ""
13291
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13292
"\"branch\" set to \"bla\"\n"
13293
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13294
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13295
"\"branch\" set to \"bla\"\n"
13296
msgstr ""
13297
13298
#: en/help_topics/urlspec.txt:1
13299
msgid "URL Identifiers"
13300
msgstr ""
13301
13302
#: en/help_topics/urlspec.txt:3
13303
msgid "Supported URL prefixes::"
13304
msgstr ""
13305
13306
#: en/help_topics/urlspec.txt:5
13307
msgid ""
13308
" aftp:// Access using active FTP.\n"
13309
" bzr:// Fast access using the Bazaar smart server.\n"
13310
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13311
" file:// Access using the standard filesystem (default)\n"
13312
" ftp:// Access using passive FTP.\n"
13313
" http:// Read-only access of branches exported on the web.\n"
13314
" https:// Read-only access of branches exported on the web using "
13315
"SSL.\n"
13316
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13317
msgstr ""
13318
13319
#: en/help_topics/urlspec.txt:14
13320
msgid "Supported modifiers::"
13321
msgstr ""
13322
13323
#: en/help_topics/urlspec.txt:16
13324
msgid " gio+ Access using any GIO supported protocols."
13325
msgstr ""
13326
13327
#: en/help_topics/urlspec.txt:18
13328
msgid "Bazaar supports all of the standard parts within the URL::"
13329
msgstr ""
13330
13331
#: en/help_topics/urlspec.txt:20
13332
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13333
msgstr ""
13334
13335
#: en/help_topics/urlspec.txt:22
13336
msgid "allowing URLs such as::"
13337
msgstr ""
13338
13339
#: en/help_topics/urlspec.txt:24
13340
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13341
msgstr ""
13342
13343
#: en/help_topics/urlspec.txt:26
13344
msgid ""
13345
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13346
"with '~' as meaning that the rest of the path should be interpreted\n"
13347
"relative to the remote user's home directory. For example if the user\n"
13348
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13349
"shell.example.com, then::"
13350
msgstr ""
13351
13352
#: en/help_topics/urlspec.txt:32
13353
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13354
msgstr ""
13355
13356
#: en/help_topics/urlspec.txt:34
13357
msgid "would refer to ``/home/remote/myproject/trunk``."
13358
msgstr ""
13359
13360
#: en/help_topics/urlspec.txt:36
13361
msgid ""
13362
"Many commands that accept URLs also accept location aliases too.\n"
13363
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13364
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1